feat(devnet): ensure eth execution layer is auto-mining (#8)

Author: hussein-aitlahcen

flake.nix

@@ -67,15 +67,21 @@
         {
           _module = {
             args = {
-
               inherit crane;
               pkgs = import nixpkgs {
                 inherit system;
                 overlays = with inputs; [
                   rust-overlay.overlays.default
                 ];
               };
-              devnetConfig = { validatorCount = 4; };
+              devnetConfig = {
+                validatorCount = 4;
+                ethereum = {
+                  beacon = {
+                    validatorCount = 64;
+                  };
+                };
+              };
               proto = {
                 uniond = builtins.path {
                   name = "uniond-proto";

networks/devnet.nix

@@ -31,6 +31,7 @@
         };
         prysm-validator = import ./services/prysm-validator.nix {
           inherit pkgs;
+          validatorCount = devnetConfig.ethereum.beacon.validatorCount;
           prysm-validator = self'.packages.prysm-validator;
           config = self'.packages.devnet-prysm-config;
         };

networks/genesis/devnet-evm/genesis.json

@@ -17,7 +17,7 @@
 		"arrowGlacierBlock": 0,
 		"grayGlacierBlock": 0,
 		"shanghaiTime": 1681499865,
-		"terminalTotalDifficulty": 0,
+    "terminalTotalDifficulty": 0,
 		"clique": {
 			"period": 5,
 			"epoch": 30000
@@ -26,11 +26,44 @@
 	"nonce": "0x0",
 	"timestamp": "0x6439a649",
 	"extraData": "0x0000000000000000000000000000000000000000000000000000000000000000123463a4b065722e99115d6c222f267d9cabb5240000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-	"gasLimit": "0x1c9c380",
+    "gasLimit": "0x1c9c380",
 	"difficulty": "0x1",
 	"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
 	"coinbase": "0x0000000000000000000000000000000000000000",
 	"alloc": {
+    "ceaBb9dE7Bdf6F20A42c7ffBBc722Eee776B3684": {
+      "balance": "100000000000000000000"
+    },
+    "Be68fC2d8249eb60bfCf0e71D5A0d2F2e292c4eD": {
+      "balance": "100000000000000000000"
+    },
+    "89b4AB1eF20763630df9743ACF155865600daFF2": {
+      "balance": "100000000000000000000"
+    },
+    "04E00e6D2e9Ea1E2AF553De02A5172120BFA5c3e": {
+      "balance": "100000000000000000000"
+    },
+    "a255dC78C1510e2c1332fBAC2de848058f479CEE": {
+      "balance": "100000000000000000000"
+    },
+    "ACbd24742b87c34dED607FB87b22401B2Ede167E": {
+      "balance": "100000000000000000000"
+    },
+    "01F6749035e02205768f97e6f1d394Fb6769EC20": {
+      "balance": "100000000000000000000"
+    },
+    "8b66D5499F52D6F1857084A61743dFCB9a712859": {
+      "balance": "100000000000000000000"
+    },
+    "13e16C4e5787f878f98a610EB321170512b134D4": {
+      "balance": "100000000000000000000"
+    },
+    "eEBFA6B9242A19f91a0463291A937a20e3355681": {
+      "balance": "100000000000000000000"
+    },
+    "87D987206180B8f3807Dd90455606eEa85cdB87a": {
+      "balance": "100000000000000000000"
+    },
 		"123463a4b065722e99115d6c222f267d9cabb524": {
 			"balance": "0x43c33c1937564800000"
 		},

networks/genesis/devnet.nix

@@ -13,7 +13,7 @@
       mkHome = { genesisAccounts }:
         pkgs.runCommand "genesis-home" { } ''
           mkdir -p $out
-          
+
           # Generate the wasm client genesis state
           base64 -w0 ${self'.packages.wasm-ethereum-lc}/lib/union_ethereum_lc.wasm > $out/encoded.txt
           ${uniond} init testnet bn254 --chain-id ${chainId} --home $out
@@ -26,11 +26,11 @@
           cat $out/config/genesis.json | \
              ${pkgs.jq}/bin/jq --arg code_id $CODE_ID --rawfile encoded_file $out/encoded.txt '.app_state."08-wasm".contracts'='[ { "code_id_key": $code_id, "contract_code": $encoded_file }  ]' \
           > $out/tmp-genesis.json
-          
+
           # TODO(aeryz): This can be enabled with `CODE_ID_B64` line if we want to add the client at the genesis.
           # | ${pkgs.jq}/bin/jq --arg code_id $CODE_ID_B64 .app_state.ibc.client_genesis.clients='[{"client_id":"08-wasm-0","client_state":{"@type":"/ibc.lightclients.wasm.v1.ClientState","code_id":$code_id,"data":"e30=","latest_height":{"revision_height":"2","revision_number":"0"}}}]' | ${pkgs.jq}/bin/jq .app_state.ibc.client_genesis.clients_consensus='[{"client_id":"08-wasm-0","consensus_states":[{"consensus_state":{"@type":"/ibc.lightclients.wasm.v1.ConsensusState","data":"e30=","timestamp":"1678732260023000000"},"height":{"revision_height":"1","revision_number":"0"}}]}]' \
           mv $out/tmp-genesis.json $out/config/genesis.json
-            
+
           # Add the dev account
           ADDRESS=`echo 'wine parrot nominee girl exchange element pudding grow area twenty next junior come render shadow evidence sentence start rough debate feed all limb real' | ${uniond} keys add --recover testkey --keyring-backend test --home $out --output json | ${pkgs.jq}/bin/jq -r .address`
           ${uniond} add-genesis-account $ADDRESS 10000000000000000000000000stake --keyring-backend test --home $out
@@ -65,12 +65,11 @@
       mkGethPrysmGenesis = {}:
         pkgs.runCommand "geth-prysm-genesis" { } ''
           mkdir -p $out
-          cp ${./devnet-evm/genesis.json} "./genesis.json"
-        
-          ${prysmctl} \
-          testnet generate-genesis \
+          cp ${./devnet-evm/genesis.json} ./genesis.json
+
+          ${prysmctl} testnet generate-genesis \
             --fork=bellatrix \
-            --num-validators=64 \
+            --num-validators=${toString devnetConfig.ethereum.beacon.validatorCount} \
             --output-ssz=$out/genesis.ssz \
             --chain-config-file=${./devnet-evm/beacon-config.yml} \
             --geth-genesis-json-in=./genesis.json \
@@ -128,7 +127,6 @@
       };
 
       packages.devnet-geth-config = pkgs.linkFarm "devnet-geth-config" [
-        { name = "genesis.json"; path = "${./devnet-evm/genesis.json}"; }
         { name = "beacon-config.yml"; path = "${./devnet-evm/beacon-config.yml}"; }
         { name = "dev-key0.prv"; path = "${./devnet-evm/dev-key0.prv}"; }
         { name = "dev-key1.prv"; path = "${./devnet-evm/dev-key1.prv}"; }

networks/services/geth.nix

@@ -8,7 +8,7 @@ let
         DATADIR=.
         ETH_DATADIR=$DATADIR/geth
         cp ${genesis}/genesis.json "$DATADIR/genesis.json"
-        
+
         geth init --datadir "$ETH_DATADIR" "$DATADIR/genesis.json"
         geth account import --datadir "$ETH_DATADIR" \
           --password /dev/null ${config}/dev-key0.prv
@@ -52,7 +52,7 @@ in
     ];
     command = [ "${geth-init}/bin/geth-init" ];
     healthcheck = {
-      start_period = "5s";
+      start_period = "20s";
       interval = "10s";
       retries = 4;
       test = [

networks/services/prysm-validator.nix

@@ -1,4 +1,4 @@
-{ pkgs, prysm-validator, config, ... }:
+{ pkgs, prysm-validator, config, validatorCount, ... }:
 let
   prysm-validator-init = pkgs.writeShellApplication {
     name = "prysm-validator-init";
@@ -11,7 +11,7 @@ let
       --beacon-rpc-provider=prysm-beacon:4000 \
       --datadir=./validatordata \
       --accept-terms-of-use \
-      --interop-num-validators=64 \
+      --interop-num-validators=${toString validatorCount} \
       --interop-start-index=0 \
       --chain-config-file=${config}/beacon-config.yml
     '';
@@ -27,8 +27,8 @@ in
     networks = [ "union-devnet" ];
     command = [ (pkgs.lib.getExe prysm-validator-init) ];
     depends_on = {
-      geth = {
-        condition = "service_healthy";
+      prysm-beacon = {
+        condition = "service_started";
       };
     };
   };