refac: update to enable useSurgeGasPriceOracle

Author: nmjustinchan

.env.devnet

@@ -1,7 +1,7 @@
 ############################### IMAGES #####################################
 PACAYA_PROTOCOL_IMAGE=nethermind/catalyst-taiko-protocol:taiko-alethia-protocol-v2.3.1-new
 PROTOCOL_IMAGE=nethermind/surge-protocol:sha-b85d39a
-NETHERMIND_CLIENT_IMAGE=nethermindeth/nethermind:master-d6befe8
+NETHERMIND_CLIENT_IMAGE=nethermindeth/nethermind:master
 TAIKO_CLIENT_IMAGE=nethermind/taiko-client:pr-260-3b8a522d
 CATALYST_IMAGE=nethermind/catalyst-node:v1.30.0
 RAIKO_IMAGE=nethermind/surge-raiko-zk:sha-76f481b
@@ -303,6 +303,12 @@ TX_SAFE_ABORT_NONCE_TOO_LOW_COUNT=
 # Timeout for sending transactions. If 0 it is disabled.
 TX_SEND_TIMEOUT=
 
+############################### CATALYST #####################################
+MAX_BLOCKS_PER_BATCH=10
+PRECONF_MIN_TXS=1
+MIN_BYTES_PER_TX_LIST=128
+RUST_LOG=info
+
 ############################### RELAYER #####################################
 # Database
 MYSQL_USER=admin

deploy-surge-full.sh

@@ -1533,7 +1533,7 @@ generate_l2_genesis() {
 
     update_env_var "$ENV_FILE" "SHASTA_TIMESTAMP" "$HEX_TIMESTAMP"
 
-    cat "$SURGE_GENESIS_FILE" | jq --arg hex_timestamp "$HEX_TIMESTAMP" '. * {difficulty: 0, config: {taiko: true, londonBlock: 0, ontakeBlock: 0, pacayaBlock: 1, shastaTimestamp: $hex_timestamp, feeCollector: "0x0000000000000000000000000000000000000000", shanghaiTime: 0}} | del(.config.clique)' | jq --from-file <(curl -s https://raw.githubusercontent.com/NethermindEth/core-scripts/refs/heads/main/gen2spec/gen2spec.jq) | jq --arg hex_timestamp "$HEX_TIMESTAMP" '.engine.Taiko.shastaTimestamp = $hex_timestamp' > "$DEPLOYMENT_DIR/surge_chainspec.json"
+    cat "$SURGE_GENESIS_FILE" | jq --arg hex_timestamp "$HEX_TIMESTAMP" '. * {difficulty: 0, config: {taiko: true, londonBlock: 0, ontakeBlock: 0, pacayaBlock: 1, shastaTimestamp: $hex_timestamp, useSurgeGasPriceOracle: true, feeCollector: "0x0000000000000000000000000000000000000000", shanghaiTime: 0}} | del(.config.clique)' | jq --from-file <(curl -s https://raw.githubusercontent.com/NethermindEth/core-scripts/refs/heads/main/gen2spec/gen2spec.jq) | jq --arg hex_timestamp "$HEX_TIMESTAMP" '.engine.Taiko.shastaTimestamp = $hex_timestamp' > "$DEPLOYMENT_DIR/surge_chainspec.json"
 
     echo
     echo "╔══════════════════════════════════════════════════════════════╗"

docker-compose.yml

@@ -221,10 +221,6 @@ services:
       TAIKO_WRAPPER_ADDRESS: ${PACAYA_TAIKO_WRAPPER}
       FORCED_INCLUSION_STORE_ADDRESS: ${PACAYA_FORCED_INCLUSION_STORE}
       TAIKO_BRIDGE_L2_ADDRESS: ${SHASTA_BRIDGE}
-      MAX_BLOCKS_PER_BATCH: 10
-      PRECONF_MIN_TXS: 1
-      MIN_BYTES_PER_TX_LIST: 128
-      RUST_LOG: "info"
     extra_hosts:
       - "host.docker.internal:host-gateway"
     networks:

script/start-nethermind.sh

@@ -35,6 +35,8 @@ ARGS="${ARGS} \
     --HealthChecks.Enabled=true \
     --Pruning.PruningBoundary=1000 \
     --log=${EL_LOG_LEVEL} \
+    --Surge.L1EthApiEndpoint=${L1_ENDPOINT_HTTP} \
+    --Surge.TaikoInboxAddress=${SHASTA_SURGE_INBOX} \
     --logger-config=/nethermind/NLog.config"
 
 echo "Starting Nethermind Execution Client with args: ${ARGS}"