fix conflict

ethereum-optimism · Jan 16, 2025 · 3df1eaf · 3df1eaf
2 parents 8b1bd87 + 97fed14
commit 3df1eaf
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 55 deletions.
diff --git a/next.config.mjs b/next.config.mjs
@@ -17,16 +17,7 @@ export default {
   eslint: {
     ignoreDuringBuilds: true,
   },
-  redirects: async () => [
-      {
-        source: '/stack/interop/architecture',
-        destination: '/stack/interop/explainer#interoperability-architecture',
-        permanent: false,
-      },
-      {
-        source: '/stack/interop/cross-chain-message',
-        destination: '/stack/interop/explainer#how-messages-get-from-one-chain-to-the-other',
-        permanent: false,
-      },
-  ],
+
+  // Don't put redirects here
+  // they go in public/_redirects
 }
diff --git a/pages/builders/app-developers/tools/supersim.mdx b/pages/builders/app-developers/tools/supersim.mdx
@@ -6,6 +6,6 @@ description: >-
   information and resources about supersim.
 ---
 
-import Supersim from '@/pages/stack/interop/supersim.mdx'
+import Supersim from '@/pages/stack/interop/tools/supersim.mdx'
 
 <Supersim />
diff --git a/pages/builders/app-developers/tutorials/cross-dom-bridge-eth.mdx b/pages/builders/app-developers/tutorials/cross-dom-bridge-eth.mdx
@@ -133,7 +133,7 @@ You can get some Sepolia ETH from [this faucet](https://sepoliafaucet.com).
 
 ## Deposit ETH
 
-Now that you have some ETH on L1 you can deposit that ETH into the `L1StandardBridge` contract. You'll then receive the same number of ETH on L2 in return.
+Now that you have some ETH on L1 you can deposit that ETH into the `OptimismPortalProxy` contract. You'll then receive the same number of ETH on L2 in return.
 
 <Tabs items={['depositETH', 'Full Code']}>
   <Tabs.Tab>
@@ -167,7 +167,7 @@ Now that you have some ETH on L1 you can deposit that ETH into the `L1StandardBr
 
       Wait for the L1 transaction to be processed and log the receipt.
 
-      ```js file=<rootDir>/public/tutorials/cross-dom-bridge-eth.js#L52-L53 hash=0de1fe6dd17f753ab80d356b38d9ca41
+      ```js file=<rootDir>/public/tutorials/cross-dom-bridge-eth.js#L52-L53 hash=bccea143ce3571de154531c40e9a0d04
       ```
 
       {<h3>Extract the L2 transaction hash</h3>}
@@ -188,7 +188,7 @@ Now that you have some ETH on L1 you can deposit that ETH into the `L1StandardBr
   </Tabs.Tab>
 
   <Tabs.Tab>
-      ```js file=<rootDir>/public/tutorials/cross-dom-bridge-eth.js#L3-L63 hash=b7d72a54dcdbb9b89c6874e2862fde00
+      ```js file=<rootDir>/public/tutorials/cross-dom-bridge-eth.js#L3-L63 hash=1198e2379e95a0e6c72c03692f10e9ee
       ```
   </Tabs.Tab>
 </Tabs>

diff --git a/pages/stack/differences.mdx b/pages/stack/differences.mdx
@@ -16,7 +16,7 @@ However, there are some minor differences between the behavior of Ethereum and O
 
 ### Bridging - Deposit Transactions
 
-Deposit transactions don't exist on L1's, and are how transactions on an L2 can be initiated from the L1. Importantly, this is how bridge applications can get L1 ETH or tokens into an L2 OP Stack chain. You can read more on deposit transactions [here](/stack/transactions/deposit-flow).
+Deposit transactions don't exist on L1s, and are how transactions on an L2 can be initiated from the L1. Importantly, this is how bridge applications can get L1 ETH or tokens into an L2 OP Stack chain. You can read more on deposit transactions [here](/stack/transactions/deposit-flow).
 
 ### Bridging - Withdrawal Transactions and Fault Proofs
 
@@ -27,7 +27,7 @@ Withdrawal transactions are how the state of the L2 rollup can be proven to the
 | Opcode       | Solidity Equivalent | Behavior                                                                                                                                                                                                                                                |
 | ------------ | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `COINBASE`   | `block.coinbase`    | Returns the address of the current Sequencer's fee wallet. Effectively the same as Ethereum with the caveat that the value typically does not change from block to block.                                                                               |
-| `PREVRANDAO` | `block.prevrandao`  | Set **pseudorandomly** for each block by the Sequencer as opposed to the stronger guarantees provided by [RANDAO](https://eips.ethereum.org/EIPS/eip-4399) on Ethereum.                                                                                 |
+| `PREVRANDAO` | `block.prevrandao`  | Returns the PREVRENDAO (the most recent [RANDAO](https://eips.ethereum.org/EIPS/eip-4399)) value of L1 at the current L1 origin block.                                                                                                                  |
 | `ORIGIN`     | `tx.origin`         | If the transaction is an L1 ⇒ L2 transaction triggered by a smart contract on L1, then `tx.origin` is set to the [aliased address](#address-aliasing) of the address that triggered the L1 ⇒ L2 transaction. Otherwise, this opcode behaves normally.   |
 | `CALLER`     | `msg.sender`        | If the transaction is an L1 ⇒ L2 transaction triggered by a smart contract on L1, and this is the first call frame (rather than an internal transaction from one contract to another), the same [address aliasing](#address-aliasing) behavior applies. |
 

diff --git a/pages/stack/interop.mdx b/pages/stack/interop.mdx
@@ -31,5 +31,4 @@ Documentation covering Cross Chain Message, Explainer, Message Passing, Op Super
   <Card title="Interoperability predeploys" href="/stack/interop/predeploy" />
 
   <Card title="Cross-chain security" href="/stack/interop/security" />
-
 </Cards>
diff --git a/pages/stack/interop/_meta.json b/pages/stack/interop/_meta.json
@@ -1,10 +1,9 @@
 {
     "explainer": "Interop explainer",
     "predeploy": "Interop predeploys",
-    "devnet": "Interop devnet",
-    "supersim": "Supersim Multichain Development Environment",
     "message-passing": "Interop message passing",
     "op-supervisor": "OP Supervisor",
     "assets": "Assets",
-    "security": "Cross-chain security"
+    "security": "Cross-chain security",
+    "tools": "Tools"
 }
diff --git a/pages/stack/interop/assets.mdx b/pages/stack/interop/assets.mdx
@@ -13,11 +13,11 @@ Documentation covering SuperchainERC20, Superchain WETH, Supersim, and how to tr
 <Cards>
   <Card title="SuperchainERC20" href="/stack/interop/assets/superchain-erc20" />
 
-  <Card title="SuperchainWETH (Interoperable ETH)" href="/stack/interop/assets/superchain-weth" />
-
   <Card title="How to transfer a SuperchainERC20" href="/stack/interop/assets/transfer-superchainERC20" />
 
   <Card title="How to deploy assets using SuperchainERC20" href="/stack/interop/assets/deploy-superchain-erc20" />
 
   <Card title="Best practices for SuperchainERC20" href="/stack/interop/assets/superchainerc20-best-practices" />
+
+  <Card title="SuperchainWETH (Interoperable ETH)" href="/stack/interop/assets/superchain-weth" />
 </Cards>
diff --git a/pages/stack/interop/op-supervisor.mdx b/pages/stack/interop/op-supervisor.mdx
@@ -33,7 +33,7 @@ OP Supervisor verifies messages between different chains in the OP Stack, reduci
 
 ## Log data indexing and management
 
-OP Supervisor acts as a hub for indexing data that every `op-node` needs to cross-verify with other chains, centralizing the process of managing interoperability data. Maintains the integrity of cross-chain interactions by tracking safety changes⁠ across the Superchain, ensuring consistent application of invalid dependency resolutions. ⁠
+OP Supervisor acts as a hub for indexing data that every `op-node` needs to cross-verify with other chains, centralizing the process of managing interoperability data. It maintains the integrity of cross-chain interactions by tracking safety changes⁠ across the Superchain, ensuring consistent application of invalid dependency resolutions. ⁠
 
 `op-supervisor` indexes two types of cross-chain dependencies:
 
@@ -46,11 +46,11 @@ OP Supervisor provides an interface for `op-node` to query cross-chain safety in
 
 Key API methods include:
 
-| Method                                    | Description                                                                           |
+| Method(s)                                    | Description                                                                           |
 | ----------------------------------------- | ------------------------------------------------------------------------------------- |
-| `UnsafeView` and `SafeView`               | Returns the Local and Cross heads for their respective levels                         |
+| `UnsafeView` and `SafeView`               | Return the Local and Cross heads for their respective levels                         |
 | `DerivedFrom`                             | OP Nodes use to check the L1 source of the Supervisor (needed for Safe Head tracking) |
-| `UpdateLocalSafe` and `UpdateLocalUnsafe` | Tells the Supervisor when the Node's heads change                                     |
+| `UpdateLocalSafe` and `UpdateLocalUnsafe` | Tell the Supervisor when the Node's heads change                                     |
 | `Finalized`                               | Returns the Finalized Head                                                            |
 | `UpdateFinalizedL1`                       | Signals to the Supervisor new finality signals                                        |
 | `CheckMessage`                            | Checks logs in the DB directly in tests                                               |

diff --git a/pages/stack/interop/tools/_meta.json b/pages/stack/interop/tools/_meta.json
@@ -0,0 +1,4 @@
+{
+    "supersim": "Supersim Multichain Development Environment",
+    "devnet": "Interop devnet - coming soon" 
+}
diff --git a/pages/stack/interop/devnet.mdx → pages/stack/interop/tools/devnet.mdx b/pages/stack/interop/devnet.mdx → pages/stack/interop/tools/devnet.mdx
@@ -1,17 +1,18 @@
 ---
-title: Interop devnet
+title: Interop Devnet - Coming Soon
 lang: en-US
 description: Details on the public interoperability devnets.
 ---
 
 import { Callout, Tabs, Steps } from 'nextra/components'
 
-# Interop devnet
+# Interop Devnet - Coming Soon
 
 <Callout>
   Interop devnet is currently in active development and may experience periods of instability, including potential outages, as the networks is regularly updated and improved. Developers should expect some level of unreliability when interacting with the devnet. The devnet is intended for testing and development purposes only, and should not be relied upon for mission-critical applications.
 </Callout>
 
+{/*
 The Interop devnet is a temporary public network of two OP Stack Sepolia instances that supports SuperERC20 tokens, native cross-chain messaging, and cross-chain ETH transfers. As we iterate on Superchain interop, these networks will be deprecated once the next devnets are released.
 
 NOTE: The current Interop devnet has been deprecated. This page will be updated once the next Interop devnet is live.
@@ -63,3 +64,5 @@ NOTE: The current Interop devnet has been deprecated. This page will be updated
 
 *   Want to start with local development? Use [Supersim](/stack/interop/supersim), a local dev environment that simulates interop for testing applications against a local version of the Superchain.
 *   Read about [interop message passing](/stack/interop/cross-chain-message) to see how you can implement it yourself on this devnet.
+
+*/}
diff --git a/pages/stack/interop/supersim.mdx → pages/stack/interop/tools/supersim.mdx b/pages/stack/interop/supersim.mdx → pages/stack/interop/tools/supersim.mdx
diff --git a/pages/stack/smart-contracts.mdx b/pages/stack/smart-contracts.mdx
@@ -73,14 +73,14 @@ The upgrade was coupled with the [Granite network upgrade](/builders/node-operat
 The Safe Extensions protocol upgrade is intended to increase the security and
 decentralization of the Superchain by:
 
-1.  Increasing the Security Council Safe's signing threshold, from 4 to 10, out
-    of 13 owners. This meets the 75% threshold requirement for a Stage 1 rollup
-    outlined in [L2Beat's Stages framework](https://medium.com/l2beat/stages-update-security-council-requirements-4c79cea8ef52)
-2.  Reassigning the role of Guardian from the Foundation to a new Guardian Safe
-    with the Security Council Safe as its sole owner. This moves the Superchain
-    closer to satisfying the 1 week exit window 5 requirement for Stage 1.
-    *   Additionally the Foundation is appointed to the new DeputyGuardian role
-        which is able to act as Guardian through the Guardian Safe. This
+1.  Increasing the Security Council Safe's signing threshold, from 4 to 10, out 
+of 13 owners. This meets the 75% threshold requirement for a Stage 1 rollup 
+outlined in [L2Beat's Stages framework](https://medium.com/l2beat/stages-update-security-council-requirements-4c79cea8ef52)
+2.  Reassigning the role of Guardian from the Foundation to a new Guardian Safe 
+with the Security Council Safe as its sole owner. This moves the Superchain 
+closer to satisfying the 1 week exit window requirement for Stage 1. 
+    *   Additionally the Foundation is appointed to the new DeputyGuardian role 
+        which is able to act as Guardian through the Guardian Safe. This 
         appointment can be revoked by the Security Council Safe at any time.
 3.  Reassigning the owner of the L2ProxyAdmin contract from the Foundation to
     the Security Council. This ensures the Security Council Safe has a blocking
@@ -353,9 +353,9 @@ optionally halt if using the wrong version.
 
 #### SystemConfig
 
-The `SystemConfig` contract is helps manage configuration of an OP Stack
-network. Much of the network's configuration is stored on L1 and picked up by
-L2 as part of the derivation of the L2 chain. The contract also contains
+The `SystemConfig` contract helps manage configuration of an OP Stack 
+network. Much of the network's configuration is stored on L1 and picked up by 
+L2 as part of the derivation of the L2 chain. The contract also contains 
 references to all other contract addresses for the chain.
 
 #### DisputeGameFactory
@@ -397,7 +397,7 @@ Architecture (ISA).
 
 #### PreimageOracle
 
-The `PreimageOracle` contract for storing permissioned pre-images.
+The `PreimageOracle` contract is used for storing permissioned pre-images.
 
 #### DEPRECATED - L2OutputOracle
 

diff --git a/public/_redirects b/public/_redirects
@@ -86,7 +86,7 @@
 /stack/protocol/fault-proofs/fp-components /stack/fault-proofs/fp-components
 /stack/protocol/fault-proofs/explainer /stack/fault-proofs/explainer
 /stack/protocol/fault-proofs/cannon /stack/fault-proofs/cannon
-/stack/protocol/interop/supersim /stack/interop/supersim
+/stack/protocol/interop/supersim /stack/interop/tools/supersim
 /stack/protocol/interop/superchain-erc20 /stack/interop/superchain-erc20
 /stack/protocol/interop/explainer /stack/interop/explainer
 /stack/protocol/interop/cross-chain-message /stack/interop/cross-chain-message
@@ -118,12 +118,5 @@
 /builders/app-developers/contracts/superchain-erc20 /stack/interop/assets/superchain-erc20
 /builders/chain-operators/tutorials/sdk /builders/app-developers/overview
 /stack/explainer /superchain/superchain-explainer
-/chain/identity/contracts-eas /stack/smart-contracts#eas-ethereum-attestation-service
-/chain/identity/about-attestations https://community.optimism.io/identity/about-attestations
-/chain/identity/applications https://community.optimism.io/identity/applications
-/chain/identity/contracts-eas https://community.optimism.io/identity/contracts-eas
-/chain/identity/individuals https://community.optimism.io/identity/individuals
-/chain/identity/organizations https://community.optimism.io/identity/organizations
-/chain/identity/overview https://community.optimism.io/identity/overview
-/chain/identity/projects https://community.optimism.io/identity/projects
-/chain/identity/schemas https://community.optimism.io/identity/schemas
+/stack/interop/architecture /stack/interop/explainer#interoperability-architecture
+/stack/interop/cross-chain-message /stack/interop/explainer#how-messages-get-from-one-chain-to-the-other
diff --git a/public/tutorials/cross-dom-bridge-eth.js b/public/tutorials/cross-dom-bridge-eth.js
@@ -49,7 +49,7 @@ const depositArgs = await publicClientL2.buildDepositTransaction({
 const depositHash = await walletClientL1.depositTransaction(depositArgs);
 console.log(`Deposit transaction hash on L1: ${depositHash}`);
 
-const depositReceipt = await publicClientL1.waitForTransactionReceipt({ depositHash });
+const depositReceipt = await publicClientL1.waitForTransactionReceipt({ hash: depositHash });
 console.log('L1 transaction confirmed:', depositReceipt);
 
 const [l2Hash] = getL2TransactionHashes(depositReceipt);

diff --git a/words.txt b/words.txt
@@ -154,7 +154,7 @@ Inator
 inator
 INFLUXDBV
 influxdbv
-interoperates
+inteoperates
 interchain
 IPCDISABLE
 ipcdisable
@@ -394,7 +394,7 @@ unmetered
 Unprotect
 unsubmitted
 UPNP
-unsafe
+usafe
 VERKLE
 verkle
 VHOSTS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,5 +31,4 @@ Documentation covering Cross Chain Message, Explainer, Message Passing, Op Super
		<Card title="Interoperability predeploys" href="/stack/interop/predeploy" />

		<Card title="Cross-chain security" href="/stack/interop/security" />

		</Cards>