Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/tasks/sep/060-U18-rev-share-betanet/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TENDERLY_GAS=15000000
22 changes: 22 additions & 0 deletions src/tasks/sep/060-U18-rev-share-betanet/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 060-U18-rev-share-betanet

Status: READY TO SIGN

## Objective

Updates RevShare Betanet (revshare-beta-0) to U18.

## Simulation & Signing

```bash
cd src/tasks/sep/060-U18-rev-share-betanet

# Testing
just simulate-stack sep 060-U18-rev-share-betanet

# Commands to execute
just --dotenv-path $(pwd)/.env simulate
USE_KEYSTORE=1 just --dotenv-path $(pwd)/.env sign
# or USE_KEYSTORE=1 just sign-stack sep 060-U18-rev-share-betanet
SIGNATURES=0x just execute
```
19 changes: 19 additions & 0 deletions src/tasks/sep/060-U18-rev-share-betanet/VALIDATION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Expected Domain and Message Hashes

First, we need to validate the domain and message hashes. These values should match both the values on your ledger and
the values printed to the terminal when you run the task.

> [!CAUTION]
>
> Before signing, ensure the below hashes match what is on your ledger.
>
> ### Betanet 1/1 Safe (`0xe934Dc97E347C6aCef74364B50125bb8689c40ff`)
>
> - Domain Hash: `<TBD after simulation>`
> - Message Hash: `<TBD after simulation>`

## Task Calldata

```
<TBD after simulation>
```
19 changes: 19 additions & 0 deletions src/tasks/sep/060-U18-rev-share-betanet/addresses.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"420110021": {
"ProxyAdmin": "0xaad0f9bbf7474d7eed4e5c18019ff560e9b2e031",
"ProxyAdminOwner": "0xe934Dc97E347C6aCef74364B50125bb8689c40ff",
"SystemConfigProxy": "0x7C8d1043FC9081CaD426DBD470E2863FbE978eef",
"L1CrossDomainMessengerProxy": "0xBE1A9F1fCE3B0d310F7444f9C973F3241CF5EAc3",
"L1StandardBridgeProxy": "0x26F9690897A56e2C459C0E0A48f525cD6dFaaD70",
"OptimismPortalProxy": "0x527aE436461691526302c5F391dA494F6d14C9dc",
"DisputeGameFactoryProxy": "0x0C668124823EE7a6ab9988C76a61fF01f480b908",
"DelayedWETHProxy": "0x29353c19876C3c3549b0811A562928Da2381cdDB",
"PermissionedDelayedWETHProxy": "0x29353c19876C3c3549b0811A562928Da2381cdDB",
"AnchorStateRegistryProxy": "0x1057Cd919CeAF39632A697A0938C2Db85aa08B10",
"AddressManager": "0x8eAbc58D43de19a57647861a0522C5E51982110a",
"L1ERC721BridgeProxy": "0xBbf34FC49ac3256f2D34AED57B2C33637a3e3Ba1",
"Proposer": "0x39Ff903Ca8a3d759dE9A7502D9C3B5Ef8A8e6670",
"Challenger": "0xd9f48B7D3e1Ff4A1d4877834aaCAC9d1d6230d8E",
"OptimismMintableERC20FactoryProxy": "0xc7cD679BD64e9396767Fc2903A429F6689fa4447"
}
}
29 changes: 29 additions & 0 deletions src/tasks/sep/060-U18-rev-share-betanet/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# RevShare Betanet on U18
l2chains = [
{name = "u18-beta-0", chainId = 420110021}
]

# Addresses for this task can be found here: https://github.com/ethereum-optimism/devnets/tree/main/betanets/u18-beta

fallbackAddressesJsonPath = "src/tasks/sep/060-U18-rev-share-betanet/addresses.json"

templateName = "OPCMUpgradeV600"

[[opcmUpgrades]]
chainId = 420110021
# U18 prestates for betanet: https://www.notion.so/oplabs/Betanet-2a9f153ee16280859261e3000d866ee9?source=copy_link#2c5f153ee162805abcc3e949ab6c837e
cannonPrestate = "0x0364251d4ea4b677ac462a25642b6de1fa53b2d6b97e56380691906bdb2e95cf"
cannonKonaPrestate = "0x03091ea717990785736623f894e6fb344fcf262361657bb28c9ece29207d9a9c"
expectedValidationErrors = "OVERRIDES-L1PAOMULTISIG,OVERRIDES-CHALLENGER,SYSCON-130,PLDG-10,CKDG-10"
# OVERRIDES-L1PAOMULTISIG,OVERRIDES-CHALLENGER: these are expected as they are not the standard OP Sepolia ones
# SYSCON-130: this is expected as the SystemConfig proxyAdmin on betanets is not the standard OP Sepolia one
# PLDG-10: this is expected because u18-beta-0 is a Permissioned chain
# CKDG-10: Custom dispute game implementation not found, expected as it's a Permissioned chain with no Permissionless implementation

[addresses]
OPCM = "0xf0a2e224519e876979ea6b2cd15ef5cc3d6703bd" # v600 OPCM source: https://github.com/ethereum-optimism/superchain-registry/blob/c84ed822ae5a65500d8c0e323460fa688cfcca22/validation/standard/standard-versions-sepolia.toml#L23C56-L23C98

[stateOverrides]
0xe934Dc97E347C6aCef74364B50125bb8689c40ff = [
{key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 64}
]
28 changes: 0 additions & 28 deletions src/tasks/sep/060-betanet-rev-share/VALIDATION.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 060 betanet-rev-share: RevShare Upgrade and Setup for Betanet
# 061 betanet-rev-share: RevShare Upgrade and Setup for Betanet

Status: [READY TO SIGN]

Expand All @@ -24,16 +24,9 @@ Simulation commands for each safe:

```bash
# For stacked simulation (recommended for validation):
just simulate-stack sep 060-betanet-rev-share <council|foundation>
just simulate-stack sep 061-betanet-rev-share

# For individual simulation:
cd src/tasks/sep/060-betanet-rev-share
SIMULATE_WITHOUT_LEDGER=1 just --dotenv-path "$(pwd)"/.env --justfile ../../../justfile simulate <council|foundation>
cd src/tasks/sep/061-betanet-rev-share
SIMULATE_WITHOUT_LEDGER=1 just --dotenv-path "$(pwd)"/.env --justfile ../../../justfile simulate
```

Signing commands for each safe:

```bash
cd src/tasks/sep/060-betanet-rev-share
just --dotenv-path "$(pwd)"/.env --justfile ../../../justfile sign <council|foundation>
```
19 changes: 19 additions & 0 deletions src/tasks/sep/061-betanet-rev-share/VALIDATION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Expected Domain and Message Hashes

First, we need to validate the domain and message hashes. These values should match both the values on your ledger and
the values printed to the terminal when you run the task.

> [!CAUTION]
>
> Before signing, ensure the below hashes match what is on your ledger.
>
> ### Betanet 1/1 Safe (`0xe934Dc97E347C6aCef74364B50125bb8689c40ff`)
>
> - Domain Hash: `<TBD after simulation>`
> - Message Hash: `<TBD after simulation>`

## Task Calldata

```
<TBD after simulation>
```
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why dont we also update the stateOverrides from now on this aswell?

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
templateName = "RevShareUpgradeAndSetup"

# L2 chains to target
l2chains = [{name = "revshare-beta-0", chainId = 420120033}]
l2chains = [{name = "revshare-beta-0", chainId = 420120033}] # TODO: Update after new betanet is deployed

safeAddress = "ProxyAdminOwner"

Expand All @@ -22,18 +22,12 @@ l1WithdrawerMinWithdrawalAmounts = [2000000000000000000]
l1WithdrawerRecipients = ["0xed9B99a703BaD32AC96FDdc313c0652e379251Fd"]
l1WithdrawerGasLimits = [800000]

fallbackAddressesJsonPath = "src/tasks/sep/060-betanet-rev-share/addresses.json"
fallbackAddressesJsonPath = "src/tasks/sep/061-betanet-rev-share/addresses.json"

[addresses]
ProxyAdminOwner = "0x1eb2ffc903729a0f03966b917003800b145f56e2"
ProxyAdminOwner = "0xe934Dc97E347C6aCef74364B50125bb8689c40ff"

[stateOverrides]
0x1Eb2fFc903729a0F03966B917003800b145F56E2 = [ # L1PAO
{key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 47}
]
0xf64bc17485f0B4Ea5F06A96514182FC4cB561977 = [ # SC
{key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 61}
]
0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B = [ # FUS
{key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 66}
0xe934Dc97E347C6aCef74364B50125bb8689c40ff = [
{key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 65}
]