git.delta.rocks / unique-network / refs/commits / 017a48dc2d8e

difftreelog

Fix node roles, add key file

Greg Zaitsev2020-07-21parent: #9b6878d.patch.diff
in: master

2 files changed

modifieddocker-compose-testnet.ymldiffbeforeafterboth
before · docker-compose-testnet.yml
1version: "3.5"23services:4  node_einstein:5    image: nft-parachain6    ports:7      - 9935:99358    build:9      context: ./10      dockerfile: Dockerfile-testnet11    volumes:12      - ./chain-data-einstein:/chain-data13    networks: 14      - substrate_network15    restart: always16    environment:17      - NODE=einstein18      - P2PPORT=3033519      - WSPORT=994520      - RPCPORT=993521      - BOOTNODE=True22      - VALIDATOR=True2324  node_newton:25    image: nft-parachain26    ports:27      - 9936:993628    build:29      context: ./30      dockerfile: Dockerfile-testnet31    volumes:32      - ./chain-data-newton:/chain-data33    networks: 34      - substrate_network35    restart: always36    environment:37      - NODE=newton38      - P2PPORT=3033639      - WSPORT=994640      - RPCPORT=993641      - BOOTNODE=False42      - BOOTPORT=3033543      - BOOTID=12D3KooWRYNrSRQvJ73esUhpyETQNJWGfC2LQ9dW3HJtzHJM28Hc44      - VALIDATOR=True4546  node_bohr:47    image: nft-parachain48    ports:49      - 9944:994450    build:51      context: ./52      dockerfile: Dockerfile-testnet53    volumes:54      - ./chain-data-bohr:/chain-data55    networks: 56      - substrate_network57    restart: always58    environment:59      - NODE=bohr60      - P2PPORT=3033461      - WSPORT=994462      - RPCPORT=993463      - BOOTNODE=False64      - BOOTPORT=3033565      - BOOTID=12D3KooWRYNrSRQvJ73esUhpyETQNJWGfC2LQ9dW3HJtzHJM28Hc66      - VALIDATOR=False67      68networks: 69  substrate_network:70    driver: bridge71    name: substrate_network
after · docker-compose-testnet.yml
1version: "3.5"23services:4  node_einstein:5    image: nft-parachain6    ports:7      - 9935:99358    build:9      context: ./10      dockerfile: Dockerfile-testnet11    volumes:12      - ./chain-data-einstein:/chain-data13    networks: 14      - substrate_network15    restart: always16    environment:17      - NODE=einstein18      - P2PPORT=3033519      - WSPORT=994520      - RPCPORT=993521      - BOOTNODE=True22      - VALIDATOR=True2324  node_newton:25    image: nft-parachain26    ports:27      - 9936:993628    build:29      context: ./30      dockerfile: Dockerfile-testnet31    volumes:32      - ./chain-data-newton:/chain-data33    networks: 34      - substrate_network35    restart: always36    environment:37      - NODE=newton38      - P2PPORT=3033639      - WSPORT=994640      - RPCPORT=993641      - BOOTNODE=False42      - BOOTPORT=3033543      - BOOTID=12D3KooWRLrjXxByPkSCzcsRyf6652brnJT9s4AQHR3uujJ35mxz44      - VALIDATOR=True4546  node_bohr:47    image: nft-parachain48    ports:49      - 9944:994450    build:51      context: ./52      dockerfile: Dockerfile-testnet53    volumes:54      - ./chain-data-bohr:/chain-data55    networks: 56      - substrate_network57    restart: always58    environment:59      - NODE=bohr60      - P2PPORT=3033461      - WSPORT=994462      - RPCPORT=993463      - BOOTNODE=False64      - BOOTPORT=3033565      - BOOTID=12D3KooWRLrjXxByPkSCzcsRyf6652brnJT9s4AQHR3uujJ35mxz66      - VALIDATOR=False67      68networks: 69  substrate_network:70    driver: bridge71    name: substrate_network
modifiedrun-testnet.shdiffbeforeafterboth
--- a/run-testnet.sh
+++ b/run-testnet.sh
@@ -8,18 +8,21 @@
 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;
 BOOTNODES="--bootnodes /dns4/node_einstein/tcp/$BOOTPORT/p2p/$BOOTID";
+NODEKEY="";
 fi
 
-if [ "VALIDATOR" = True ];
+if [ "$VALIDATOR" = True ];
 then
 echo This is a Validator node;
 /usr/local/bin/nft \
@@ -34,7 +37,8 @@
   --ws-external \
   --rpc-external \
   -lruntime \
-  $BOOTNODES;
+  $BOOTNODES \
+  $NODEKEY;
 else
 echo This is a Gateway node;
 /usr/local/bin/nft \
@@ -43,11 +47,8 @@
   --port $P2PPORT \
   --ws-port $WSPORT \
   --rpc-port $RPCPORT \
-  --validator \
-  --rpc-methods=Unsafe \
   --name $NODE \
   --ws-external \
-  --rpc-external \
   --rpc-cors all \
   -lruntime \
   $BOOTNODES;