Skip to content

feat: update StandardValidator for U16 #15923

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
maurelian merged 1 commit into from
May 15, 2025
Merged

feat: update StandardValidator for U16 #15923

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
30 changes: 25 additions & 5 deletions op-validator/pkg/validations/codes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ var descriptions = map[string]string{
"SYSCON-80": "SystemConfig systemTxMaxGas is not set to 1,000,000",
"SYSCON-90": "SystemConfig minimumBaseFee is not set to 1 gwei",
"SYSCON-100": "SystemConfig maximumBaseFee is not set to max uint128",
"SYSCON-110": "SystemConfig operatorFeeScalar is not set to 0",
"SYSCON-120": "SystemConfig operatorFeeConstant is not set to 0",
"SYSCON-130": "SystemConfig proxyAdmin is invalid",
"SYSCON-140": "SystemConfig superchainConfig is invalid",

// L1 Cross Domain Messenger validations
"L1xDM-10": "L1CrossDomainMessenger version mismatch",
Expand All @@ -26,7 +30,8 @@ var descriptions = map[string]string{
"L1xDM-40": "L1CrossDomainMessenger otherMessenger address mismatch",
"L1xDM-50": "L1CrossDomainMessenger PORTAL address mismatch",
"L1xDM-60": "L1CrossDomainMessenger portal address mismatch",
"L1xDM-70": "L1CrossDomainMessenger superchainConfig address mismatch",
"L1xDM-70": "L1CrossDomainMessenger systemConfig address mismatch",
"L1xDM-80": "L1CrossDomainMessenger proxyAdmin is invalid",

// L1 Standard Bridge validations
"L1SB-10": "L1StandardBridge version mismatch",
Expand All @@ -35,7 +40,8 @@ var descriptions = map[string]string{
"L1SB-40": "L1StandardBridge messenger address mismatch",
"L1SB-50": "L1StandardBridge OTHER_BRIDGE address mismatch",
"L1SB-60": "L1StandardBridge otherBridge address mismatch",
"L1SB-70": "L1StandardBridge superchainConfig address mismatch",
"L1SB-70": "L1StandardBridge systemConfig address mismatch",
"L1SB-80": "L1StandardBridge proxyAdmin is invalid",

// Optimism Mintable ERC20 Factory validations
"MERC20F-10": "OptimismMintableERC20Factory version mismatch",
Expand All @@ -50,21 +56,29 @@ var descriptions = map[string]string{
"L721B-40": "L1ERC721Bridge otherBridge address mismatch",
"L721B-50": "L1ERC721Bridge MESSENGER address mismatch",
"L721B-60": "L1ERC721Bridge messenger address mismatch",
"L721B-70": "L1ERC721Bridge superchainConfig address mismatch",
"L721B-70": "L1ERC721Bridge systemConfig address mismatch",
"L721B-80": "L1ERC721Bridge proxyAdmin is invalid",

// Optimism Portal validations
"PORTAL-10": "OptimismPortal version mismatch",
"PORTAL-20": "OptimismPortal implementation address mismatch",
"PORTAL-30": "OptimismPortal disputeGameFactory address mismatch",
"PORTAL-40": "OptimismPortal systemConfig address mismatch",
"PORTAL-50": "OptimismPortal superchainConfig address mismatch",
"PORTAL-60": "OptimismPortal guardian address mismatch",
"PORTAL-80": "OptimismPortal l2Sender not set to default value",
"PORTAL-90": "OptimismPortal proxyAdmin is invalid",

// Dispute Factory validations
"DF-10": "DisputeGameFactory version mismatch",
"DF-20": "DisputeGameFactory implementation address mismatch",
"DF-30": "DisputeGameFactory owner is not set to L1 PAO multisig",
"DF-40": "DisputeGameFactory proxyAdmin is invalid",

// ETHLockbox validations
"LOCKBOX-10": "ETHLockbox version mismatch",
"LOCKBOX-20": "ETHLockbox implementation address mismatch",
"LOCKBOX-30": "ETHLockbox proxyAdmin is invalid",
"LOCKBOX-40": "ETHLockbox systemConfig address mismatch",
"LOCKBOX-50": "ETHLockbox authorizedPortals mismatch",

// Permissioned Dispute Game validations
"PDDG-10": "Permissioned dispute game implementation not found",
Expand Down Expand Up @@ -98,22 +112,28 @@ var descriptions = map[string]string{
"PDDG-DWETH-20": "Permissioned dispute game delayed WETH implementation address mismatch",
"PDDG-DWETH-30": "Permissioned dispute game delayed WETH owner mismatch",
"PDDG-DWETH-40": "Permissioned dispute game delayed WETH delay not set to 1 week",
"PDDG-DWETH-50": "Permissioned dispute game delayed WETH system config address mismatch",
"PDDG-DWETH-60": "Permissioned dispute game delayed WETH proxy admin mismatch",
"PLDG-DWETH-10": "Permissionless dispute game delayed WETH version mismatch",
"PLDG-DWETH-20": "Permissionless dispute game delayed WETH implementation address mismatch",
"PLDG-DWETH-30": "Permissionless dispute game delayed WETH owner mismatch",
"PLDG-DWETH-40": "Permissionless dispute game delayed WETH delay not set to 1 week",
"PLDG-DWETH-50": "Permissionless dispute game delayed WETH system config address mismatch",
"PLDG-DWETH-60": "Permissionless dispute game delayed WETH proxy admin mismatch",

// Anchor State Registry validations (for both PDDG and PLDG)
"PDDG-ANCHORP-10": "Permissioned dispute game anchor state registry version mismatch",
"PDDG-ANCHORP-20": "Permissioned dispute game anchor state registry implementation address mismatch",
"PDDG-ANCHORP-30": "Permissioned dispute game anchor state registry dispute game factory address mismatch",
"PDDG-ANCHORP-40": "Permissioned dispute game anchor state registry root hash mismatch",
"PDDG-ANCHORP-50": "Permissioned dispute game anchor state registry superchain config address mismatch",
"PDDG-ANCHORP-60": "Permissioned dispute game anchor state registry retirement timestamp is not set",
"PLDG-ANCHORP-10": "Permissionless dispute game anchor state registry version mismatch",
"PLDG-ANCHORP-20": "Permissionless dispute game anchor state registry implementation address mismatch",
"PLDG-ANCHORP-30": "Permissionless dispute game anchor state registry dispute game factory address mismatch",
"PLDG-ANCHORP-40": "Permissionless dispute game anchor state registry root hash mismatch",
"PLDG-ANCHORP-50": "Permissionless dispute game anchor state registry superchain config address mismatch",
"PLDG-ANCHORP-60": "Permissionless dispute game anchor state registry retirement timestamp is not set",

// Preimage Oracle validations (for both PDDG and PLDG)
"PDDG-PIMGO-10": "Permissioned dispute game preimage oracle version mismatch",
Expand Down
3 changes: 3 additions & 0 deletions packages/contracts-bedrock/interfaces/L1/IStandardValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interface IStandardValidator {
struct Implementations {
address l1ERC721BridgeImpl;
address optimismPortalImpl;
address ethLockboxImpl;
address systemConfigImpl;
address optimismMintableERC20FactoryImpl;
address l1CrossDomainMessengerImpl;
Expand Down Expand Up @@ -52,6 +53,8 @@ interface IStandardValidator {
function optimismMintableERC20FactoryVersion() external pure returns (string memory);
function optimismPortalImpl() external view returns (address);
function optimismPortalVersion() external pure returns (string memory);
function ethLockboxImpl() external view returns (address);
function ethLockboxVersion() external pure returns (string memory);
function permissionedDisputeGameVersion() external pure returns (string memory);
function preimageOracleVersion() external pure returns (string memory);
function superchainConfig() external view returns (ISuperchainConfig);
Expand Down
10 changes: 10 additions & 0 deletions packages/contracts-bedrock/scripts/deploy/DeployStandardValidator.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ contract DeployStandardValidatorInput is BaseDeployIO {
address internal _protocolVersionsImpl;
address internal _l1ERC721BridgeImpl;
address internal _optimismPortalImpl;
address internal _ethLockboxImpl;
address internal _systemConfigImpl;
address internal _optimismMintableERC20FactoryImpl;
address internal _l1CrossDomainMessengerImpl;
Expand Down Expand Up @@ -60,6 +61,9 @@ contract DeployStandardValidatorInput is BaseDeployIO {
} else if (_sel == this.optimismPortalImpl.selector) {
require(_value != address(0), "DeployStandardValidator: optimismPortalImpl cannot be empty");
_optimismPortalImpl = _value;
} else if (_sel == this.ethLockboxImpl.selector) {
require(_value != address(0), "DeployStandardValidator: ethLockboxImpl cannot be empty");
_ethLockboxImpl = _value;
} else if (_sel == this.systemConfigImpl.selector) {
require(_value != address(0), "DeployStandardValidator: systemConfigImpl cannot be empty");
_systemConfigImpl = _value;
Expand Down Expand Up @@ -146,6 +150,11 @@ contract DeployStandardValidatorInput is BaseDeployIO {
return _optimismPortalImpl;
}

function ethLockboxImpl() public view returns (address) {
require(_ethLockboxImpl != address(0), "DeployStandardValidator: ethLockboxImpl not set");
return _ethLockboxImpl;
}

function systemConfigImpl() public view returns (address) {
require(_systemConfigImpl != address(0), "DeployStandardValidator: systemConfigImpl not set");
return _systemConfigImpl;
Expand Down Expand Up @@ -231,6 +240,7 @@ contract DeployStandardValidator is Script {
return IStandardValidator.Implementations({
l1ERC721BridgeImpl: _si.l1ERC721BridgeImpl(),
optimismPortalImpl: _si.optimismPortalImpl(),
ethLockboxImpl: _si.ethLockboxImpl(),
systemConfigImpl: _si.systemConfigImpl(),
optimismMintableERC20FactoryImpl: _si.optimismMintableERC20FactoryImpl(),
l1CrossDomainMessengerImpl: _si.l1CrossDomainMessengerImpl(),
Expand Down
31 changes: 31 additions & 0 deletions packages/contracts-bedrock/snapshots/abi/StandardValidator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
"name": "optimismPortalImpl",
"type": "address"
},
{
"internalType": "address",
"name": "ethLockboxImpl",
"type": "address"
},
{
"internalType": "address",
"name": "systemConfigImpl",
Expand Down Expand Up @@ -173,6 +178,32 @@
"stateMutability": "pure",
"type": "function"
},
{
"inputs": [],
"name": "ethLockboxImpl",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "ethLockboxVersion",
"outputs": [
{
"internalType": "string",
"name": "",
"type": "string"
}
],
"stateMutability": "pure",
"type": "function"
},
{
"inputs": [],
"name": "l1CrossDomainMessengerImpl",
Expand Down
23 changes: 15 additions & 8 deletions packages/contracts-bedrock/snapshots/storageLayout/StandardValidator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,58 +43,65 @@
},
{
"bytes": "20",
"label": "systemConfigImpl",
"label": "ethLockboxImpl",
"offset": 0,
"slot": "6",
"type": "address"
},
{
"bytes": "20",
"label": "optimismMintableERC20FactoryImpl",
"label": "systemConfigImpl",
"offset": 0,
"slot": "7",
"type": "address"
},
{
"bytes": "20",
"label": "l1CrossDomainMessengerImpl",
"label": "optimismMintableERC20FactoryImpl",
"offset": 0,
"slot": "8",
"type": "address"
},
{
"bytes": "20",
"label": "l1StandardBridgeImpl",
"label": "l1CrossDomainMessengerImpl",
"offset": 0,
"slot": "9",
"type": "address"
},
{
"bytes": "20",
"label": "disputeGameFactoryImpl",
"label": "l1StandardBridgeImpl",
"offset": 0,
"slot": "10",
"type": "address"
},
{
"bytes": "20",
"label": "anchorStateRegistryImpl",
"label": "disputeGameFactoryImpl",
"offset": 0,
"slot": "11",
"type": "address"
},
{
"bytes": "20",
"label": "delayedWETHImpl",
"label": "anchorStateRegistryImpl",
"offset": 0,
"slot": "12",
"type": "address"
},
{
"bytes": "20",
"label": "mipsImpl",
"label": "delayedWETHImpl",
"offset": 0,
"slot": "13",
"type": "address"
},
{
"bytes": "20",
"label": "mipsImpl",
"offset": 0,
"slot": "14",
"type": "address"
}
]
Loading