pre-release-v3

test-pp-op/2-deploy-op-contracts.sh

@@ -240,6 +240,31 @@ deploy_custom_gas_token() {
   echo "🔧 Setting up Custom Gas Token (CGT) configuration..."
   echo ""
 
+  # Extract parameters from intent.toml BEFORE changing directory
+  GAS_LIMIT=$(grep -E "^[[:space:]]*gasLimit[[:space:]]*=" "$CONFIG_DIR/intent.toml" | sed -E 's/^[[:space:]]*gasLimit[[:space:]]*=[[:space:]]*([0-9]+).*/\1/')
+  EIP1559_DENOMINATOR=$(grep -E "^[[:space:]]*eip1559Denominator[[:space:]]*=" "$CONFIG_DIR/intent.toml" | sed -E 's/^[[:space:]]*eip1559Denominator[[:space:]]*=[[:space:]]*([0-9]+).*/\1/')
+  EIP1559_ELASTICITY=$(grep -E "^[[:space:]]*eip1559Elasticity[[:space:]]*=" "$CONFIG_DIR/intent.toml" | sed -E 's/^[[:space:]]*eip1559Elasticity[[:space:]]*=[[:space:]]*([0-9]+).*/\1/')
+
+  echo "📋 Configuration from intent.toml:"
+  echo "   Gas Limit: $GAS_LIMIT"
+  echo "   EIP1559 Denominator: $EIP1559_DENOMINATOR"
+  echo "   EIP1559 Elasticity: $EIP1559_ELASTICITY"
+  echo ""
+
+  # Validate extracted parameters
+  if [ -z "$GAS_LIMIT" ]; then
+    echo "❌ Failed to extract gasLimit from intent.toml"
+    exit 1
+  fi
+  if [ -z "$EIP1559_DENOMINATOR" ]; then
+    echo "❌ Failed to extract eip1559Denominator from intent.toml"
+    exit 1
+  fi
+  if [ -z "$EIP1559_ELASTICITY" ]; then
+    echo "❌ Failed to extract eip1559Elasticity from intent.toml"
+    exit 1
+  fi
+
   SYSTEM_CONFIG_PROXY_ADDRESS=$(jq -r '.opChainDeployments[0].SystemConfigProxy' "$CONFIG_DIR/state.json")
   OPTIMISM_PORTAL_PROXY_ADDRESS=$(jq -r '.opChainDeployments[0].OptimismPortalProxy' "$CONFIG_DIR/state.json")
 
@@ -282,6 +307,38 @@ deploy_custom_gas_token() {
   echo "   Adapter:            $ADAPTER_ADDRESS"
   echo ""
 
+  # Set gas config to 0 for custom gas token (Ecotone upgrade)
+  echo "🔧 Setting gas config for Ecotone (Custom Gas Token)..."
+  cast send "$SYSTEM_CONFIG_PROXY_ADDRESS" \
+    "setGasConfigEcotone(uint32,uint32)" \
+    0 \
+    0 \
+    --rpc-url "$L1_RPC_URL" \
+    --private-key "$DEPLOYER_PRIVATE_KEY"
+  echo "✅ Gas config set to (0, 0) for Custom Gas Token"
+  echo ""
+
+  # Set gas limit
+  echo "🔧 Setting gas limit to $GAS_LIMIT..."
+  cast send "$SYSTEM_CONFIG_PROXY_ADDRESS" \
+    "setGasLimit(uint64)" \
+    "$GAS_LIMIT" \
+    --rpc-url "$L1_RPC_URL" \
+    --private-key "$DEPLOYER_PRIVATE_KEY"
+  echo "✅ Gas limit set successfully"
+  echo ""
+
+  # Set EIP-1559 parameters
+  echo "🔧 Setting EIP-1559 parameters (denominator: $EIP1559_DENOMINATOR, elasticity: $EIP1559_ELASTICITY)..."
+  cast send "$SYSTEM_CONFIG_PROXY_ADDRESS" \
+    "setEIP1559Params(uint32,uint32)" \
+    "$EIP1559_DENOMINATOR" \
+    "$EIP1559_ELASTICITY" \
+    --rpc-url "$L1_RPC_URL" \
+    --private-key "$DEPLOYER_PRIVATE_KEY"
+  echo "✅ EIP-1559 parameters set successfully"
+  echo ""
+
   # Transfer SystemConfig ownership
   echo "🔧 Transferring SystemConfig ownership..."
   echo ""

test-pp-op/4-migrate-op.sh

@@ -1,11 +1,17 @@
 #!/bin/bash
-set -x
 set -e
+
+# Debug mode - set to true to enable verbose output
+DEBUG=${DEBUG:-false}
+
+if [ "$DEBUG" = "true" ]; then
+    set -x
+fi
+
 source .env
 source tools.sh
 source utils.sh
 
-
 prepare() {
   # Check required files exist
   if [ ! -f "./config-op/genesis.json" ]; then
@@ -151,10 +157,29 @@ migrate() {
   echo "L2_NUMBER: $L2_NUMBER"
   echo "L2_HASH: $L2_HASH"
 
-  jq --argjson num "$L2_NUMBER" --arg hash "$L2_HASH" \
-     '.genesis.l2.number = $num | .genesis.l2.hash = $hash' \
+  # Update eip1559DenominatorCanyon to match eip1559Denominator in rollup.json
+  echo "🔧 Updating eip1559DenominatorCanyon to match eip1559Denominator..."
+
+  # Extract eip1559Denominator from rollup.json
+  EIP1559_DENOMINATOR=$(jq -r '.chain_op_config.eip1559Denominator' config-op/rollup.json)
+  echo "eip1559Denominator value from rollup.json: $EIP1559_DENOMINATOR"
+
+  # Debug: Check current rollup.json structure
+  echo "🔍 Current rollup.json chain_op_config structure:"
+  jq '.chain_op_config' config-op/rollup.json
+
+  # Update rollup.json with the eip1559DenominatorCanyon value
+  echo "🔧 Updating rollup.json chain_op_config..."
+  jq --argjson denominator "$EIP1559_DENOMINATOR" \
+     '.chain_op_config.eip1559DenominatorCanyon = $denominator' \
      config-op/rollup.json > config-op/rollup.json.tmp && mv config-op/rollup.json.tmp config-op/rollup.json
 
+  # Verify the update
+  echo "🔍 Updated rollup.json chain_op_config structure:"
+  jq '.chain_op_config' config-op/rollup.json
+
+  echo "✅ Updated eip1559DenominatorCanyon to $EIP1559_DENOMINATOR in rollup.json"
+
   echo "finished migrate op-geth"
 }
 

test-pp-op/config-op/intent.fakemainnet.toml.bak

@@ -18,7 +18,7 @@ l2ContractsLocator = "file:///app/packages/contracts-bedrock/forge-artifacts"
   gasLimit = 30000000
   [chains.deployOverrides]
       l2GenesisBlockGasLimit = "0x1C9C380"
-      l2GenesisBlockBaseFeePerGas = "0x5F5E100"
+      l2GenesisBlockBaseFeePerGas = "0x5FC01C5"
       l2BlockTime = 1
   [chains.customGasToken]
       enabled = true
@@ -31,5 +31,5 @@ l2ContractsLocator = "file:///app/packages/contracts-bedrock/forge-artifacts"
     systemConfigOwner = "0x1183f158515091c94188C13Cd16923cee663d4c4"
     unsafeBlockSigner = "0xe44FaF74D0EA83D962BB8cE077F69e449c6D8c4a"
     batcher = "0x02E0eF87B04FD60E7F2215D1932420a80Cc35c55"
-    proposer = "0x8E2e2C0fB70A26d94a9B29f75F9449c09F8CCc5A"
-    challenger = "0x2ada62d4B0581896c26b8627d46285A3C3078CCf"
+    proposer = "0xe43944421681170648e10007f73816e04f74394f"
+    challenger = "0x736e68af2cbf2ab0e46e4310fe5ae568b3642ff6"

test-pp-op/config-op/intent.mainnet.toml.bak

@@ -18,7 +18,7 @@ l2ContractsLocator = "file:///app/packages/contracts-bedrock/forge-artifacts"
   gasLimit = 30000000
   [chains.deployOverrides]
       l2GenesisBlockGasLimit = "0x1C9C380"
-      l2GenesisBlockBaseFeePerGas = "0x5F5E100"
+      l2GenesisBlockBaseFeePerGas = "0x5FC01C5"
       l2BlockTime = 1
   [chains.customGasToken]
       enabled = true

test-pp-op/config-op/intent.testnet.toml.bak

@@ -18,7 +18,7 @@ l2ContractsLocator = "file:///app/packages/contracts-bedrock/forge-artifacts"
   gasLimit = 30000000
   [chains.deployOverrides]
       l2GenesisBlockGasLimit = "0x1C9C380"
-      l2GenesisBlockBaseFeePerGas = "0x5F5E100"
+      l2GenesisBlockBaseFeePerGas = "0x5FC01C5"
       l2BlockTime = 1
   [chains.customGasToken]
       enabled = true

test-pp-op/m1-deploy-and-upload.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-set -x
 
 if [ ! -f .env ];then
   echo "Please create .env file."
@@ -32,6 +31,11 @@ echo ""
 echo "=============================================="
 echo "Step 2: Build op-migrate image"
 echo "=============================================="
+
+# Remove previous uploads to keep size of docker image small.
+echo "🗑️ Removing existing container ${UPLOAD_DIR}..."
+rm -rf $UPLOAD_DIR ${UPLOAD_DIR}.tar.gz
+
 if [ "$SKIP_BUILD_GETH" = true ]; then
     echo "⏭️  Skipping build_images.sh (--skip-geth flag detected)"
 else
@@ -50,7 +54,6 @@ echo ""
 echo "=============================================="
 echo "Step 4: Create folder to store upload files"
 echo "=============================================="
-rm -rf $UPLOAD_DIR
 mkdir -p $UPLOAD_DIR
 mv ${IMAGE_NAME}.tar.gz $UPLOAD_DIR
 cp ./m2-migrate.sh $UPLOAD_DIR
@@ -73,4 +76,4 @@ echo ""
 echo "=============================================="
 echo "Step 6: Upload to OSS"
 echo "=============================================="
-echo "Please create an OSS ticket with the MD5 hash: ${MD5_HASH}."
+echo "Please create an OSS ticket using ${TAR_FILE} and its MD5 hash: ${MD5_HASH}."