-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into bm/simulate-in-ci
- Loading branch information
Showing
32 changed files
with
1,337 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ install-eip712sign: | |
| PATH="$REPO_ROOT/bin:$PATH" | ||
| cd $REPO_ROOT | ||
| mkdir -p bin || true | ||
| GOBIN="$REPO_ROOT/bin" go install github.com/base-org/[email protected].8 | ||
| GOBIN="$REPO_ROOT/bin" go install github.com/base-org/[email protected].10 | ||
| # Bundle path should be provided including the .json file extension. | ||
| add-transaction bundlePath to sig *params: | ||
|
|
||
Submodule base-contracts
updated
6 files
Submodule superchain-registry
updated
54 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| ETH_RPC_URL="https://ethereum.publicnode.com" | ||
|
|
||
| # Base L1 PAO | ||
| OWNER_SAFE=0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c | ||
| # This is Base's safe but the Nested.just file uses council as a keyword and | ||
| # we want to minimize changes | ||
| COUNCIL_SAFE=0x9855054731540A48b28990B63DcF4f33d8AE46A1 | ||
| # Foundation Operations Safe | ||
| FOUNDATION_SAFE=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A | ||
|
|
||
| # No nonce overrides needed, this is the next task for B1PAO, BOS, FOS. | ||
| # But doing them anyways. | ||
| SAFE_NONCE=4 | ||
| SAFE_NONCE_0X9855054731540A48B28990B63DCF4F33D8AE46A1=16 | ||
| SAFE_NONCE_0X9BA6E03D8B90DE867373DB8CF1A58D2F7F006B3A=97 |
57 changes: 57 additions & 0 deletions
57
tasks/eth/base-003-holocene-fp-upgrade/NestedSignFromJson.s.sol
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.15; | ||
|
|
||
| import {console2 as console} from "forge-std/console2.sol"; | ||
| import {Vm} from "forge-std/Vm.sol"; | ||
| import {stdJson} from "forge-std/StdJson.sol"; | ||
| import {Simulation} from "@base-contracts/script/universal/Simulation.sol"; | ||
| import {NestedSignFromJson as OriginalNestedSignFromJson} from "script/NestedSignFromJson.s.sol"; | ||
| import {DisputeGameUpgrade} from "script/verification/DisputeGameUpgrade.s.sol"; | ||
| import {CouncilFoundationNestedSign} from "script/verification/CouncilFoundationNestedSign.s.sol"; | ||
| import {SuperchainRegistry} from "script/verification/Verification.s.sol"; | ||
|
|
||
| contract NestedSignFromJson is OriginalNestedSignFromJson, CouncilFoundationNestedSign, DisputeGameUpgrade { | ||
| constructor() | ||
| SuperchainRegistry("mainnet", "base", "v1.8.0-rc.4") | ||
| DisputeGameUpgrade( | ||
| 0x03f89406817db1ed7fd8b31e13300444652cdb0b9c509a674de43483b2f83568, // absolutePrestate | ||
| 0xc5f3677c3C56DB4031ab005a3C9c98e1B79D438e, // faultDisputeGame | ||
| 0xF62c15e2F99d4869A925B8F57076cD85335832A2 // permissionedDisputeGame | ||
| ) | ||
| {} | ||
|
|
||
| function setUp() public view { | ||
| checkInput(); | ||
| } | ||
|
|
||
| function checkInput() public view { | ||
| string memory inputJson; | ||
| string memory path = "/tasks/eth/base-003-holocene-fp-upgrade/input.json"; | ||
| try vm.readFile(string.concat(vm.projectRoot(), path)) returns (string memory data) { | ||
| inputJson = data; | ||
| } catch { | ||
| revert(string.concat("Failed to read ", path)); | ||
| } | ||
|
|
||
| address inputPermissionedDisputeGame = | ||
| stdJson.readAddress(inputJson, "$.transactions[0].contractInputsValues._impl"); | ||
| address inputFaultDisputeGame = stdJson.readAddress(inputJson, "$.transactions[1].contractInputsValues._impl"); | ||
| require(expPermissionedDisputeGame == inputPermissionedDisputeGame, "input-pdg"); | ||
| require(expFaultDisputeGame == inputFaultDisputeGame, "input-fdg"); | ||
| } | ||
|
|
||
| function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal view override { | ||
| console.log("Running post-deploy assertions"); | ||
| checkStateDiff(accesses); | ||
| checkDisputeGameUpgrade(); | ||
| console.log("All assertions passed!"); | ||
| } | ||
|
|
||
| function getAllowedStorageAccess() internal view override returns (address[] memory) { | ||
| return allowedStorageAccess; | ||
| } | ||
|
|
||
| function getCodeExceptions() internal view override returns (address[] memory) { | ||
| return codeExceptions; | ||
| } | ||
| } |
Oops, something went wrong.