Merge pull request #4575 from ethereum-optimism/fix/migrate-withdrawal-version

op-chain-ops: make the migrated withdrawals version 0

op-chain-ops/crossdomain/migrate.go

@@ -63,7 +63,10 @@ func MigrateWithdrawal(withdrawal *LegacyWithdrawal, l1CrossDomainMessenger *com
 		return nil, err
 	}
 
-	versionedNonce := EncodeVersionedNonce(withdrawal.Nonce, common.Big1)
+	// Migrated withdrawals are specified as version 0. Both the
+	// L2ToL1MessagePasser and the CrossDomainMessenger use the same
+	// versioning scheme. Both should be set to version 0
+	versionedNonce := EncodeVersionedNonce(withdrawal.Nonce, new(big.Int))
 	// Encode the call to `relayMessage` on the `CrossDomainMessenger`.
 	// The minGasLimit can safely be 0 here.
 	data, err := abi.Pack(
@@ -83,7 +86,7 @@ func MigrateWithdrawal(withdrawal *LegacyWithdrawal, l1CrossDomainMessenger *com
 	gasLimit := uint64(len(data)*16 + 200_000)
 
 	w := NewWithdrawal(
-		withdrawal.Nonce,
+		versionedNonce,
 		&predeploys.L2CrossDomainMessengerAddr,
 		l1CrossDomainMessenger,
 		value,

packages/contracts-bedrock/.gas-snapshot

@@ -68,7 +68,7 @@ L1CrossDomainMessenger_Test:test_relayMessage_reentrancy_reverts() (gas: 190932)
 L1CrossDomainMessenger_Test:test_relayMessage_retryAfterFailure_succeeds() (gas: 197320)
 L1CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 73646)
 L1CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 65917)
-L1CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 19530)
+L1CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 19545)
 L1CrossDomainMessenger_Test:test_replayMessage_withValue_reverts() (gas: 38265)
 L1CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 299568)
 L1CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 1490458)
@@ -115,7 +115,7 @@ L2CrossDomainMessenger_Test:test_relayMessage_reentrancy_reverts() (gas: 167794)
 L2CrossDomainMessenger_Test:test_relayMessage_retry_succeeds() (gas: 168371)
 L2CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 53212)
 L2CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 36246)
-L2CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 18898)
+L2CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 18913)
 L2CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 122533)
 L2CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 134671)
 L2CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 52623)