Skip to content

Test PR do not merge #18719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
maurelian wants to merge 1 commit into
base: develop
Choose a base branch
from
+332 −91
Draft

Test PR do not merge #18719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 76 additions & 9 deletions op-deployer/pkg/deployer/integration_test/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,15 +914,10 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat
// First, upgrade the superchain with V2
t.Run("upgrade superchain v2", func(t *testing.T) {
superchainUpgradeConfig := embedded.UpgradeSuperchainConfigInput{
Prank: superchainProxyAdminOwner,
Opcm: impls.OpcmV2,
SuperchainConfig: implementationsConfig.SuperchainConfigProxy,
ExtraInstructions: []embedded.ExtraInstruction{
{
Key: "PermittedProxyDeployment",
Data: []byte("DelayedWETH"),
},
},
Prank: superchainProxyAdminOwner,
Opcm: impls.OpcmV2,
SuperchainConfig: implementationsConfig.SuperchainConfigProxy,
ExtraInstructions: []embedded.ExtraInstruction{},
}
err := embedded.UpgradeSuperchainConfig(host, superchainUpgradeConfig)
if err != nil {
Expand Down Expand Up @@ -985,6 +980,7 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat
Key: "PermittedProxyDeployment",
Data: []byte("DelayedWETH"),
},
// TODO(#18502): Remove the extra instruction for custom gas token after U18 ships.
{
Key: "overrides.cfg.useCustomGasToken",
Data: make([]byte, 32),
Expand All @@ -995,6 +991,77 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat

upgradeConfigBytes, err := json.Marshal(upgradeConfig)
require.NoError(t, err, "UpgradeOPChainV2Input should marshal to JSON")

// Verify input encoding
encodedData, err := upgradeConfig.EncodedUpgradeInputV2()
require.NoError(t, err, "Should encode UpgradeInputV2")
require.NotEmpty(t, encodedData, "Encoded data should not be empty")

// Build expected hex encoding
// Structure breakdown:
// - Tuple offset (0x20)
// - SystemConfig address (0x034edd2a225f7f429a63e0f1d2084b9e0a93b538)
// - DisputeGameConfigs array offset (0x60) and ExtraInstructions array offset (0x340)
// - DisputeGameConfigs[]: 3 configs
// [0] Cannon: enabled=true, initBond=1e18, gameType=0, gameArgs="PRESTATE"
// [1] PermissionedCannon: enabled=true, initBond=1e18, gameType=1, gameArgs="PRESTATE"+proposer+challenger
// [2] CannonKona: enabled=false, initBond=0, gameType=0, gameArgs=empty
// - ExtraInstructions[]: 2 instructions
// [0] key="PermittedProxyDeployment", data="DelayedWETH"
// [1] key="overrides.cfg.useCustomGasToken", data=32 zero bytes
expected := "0000000000000000000000000000000000000000000000000000000000000020" + // offset to tuple
"000000000000000000000000034edd2a225f7f429a63e0f1d2084b9e0a93b538" + // systemConfig address
"0000000000000000000000000000000000000000000000000000000000000060" + // offset to disputeGameConfigs
"0000000000000000000000000000000000000000000000000000000000000340" + // offset to extraInstructions
"0000000000000000000000000000000000000000000000000000000000000003" + // disputeGameConfigs.length (3)
"0000000000000000000000000000000000000000000000000000000000000060" + // offset to disputeGameConfigs[0]
"0000000000000000000000000000000000000000000000000000000000000120" + // offset to disputeGameConfigs[1]
"0000000000000000000000000000000000000000000000000000000000000220" + // offset to disputeGameConfigs[2]
// DisputeGameConfigs[0] - Cannon
"0000000000000000000000000000000000000000000000000000000000000001" + // enabled=true
"0000000000000000000000000000000000000000000000000de0b6b3a7640000" + // initBond=1e18
"0000000000000000000000000000000000000000000000000000000000000000" + // gameType=0 (Cannon)
"0000000000000000000000000000000000000000000000000000000000000080" + // offset to gameArgs
"0000000000000000000000000000000000000000000000000000000000000020" + // gameArgs.length (32 bytes)
"5052455354415445000000000000000000000000000000000000000000000000" + // gameArgs data "PRESTATE"
// DisputeGameConfigs[1] - PermissionedCannon
"0000000000000000000000000000000000000000000000000000000000000001" + // enabled=true
"0000000000000000000000000000000000000000000000000de0b6b3a7640000" + // initBond=1e18
"0000000000000000000000000000000000000000000000000000000000000001" + // gameType=1 (PermissionedCannon)
"0000000000000000000000000000000000000000000000000000000000000080" + // offset to gameArgs
"0000000000000000000000000000000000000000000000000000000000000060" + // gameArgs.length (96 bytes)
"5052455354415445000000000000000000000000000000000000000000000000" + // gameArgs data "PRESTATE"
"0000000000000000000000005000000000000000000000000000000000000000" + // proposer address
"0000000000000000000000004300000000000000000000000000000000000000" + // challenger address
// DisputeGameConfigs[2] - CannonKona (disabled)
"0000000000000000000000000000000000000000000000000000000000000000" + // enabled=false
"0000000000000000000000000000000000000000000000000000000000000000" + // initBond=0
"0000000000000000000000000000000000000000000000000000000000000008" + // gameType=8 (CannonKona)
"0000000000000000000000000000000000000000000000000000000000000080" + // offset to gameArgs
"0000000000000000000000000000000000000000000000000000000000000000" + // gameArgs.length (0)
// ExtraInstructions array
"0000000000000000000000000000000000000000000000000000000000000002" + // extraInstructions.length (2)
"0000000000000000000000000000000000000000000000000000000000000040" + // offset to extraInstructions[0]
"0000000000000000000000000000000000000000000000000000000000000100" + // offset to extraInstructions[1]
// ExtraInstructions[0] - PermittedProxyDeployment
"0000000000000000000000000000000000000000000000000000000000000040" + // offset to key
"0000000000000000000000000000000000000000000000000000000000000080" + // offset to data
"0000000000000000000000000000000000000000000000000000000000000018" + // key.length (24 bytes)
"5065726d697474656450726f78794465706c6f796d656e74000000000000000" + // "PermittedProxyDeployment"
"0" + // padding
"000000000000000000000000000000000000000000000000000000000000000b" + // data.length (11 bytes)
"44656c617965645745544800000000000000000000000000000000000000000" + // "DelayedWETH"
"0" + // padding
// ExtraInstructions[1] - useCustomGasToken override
"0000000000000000000000000000000000000000000000000000000000000040" + // offset to key
"0000000000000000000000000000000000000000000000000000000000000080" + // offset to data
"000000000000000000000000000000000000000000000000000000000000001f" + // key.length (31 bytes)
"6f76657272696465732e6366672e757365437573746f6d476173546f6b656e00" + // "overrides.cfg.useCustomGasToken"
"0000000000000000000000000000000000000000000000000000000000000020" + // data.length (32 bytes)
"0000000000000000000000000000000000000000000000000000000000000000" // data (32 zero bytes)

require.Equal(t, expected, hex.EncodeToString(encodedData), "Encoded calldata should match expected structure")

err = embedded.DefaultUpgrader.Upgrade(host, upgradeConfigBytes)
require.NoError(t, err, "OPCM V2 chain upgrade should succeed")
})
Expand Down
2 changes: 1 addition & 1 deletion op-deployer/pkg/deployer/upgrade/embedded/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
)

func TestUpgradeOPChainInput_UpgradeInput(t *testing.T) {
func TestUpgradeOPChainInput_UpgradeInputV2(t *testing.T) {
input := &UpgradeOPChainInput{
Prank: common.Address{0xaa},
Opcm: common.Address{0xbb},
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts-bedrock/scripts/deploy/UpgradeOPChain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ contract UpgradeOPChainInput is BaseDeployIO {
/// @param _sel The selector of the field to set.
/// @param _value The value to set.
function set(bytes4 _sel, OPContractsManager.OpChainConfig[] memory _value) public {
if (OPContractsManager(opcm()).isDevFeatureEnabled(DevFeatures.OPCM_V2)) {
revert("UpgradeOPCMInput: cannot set OPCM v1 upgrade input when OPCM v2 is enabled");
}
require(_value.length > 0, "UpgradeOPCMInput: cannot set empty array");

if (_sel == this.upgradeInput.selector) _upgradeInput = abi.encode(_value);
Expand All @@ -40,6 +43,9 @@ contract UpgradeOPChainInput is BaseDeployIO {
/// @param _sel The selector of the field to set.
/// @param _value The value to set.
function set(bytes4 _sel, OPContractsManagerV2.UpgradeInput memory _value) public {
if (!OPContractsManager(opcm()).isDevFeatureEnabled(DevFeatures.OPCM_V2)) {
revert("UpgradeOPCMInput: cannot set OPCM v2 upgrade input when OPCM v1 is enabled");
}
require(address(_value.systemConfig) != address(0), "UpgradeOPCMInput: cannot set zero address");
require(_value.disputeGameConfigs.length > 0, "UpgradeOPCMInput: cannot set empty dispute game configs array");

Expand Down
4 changes: 1 addition & 3 deletions packages/contracts-bedrock/scripts/deploy/UpgradeSuperchainConfig.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ contract UpgradeSuperchainConfig is Script {

/// @notice Asserts that the input is valid.
function assertValidInput(Input memory _input) internal pure {
// Note: Intentionally not checking extra instructions for OPCM v2 as they are not required in some upgrades.
// This responsibility is delegated to the OPCM v2 contract.
require(_input.prank != address(0), "UpgradeSuperchainConfig: prank not set");
require(address(_input.opcm) != address(0), "UpgradeSuperchainConfig: opcm not set");
require(address(_input.superchainConfig) != address(0), "UpgradeSuperchainConfig: superchainConfig not set");
Expand Down Expand Up @@ -92,10 +90,10 @@ contract DummyCaller {
return (success, result);
}
}

/// @title DummyCallerV2
/// @notice This contract is used to mimic the contract that is used as the source of the delegatecall to the OPCM v2.
/// Uses IOPContractsManagerV2.SuperchainUpgradeInput type for the upgrade input.

contract DummyCallerV2 {
address internal _opcmAddr;

Expand Down
Loading