Skip to content

Commit c29598b

Browse files
authored
Merge branch 'main' into sb/u15-docs-warning
2 parents 1af69f1 + e51a1d8 commit c29598b

File tree

6 files changed

+30
-22
lines changed

6 files changed

+30
-22
lines changed

pages/interop/tutorials/bridge-crosschain-eth.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,13 @@ The tutorial uses these primary tools:
214214

215215
Import all chain definitions from `@eth-optimism/viem`.
216216

217-
```typescript file=<rootDir>/public/tutorials/transfer-eth.mts#L29-L32 hash=2c2dd55bc8c8122fe2991ab38cc9c1ac
217+
```typescript file=<rootDir>/public/tutorials/transfer-eth.mts#L28-L31 hash=e8c21357997ea12151305337eced7d71
218218
```
219219

220220
If the address we use is `0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266`, one of the prefunded addresses on `anvil`, assume we're using Supersim.
221221
Otherwise, use Interop devnet.
222222

223-
```typescript file=<rootDir>/public/tutorials/transfer-eth.mts#L78-L80 hash=c5c2f87d5f6bb564376016ac62712501
223+
```typescript file=<rootDir>/public/tutorials/transfer-eth.mts#L73-L79 hash=7d892d7a6578d8efb7cbe16a0af7e342
224224
```
225225

226226
To relay a message we need the information in the receipt.
@@ -232,7 +232,7 @@ The tutorial uses these primary tools:
232232
A single transaction can send multiple messages.
233233
But here we know we sent just one, so we look for the first one in the list.
234234

235-
```typescript file=<rootDir>/public/tutorials/transfer-eth.mts#L90-L96 hash=d650e8c2b31d75d82ba4c5e4519c028d
235+
```typescript file=<rootDir>/public/tutorials/transfer-eth.mts#L90-L94 hash=2f3cc02cffd52ab5b807c5e70388f0ac
236236
```
237237

238238
This is how you use `@eth-optimism/viem` to create an executing message.

pages/interop/tutorials/relay-messages-cast.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ struct Identifier {
125125

126126
### Retrieve the block timestamp the log was emitted in
127127

128-
Since the message identifier requires the block timestamp, fetch the block info to get the timestamp.
128+
Since the message identifier requires the block timestamp, fetch the block info to get the timestamp. `0xREPLACE_WITH_CORRECT_BLOCKHASH` should be replaced with the `blockHash` from the output of the previous step.
129129

130130
```sh
131131
cast block 0xREPLACE_WITH_CORRECT_BLOCKHASH --rpc-url http://127.0.0.1:9545
@@ -167,7 +167,7 @@ struct Identifier {
167167

168168
### Construct the access list for the message
169169

170-
An access list must be passed along with the relay message tx. There are two admin RPC methods that can be used to construct the access list: `admin_getAccessListByMsgHash` and `admin_getAccessListForIdentifier` and.
170+
An access list must be passed along with the relay message transaction. There are two admin RPC methods that can be used to construct the access list: `admin_getAccessListByMsgHash` and `admin_getAccessListForIdentifier`.
171171

172172
a. To get the access list using the `admin_getAccessListByMsgHash` RPC method, call the method with the message hash.
173173

pages/notices/superchain-withdrawal-pause-test.mdx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ import { Steps, Callout } from 'nextra/components'
2020
# Superchain withdrawal pause test
2121

2222
<Callout type="info">
23-
* Sepolia Superchain withdrawal pause test is scheduled for **April 14th 2025**
24-
* Mainnet Superchain withdrawal pause test date will be announced soon
23+
Sepolia Superchain withdrawal pause test was successfully completed on **April 14th 2025**.
2524
</Callout>
2625

2726
The Optimism Collective will be testing improved incident response features on the Sepolia Superchain.

pages/notices/upgrade-15.mdx

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ This page outlines breaking changes related to the Isthmus network upgrade for c
2424
If you experience difficulty at any stage of this process, please reach out to developer support.
2525

2626
<Callout type="info">
27-
The Isthmus hard fork for the Sepolia Superchain will be activated at **Thu Apr 17 16:00:00 UTC 2025** (`1744905600`).
28-
This is for all chains who have opted into the [hard fork inheritance behavior](/superchain/superchain-registry#hard-fork-activation-inheritance-behavior). The activation for the Mainnet Superchain will be decided after Pectra activates on Ethereum. This time is still to be determined. The last tentative timeline from the Ethereum All Core Devs call is May 7th (from the call on Thursday, April 3rd).
27+
The Isthmus hard fork for the Sepolia Superchain will be activated at **Thu Apr 17 16:00:00 UTC 2025** (`1744905600`) and the Mainnet Superchain will be activated at **Fri May 9 2025 16:00:01 UTC** (`1746806401`).
28+
This is for all chains who have opted into the [hard fork inheritance behavior](/superchain/superchain-registry#hard-fork-activation-inheritance-behavior).
2929
</Callout>
3030

3131
## What's included in Isthmus
@@ -40,22 +40,26 @@ For more information on the Isthmus implementation details, please review [Isthm
4040

4141
## For chain operators
4242

43-
Chain operators must upgrade their nodes ahead of the activation times to a release that contains the Isthmus changes and has the activation times for their chains baked in, or set the activation times manually via overrides. The details are outlined in the node operator section below. Additionally, chain operators must update `op-batcher` to [`v1.12.0`](https://github.com/ethereum-optimism/optimism/releases/tag/op-batcher%2Fv1.12.0) and should update `op-challenger` to [`v1.3.3`](https://github.com/ethereum-optimism/optimism/releases/tag/op-challenger%2Fv1.3.3).
43+
Chain operators must upgrade their nodes ahead of the activation times to a release that contains the Isthmus changes and has the activation times for their chains baked in, or set the activation times manually via overrides. The details are outlined in the node operator section below. Additionally, chain operators must update `op-batcher` to [`v1.12.0`](https://github.com/ethereum-optimism/optimism/releases/tag/op-batcher%2Fv1.12.0) and must update `op-challenger` to [`v1.4.0`](https://github.com/ethereum-optimism/optimism/releases/tag/op-challenger%2Fv1.4.0).
4444

4545
In addition to this, the L1 smart contract upgrades in [upgrade 14](/notices/upgrade-14) are required to utilize this new funcationality.
4646

4747
### For permissionless fault proof enabled chains
4848

49-
Chains running permissionless fault proofs will need to deploy new dispute game contracts with new absolute prestates. The new 64 bit version of cannon will be utilized moving forward. The Sepolia Superchain, will utilize [op-program/v1.6.0-rc.1](https://github.com/ethereum-optimism/optimism/tree/op-program/v1.6.0-rc.1). The following permissionless fault proof Sepolia chains are: `Base Sepolia`, `Ink Sepolia`, and `OP Sepolia`.
49+
Chains running permissionless fault proofs will need to deploy new dispute game contracts with new absolute prestates. The new 64 bit version of cannon will be utilized moving forward. The Sepolia Superchain, will utilize [op-program/v1.6.0-2](https://github.com/ethereum-optimism/optimism/tree/op-program/v1.6.0-rc.2). The following permissionless fault proof Sepolia chains are: `Base Sepolia`, `Ink Sepolia`, and `OP Sepolia`.
5050

5151
<Steps>
5252
### Verify the new absolute prestate
5353

54-
The absolute prestate is generated with the [op-program/v1.6.0-rc.1](https://github.com/ethereum-optimism/optimism/tree/op-program/v1.6.0-rc.1). You can use this new absolute prestate (`0x03394563dd4a36e95e6d51ce7267ecceeb05fad23e68d2f9eed1affa73e5641a`) for the following chains:
54+
<Callout type="info">
55+
As of upgrade 14, the 64 bit multi-threaded version of cannon is utilized.
56+
</Callout>
57+
58+
The absolute prestate is generated with the [op-program/v1.6.0-rc.2](https://github.com/ethereum-optimism/optimism/tree/op-program/v1.6.0-rc.2). You can use this new absolute prestate (`0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6`) for the following chains:
5559

5660
* Sepolia: Base, Creator Chain, OP, Metal, Mode, Zora, Ethernity, Unichain, Ink, and Minato (Soneium)
5761

58-
You can verify this absolute prestate by running the following [command](https://github.com/ethereum-optimism/optimism/blob/5f003211aed7469eed7df666291a62c025d1c46c/Makefile#L129-L131) in the root of the monorepo on the `op-program/v1.6.0-rc.1` tag:
62+
You can verify this absolute prestate by running the following [command](https://github.com/ethereum-optimism/optimism/blob/d6fb90dd489e39efa206b55200766ccc075c1d9b/Makefile#L130-L132) in the root of the monorepo on the `op-program/v1.6.0-rc.2` tag:
5963

6064
```shell
6165
make reproducible-prestate
@@ -64,17 +68,17 @@ Chains running permissionless fault proofs will need to deploy new dispute game
6468
You should expect the following output at the end of the command:
6569

6670
```shell
67-
Cannon Absolute prestate hash:
68-
0x03526dfe02ab00a178e0ab77f7539561aaf5b5e3b46cd3be358f1e501b06d8a9
69-
Cannon64 Absolute prestate hash:
70-
0x03394563dd4a36e95e6d51ce7267ecceeb05fad23e68d2f9eed1affa73e5641a
71-
CannonInterop Absolute prestate hash:
72-
0x03ada038f8a81526c68596586dfc762eb5412d4d5bb7cb46110d8c47ee570d7e
71+
Cannon Absolute prestate hash:
72+
0x03513e996556589f633fe1d38d694f63bc93cca5df559af37631b30875a829e9
73+
Cannon64 Absolute prestate hash:
74+
0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6
75+
CannonInterop Absolute prestate hash:
76+
0x0399cfb018011977a027d1e7a85eb7ff101aec9bfc7d6500abac944c47a4581f
7377
```
7478

7579
### Upload your new preimage file
7680

77-
During the previous step, you also generated the preimage of the absolute prestate, which is basically the op-program serialized into a binary file. You'll find that new file at `optimism/op-program/bin/prestate.bin.gz`. Rename that file to have the absolute prestate hash as the filename so it looks like `0x03394563dd4a36e95e6d51ce7267ecceeb05fad23e68d2f9eed1affa73e5641a.bin.gz`.
81+
During the previous step, you also generated the preimage of the absolute prestate, which is basically the op-program serialized into a binary file. You'll find that new file at `optimism/op-program/bin/prestate-mt64.bin.gz`. Rename that file to have the absolute prestate hash as the filename so it looks like `0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6.bin.gz`.
7882

7983
Upload that file to where you're storing your other absolute preimage files. This should be the location where you're pointing your `--cannon-prestates-url` at. The `op-challenger` will grab this file and use it when it needs to challenge games.
8084

@@ -95,6 +99,10 @@ The new op-program release that contains the Mainnet activation timestamps will
9599

96100
## For node operators
97101

102+
<Callout type="info">
103+
The Mainnet node binaries will be available soon. The following versions are for the Sepolia Superchain activation.
104+
</Callout>
105+
98106
Node operators will need to upgrade to the respective Isthmus releases before the activation dates.
99107

100108
These following steps are necessary for every node operator:

public/tutorials/GreetingSender.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.0;
33

4-
import { Predeploys } from "@eth-optimism/contracts-bedrock/src/libraries/Predeploys.sol";
5-
import { IL2ToL2CrossDomainMessenger } from "@eth-optimism/contracts-bedrock/interfaces/L2/IL2ToL2CrossDomainMessenger.sol";
4+
import { Predeploys } from "lib/optimism/packages/contracts-bedrock/src/libraries/Predeploys.sol";
5+
import { IL2ToL2CrossDomainMessenger } from "lib/optimism/packages/contracts-bedrock/interfaces/L2/IL2ToL2CrossDomainMessenger.sol";
66

77
import { Greeter } from "src/Greeter.sol";
88

words.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ devnet
9696
Devnets
9797
devnets
9898
Devs
99+
99100
direnv
100101
DISABLETXPOOLGOSSIP
101102
disabletxpoolgossip

0 commit comments

Comments
 (0)