Update to electra consensus

chains/orchestrator-relays/runtime/dancelight/src/bridge_to_ethereum_config.rs

@@ -127,6 +127,10 @@ parameter_types! {
         deneb: Fork {
             version: [4, 0, 0, 0], // 0x04000000
             epoch: 0,
+        },
+        electra: Fork {
+            version: [5, 0, 0, 0], // 0x04000000
+            epoch: 0,
         }
     };
 }
@@ -161,6 +165,10 @@ parameter_types! {
             version: hex_literal::hex!("05017000"), // 0x05017000
             epoch: 29696,
         },
+        electra: Fork {
+            version: hex_literal::hex!("06017000"), // 0x06017000
+            epoch: 115968,
+        },
     };
 }
 

test/scripts/bridge/assets/beacon-relay.json

@@ -7,7 +7,10 @@
                 "syncCommitteeSize": 512,
                 "slotsInEpoch": 32,
                 "epochsPerSyncCommitteePeriod": 256,
-                "denebForkedEpoch": 0
+                "forkVersions": {
+                    "deneb": 0,
+                    "electra": 0
+                }
             },
             "datastore": {
                 "location": "",

test/scripts/bridge/assets/execution-relay.json

@@ -14,7 +14,10 @@
                 "syncCommitteeSize": 512,
                 "slotsInEpoch": 32,
                 "epochsPerSyncCommitteePeriod": 256,
-                "denebForkedEpoch": 0
+                "forkVersions": {
+                    "deneb": 0,
+                    "electra": 0
+                }
             },
             "datastore": {
                 "location": "",

test/scripts/bridge/assets/genesis.json

@@ -1,61 +1,74 @@
 {
-    "config": {
-        "chainId": 11155111,
-        "homesteadBlock": 0,
-        "eip150Block": 0,
-        "eip155Block": 0,
-        "eip158Block": 0,
-        "byzantiumBlock": 0,
-        "constantinopleBlock": 0,
-        "petersburgBlock": 0,
-        "istanbulBlock": 0,
-        "muirGlacierBlock": 0,
-        "berlinBlock": 0,
-        "londonBlock": 0,
-        "ethash": {},
-        "terminalTotalDifficulty": 0,
-        "ShanghaiTime": 0,
-        "CancunTime": null,
-        "terminalTotalDifficultyPassed": true
-    },
-    "difficulty": "0x9FFE0",
-    "gasLimit": "80000000",
-    "alloc": {
-        "90A987B944Cb1dCcE5564e5FDeCD7a54D3de27Fe": {
-            "balance": "1000000000000000000000000"
-        },
-        "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"
-        },
-        "0xACbd24742b87c34dED607FB87b22401B2Ede167E": {
-            "balance": "100000000000000000000"
-        }
+  "config": {
+    "chainId": 11155111,
+    "homesteadBlock": 0,
+    "eip150Block": 0,
+    "eip155Block": 0,
+    "eip158Block": 0,
+    "byzantiumBlock": 0,
+    "constantinopleBlock": 0,
+    "petersburgBlock": 0,
+    "istanbulBlock": 0,
+    "muirGlacierBlock": 0,
+    "berlinBlock": 0,
+    "londonBlock": 0,
+    "ethash": {},
+    "terminalTotalDifficulty": 0,
+    "ShanghaiTime": 0,
+    "CancunTime": 0,
+    "PragueTime": null,
+    "terminalTotalDifficultyPassed": true,
+    "blobSchedule": {
+        "cancun": {
+            "target": 3,
+            "max": 6,
+            "baseFeeUpdateFraction": 3338477
+	},
+	"prague": {
+            "target": 6,
+            "max": 9,
+           "baseFeeUpdateFraction": 5007716
     }
+    }	
+  },
+  "difficulty": "0x9FFE0",
+  "gasLimit": "80000000",
+  "alloc": {
+    "90A987B944Cb1dCcE5564e5FDeCD7a54D3de27Fe": {
+      "balance": "1000000000000000000000000"
+    },
+    "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"
+    },
+    "0xACbd24742b87c34dED607FB87b22401B2Ede167E": {
+      "balance": "100000000000000000000"
+    }
+  }
 }

test/scripts/bridge/set-env.sh

@@ -22,10 +22,10 @@ export contract_dir="$relayer_root_dir/snowbridge/contracts"
 test_helpers_dir="$web_dir/packages/test-helpers"
 relay_bin="$relayer_root_dir/build/tanssi-bridge-relayer"
 
-RELAYER_COMMIT="6b4e60b905854fd72e2e972a4734b6cb6d308ac2" # TODO: Change to tag when we do releases
+RELAYER_COMMIT="05b5e6cf8fe836690cca4e88d2dff3307bf17fa4" # TODO: Change to tag when we do releases
 TANSSI_SYMBIOTIC_COMMIT="224bf2dfc682b25bf8f757e222de0aa7003ffb9f" # TODO: Change to tag when we do release
-GETH_TAG="v1.14.11" # We will need to investigate if this is right
-LODESTAR_TAG="v1.19.0"
+GETH_TAG="v1.15.3" # We will need to investigate if this is right
+LODESTAR_TAG="v1.27.0"
 
 lodestar_dir=$artifacts_dir/lodestar
 

test/scripts/bridge/setup-relayer.sh

@@ -28,16 +28,16 @@ config_relayer() {
         $assets_dir/beefy-relay.json > $output_dir/beefy-relay.json
 
     # Configure beacon relay
-    local deneb_forked_epoch=132608
-    deneb_forked_epoch=0
+    local electra_forked_epoch=132608
+    electra_forked_epoch=0
     jq \
         --arg beacon_endpoint_http $beacon_endpoint_http \
-        --argjson deneb_forked_epoch $deneb_forked_epoch \
+        --argjson electra_forked_epoch $electra_forked_epoch \
         --arg relay_chain_endpoint $RELAYCHAIN_ENDPOINT \
         --arg data_store_dir $data_store_dir \
         '
       .source.beacon.endpoint = $beacon_endpoint_http
-    | .source.beacon.spec.denebForkedEpoch = $deneb_forked_epoch
+    | .source.beacon.spec.forkVersions.electra = $electra_forked_epoch
     | .sink.parachain.endpoint = $relay_chain_endpoint
     | .source.beacon.datastore.location = $data_store_dir
     ' \

test/scripts/bridge/start-ethereum-node.sh

@@ -16,11 +16,11 @@ mkdir -p $logs_dir
 
 start_geth() {
     echo "Starting geth local node"
-    local timestamp="0" #start Cancun from genesis
+    local timestamp="0" #start Prague from genesis
     jq \
         --argjson timestamp "$timestamp" \
         '
-        .config.CancunTime = $timestamp
+        .config.PragueTime = $timestamp
         ' \
         $assets_dir/genesis.json > $output_dir/genesis.json
     geth init --datadir "$ethereum_data_dir" --state.scheme=hash "$output_dir/genesis.json"
@@ -37,7 +37,7 @@ start_geth() {
         --password /dev/null \
         --rpc.gascap 0 \
         --ws.origins "*" \
-        --trace "$ethereum_data_dir/trace" \
+        --go-execution-trace "$ethereum_data_dir/trace" \
         --gcmode archive \
         --syncmode=full \
         --state.scheme=hash \
@@ -79,6 +79,7 @@ start_lodestar() {
         --params.BELLATRIX_FORK_EPOCH 0 \
         --params.CAPELLA_FORK_EPOCH 0 \
         --params.DENEB_FORK_EPOCH 0 \
+        --params.ELECTRA_FORK_EPOCH 0 \
         --eth1=true \
         --rest.namespace="*" \
         --jwt-secret $assets_dir/jwtsecret \