Skip to content

[U16] StandardValidator Validation Overrides #15834

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 14 commits into from
May 14, 2025
+332 −42
Merged

[U16] StandardValidator Validation Overrides #15834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6783473
...
AmadiMichael May 12, 2025
bb9f193
fix error concatenation
AmadiMichael May 12, 2025
88df433
fix checks
AmadiMichael May 12, 2025
9a7d9cc
fix checks
AmadiMichael May 12, 2025
06754e3
better approach, add some tests
AmadiMichael May 13, 2025
ced3a6d
better approach, add more tests
AmadiMichael May 13, 2025
ce60ff2
add more tests
AmadiMichael May 13, 2025
06f2e66
improvementz
AmadiMichael May 14, 2025
79afafb
rm guardian override, fixes
AmadiMichael May 14, 2025
b311ede
fixes
AmadiMichael May 14, 2025
a2564ae
fixes
AmadiMichael May 14, 2025
baf9967
fixes...
AmadiMichael May 14, 2025
2fd1d58
optimized approach
AmadiMichael May 14, 2025
302aea7
add tests for no allow failure error with overrides
AmadiMichael May 14, 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
16 changes: 15 additions & 1 deletion packages/contracts-bedrock/interfaces/L1/IStandardValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ interface IStandardValidator {
uint256 l2ChainID;
}

struct ValidationOverrides {
address l1PAOMultisig;
address challenger;
}

function anchorStateRegistryImpl() external view returns (address);
function anchorStateRegistryVersion() external pure returns (string memory);
function challenger() external view returns (address);
Expand Down Expand Up @@ -54,6 +59,14 @@ interface IStandardValidator {
function systemConfigVersion() external pure returns (string memory);
function withdrawalDelaySeconds() external view returns (uint256);

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

function __constructor__(
Expand All @@ -62,5 +75,6 @@ interface IStandardValidator {
address _l1PAOMultisig,
address _challenger,
uint256 _withdrawalDelaySeconds
) external;
)
external;
}
63 changes: 63 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 @@ -453,6 +453,69 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "contract IProxyAdmin",
"name": "proxyAdmin",
"type": "address"
},
{
"internalType": "contract ISystemConfig",
"name": "sysCfg",
"type": "address"
},
{
"internalType": "bytes32",
"name": "absolutePrestate",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "l2ChainID",
"type": "uint256"
}
],
"internalType": "struct StandardValidator.ValidationInput",
"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 StandardValidator.ValidationOverrides",
"name": "_overrides",
"type": "tuple"
}
],
"name": "validate",
"outputs": [
{
"internalType": "string",
"name": "",
"type": "string"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "withdrawalDelaySeconds",
Expand Down
125 changes: 108 additions & 17 deletions packages/contracts-bedrock/src/L1/StandardValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ contract StandardValidator {
uint256 l2ChainID;
}

struct ValidationOverrides {
address l1PAOMultisig;
address challenger;
}

constructor(
Implementations memory _implementations,
ISuperchainConfig _superchainConfig,
Expand All @@ -87,6 +92,35 @@ contract StandardValidator {
mipsImpl = _implementations.mipsImpl;
}

function getOverridesString(ValidationOverrides memory _overrides) private pure returns (string memory) {
string memory overridesError;

if (_overrides.l1PAOMultisig != address(0)) {
overridesError = string.concat(overridesError, "OVERRIDES-L1PAOMULTISIG");
}

if (_overrides.challenger != address(0)) {
if (bytes(overridesError).length > 0) overridesError = string.concat(overridesError, ",");
overridesError = string.concat(overridesError, "OVERRIDES-CHALLENGER");
}

return overridesError;
}

function expectedL1PAOMultisig(ValidationOverrides memory _overrides) internal view returns (address) {
if (_overrides.l1PAOMultisig != address(0)) {
return _overrides.l1PAOMultisig;
}
return l1PAOMultisig;
}

function expectedChallenger(ValidationOverrides memory _overrides) internal view returns (address) {
if (_overrides.challenger != address(0)) {
return _overrides.challenger;
}
return challenger;
}

function systemConfigVersion() public pure returns (string memory) {
return "3.2.0";
}
Expand Down Expand Up @@ -140,8 +174,17 @@ contract StandardValidator {
return _errors;
}

function assertValidProxyAdmin(string memory _errors, IProxyAdmin _admin) internal view returns (string memory) {
_errors = internalRequire(_admin.owner() == l1PAOMultisig, "PROXYA-10", _errors);
function assertValidProxyAdmin(
string memory _errors,
IProxyAdmin _admin,
ValidationOverrides memory _overrides
)
internal
view
returns (string memory)
{
address _l1PAOMultisig = expectedL1PAOMultisig(_overrides);
_errors = internalRequire(_admin.owner() == _l1PAOMultisig, "PROXYA-10", _errors);
return _errors;
}

Expand Down Expand Up @@ -297,7 +340,8 @@ contract StandardValidator {
function assertValidDisputeGameFactory(
string memory _errors,
ISystemConfig _sysCfg,
IProxyAdmin _admin
IProxyAdmin _admin,
ValidationOverrides memory _overrides
)
internal
view
Expand All @@ -308,7 +352,9 @@ contract StandardValidator {
_errors = internalRequire(
_admin.getProxyImplementation(address(_factory)) == disputeGameFactoryImpl, "DF-20", _errors
);
_errors = internalRequire(_factory.owner() == l1PAOMultisig, "DF-30", _errors);

address _l1PAOMultisig = expectedL1PAOMultisig(_overrides);
_errors = internalRequire(_factory.owner() == _l1PAOMultisig, "DF-30", _errors);
return _errors;
}

Expand All @@ -317,7 +363,8 @@ contract StandardValidator {
ISystemConfig _sysCfg,
bytes32 _absolutePrestate,
uint256 _l2ChainID,
IProxyAdmin _admin
IProxyAdmin _admin,
ValidationOverrides memory _overrides
)
internal
view
Expand All @@ -343,9 +390,11 @@ contract StandardValidator {
_l2ChainID,
_admin,
GameTypes.PERMISSIONED_CANNON,
_overrides,
"PDDG"
);
_errors = internalRequire(_game.challenger() == challenger, "PDDG-120", _errors);
address _challenger = expectedChallenger(_overrides);
_errors = internalRequire(_game.challenger() == _challenger, "PDDG-120", _errors);

return _errors;
}
Expand All @@ -355,7 +404,8 @@ contract StandardValidator {
ISystemConfig _sysCfg,
bytes32 _absolutePrestate,
uint256 _l2ChainID,
IProxyAdmin _admin
IProxyAdmin _admin,
ValidationOverrides memory _overrides
)
internal
view
Expand All @@ -372,7 +422,16 @@ contract StandardValidator {
}

_errors = assertValidDisputeGame(
_errors, _sysCfg, _game, _factory, _absolutePrestate, _l2ChainID, _admin, GameTypes.CANNON, "PLDG"
_errors,
_sysCfg,
_game,
_factory,
_absolutePrestate,
_l2ChainID,
_admin,
GameTypes.CANNON,
_overrides,
"PLDG"
);

return _errors;
Expand All @@ -387,6 +446,7 @@ contract StandardValidator {
uint256 _l2ChainID,
IProxyAdmin _admin,
GameType _gameType,
ValidationOverrides memory _overrides,
string memory _errorPrefix
)
internal
Expand Down Expand Up @@ -417,7 +477,7 @@ contract StandardValidator {
Duration.unwrap(_game.maxClockDuration()) == 302400, string.concat(_errorPrefix, "-110"), _errors
);

_errors = assertValidDelayedWETH(_errors, _sysCfg, _game.weth(), _admin, _errorPrefix);
_errors = assertValidDelayedWETH(_errors, _sysCfg, _game.weth(), _admin, _overrides, _errorPrefix);
_errors = assertValidAnchorStateRegistry(_errors, _sysCfg, _factory, _asr, _admin, _errorPrefix);

// Only assert valid preimage oracle if the game VM is valid, since otherwise
Expand All @@ -434,6 +494,7 @@ contract StandardValidator {
ISystemConfig _sysCfg,
IDelayedWETH _weth,
IProxyAdmin _admin,
ValidationOverrides memory _overrides,
string memory _errorPrefix
)
internal
Expand All @@ -449,7 +510,9 @@ contract StandardValidator {
string.concat(_errorPrefix, "-20"),
_errors
);
_errors = internalRequire(_weth.proxyAdminOwner() == l1PAOMultisig, string.concat(_errorPrefix, "-30"), _errors);
address _l1PAOMultisig = expectedL1PAOMultisig(_overrides);
_errors =
internalRequire(_weth.proxyAdminOwner() == _l1PAOMultisig, string.concat(_errorPrefix, "-30"), _errors);
_errors = internalRequire(_weth.delay() == withdrawalDelaySeconds, string.concat(_errorPrefix, "-40"), _errors);
_errors = internalRequire(_weth.systemConfig() == _sysCfg, string.concat(_errorPrefix, "-50"), _errors);
return _errors;
Expand Down Expand Up @@ -531,29 +594,57 @@ contract StandardValidator {
return keccak256(bytes(_a)) == keccak256(bytes(_b));
}

function validate(ValidationInput memory _input, bool _allowFailure) public view returns (string memory) {
function validate(ValidationInput memory _input, bool _allowFailure) external view returns (string memory) {
return
validate(_input, _allowFailure, ValidationOverrides({ l1PAOMultisig: address(0), challenger: address(0) }));
}

function validate(
ValidationInput memory _input,
bool _allowFailure,
ValidationOverrides memory _overrides
)
public
view
returns (string memory)
{
string memory _errors = "";

_errors = assertValidSuperchainConfig(_errors);
_errors = assertValidProxyAdmin(_errors, _input.proxyAdmin);
_errors = assertValidProxyAdmin(_errors, _input.proxyAdmin, _overrides);
_errors = assertValidSystemConfig(_errors, _input.sysCfg, _input.proxyAdmin);
_errors = assertValidL1CrossDomainMessenger(_errors, _input.sysCfg, _input.proxyAdmin);
_errors = assertValidL1StandardBridge(_errors, _input.sysCfg, _input.proxyAdmin);
_errors = assertValidOptimismMintableERC20Factory(_errors, _input.sysCfg, _input.proxyAdmin);
_errors = assertValidL1ERC721Bridge(_errors, _input.sysCfg, _input.proxyAdmin);
_errors = assertValidOptimismPortal(_errors, _input.sysCfg, _input.proxyAdmin);
_errors = assertValidDisputeGameFactory(_errors, _input.sysCfg, _input.proxyAdmin);
_errors = assertValidDisputeGameFactory(_errors, _input.sysCfg, _input.proxyAdmin, _overrides);
_errors = assertValidPermissionedDisputeGame(
_errors, _input.sysCfg, _input.absolutePrestate, _input.l2ChainID, _input.proxyAdmin
_errors, _input.sysCfg, _input.absolutePrestate, _input.l2ChainID, _input.proxyAdmin, _overrides
);
_errors = assertValidPermissionlessDisputeGame(
_errors, _input.sysCfg, _input.absolutePrestate, _input.l2ChainID, _input.proxyAdmin
_errors, _input.sysCfg, _input.absolutePrestate, _input.l2ChainID, _input.proxyAdmin, _overrides
);

string memory overridesString = getOverridesString(_overrides);
string memory finalErrors = _errors;

// Handle overrides if present
if (bytes(overridesString).length > 0) {
// If we have both overrides and errors, combine them
if (bytes(_errors).length > 0) {
finalErrors = string.concat(overridesString, ",", _errors);
} else {
// If we only have overrides, use them as the final message
finalErrors = overridesString;
}
}

// Handle validation failure
if (bytes(_errors).length > 0 && !_allowFailure) {
revert(string.concat("StandardValidator: ", _errors));
revert(string.concat("StandardValidator: ", finalErrors));
}

return _errors;
return finalErrors;
}
}
Loading