migration: cap withdrawal gaslimit to 25mil

ethereum-optimism · Mar 9, 2023 · 7af32bd · 7af32bd
1 parent 66cafc0
commit 7af32bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/op-chain-ops/crossdomain/migrate.go b/op-chain-ops/crossdomain/migrate.go
@@ -95,6 +95,11 @@ func MigrateWithdrawal(withdrawal *LegacyWithdrawal, l1CrossDomainMessenger *com
 
 	// Set the outer gas limit. This cannot be zero
 	gasLimit := dataCost + 200_000
+	// Cap the gas limit to be 25 million to prevent creating withdrawals
+	// that go over the block gas limit.
+	if gasLimit > 25_000_000 {
+		gasLimit = 25_000_000
+	}
 
 	w := NewWithdrawal(
 		versionedNonce,

diff --git a/packages/sdk/src/cross-chain-messenger.ts b/packages/sdk/src/cross-chain-messenger.ts
@@ -351,8 +351,12 @@ export class CrossChainMessenger {
       }
     }
 
+    // Compute the gas limit and cap at 25 million
     const dataCost = calldataCost(resolved.message)
-    const minGasLimit = dataCost.add(200_000)
+    let minGasLimit = dataCost.add(200_000)
+    if (minGasLimit.gt(25_000_000)) {
+      minGasLimit = BigNumber.from(25_000_000)
+    }
 
     return {
       ...resolved,