difftreelog
Merge branch 'master' of https://github.com/usetech-llc/nft_parachain
in: master
5 files changed
Dockerfile-testnetdiffbeforeafterboth--- a/Dockerfile-testnet
+++ b/Dockerfile-testnet
@@ -15,7 +15,6 @@
#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain
RUN mkdir nft_parachain
WORKDIR /nft_parachain
-COPY . .
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
export PATH="$PATH:$HOME/.cargo/bin" && \
@@ -26,6 +25,8 @@
rustup target list --installed && \
rustup show
+COPY . .
+
RUN export PATH="$PATH:$HOME/.cargo/bin" && \
cargo build "--$PROFILE"
# && \
deploy-testnet.shdiffbeforeafterboth--- a/deploy-testnet.sh
+++ b/deploy-testnet.sh
@@ -13,6 +13,8 @@
### Build and run Einstein node (bootnode) and Newton node
docker-compose -f docker-compose-testnet.yml up -d --build
+sleep 30
+
### Deploy aura store keys
# Einstein
curl http://localhost:9935 -H "Content-Type:application/json;charset=utf-8" -d "@./einstein_store_key.json"
@@ -27,9 +29,15 @@
# Newton
curl http://localhost:9936 -H "Content-Type:application/json;charset=utf-8" -d "@./newton_store_key_grandpa.json"
+sleep 30
+
### Stop and restart nodes so that they start finalizing
-docker-compose -f docker-compose-testnet.yml down
-docker-compose -f docker-compose-testnet.yml up -d
+docker stop nft_parachain_node_einstein_1
+docker stop nft_parachain_node_newton_1
+docker stop nft_parachain_node_bohr_1
+docker start nft_parachain_node_einstein_1
+docker start nft_parachain_node_newton_1
+docker start nft_parachain_node_bohr_1
### Cleanup
@@ -39,3 +47,5 @@
# Delete store key files
rm ./einstein_store_key.json
rm ./newton_store_key.json
+rm ./einstein_store_key_grandpa.json
+rm ./newton_store_key_grandpa.json
docker-compose-testnet.ymldiffbeforeafterboth--- a/docker-compose-testnet.yml
+++ b/docker-compose-testnet.yml
@@ -4,7 +4,6 @@
node_einstein:
image: nft-parachain
ports:
- - 9944:9944
- 9935:9935
build:
context: ./
@@ -17,14 +16,14 @@
environment:
- NODE=einstein
- P2PPORT=30335
- - WSPORT=9944
+ - WSPORT=9945
- RPCPORT=9935
- BOOTNODE=True
+ - VALIDATOR=True
node_newton:
image: nft-parachain
ports:
- - 9946:9946
- 9936:9936
build:
context: ./
@@ -41,8 +40,31 @@
- RPCPORT=9936
- BOOTNODE=False
- BOOTPORT=30335
- - BOOTID=12D3KooWRYNrSRQvJ73esUhpyETQNJWGfC2LQ9dW3HJtzHJM28Hc
+ - BOOTID=12D3KooWRLrjXxByPkSCzcsRyf6652brnJT9s4AQHR3uujJ35mxz
+ - VALIDATOR=True
+ node_bohr:
+ image: nft-parachain
+ ports:
+ - 9944:9944
+ build:
+ context: ./
+ dockerfile: Dockerfile-testnet
+ volumes:
+ - ./chain-data-bohr:/chain-data
+ networks:
+ - substrate_network
+ restart: always
+ environment:
+ - NODE=bohr
+ - P2PPORT=30334
+ - WSPORT=9944
+ - RPCPORT=9934
+ - BOOTNODE=False
+ - BOOTPORT=30335
+ - BOOTID=12D3KooWRLrjXxByPkSCzcsRyf6652brnJT9s4AQHR3uujJ35mxz
+ - VALIDATOR=False
+
networks:
substrate_network:
driver: bridge
run-testnet.shdiffbeforeafterboth1# ls -la /nft_parachain/target/release23# /usr/local/bin/nft --dev --ws-external --rpc-external --base-path=/chain-data -lwarn,runtime45echo Running node $NODE6echo P2P Port : $P2PPORT7echo WebSocket Port : $WSPORT8echo RPC Port : $RPCPORT910echo Boot = $BOOTNODE1112if [ "$BOOTNODE" = True ]; 13then14echo This is a Bootnode;15BOOTNODES="";16else17echo Bootnode Port : $BOOTPORT18echo Bootnode PeerID : $BOOTID19BOOTNODES="--bootnodes /dns4/node_einstein/tcp/$BOOTPORT/p2p/$BOOTID";20fi2122/usr/local/bin/nft \23 --base-path /chain-data \24 --chain ./nftTestnetSpecRaw.json \25 --port $P2PPORT \26 --ws-port $WSPORT \27 --rpc-port $RPCPORT \28 --validator \29 --rpc-methods=Unsafe \30 --name $NODE \31 --ws-external \32 --rpc-external \33 -lruntime \34 $BOOTNODES35upload_secrets.shdiffbeforeafterboth--- /dev/null
+++ b/upload_secrets.sh
@@ -0,0 +1,7 @@
+scp -P 8022 ./einstein_key_file developer@212.248.19.53:~/nft_parachain/einstein_key_file
+
+scp -P 8022 ./einstein_store_key.json developer@212.248.19.53:~/nft_parachain/einstein_store_key.json
+scp -P 8022 ./newton_store_key.json developer@212.248.19.53:~/nft_parachain/newton_store_key.json
+
+scp -P 8022 ./einstein_store_key_grandpa.json developer@212.248.19.53:~/nft_parachain/einstein_store_key_grandpa.json
+scp -P 8022 ./newton_store_key_grandpa.json developer@212.248.19.53:~/nft_parachain/newton_store_key_grandpa.json