git.delta.rocks / unique-network / refs/commits / 4fc7c3c8399c

--- 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" 
 	# && \

--- 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

--- 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

--- a/run-testnet.sh
+++ b/run-testnet.sh
@@ -8,17 +8,23 @@
 echo RPC Port        : $RPCPORT
 
 echo Boot = $BOOTNODE
+echo Validator = $VALIDATOR
 
 if [ "$BOOTNODE" = True ]; 
 then
 echo This is a Bootnode;
 BOOTNODES="";
+NODEKEY="--node-key-file einstein_key_file";
 else
-echo Bootnode Port   : $BOOTPORT
-echo Bootnode PeerID : $BOOTID
+echo Bootnode Port   : $BOOTPORT;
+echo Bootnode PeerID : $BOOTID;
 BOOTNODES="--bootnodes /dns4/node_einstein/tcp/$BOOTPORT/p2p/$BOOTID";
+NODEKEY="";
 fi
 
+if [ "$VALIDATOR" = True ];
+then
+echo This is a Validator node;
 /usr/local/bin/nft \
   --base-path /chain-data \
   --chain ./nftTestnetSpecRaw.json \
@@ -31,5 +37,19 @@
   --ws-external \
   --rpc-external \
   -lruntime \
-  $BOOTNODES
-
+  $BOOTNODES \
+  $NODEKEY;
+else
+echo This is a Gateway node;
+/usr/local/bin/nft \
+  --base-path /chain-data \
+  --chain ./nftTestnetSpecRaw.json \
+  --port $P2PPORT \
+  --ws-port $WSPORT \
+  --rpc-port $RPCPORT \
+  --name $NODE \
+  --ws-external \
+  --rpc-cors all \
+  -lruntime \
+  $BOOTNODES;
+fi