fix merge conflict

krofax · krofax · commit 0b8736ccf44c · 2025-02-17T18:02:10.000+01:00
diff --git a/pages/app-developers/starter-kit.mdx b/pages/app-developers/starter-kit.mdx
@@ -43,7 +43,7 @@ Here's a breakdown of what's under the hood:
   Next, you need to clone and navigate to the repo:
 
   ```sh
-  git clone git@github.com:ethereum-optimism/superchainerc20-starter.git
+  git clone https://github.com/ethereum-optimism/superchainerc20-starter.git
   cd superchainerc20-starter
   ```
 
@@ -72,6 +72,14 @@ Here's a breakdown of what's under the hood:
   ```sh
   pnpm dev
   ```
+
+  <details>
+
+    <summary>Sanity check</summary>
+
+    Browse to [the console](http://localhost:5173/), mint some tokens and transfer them.
+
+  </details>
 </Steps>
 
 ## Deploy SuperchainERC20s
diff --git a/pages/app-developers/tools/connect/rpc-providers.mdx b/pages/app-developers/tools/connect/rpc-providers.mdx
@@ -126,7 +126,7 @@ GetBlock offers Pay-as-You-Go flexible pricing based on actual usage, suitable f
 
 ### Description and pricing
 
-[QuickNode](https://www.quicknode.com/) offers access to hosted OP Mainnet (and testnet) nodes for free.
+[QuickNode](https://www.quicknode.com/chains/optimism) offers access to hosted OP Mainnet (and testnet) nodes for free.
 With the option to upgrade to a premium plan for additional features, we allow you to focus solely on optimizing your application while we manage the complex infrastructure.
 
 ### Supported networks
diff --git a/pages/app-developers/tutorials/bridging/standard-bridge-standard-token.mdx b/pages/app-developers/tutorials/bridging/standard-bridge-standard-token.mdx
@@ -83,7 +83,7 @@ Set your L1 ERC-20 token address as an environment variable with the `export` co
 
 {<h3>Deploy your L2 ERC-20 token</h3>}
 
-You can now deploy our L2 ERC-20 token using the [`OptimismMintableERC20Factory`](https://github.com/ethereum-optimism/optimism/blob/develop/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol).
+You can now deploy your L2 ERC-20 token using the [`OptimismMintableERC20Factory`](https://github.com/ethereum-optimism/optimism/blob/develop/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol).
 Use the `cast` command to trigger the deployment function on the factory contract.
 This example command creates a token with the name "My Standard Demo Token" and the symbol "L2TKN".
 The resulting L2 ERC-20 token address is printed to the console.
diff --git a/pages/connect/contribute/stack-contribute.mdx b/pages/connect/contribute/stack-contribute.mdx
@@ -29,7 +29,7 @@ To make your first contribution to the codebase, check out the [open issues](htt
 
 <Callout type="warning">
   Only the software components included within the current release of the OP Stack codebase are considered in the scope of the OP Stack.
-  Any usage of the OP Stack outside of the official, intended capabilities of the current release are considered [OP Stack Hacks](https://github.com/ethereum-optimism/developers/tree/main/hacks) — unofficial modifications that are useful for experimentation but could have unforeseen results, such as security vulnerabilities, and are likely to cause your chain to no longer be interoperable with the [Optimism Superchain](https://app.optimism.io/superchain/).
+  Any usage of the OP Stack outside of the official, intended capabilities of the current release is considered [OP Stack Hacks](https://github.com/ethereum-optimism/developers/tree/main/hacks) — unofficial modifications that are useful for experimentation but could have unforeseen results, such as security vulnerabilities, and are likely to cause your chain to no longer be interoperable with the [Optimism Superchain](https://app.optimism.io/superchain/).
   Developer support for OP Stack Hacks is limited — when in doubt, stick to the capabilities of the current release!
 </Callout>
 
diff --git a/pages/notices/holocene-changes.mdx b/pages/notices/holocene-changes.mdx
@@ -23,7 +23,6 @@ If you experience difficulty at any stage of this process, please reach out to [
   The Holocene upgrade for the Mainnet Superchain is scheduled for **Thu 9 Jan 2025 18:00:01 UTC**, [governance approval](https://vote.optimism.io/proposals/20127877429053636874064552098716749508236019236440427814457915785398876262515).
 
   The Holocene upgrade for the Soneium Mainnet will be activated at **Mon Feb 03 at 09:00:00 UTC** (`1738573200`).
-  The Holocene upgrade for the Mainnet Superchain is scheduled for **Thu 9 Jan 2025 18:00:01 UTC**, [governance approval](https://vote.optimism.io/proposals/20127877429053636874064552098716749508236019236440427814457915785398876262515).
 </Callout>
 
 ## What's included in Holocene
diff --git a/pages/notices/pectra-changes.mdx b/pages/notices/pectra-changes.mdx
@@ -44,7 +44,6 @@ Pectra contains a variety of EIPs, some of which apply to the OP Stack; others d
 
 Node operators will need to upgrade to the respective releases before the activation dates.These following steps are necessary for every node operator:
 
-
 ### Update to the latest release
 
 <Callout type="warning">
@@ -53,42 +52,49 @@ Node operators will need to upgrade to the respective releases before the activa
 
 *   `op-node` at [`v1.11.0`](https://github.com/ethereum-optimism/optimism/releases/tag/op-node%2Fv1.11.0)
 *   `op-geth` at [`v1.101500.0`](https://github.com/ethereum-optimism/op-geth/releases/tag/v1.101500.0)
-*   `op-batcher` at [`v1.11.1`](https://github.com/ethereum-optimism/optimism/releases/tag/op-batcher%2Fv1.11.1)
 *   `op-reth` at [`v1.1.5`](https://github.com/paradigmxyz/reth/releases/tag/v1.1.5) also includes L1 Pectra support.
 
 ## For chain operators
 
-The following sections are how chain operators can prepare the first part of the OP Stack's Pectra L1 support. This ensures OP Stack chains do not break when the L1 Pectra upgrade activates.
+The following sections are how chain operators can prepare the first part of the OP Stack's Pectra L1 support. This ensures OP Stack chains do not break when the L1 Pectra upgrade activates. Every chain operator will need to:
+
+<Steps>
+
+  ### Update your node binaries
+
+  Follow the guidance outlined in the [Node Operator section](#update-to-the-latest-release) to update your nodes to the latest releases. 
+
+  ### Update your batcher
+
+  Then update your batcher to [`op-batcher/v1.11.1`](https://github.com/ethereum-optimism/optimism/releases/tag/op-batcher%2Fv1.11.1).
+
+</Steps>
 
-Every chain operator will need to first follow the guidance outlined in the [Node Operator section](#update-to-the-latest-release) to update your nodes to the latest releases. 
 
 ## For fault proof enabled chains
 
 <Callout type="info">
   The following instructions assume your chain is on the latest contract release `op-contracts/v1.8.0` and have Holocene activated.
 </Callout>
-
-The following steps are to update your absolute prestate on your chain. **This is absolutely necessary for chains running permissionless fault proofs.** For chains running the Fault Proof System with permissioned games you can skip this section because games will not be played out and the absolute prestate is not used. 
+  
+The following steps are to update your absolute prestate with new dispute game contracts. **This is absolutely necessary for chains running permissionless fault proofs.** For chains running the Fault Proof System with permissioned games you can skip this section because games will not be played out and the absolute prestate is not used. 
 
 The Pectra upgrade changes the derivation rules, permissionless fault proof chains need to upgrade the `op-program` version used in the fault proof system to support these changes. The `op-program` version used is specified via the `faultGameAbsolutePrestate` setting, deployed as part of `FaultDisputeGame` and `PermissionedDisputeGame` contracts.
 
 <Steps>
-  ### Make sure the Superchain Registry is up to date
 
-  The new `op-program` release will pull the configurations from the [superchain-registry](https://github.com/ethereum-optimism/superchain-registry). This is important because the op-challenger uses the `op-program` and it needs to be aware of your chain's configuration. If your chain that not in the superchain-registry, please [open a PR to add your chain to the superchain-registry](https://github.com/ethereum-optimism/superchain-registry/blob/main/docs/ops.md#adding-a-chain).
+  ### Update your `op-challenger`
 
-  ### Verify the new absolute prestate
+  Update your `op-challenger` binary to [`op-challenger/v1.3.1`](https://github.com/ethereum-optimism/optimism/releases/tag/op-challenger%2Fv1.3.1). 
 
-  <Callout type="info">
-    The following is based on the [op-program/v1.5.0-rc.2](https://github.com/ethereum-optimism/optimism/tree/op-program/v1.5.0-rc.2) which will be included in the `op-challenger` release.
-  </Callout>
+  ### Verify the new absolute prestate
 
-  You can use this new absolute prestate (`0x035ac388b5cb22acf52a2063cfde108d09b1888655d21f02f595f9c3ea6cbdcd`) for the following chains:
+  The absolute prestate is generated with the [op-program/v1.5.0-rc.2](https://github.com/ethereum-optimism/optimism/tree/op-program/v1.5.0-rc.2). You can use this new absolute prestate (`0x035ac388b5cb22acf52a2063cfde108d09b1888655d21f02f595f9c3ea6cbdcd`) for the following chains:
 
   *   Sepolia: Base, OP, Metal, Mode, Zora, Ethernity, Unichain, Ink
   *   Mainnet: Base, OP, Orderly, Lyra, Metal, Mode, Zora, Lisk, Ethernity, Binary, Ink, Unichain
 
-  You can verify this absolute prestate by running the following [command](https://github.com/ethereum-optimism/optimism/blob/3f18df1c8a502136bbe33f10ed1e29a26cd4678a/Makefile#L129-L131) in the root of the monorepo:
+  You can verify this absolute prestate by running the following [command](https://github.com/ethereum-optimism/optimism/blob/3f18df1c8a502136bbe33f10ed1e29a26cd4678a/Makefile#L129-L131) in the root of the monorepo on the `op-program/v1.5.0-rc.2` tag:
 
   ```shell
   make reproducible-prestate
@@ -105,6 +111,12 @@ The Pectra upgrade changes the derivation rules, permissionless fault proof chai
   0x0379d61de1833af6766f07b4ed931d85b3f6282508bbcbf9f4637398d97b61c1
   ```
 
+  ### Upload your new preimage file
+
+  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 `0x035ac388b5cb22acf52a2063cfde108d09b1888655d21f02f595f9c3ea6cbdcd.bin.gz`. 
+  
+  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.
+
   ### Deploy new dispute game contracts
 
   You will then take the absolute prestate and deploy new `FaultDisputeGame` and `PermissionedDisputeGame` contracts with that value. You can reuse the [Holocene script](https://github.com/ethereum-optimism/optimism/tree/op-contracts/v1.8.0-rc.4/packages/contracts-bedrock/scripts/upgrades/holocene) to deploy the new contracts. The only change you will need to make is to update the `absolutePrestate` value in your [deploy-config](https://github.com/ethereum-optimism/optimism/blob/2073f4059bd806af3e8b76b820aa3fa0b42016d0/packages/contracts-bedrock/scripts/upgrades/holocene/README.md?plain=1#L53-L54). Alternatively we will be releasing an `OPPrestateUpdater` that can be used to deploy the new contracts.
@@ -113,13 +125,9 @@ The Pectra upgrade changes the derivation rules, permissionless fault proof chai
 
   You will then need to update the `DisputeGameFactory` to point to the new `FaultDisputeGame` and `PermissionedDisputeGame` contracts by calling `DisputeGameFactory.setImplementation`. You can utilize this [template](https://github.com/ethereum-optimism/superchain-ops/tree/main/tasks/sep/fp-recovery/005-set-game-implementation) to generate the transaction and validation script for this step. Before executing, you will need to update your op-challenger.
 
-  ### Update your op-challenger
-
-  Update your `op-challenger` to the new release version that will be provided soon and configure it to use the new absolute prestate.
-
   ### Execute the upgrade 
 
-  Once your challenger is ready, you can execute the "Set Dispute Game Implementation" transaction. Please simulate and validate that the expected output prior to executing the transaction.
+  Once your `op-challenger` is ready with the new preimage, you can execute the "Set Dispute Game Implementation" transaction. Please simulate and validate that the expected output prior to executing the transaction.
 </Steps>
 
 ## For OP Stack forks
diff --git a/pages/operators/chain-operators/deploy/genesis.mdx b/pages/operators/chain-operators/deploy/genesis.mdx
@@ -80,7 +80,7 @@ Once you have `genesis.json` and `rollup.json`:
 Now that you have your `genesis.json` and `rollup.json` you can spin up a node on your network.
 You can also use the following inspect subcommands to get additional data:
 
-````bash
+```bash
 ./bin/op-deployer inspect l1 --workdir .deployer <l2-chain-id> # outputs all L1 contract addresses for an L2 chain
 ./bin/op-deployer inspect deploy-config --workdir .deployer <l2-chain-id> # outputs the deploy config for an L2 chain
 ```
@@ -98,7 +98,7 @@ provided to the consensus client (op-node).
 </Callout>
 
 
-## Solidity script (Legacy)
+### Solidity script (Legacy)
 
 You can also use the foundry script
 located in the monorepo to generate an "L2 state dump" and then pass this into the op-node genesis subcommand.
diff --git a/pages/stack/interop/tutorials/event-reads.mdx b/pages/stack/interop/tutorials/event-reads.mdx
@@ -34,7 +34,7 @@ This contract relies on a **CREATE2** deployment to ensure a consistent address
 <Steps>
   ### Intent to play
 
-  A game is uniquely identified by the chain it was started from with a unqiue nonce. This identifier is included in all event fields such that each player can uniquely reference it locally.
+  A game is uniquely identified by the chain it was started from with a unique nonce. This identifier is included in all event fields such that each player can uniquely reference it locally.
 
   To start a game, a player invokes `newGame` which broadcasts a `NewGame` event that any opponent **on any chain** can react to.
 
@@ -86,7 +86,7 @@ This contract relies on a **CREATE2** deployment to ensure a consistent address
 
   ### Starting the game
 
-  As `AcceptedGame` events are emmited, the player must pick one opponent to play. The opponent's `AcceptedGame` event is used to instantiate the game and play the starting move via the `MovePlayed` event.
+  As `AcceptedGame` events are emitted, the player must pick one opponent to play. The opponent's `AcceptedGame` event is used to instantiate the game and play the starting move via the `MovePlayed` event.
 
   ```solidity
   event MovePlayed(uint256 chainId, uint256 gameId, address player, uint8 _x, uint8 _y);
@@ -103,7 +103,7 @@ This contract relies on a **CREATE2** deployment to ensure a consistent address
       emit MovePlayed(chainId, gameId, game.player, _x, _y);
   ```
 
-  The event fields contain the information required to perform the neccessary validation.
+  The event fields contain the information required to perform the necessary validation.
 
   *   The game identifier for lookup
   *   The caller is the appropriate player
diff --git a/pages/stack/interop/tutorials/message-passing.mdx b/pages/stack/interop/tutorials/message-passing.mdx
