Skip to content
Closed
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
289bdd4
chore: add remapping for optimism lib
oxlumi Aug 19, 2025
fb1de79
feat: L1PortalExecuteL2Call task implementation
oxlumi Aug 19, 2025
27de7e3
feat: rehearsals specs for L1PortalExecuteL2Call task
oxlumi Aug 19, 2025
64e7689
test: add regression test for new template L1PortalExecuteL2Call
0xiamflux Aug 23, 2025
a4bc70d
feat: create new rehearsal ceremony to make an upgrade to L2 Governor
0xiamflux Aug 25, 2025
0f97595
chore: update comment on Optimism Portal address
0xiamflux Aug 27, 2025
dfadb1f
Merge pull request #2 from defi-wonderland/test/l1portalexecutel2call
0xiamflux Aug 27, 2025
9b22137
chore: sync with main branch
0xiamflux Aug 27, 2025
212a84e
refactor: remove nested try-catch
0xiamflux Aug 28, 2025
fe44a7e
chore: update fmt
0xiamflux Aug 28, 2025
b823c6a
chore: complies with ci
0xiamflux Aug 28, 2025
a9b18e6
chore: remove unecessary remapping
0xiamflux Sep 15, 2025
51d63c5
chore: remove rehearsal docs for no-op upgrade
0xiamflux Sep 18, 2025
543b409
chore: fix compiler warnings
0xiamflux Sep 18, 2025
cc569d3
chore: fix just simulate sep command failure
0xiamflux Sep 18, 2025
fcc89ba
chore: remove newline in sc rehearsals README
0xiamflux Sep 22, 2025
fadfa08
refactor: add OptimismPortal interface in template to avoid coupling
0xiamflux Sep 22, 2025
a3ca79e
chore: update comment natspec on template
0xiamflux Sep 22, 2025
0caf083
feat: revert before reaching portal with a descriptive message when i…
0xiamflux Sep 22, 2025
c0cd688
refactor: prefe readBytes over manually parsing
0xiamflux Sep 22, 2025
0af20c9
fix: use encodeCall over encodeWithSelector
0xiamflux Sep 22, 2025
cde2b35
chore: undo diff for canceled task
0xiamflux Sep 22, 2025
3f3b8d9
chore: fix README newlines
0xiamflux Sep 22, 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
2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ remappings = [
'@solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src/',
'@lib-keccak/=lib/optimism/packages/contracts-bedrock/lib/lib-keccak/contracts/lib/',
'ds-test/=lib/optimism/packages/contracts-bedrock/lib/forge-std/lib/ds-test/src',
'forge-std/=lib/forge-std/src/',
'forge-std/=lib/forge-std/src/'
]

[profile.ci]
Expand Down
2 changes: 2 additions & 0 deletions security-council-rehearsals/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ This directory contains templates and ceremonies related to onboarding Security
## Creating and signing a new rehearsal ceremony

To create a new rehearsal ceremony, follow the instructions in the _Facilitator_ section of the README files for each of the following rehearsals:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit, can undo this diff since we don't touch the rehearsals dir anywhere else here

1. [rehearsal-1-welcome](./rehearsal-1-welcome/README.md)
2. [rehearsal-2-remove-signer](./rehearsal-2-remove-signer/README.md)
3. [rehearsal-3-nested-upgrade](./rehearsal-3-jointly-upgrade/README.md)
4. [rehearsal-4-noop-upgrade](./rehearsal-4-noop-upgrade/README.md)

If you're a signer, you can find instructions for signing the rehearsals in the top sections of the same README files.
265 changes: 265 additions & 0 deletions security-council-rehearsals/rehearsal-4-noop-upgrade/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
# Rehearsal 4 - No-op Governor Upgrade

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this being put into the rehearsals directory?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

GM, our goal here was to add a rehearsal task for a no-op upgrade on the Optimism Governor Proxy on L2 using a newly added template. What would be the best place to do this?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

hm, this rehearsals directory contains templates and ceremonies related to onboarding Security Council members. I don't think this is what you want to do right?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The task was to create a rehearsal upgrade ceremony for the Security Council to complete an end-to-end process of a no-op upgrade in a way that is repeatable.

Which would be a better suited place to put it?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this simply to test this templates functionality? Or have you been in touch with the security council and agreed that this should be a new rehearsal for them to perform when onboarding a security council memeber?

If it's the former, you don't need to add this as a rehearsal. When you create a new template, you just need to follow this guide: https://github.com/ethereum-optimism/superchain-ops/blob/main/src/improvements/doc/NEW_TEMPLATE_GUIDE.md (1. make template 2. make Regression test 3. make example task

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We just removed the rehearsal docs in the rehearsal folder on this commit.


## Objective

In this rehearsal, we will be performing an upgrade call to the Governor Proxy on OP Mainnet.

Once completed:

- A deposit transaction event will be emitted from the OptimismPortal contract on L1.
- The Governor implementation on OP Mainnet will remain unchanged

The call executed by the Safe contract is defined in the `build` function of the [`L1PortalExecuteL2Call`](../../src/improvements/template/L1PortalExecuteL2Call.sol) template.

Note: No onchain actions will occur during this rehearsal. You are not submitting a transaction, and your wallet does not need to be funded. You will simply sign an offchain message with your wallet. These signatures will be collected by a Facilitator, who will submit them for execution.
Once the required number of signatures is collected, anyone can finalize the execution. For convenience, a Facilitator will handle this step.

## Approving the transaction

### 1. Update repo and move to the appropriate folder for this rehearsal task:

```
cd superchain-ops
git pull
# Make sure you've installed the dependencies for the repository.
cd src/improvements/tasks/<network>/rehearsals/<rehearsal-task-name> # This path should be shared with you by the Facilitator.
```

See the [README](../../src/improvements/README.md) for more information on how to install the dependencies for the repository.

### 2. Setup Ledger

Your Ledger needs to be connected and unlocked. The Ethereum
application needs to be opened on Ledger with the message “Application
is ready”.

### 3. Simulate and validate the transaction

Make sure your ledger is still unlocked and run the following.

```shell
cd src/improvements/tasks/<network>/rehearsals/<rehearsal-task-name>
just --dotenv-path $(pwd)/.env simulate
# For a different derivation path, use: HD_PATH=1 just --dotenv-path $(pwd)/.env simulate
```

You will see a "Simulation link" URL in the output.

Copy this URL from the output and and open it with your browser. A prompt may ask you to choose a
project, any project will do. You can create one if necessary.

Click "Simulate Transaction".

We will be performing 3 validations and ensure the domain hash and
message hash are the same between the Tenderly simulation and your
Ledger:

1. Validate integrity of the simulation.
2. Validate correctness of the state diff.
3. Validate and extract domain hash and message hash to approve.

#### 3.1. Validate integrity of the simulation.

To validate integrity of the simulation, we need to check the following:

1. "Network": Check the network is Ethereum Mainnet.
2. "Timestamp": Check the simulation is performed on a block with a
recent timestamp (i.e. close to when you run the script).
3. "Sender": Check the address shown is your signer account. If not,
you will need to determine which “number” it is in the list of
addresses on your ledger. By default the script will assume the
derivation path is `m/44'/60'/0'/0/0`.

Here is an example screenshot, note that the Timestamp and Sender
might be different in your simulation:

![](./images/1-simulation-success.png)

#### 3.2. Validate correctness of the state diff.

Now click on the "State" tab. Verify that:

1. You'll see 3 nonce changes for the signer address, the Safe and the Proxy Admin's safe.
2. You will see state overrides (not a state change) for both Council's Safe and Proxy Admin's. This is expected and its purpose is to generate a successful Safe execution simulation without collecting any signatures.
3. You will also see state changes on the Proxy Admin's `approvedHashes` mapping.
4. You will see state changes for the OptimismPortal's `prevBoughtGas` and `prevBlockNum` storage variables, on the first slot.
5. You may see some LivenessGuard state changes which are safe to ignore, as per the screenshot below. These are a result of using the production Security Council safe for the simulation, which has LivenessGuard enabled.

Here is an example screenshot. Note that the addresses may be
different:

![](./images/2-state-diff.png)

Now click on the "Events" tab. Verify that:

1. `TransactionDeposited` event has been emitted by the Optimism Portal. This should include:
- The correct `to` address, in this case, the address used in the `config.toml` for `l2Target`.
- The correct `from` address, in this case, the aliased address of the `ProxyAdmin`.
- The correct calldata sent to the Governor in the `opaqueData` field: this is the concatenation of the value sent to the contract, the gas limit, a flag indicating if we are creating a contract (`false` in this rehearsal) and the actual call made to the L2 contract.

Here is an example screenshot. Note the specific data might be different:

![](./images/3-event-emission.png)

In this rehearsal the values correspond to:

```
0000000000000000000000000000000000000000000000000000000000000000 -> msg.value
0000000000000000000000000000000000000000000000000000000000000000 -> value sent to L2 contract
000000000007a120 -> Gas Limit, in the photo the value corresponds to 500,000
00 -> isCreation, set to false
3659cfe60000000000000000000000000000000000000000000000000000000000001234 -> The abi-encoded call to `upgradeTo(address)` with address `0x0000000000000000000000000000000000001234`
```

#### 3.3. Extract the domain hash and the message hash to approve.

Now that we have verified the transaction performs the right
operation, we need to extract the domain hash and the message hash to
approve.

Go back to the "Overview" tab, and find the first
`GnosisSafe.domainSeparator` call. This call's return value will be
the domain hash that will show up in your Ledger.

Here is an example screenshot. Note that the hash value may be
different:

![](./images/4-tenderly-hashes-1.png)

Right before the `GnosisSafe.domainSeparator` call, you will see a
call to `GnosisSafe.encodeTransactionData`. Its return value will be a
concatenation of `0x1901`, the domain hash, and the message hash:
`0x1901[domain hash][message hash]`.

Here is an example screenshot. Note that the hash value may be
different:

![](./images/5-tenderly-hashes-2.png)

Note down both the domain hash and the message hash. You will need to
compare them with the ones displayed in your terminal AND on the Ledger screen at signing.

### 4. Approve the signature on your ledger

Once the validations are done, it's time to actually sign the
transaction. Make sure your ledger is still unlocked and run the
following:

```shell
cd src/improvements/tasks/<network>/rehearsals/<rehearsal-task-name>
just --dotenv-path $(pwd)/.env sign
# For a different derivation path, use: HD_PATH=1 just --dotenv-path $(pwd)/.env sign
```

> [!IMPORTANT] This is the most security critical part of the
> playbook: make sure the domain hash and message hash in the
> following three places match:

1. In your terminal output.
2. On your Ledger screen.
3. In the Tenderly simulation. You should use the same Tenderly
simulation as the one you used to verify the state diffs, instead
of opening the new one printed in the console.

After verification, sign the transaction. You will see the `Data`,
`Signer` and `Signature` printed in the console. Format should be
something like this:

```
Data: <DATA>
Signer: <ADDRESS>
Signature: <SIGNATURE>
```

Double check the signer address is the right one.

### 5. Send the output to Facilitator(s)

Nothing has occurred onchain - these are offchain signatures which
will be collected by Facilitators for execution. Execution can occur
by anyone once a threshold of signatures are collected, so a
Facilitator will do the final execution for convenience.

Format should be something like this:

```
Data: <DATA>
Signer: <ADDRESS>
Signature: <SIGNATURE>
```

Share the `Data`, `Signer` and `Signature` with the Facilitator, and
congrats, you are done!

## [For Facilitator ONLY] How to prepare and execute the rehearsal

### [Before the rehearsal] Prepare the rehearsal

#### 1. Create a new task in the `eth` directory:

```bash
cd superchain-ops/src/improvements
just new task # Follow the prompts to create a new rehearsals task.
# (a) choose 'eth'
# (b) choose 'L1PortalExecuteL2Call'
# (c) press enter to answer 'no' to 'Is this a test task?'
# (d) press 'y' for 'Is this a security council rehearsal task?'
# (e) enter a name of the task in the format of '<yyyy-mm-dd>-<task-name>'

# This creates a new directory in the `src/improvements/tasks/eth/rehearsals` directory.
```

Next, make sure your `config.toml` is correct. You should use the TOML below as a starting point.

```toml
templateName = "L1PortalExecuteL2Call"

portal = "0x0" # L1 OptimismPortal
l2Target = "0x0" # replace with the target contract on L2
l2Data = "0x0" # calldata to pass to L2 contract
gasLimit = 500000
value = 0
isCreation = false

[addresses]
ProxyAdminOwner = "0x0"
OptimismPortal = "0x0"
```

#### 2. Test the rehearsal and commit the files to Github

1. Test the newly created rehearsal by following the security council
steps in the `Approving the transaction` section above.
2. Commit the newly created files to Github.

### [After the rehearsal] Execute the output

1. Collect outputs from all participating signers.
2. Concatenate all signatures and export it as the `SIGNATURES`
environment variable, i.e. `export
SIGNATURES="0x[SIGNATURE1][SIGNATURE2]..."`.
3. Execute the transaction onchain.

For example, if the quorum is 2 and you get the following outputs:

```shell
Data: 0xDEADBEEF
Signer: 0xC0FFEE01
Signature: AAAA
```

```shell
Data: 0xDEADBEEF
Signer: 0xC0FFEE02
Signature: BBBB
```

Then you should run

```shell
export SIGNATURES="0xAAAABBBB"
cd src/improvements/tasks/<network>/rehearsals/<rehearsal-task-name>
just --dotenv-path $(pwd)/.env execute
```

For posterity, you should make a `README.md` file in the tasks directory that contains a link to the executed transaction e.g. see [here](../../src/improvements/tasks/eth/rehearsals/2025-11-28-R2-remove-signer/README.md).
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TENDERLY_GAS=10000000
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Status: [DRAFT, NOT READY TO SIGN]
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
templateName = "L1PortalExecuteL2Call"

# Portal + L2 call params
portal = "0xbEb5Fc579115071764c7423A4f12eDde41f106Ed" # L1 OptimismPortal
l2Target = "0x1234567890123456789012345678901234567890" # replace with real OptimismGovernor Proxy

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The placeholder address 0x1234567890123456789012345678901234567890 should be replaced with the actual OptimismGovernor Proxy address on L2 before using this configuration for the rehearsal. Using a real address ensures that the simulation and validation steps will accurately reflect the intended behavior when executed on-chain.

Spotted by Diamond

Fix in Graphite


Is this helpful? React 👍 or 👎 to let us know.

l2Data = "0x3659cfe60000000000000000000000000000000000000000000000000000000000001234" # upgradeTo(0x00..1234)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The placeholder address 0x00..1234 in the L2Data is not a valid implementation address for a production deployment. For a proper rehearsal, consider replacing this with either:

  1. The current implementation address (for a true no-op upgrade)
  2. A valid implementation contract address that exists on L2

This ensures the rehearsal accurately simulates a real governance action. The test example in 014-noop-call-optimismportal demonstrates this approach by using the current implementation address.

Spotted by Diamond

Fix in Graphite


Is this helpful? React 👍 or 👎 to let us know.

gasLimit = 500000
value = 0
isCreation = false

[addresses]
ProxyAdminOwner = "0x5a0Aae59D09fccBdDb6C6CcEB07B7279367C3d2A"
OptimismPortal = "0xbEb5Fc579115071764c7423A4f12eDde41f106Ed"
Loading