Skip to content

opcm-standard-validator: Add validation for CANNON_KONA games #18050

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

Merged
mbaxter merged 13 commits into from
Oct 30, 2025
Merged

opcm-standard-validator: Add validation for CANNON_KONA games #18050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9a70eca
Add validation input for cannon-kona prestate
mbaxter Oct 27, 2025
7c46df1
Pass errorPrefix as a parameter to assertValidPermissionlessDisputeGame
mbaxter Oct 27, 2025
bca5d07
Inject gameType into assertValidPermissionlessDisputeGame
mbaxter Oct 27, 2025
c508df5
Add checks for cannon-kona game type
mbaxter Oct 27, 2025
15ec3be
Cleanup - rename game variables for clarity
mbaxter Oct 27, 2025
99dca4e
Cleanup: guard logic that is only necessary for v1 games
mbaxter Oct 27, 2025
ea60069
Deploy cannon-kona game for standard validator tests
mbaxter Oct 27, 2025
00588eb
Update existing test error expectations
mbaxter Oct 27, 2025
50d4442
Add CannonKona tests
mbaxter Oct 27, 2025
edb9b72
Bump contract versions
mbaxter Oct 28, 2025
f700876
Run pre-pr
mbaxter Oct 28, 2025
771d478
Preserve current validation methods and structs
mbaxter Oct 29, 2025
bb19aaf
Run pre-pr
mbaxter Oct 29, 2025
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
17 changes: 17 additions & 0 deletions packages/contracts-bedrock/interfaces/L1/IOPContractsManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,23 @@ interface IOPContractsManager {
view
returns (string memory);

function validateWithOverrides(
IOPContractsManagerStandardValidator.ValidationInputDev calldata _input,
bool _allowFailure,
IOPContractsManagerStandardValidator.ValidationOverrides calldata _overrides
)
external
view
returns (string memory);

function validate(
IOPContractsManagerStandardValidator.ValidationInputDev calldata _input,
bool _allowFailure
)
external
view
returns (string memory);

function deploy(DeployInput calldata _input) external returns (DeployOutput memory);

/// @notice Upgrades the implementation of all proxies in the specified chains
Expand Down
21 changes: 21 additions & 0 deletions packages/contracts-bedrock/interfaces/L1/IOPContractsManagerStandardValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ interface IOPContractsManagerStandardValidator {
address proposer;
}

struct ValidationInputDev {
IProxyAdmin proxyAdmin;
ISystemConfig sysCfg;
bytes32 cannonPrestate;
bytes32 cannonKonaPrestate;
uint256 l2ChainID;
address proposer;
}

struct ValidationOverrides {
address l1PAOMultisig;
address challenger;
Expand Down Expand Up @@ -66,8 +75,20 @@ interface IOPContractsManagerStandardValidator {
external
view
returns (string memory);

function validate(ValidationInput memory _input, bool _allowFailure) external view returns (string memory);

function validateWithOverrides(
ValidationInputDev memory _input,
bool _allowFailure,
ValidationOverrides memory _overrides
)
external
view
returns (string memory);

function validate(ValidationInputDev memory _input, bool _allowFailure) external view returns (string memory);

function __constructor__(
Implementations memory _implementations,
ISuperchainConfig _superchainConfig,
Expand Down
129 changes: 129 additions & 0 deletions packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,62 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "contract IProxyAdmin",
"name": "proxyAdmin",
"type": "address"
},
{
"internalType": "contract ISystemConfig",
"name": "sysCfg",
"type": "address"
},
{
"internalType": "bytes32",
"name": "cannonPrestate",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "cannonKonaPrestate",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "l2ChainID",
"type": "uint256"
},
{
"internalType": "address",
"name": "proposer",
"type": "address"
}
],
"internalType": "struct OPContractsManagerStandardValidator.ValidationInputDev",
"name": "_input",
"type": "tuple"
},
{
"internalType": "bool",
"name": "_allowFailure",
"type": "bool"
}
],
"name": "validate",
"outputs": [
{
"internalType": "string",
"name": "",
"type": "string"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
Expand Down Expand Up @@ -933,6 +989,79 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "contract IProxyAdmin",
"name": "proxyAdmin",
"type": "address"
},
{
"internalType": "contract ISystemConfig",
"name": "sysCfg",
"type": "address"
},
{
"internalType": "bytes32",
"name": "cannonPrestate",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "cannonKonaPrestate",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "l2ChainID",
"type": "uint256"
},
{
"internalType": "address",
"name": "proposer",
"type": "address"
}
],
"internalType": "struct OPContractsManagerStandardValidator.ValidationInputDev",
"name": "_input",
"type": "tuple"
},
{
"internalType": "bool",
"name": "_allowFailure",
"type": "bool"
},
{
"components": [
{
"internalType": "address",
"name": "l1PAOMultisig",
"type": "address"
},
{
"internalType": "address",
"name": "challenger",
"type": "address"
}
],
"internalType": "struct OPContractsManagerStandardValidator.ValidationOverrides",
"name": "_overrides",
"type": "tuple"
}
],
"name": "validateWithOverrides",
"outputs": [
{
"internalType": "string",
"name": "",
"type": "string"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "version",
Expand Down
129 changes: 129 additions & 0 deletions packages/contracts-bedrock/snapshots/abi/OPContractsManagerStandardValidator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,62 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "contract IProxyAdmin",
"name": "proxyAdmin",
"type": "address"
},
{
"internalType": "contract ISystemConfig",
"name": "sysCfg",
"type": "address"
},
{
"internalType": "bytes32",
"name": "cannonPrestate",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "cannonKonaPrestate",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "l2ChainID",
"type": "uint256"
},
{
"internalType": "address",
"name": "proposer",
"type": "address"
}
],
"internalType": "struct OPContractsManagerStandardValidator.ValidationInputDev",
"name": "_input",
"type": "tuple"
},
{
"internalType": "bool",
"name": "_allowFailure",
"type": "bool"
}
],
"name": "validate",
"outputs": [
{
"internalType": "string",
"name": "",
"type": "string"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
Expand Down Expand Up @@ -450,6 +506,79 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "contract IProxyAdmin",
"name": "proxyAdmin",
"type": "address"
},
{
"internalType": "contract ISystemConfig",
"name": "sysCfg",
"type": "address"
},
{
"internalType": "bytes32",
"name": "cannonPrestate",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "cannonKonaPrestate",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "l2ChainID",
"type": "uint256"
},
{
"internalType": "address",
"name": "proposer",
"type": "address"
}
],
"internalType": "struct OPContractsManagerStandardValidator.ValidationInputDev",
"name": "_input",
"type": "tuple"
},
{
"internalType": "bool",
"name": "_allowFailure",
"type": "bool"
},
{
"components": [
{
"internalType": "address",
"name": "l1PAOMultisig",
"type": "address"
},
{
"internalType": "address",
"name": "challenger",
"type": "address"
}
],
"internalType": "struct OPContractsManagerStandardValidator.ValidationOverrides",
"name": "_overrides",
"type": "tuple"
}
],
"name": "validateWithOverrides",
"outputs": [
{
"internalType": "string",
"name": "",
"type": "string"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "version",
Expand Down
8 changes: 4 additions & 4 deletions packages/contracts-bedrock/snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
"sourceCodeHash": "0xfca613b5d055ffc4c3cbccb0773ddb9030abedc1aa6508c9e2e7727cc0cd617b"
},
"src/L1/OPContractsManager.sol:OPContractsManager": {
"initCodeHash": "0x3c4a51c5845588b4d19570cc1bae0099c15f43051d66b41c28d27d3c918a2e72",
"sourceCodeHash": "0x4a011105a9c1019cef7f35aa8f6eef131c29c54078e1df57d2089a43f7d81f3a"
"initCodeHash": "0x103775faed94486265eb7f68a9ae83b3055aa34f635c3a03938f1e57917eebca",
"sourceCodeHash": "0x7b627075f2ee890e526e038e47b9cc8f70f93e971f2cbebaed6ef93631bc4b00"
},
"src/L1/OPContractsManagerStandardValidator.sol:OPContractsManagerStandardValidator": {
"initCodeHash": "0xe0e6d892d38211dc0165ca00dc1e8aa558eb7a1240560260e23262f066f6be72",
"sourceCodeHash": "0xe40f42a857c9b0905db4c91d61073d9dd572a6bc49921c5ee6e875cf54dc9407"
"initCodeHash": "0xa5113ddf9f502b9ebf1b2d487f24caed21a5946c271ba69cb381f1a8cad27fcb",
"sourceCodeHash": "0x5a28bd2252503efdd3622aca1a3bbf253e6e757b4008520950c3a2177acb6fa0"
},
"src/L1/OptimismPortal2.sol:OptimismPortal2": {
"initCodeHash": "0x5bf576ea7f566e402a997204988471fc9b971410aa9dff8fe810b10baf6b7456",
Expand Down
Loading