ethereum/client-go and parameters updated to 1.10

darienmh · Aug 26, 2022 · f8d82ef · f8d82ef
1 parent 9795f24
commit f8d82ef
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
   # The bootnode is the rendez-vous point for all other nodes.
   bootnode:
-    image: ethereum/client-go:alltools-release-1.8
+    image: ethereum/client-go:alltools-release-1.10
     ports:
       - 30303:30303
     volumes:
@@ -14,7 +14,7 @@ services:
   # The node container is our entry point to issue RPC commands
   # but it's not sealing.
   node:
-    image: ethereum/client-go:alltools-release-1.8
+    image: ethereum/client-go:alltools-release-1.10
     links: [bootnode]
     ports:
       - 8544-8546:8544-8546
@@ -26,7 +26,7 @@ services:
     command: /scripts/node.sh 0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2
   # Sealer nodes are workers that commit blocks constantly.
   sealer-one:
-    image: ethereum/client-go:alltools-release-1.8
+    image: ethereum/client-go:alltools-release-1.10
     links: [bootnode]
     volumes:
       - ./scripts:/scripts:ro
@@ -35,7 +35,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     command: /scripts/sealer.sh 0x6c319A49787d10a6e0c72a25DB06cc555370c4DD
   # sealer-two:
-  #   image: ethereum/client-go:alltools-release-1.8
+  #   image: ethereum/client-go:alltools-release-1.10
   #   restart: on-failure
   #   links: [bootnode]
   #   volumes:
@@ -45,7 +45,7 @@ services:
   #     - /etc/localtime:/etc/localtime:ro
   #   command: /scripts/sealer.sh 0x9E9581516679F57Aa7eb81D278841DF6aB93902B
   # sealer-three:
-  #   image: ethereum/client-go:alltools-release-1.8
+  #   image: ethereum/client-go:alltools-release-1.10
   #   restart: on-failure
   #   links: [bootnode]
   #   volumes:
@@ -55,7 +55,7 @@ services:
   #     - /etc/localtime:/etc/localtime:ro
   #   command: /scripts/sealer.sh 0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2
   # sealer-four:
-  #   image: ethereum/client-go:alltools-release-1.8
+  #   image: ethereum/client-go:alltools-release-1.10
   #   restart: on-failure
   #   links: [bootnode]
   #   volumes:
@@ -65,7 +65,7 @@ services:
   #     - /etc/localtime:/etc/localtime:ro
   #   command: /scripts/sealer.sh 0x0Cbbb79B02449ea575F6185dd3C541E9ab8d8182
   # sealer-five:
-  #   image: ethereum/client-go:alltools-release-1.8
+  #   image: ethereum/client-go:alltools-release-1.10
   #   restart: on-failure
   #   links: [bootnode]
   #   volumes:

diff --git a/scripts/functions.sh b/scripts/functions.sh
@@ -6,10 +6,10 @@ function prepareDatadir {
   if [ ! -d $datadir/geth ]; then
     echo "----------> A new data directory will be created!"
     geth --datadir $datadir \
-         --etherbase $etherbase \
          --networkid "18021982" \
-         --gasprice "1" \
-         --targetgaslimit "0x59a5380" \
+         --miner.etherbase $etherbase \
+         --miner.gasprice "1" \
+         --miner.gaslimit "0x59a5380" \
          init genesis.json
   fi
 }
diff --git a/scripts/node.sh b/scripts/node.sh
@@ -11,13 +11,12 @@ cp -R /keystore $datadir
 prepareDatadir $datadir $etherbase
 
 geth --datadir $datadir \
-     --etherbase $etherbase \
      --networkid "18021982" \
-     --gasprice "1" \
-     --targetgaslimit "0x59a5380" \
-     --rpc --rpcaddr '0.0.0.0' --rpcport 8545 --rpccorsdomain '*' --rpcapi 'admin,db,eth,miner,net,web3,personal,txpool' \
-     --ws --wsaddr '0.0.0.0' --wsport 8546 --wsorigins '*' \
+     --miner.etherbase $etherbase \
+     --miner.gasprice "1" \
+     --miner.gaslimit "0x59a5380" \
+     --http --http.addr '0.0.0.0' --http.port 8545 --http.corsdomain '*' --http.api 'admin,db,eth,miner,net,web3,personal,txpool' \
+     --ws --ws.addr '0.0.0.0' --ws.port 8546 --ws.origins '*' \
      --bootnodes "enode://f94118749beb981da38b82ab6be7b00dc0082783d698080fd0ae45a2c3d42f1ce74cbb153ffcfb1379b64235605bfff43f85b112032ddd9685ad2ab88735e1b1@${bootnode}:30301" \
-     --unlock $addresses \
      --password "/dev/null" \
      --verbosity 3
diff --git a/scripts/sealer.sh b/scripts/sealer.sh
@@ -10,10 +10,10 @@ cp /keystore/$etherbase.json $datadir/keystore
 prepareDatadir $datadir $etherbase
 
 geth --datadir $datadir \
-     --etherbase $etherbase \
      --networkid "18021982" \
-     --gasprice "1" \
-     --targetgaslimit "0x59a5380" \
+     --miner.etherbase $etherbase \
+     --miner.gasprice "1" \
+     --miner.gaslimit "0x59a5380" \
      --bootnodes "enode://f94118749beb981da38b82ab6be7b00dc0082783d698080fd0ae45a2c3d42f1ce74cbb153ffcfb1379b64235605bfff43f85b112032ddd9685ad2ab88735e1b1@${bootnode}:30301" \
      --unlock $etherbase \
      --password "/dev/null" \