fix crosscheck

Author: mmsqe

integration_tests/network.py

@@ -114,6 +114,8 @@ def setup_geth(path, base_port):
             str(base_port + 1),
             "--networkid",
             str(15),
+            "--miner.etherbase",
+            "0x57f96e6B86CdeFdB3d412547816a82E3E0EbF9D2",
         ]
         print(*cmd)
         proc = subprocess.Popen(

nix/go-ethereum.nix

@@ -10,16 +10,16 @@ let
 in
 buildGoModule rec {
   pname = "go-ethereum";
-  version = "1.10.15";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0f6n9rg42ph47mvykc9f0lf99yzwqy4jm7mlzyks4l6i6fl1g3q1";
+    sha256 = "sha256-LCJDpSyQUL7DXZDbZepaoU78uXfoPPMKMETy/uq+0LE=";
   };
 
-  vendorSha256 = "1s5yfpk2yn7f3zwjl2fdrh6c63ki2b8rlmnlss27yxibsidaj0yd";
+  vendorSha256 = "sha256-6yLkeT5DrAPUohAmobssKkvxgXI8kACxiu17WYbw+n0=";
 
   doCheck = false;
 
@@ -42,7 +42,6 @@ buildGoModule rec {
     "cmd/faucet"
     "cmd/geth"
     "cmd/p2psim"
-    "cmd/puppeth"
     "cmd/rlpdump"
     "cmd/utils"
   ];

scripts/geth-genesis.json

@@ -14,6 +14,7 @@
     "berlinBlock": 0,
     "yoloV3Block": 0,
     "londonBlock": 0,
+    "shanghaiTime": 0,
     "clique": {
       "period": 2,
       "epoch": 30000

scripts/start-geth

@@ -33,7 +33,7 @@ print(Account.from_mnemonic('$VALIDATOR1_MNEMONIC').key.hex().replace('0x',''))
 cat > $tmpfile << EOF
 $validator_key
 EOF
-geth --datadir $DATA account import $tmpfile --password $pwdfile
+geth --datadir $DATA --password $pwdfile account import $tmpfile
 
 # import community key
 community_key=$(python -c """
@@ -45,7 +45,7 @@ print(Account.from_mnemonic('$COMMUNITY_MNEMONIC').key.hex().replace('0x',''))
 cat > $tmpfile << EOF
 $community_key
 EOF
-geth --datadir $DATA account import $tmpfile --password $pwdfile
+geth --datadir $DATA --password $pwdfile account import $tmpfile
 
 rm $tmpfile