Skip to content

Commit 07340ca

Browse files
wileyjwileyj
committed
Cleaning up for testnet image
1 parent 735c5de commit 07340ca

8 files changed

+99
-24
lines changed

‎docker/docker-compose.dev.stacks-blockchain-follower.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
stacks-blockchain:
44
build:
55
context: ../stacks-blockchain/docker
6-
command: stacks-node start --config=/app/config/Stacks-follower.toml
6+
command: stacks-node start --config=/app/config/Stacks-mocknet.toml
77
restart: on-failure
88
environment:
99
STACKS_EVENT_OBSERVER: host.docker.internal:3700

‎docker/docker-compose.dev.stacks-blockchain.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
stacks-blockchain:
44
build:
55
context: ../stacks-blockchain/docker
6-
command: stacks-node start --config=/app/config/Stacks-dev.toml
6+
command: stacks-node start --config=/app/config/Stacks-mocknet.toml
77
restart: on-failure
88
environment:
99
STACKS_EVENT_OBSERVER: host.docker.internal:3700

‎docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
stacks-blockchain:
1515
build:
1616
context: ../stacks-blockchain/docker
17-
command: stacks-node start --config=/app/config/Stacks-follower.toml
17+
command: stacks-node start --config=/app/config/Stacks-mocknet.toml
1818
restart: on-failure
1919
environment:
2020
STACKS_EVENT_OBSERVER: stacks-blockchain-api:3700

‎docker/stx-rosetta.Dockerfile

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
ARG STACKS_API_VERSION=v0.63.0
2-
ARG STACKS_NODE_VERSION=2.0.11.2.0
1+
ARG STACKS_API_VERSION=v0.71.0
2+
ARG STACKS_NODE_VERSION=2.0.11.4.0
33
ARG STACKS_API_REPO=blockstack/stacks-blockchain-api
44
ARG STACKS_NODE_REPO=blockstack/stacks-blockchain
55
ARG PG_VERSION=12
6-
ARG STACKS_NETWORK=testnet
6+
ARG STACKS_NETWORK=mainnet
77
ARG STACKS_LOG_DIR=/var/log/stacks-node
88
ARG STACKS_SVC_DIR=/etc/service
99
ARG STACKS_BLOCKCHAIN_DIR=/stacks-blockchain
1010
ARG STACKS_BLOCKCHAIN_API_DIR=/stacks-blockchain-api
11-
ARG PG_DATA=/data/postgres
1211
ARG V2_POX_MIN_AMOUNT_USTX=90000000260
12+
ARG PG_DATA=/data/postgres
13+
ARG PG_DATABASE=postgres
14+
ARG PG_HOST=127.0.0.1
15+
ARG PG_PORT=5432
16+
ARG PG_USER=postgres
17+
ARG PG_PASSWORD=postgres
1318

1419
#######################################################################
1520
## Build the stacks-blockchain-api
@@ -60,13 +65,17 @@ ARG STACKS_BLOCKCHAIN_API_DIR
6065
ARG PG_DATA
6166
ARG PG_VERSION
6267
ARG V2_POX_MIN_AMOUNT_USTX
63-
ENV PG_HOST=127.0.0.1
64-
ENV PG_PORT=5432
65-
ENV PG_USER=postgres
66-
ENV PG_PASSWORD=postgres
67-
ENV PG_DATABASE=postgres
68+
ARG PG_HOST
69+
ARG PG_PORT
70+
ARG PG_USER
71+
ARG PG_PASSWORD
72+
ARG PG_DATABASE
73+
ENV PG_HOST=${PG_HOST}
74+
ENV PG_PORT=${PG_PORT}
75+
ENV PG_USER=${PG_USER}
76+
ENV PG_PASSWORD=${PG_PASSWORD}
77+
ENV PG_DATABASE=${PG_DATABASE}
6878
ENV PG_DATA=${PG_DATA}
69-
ENV PG_VERSION=${PG_VERSION}
7079
ENV STACKS_SVC_DIR=${STACKS_SVC_DIR}
7180
ENV STACKS_BLOCKCHAIN_DIR=${STACKS_BLOCKCHAIN_DIR}
7281
ENV STACKS_BLOCKCHAIN_API_DIR=${STACKS_BLOCKCHAIN_API_DIR}
@@ -79,6 +88,7 @@ ENV STACKS_BLOCKCHAIN_API_PORT=3999
7988
ENV STACKS_BLOCKCHAIN_API_HOST=0.0.0.0
8089
ENV STACKS_CORE_RPC_HOST=127.0.0.1
8190
ENV STACKS_CORE_RPC_PORT=20443
91+
ENV STACKS_CORE_P2P_PORT=20444
8292
ENV MAINNET_STACKS_CHAIN_ID=0x00000001
8393
ENV TESTNET_STACKS_CHAIN_ID=0x80000000
8494
ENV V2_POX_MIN_AMOUNT_USTX=${V2_POX_MIN_AMOUNT_USTX}
@@ -110,15 +120,14 @@ RUN mkdir -p \
110120
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/* /tmp/* ${STACKS_SVC_DIR}/getty*
111121
COPY --from=stacks-blockchain-build /out ${STACKS_BLOCKCHAIN_DIR}
112122
COPY --from=stacks-blockchain-api-build /app ${STACKS_BLOCKCHAIN_API_DIR}
113-
RUN cp ${STACKS_BLOCKCHAIN_API_DIR}/stacks-blockchain/Stacks-mocknet.toml ${STACKS_BLOCKCHAIN_DIR}/Stacks-testnet.toml \
114-
&& cp ${STACKS_BLOCKCHAIN_API_DIR}/stacks-blockchain/Stacks-mocknet.toml ${STACKS_BLOCKCHAIN_DIR}/Stacks-mocknet.toml
123+
COPY stacks-blockchain/Stacks-*.toml ${STACKS_BLOCKCHAIN_DIR}/
115124

116125
###################################
117126
## runit service files
118127
RUN printf '#!/bin/sh\nexec 2>&1\n[ ! -d %s ] && mkdir -p %s && chown -R postgres:postgres %s && gosu postgres /usr/lib/postgresql/%s/bin/pg_ctl init -D %s\nexec gosu postgres /usr/lib/postgresql/%s/bin/postmaster -D %s' ${PG_DATA} ${PG_DATA} ${PG_DATA} ${PG_VERSION} ${PG_DATA} ${PG_VERSION} ${PG_DATA} > ${STACKS_SVC_DIR}/postgresql/run \
119128
&& printf '#!/bin/sh\nrm -rf %s' ${PG_DATA} > ${STACKS_SVC_DIR}/postgresql/finish \
120129
&& printf '#!/bin/sh\nexec svlogd -tt %s/postgresql' ${STACKS_LOG_DIR} > ${STACKS_SVC_DIR}/postgresql/log/run \
121-
&& printf '#!/bin/sh\nexec 2>&1\nif [ $STACKS_NETWORK != "mainnet" ]; then\n exec %s/stacks-node start --config=%s/Stacks-testnet.toml 2>&1\nelse\n exec %s/stacks-node mainnet 2>&1\nfi' ${STACKS_BLOCKCHAIN_DIR} ${STACKS_BLOCKCHAIN_DIR} ${STACKS_BLOCKCHAIN_DIR} > ${STACKS_SVC_DIR}/stacks-blockchain/run \
130+
&& printf '#!/bin/sh\nexec 2>&1\ncase $STACKS_NETWORK in\n testnet)\n exec %s/stacks-node start --config=%s/Stacks-testnet.toml 2>&1\n ;;\n mocknet)\n exec %s/stacks-node start --config=%s/Stacks-mocknet.toml 2>&1\n ;;\n *)\n exec %s/stacks-node start --config=%s/Stacks-mainnet.toml 2>&1\n ;;\nesac' ${STACKS_BLOCKCHAIN_DIR} ${STACKS_BLOCKCHAIN_DIR} ${STACKS_BLOCKCHAIN_DIR} ${STACKS_BLOCKCHAIN_DIR} ${STACKS_BLOCKCHAIN_DIR} ${STACKS_BLOCKCHAIN_DIR} > ${STACKS_SVC_DIR}/stacks-blockchain/run \
122131
&& printf '#!/bin/bash\nexec 2>&1\nsv start postgresql stacks-blockchain || exit 1\nif [ $STACKS_NETWORK != "mainnet" ]; then\n export STACKS_CHAIN_ID=%s\nelse\n export STACKS_CHAIN_ID=%s\n export V2_POX_MIN_AMOUNT_USTX=%s\nfi\ncd %s && exec node ./lib/index.js 2>&1' ${TESTNET_STACKS_CHAIN_ID} ${MAINNET_STACKS_CHAIN_ID} ${V2_POX_MIN_AMOUNT_USTX} ${STACKS_BLOCKCHAIN_API_DIR} > ${STACKS_SVC_DIR}/stacks-blockchain-api/run \
123132
&& printf '#!/bin/sh\nexec svlogd -tt %s/stacks-blockchain-api' ${STACKS_LOG_DIR} > ${STACKS_SVC_DIR}/stacks-blockchain-api/log/run \
124133
&& printf '#!/bin/sh\n/usr/bin/runsvdir %s' ${STACKS_SVC_DIR} > /entrypoint.sh \
@@ -131,6 +140,6 @@ RUN printf '#!/bin/sh\nexec 2>&1\n[ ! -d %s ] && mkdir -p %s && chown -R postgre
131140
${STACKS_SVC_DIR}/stacks-blockchain-api/log/run \
132141
/entrypoint.sh
133142

134-
EXPOSE ${STACKS_BLOCKCHAIN_API_PORT} ${STACKS_CORE_RPC_PORT}
143+
EXPOSE ${STACKS_BLOCKCHAIN_API_PORT} ${STACKS_CORE_RPC_PORT} ${STACKS_CORE_P2P_PORT}
135144
VOLUME /data
136-
ENTRYPOINT ["/entrypoint.sh"]
145+
CMD ["/entrypoint.sh"]

‎stacks-blockchain/Stacks-follower.toml renamed to ‎stacks-blockchain/Stacks-mainnet.toml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
rpc_bind = "0.0.0.0:20443"
33
p2p_bind = "0.0.0.0:20444"
44
bootstrap_node = "02da7a464ac770ae8337a343670778b93410f2f3fef6bea98dd1c3e9224459d36b@seed-0.mainnet.stacks.co:20444,02afeae522aab5f8c99a00ddf75fbcb4a641e052dd48836408d9cf437344b63516@seed-1.mainnet.stacks.co:20444,03652212ea76be0ed4cd83a25c06e57819993029a7b9999f7d63c36340b34a4e62@seed-2.mainnet.stacks.co:20444"
5+
working_dir = "/tmp/stacks-blockchain"
56

67
[burnchain]
78
chain = "bitcoin"
89
mode = "mainnet"
9-
peer_host = "bitcoin.blockstack.com"
10+
peer_host = "bitcoind.stacks.co"
1011
username = "blockstack"
1112
password = "blockstacksystem"
1213
rpc_port = 8332
1314
peer_port = 8333
14-
magic_byte = "X2"
15+
16+
# Used for sending events to a local stacks-blockchain-api service
17+
[[events_observer]]
18+
endpoint = "localhost:3700"
19+
retry_count = 255
20+
events_keys = ["*"]

‎stacks-blockchain/Stacks-mocknet.toml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,35 @@
11
[node]
2-
name = "helium-node"
32
rpc_bind = "0.0.0.0:20443"
4-
#working_dir = "/tmp/stacks-blockchain-data"
3+
p2p_bind = "0.0.0.0:20444"
4+
bootstrap_node = "04ee0b1602eb18fef7986887a7e8769a30c9df981d33c8380d255edef003abdcd243a0eb74afdf6740e6c423e62aec631519a24cf5b1d62bf8a3e06ddc695dcb77@127.0.0.1:20444"
5+
wait_time_for_microblocks = 10000
6+
use_test_genesis_chainstate = true
57

68
[burnchain]
79
chain = "bitcoin"
810
mode = "mocknet"
9-
commit_anchor_block_within = 10000
11+
12+
# Used for sending events to a local stacks-blockchain-api service
13+
[[events_observer]]
14+
endpoint = "localhost:3700"
15+
retry_count = 255
16+
events_keys = ["*"]
17+
18+
[[mstx_balance]]
19+
address = "ST3EQ88S02BXXD0T5ZVT3KW947CRMQ1C6DMQY8H19"
20+
amount = 100000000000000
21+
22+
[[mstx_balance]]
23+
address = "ST3KCNDSWZSFZCC6BE4VA9AXWXC9KEB16FBTRK36T"
24+
amount = 100000000000000
25+
26+
[[mstx_balance]]
27+
address = "STB2BWB0K5XZGS3FXVTG3TKS46CQVV66NAK3YVN8"
28+
amount = 100000000000000
29+
30+
[[mstx_balance]]
31+
address = "STSTW15D618BSZQB85R058DS46THH86YQQY6XCB7"
32+
amount = 100000000000000
1033

1134
[[mstx_balance]]
1235
address = "STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6"

‎stacks-blockchain/Stacks-testnet.toml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[node]
2+
rpc_bind = "0.0.0.0:20443"
3+
p2p_bind = "0.0.0.0:20444"
4+
bootstrap_node = "047435c194e9b01b3d7f7a2802d6684a3af68d05bbf4ec8f17021980d777691f1d51651f7f1d566532c804da506c117bbf79ad62eea81213ba58f8808b4d9504ad@testnet.stacks.co:20444"
5+
wait_time_for_microblocks = 10000
6+
working_dir = "/tmp/stacks-blockchain"
7+
8+
[burnchain]
9+
chain = "bitcoin"
10+
mode = "xenon"
11+
peer_host = "bitcoind.testnet.stacks.co"
12+
username = "blockstack"
13+
password = "blockstacksystem"
14+
rpc_port = 18332
15+
peer_port = 18333
16+
17+
# Used for sending events to a local stacks-blockchain-api service
18+
[[events_observer]]
19+
endpoint = "localhost:3700"
20+
retry_count = 255
21+
events_keys = ["*"]
22+
23+
[[mstx_balance]]
24+
address = "ST2QKZ4FKHAH1NQKYKYAYZPY440FEPK7GZ1R5HBP2"
25+
amount = 10000000000000000
26+
27+
[[mstx_balance]]
28+
address = "ST319CF5WV77KYR1H3GT0GZ7B8Q4AQPY42ETP1VPF"
29+
amount = 10000000000000000
30+
31+
[[mstx_balance]]
32+
address = "ST221Z6TDTC5E0BYR2V624Q2ST6R0Q71T78WTAX6H"
33+
amount = 10000000000000000
34+
35+
[[mstx_balance]]
36+
address = "ST2TFVBMRPS5SSNP98DQKQ5JNB2B6NZM91C4K3P7B"
37+
amount = 10000000000000000

‎stacks-blockchain/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM blockstack/stacks-blockchain:2.0.11.2.0-stretch as build
1+
FROM blockstack/stacks-blockchain:2.0.11.4.0-stretch as build
22

33
FROM debian:stretch
44

0 commit comments

Comments
 (0)