Skip to content
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.

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

add tests #21

Open
wants to merge 32 commits into
base: feat/templates-pt2
Choose a base branch
from
Open

add tests #21

wants to merge 32 commits into from

Conversation

prateek105
Copy link
Collaborator

No description provided.

@prateek105 prateek105 marked this pull request as ready for review January 27, 2025 05:31
Comment on lines 174 to 182
"MultisigTask: address ORDERLY_SystemConfigProxy @0x886B187C3D293B1449A3A0F23Ca9e2269E0f2664 not in allowed storage accesses"
);
multisigTask.run(taskConfigFilePath);
}

function testRevertIfAllowedStorageNotWritten() public {
multisigTask = new IncorrectGasConfigTemplate2();
vm.expectRevert(
"MultisigTask: address METAL_SystemConfigOwner @0x4a4962275DF8C60a80d3a25faEc5AA7De116A746 not in task state change addresses"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's make these addresses pulled in from superchain registry repo so if they ever change the tests don't fail

Comment on lines 6 to 10
import {AddressRegistry as Addresses} from "src/fps/AddressRegistry.sol";
import {MultisigTask} from "src/fps/task/MultisigTask.sol";
import {DisputeGameUpgradeTemplate} from "src/fps/example/template/DisputeGameUpgradeTemplate.sol";
import {IGnosisSafe, Enum} from "@base-contracts/script/universal/IGnosisSafe.sol";
import {MULTICALL3_ADDRESS} from "src/fps/utils/Constants.sol";

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: visual import style:

Suggested change
import {AddressRegistry as Addresses} from "src/fps/AddressRegistry.sol";
import {MultisigTask} from "src/fps/task/MultisigTask.sol";
import {DisputeGameUpgradeTemplate} from "src/fps/example/template/DisputeGameUpgradeTemplate.sol";
import {IGnosisSafe, Enum} from "@base-contracts/script/universal/IGnosisSafe.sol";
import {MULTICALL3_ADDRESS} from "src/fps/utils/Constants.sol";
import {MultisigTask} from "src/fps/task/MultisigTask.sol";
import {IGnosisSafe, Enum} from "@base-contracts/script/universal/IGnosisSafe.sol";
import {MULTICALL3_ADDRESS} from "src/fps/utils/Constants.sol";
import {AddressRegistry as Addresses} from "src/fps/AddressRegistry.sol";
import {DisputeGameUpgradeTemplate} from "src/fps/example/template/DisputeGameUpgradeTemplate.sol";

ElliotFriedman and others added 13 commits January 27, 2025 17:37
* remove: name and description from task config

Signed-off-by: Elliot <[email protected]>

add example task template config files

Signed-off-by: Elliot <[email protected]>

add fps example templates

Signed-off-by: Elliot <[email protected]>

remove name and description, set task nonce to current multisig nonce

Signed-off-by: Elliot <[email protected]>

fmt and add TODO to switch to manual nonce later

Signed-off-by: Elliot <[email protected]>

templates

Signed-off-by: Elliot <[email protected]>

remove safeNonce from mock network config

Signed-off-by: Elliot <[email protected]>

* checkpoint

Signed-off-by: Elliot <[email protected]>

* remove isNested flag from toml config file

Signed-off-by: Elliot <[email protected]>

* fmt

Signed-off-by: Elliot <[email protected]>

* fix is nested safe logic

* fix task01

* add Task02

* refactor _getDataToSign function

Signed-off-by: Elliot <[email protected]>

* add: gas template docs

Signed-off-by: Elliot <[email protected]>

* add: template examples to run

Signed-off-by: Elliot <[email protected]>

* add: error handle parsing l2 chain configs

Signed-off-by: Elliot <[email protected]>

* fmt

Signed-off-by: Elliot <[email protected]>

* remove unused variable name

Signed-off-by: Elliot <[email protected]>

* error handle reading in and parsing task config file

Signed-off-by: Elliot <[email protected]>

* add breakdown of calldata difference for signers

Signed-off-by: Elliot <[email protected]>

* remove setting scalars to simplify example task

Signed-off-by: Elliot <[email protected]>

* add duplicate call structure of task 020 in existing tooling

Signed-off-by: Elliot <[email protected]>

* remove setting gas scalars from gas config template

Signed-off-by: Elliot <[email protected]>

* note on commenting out failing check and link to diffchecker

Signed-off-by: Elliot <[email protected]>

* add: task config tests

Signed-off-by: Elliot <[email protected]>

* add forge build before running template

Signed-off-by: Elliot <[email protected]>

* update docs to only include gas limits and not gas scalars

Signed-off-by: Elliot <[email protected]>

* remove template ci runs

Signed-off-by: Elliot <[email protected]>

* Update src/fps/FPS.md

Co-authored-by: blaine <[email protected]>

* Update src/fps/FPS.md

Co-authored-by: blaine <[email protected]>

* Update src/fps/FPS.md

* fps -> new task simulation tooling

Signed-off-by: Elliot <[email protected]>

* remove unused template files

Signed-off-by: Elliot <[email protected]>

* naming: fps.md -> readme.md

Signed-off-by: Elliot <[email protected]>

* naming: move away from fps

Signed-off-by: Elliot <[email protected]>

* use op types, remove inlined interfaces

Signed-off-by: Elliot <[email protected]>

* update readme for running tasks

Signed-off-by: Elliot <[email protected]>

* update: cleanup, make MultisigTask a generic template

Signed-off-by: Elliot <[email protected]>

* fix test

Signed-off-by: Elliot <[email protected]>

* delete: task config

Signed-off-by: Elliot <[email protected]>

* update based on PR feedback, remove taskConfig.toml fields, and safeNonce and isNestedSafe

Signed-off-by: Elliot <[email protected]>

* remove unused mock network configs

Signed-off-by: Elliot <[email protected]>

* remove opmainnetConfig.toml

Signed-off-by: Elliot <[email protected]>

* add op set gas limit config

Signed-off-by: Elliot <[email protected]>

* update command to use new run function

Signed-off-by: Elliot <[email protected]>

* update command to only have mainnet config toml file

Signed-off-by: Elliot <[email protected]>

* naming: networkConfigFilePath -> taskConfigFilePath

Signed-off-by: Elliot <[email protected]>

* fmt

Signed-off-by: Elliot <[email protected]>

* natspec, taskStorageWrites -> _taskStorageWrites

Signed-off-by: Elliot <[email protected]>

* fix test

Signed-off-by: Elliot <[email protected]>

* add additional docs for address registry

Signed-off-by: Elliot <[email protected]>

* fix: nested multisig issue

Signed-off-by: Elliot <[email protected]>

* add op gas config command

Signed-off-by: Elliot <[email protected]>

* add task tests

* Revert "add task tests"

This reverts commit 70ed74f.

* fix: nonce for nested safes use their own nonce and not parent

Signed-off-by: Elliot <[email protected]>

* update natspec proposal -> task

Signed-off-by: Elliot <[email protected]>

---------

Signed-off-by: Elliot <[email protected]>
Co-authored-by: prateek <[email protected]>
Co-authored-by: blaine <[email protected]>
* naming: proposal -> task

Signed-off-by: Elliot <[email protected]>

* naming: proposal -> task

Signed-off-by: Elliot <[email protected]>

---------

Signed-off-by: Elliot <[email protected]>
…ord-template

refactor virtual keyword template
prateek105 and others added 10 commits January 30, 2025 14:00
…ereum-optimism#484)

* upgrade Base's mainnet SystemConfig to v2.3.0

* fix: temporarily transfer ownership to allow batching setEip1559 tx

* add validation instructions

* remove SIMULATE_WITHOUT_LEDGER

* use public RPC url

* add SAFE_NONCE_XXX env variables

* fix syntax issues in VALIDATION.md

* update eip1559 params

* fix: typo

* Update README.md

---------

Co-authored-by: blaine <[email protected]>
* fix: add simulate task for mainnet

* fix: change task

* fix: task name
* Setup Rehearsal 4 for OPSC

* Update security-council-rehearsals/2025-01-28-r4-jointly-upgrade-2025-01-28/README.md

---------

Co-authored-by: Matt Solomon <[email protected]>
Missing a / in the just command
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants