fix conflicts

Author: krofax

.gitignore

@@ -17,4 +17,6 @@ public/sitemap.xml
 .env
 
 # algolia
-.algolia
+.algolia
+# Local Netlify folder
+.netlify

pages/app-developers/building-apps.mdx

@@ -32,7 +32,7 @@ You can verify your development stack configuration by interacting with it.
 
 As you can see in the different development stacks below, the way you deploy contracts and interact with them on OP Stack chains is almost identical to the way you do it with L1 Ethereum.
 The most visible difference is that you have to specify a different endpoint (of course).
-The list of other differences is [here](differences).
+For more detail, see the guide on [Differences between Ethereum and OP Stack Chains](/stack/differences).
 
 *   [Apeworx](https://www.apeworx.io/)
 *   [Brownie](https://eth-brownie.readthedocs.io/en/stable/install.html)

pages/app-developers/get-started.mdx

@@ -21,7 +21,7 @@ Select a network to build, test, and quickly iterate on interoperable apps.
 | Local network                                                                                                   | Devnet                                                                                                            |
 | :-------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------- |
 | Build and iterate on your apps with Supersim – a local multi-chain dev environment.                             | Deploy your app to devnet – a testnet developmental version – to conduct large-scale testing.                     |
-| <ul><li>RPC Endpoint: `local RPC URL` </li><li>Chain ID: `local chain ID`</li><li>[Block explorer](#)</li></ul> | <ul><li>RPC Endpoint: `devnet RPC URL`</li><li>Chain ID: `devnet chain ID`</li><li> [Block explorer](#)</li></ul> |
+| <ul><li>RPC Endpoint: `local RPC URL` </li><li>Chain ID: `local chain ID`</li><li>Block explorer: TBD</li></ul> | <ul><li>RPC Endpoint: `devnet RPC URL`</li><li>Chain ID: `devnet chain ID`</li><li> Block explorer: TBD</li></ul> |
 | [Supersim](tutorials/supersim)                                                                                  | [Devnet Docs](/stack/interop/tools/devnet)                                                                        |
 
 ## Deploy your app to devnet in minutes
@@ -48,8 +48,6 @@ The SuperchainERC20 Starter Kit allows you to focus on what to deploy, not how t
 
   <Card title="Interop tutorials" href="/app-developers/tutorials/interop" icon={<img src="/img/icons/shapes.svg" />} />
 
-  <Card title="Crosschain guides" href="/stack/interop/cross-chain" icon={<img src="/img/icons/shapes.svg" />} />
-
   <Card title="Transaction tutorials" href="/app-developers/tutorials/transactions" icon={<img src="/img/icons/shapes.svg" />} />
 
   <Card title="Bridging tutorials" href="/app-developers/tutorials/bridging" icon={<img src="/img/icons/shapes.svg" />} />

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

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

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.

pages/app-developers/tutorials/interop.mdx

@@ -16,4 +16,7 @@ This is a collection of app developer tutorials focused on interop.
   <Card title="Bridging native cross-chain ETH transfers" href="/app-developers/tutorials/interop/bridge-crosschain-eth" icon={<img src="/img/icons/shapes.svg" />} />
   <Card title="Relaying interop messages using `cast`" href="/app-developers/tutorials/interop/relay-messages-cast" icon={<img src="/img/icons/shapes.svg" />} />
   <Card title="Relaying interop messages using `viem`" href="/app-developers/tutorials/interop/relay-messages-viem" icon={<img src="/img/icons/shapes.svg" />} />
+  <Card title="Making crosschain contract calls (ping pong)" href="/app-developers/tutorials/interop/contract-calls" icon={<img src="/img/icons/shapes.svg" />} />
+  <Card title="Making crosschain event reads (tic-tac-toe)" href="/app-developers/tutorials/interop/event-reads" icon={<img src="/img/icons/shapes.svg" />} />
+  <Card title="Deploying crosschain event composability (contests)" href="/app-developers/tutorials/interop/event-contests" icon={<img src="/img/icons/shapes.svg" />} />
 </Cards>

pages/app-developers/tutorials/interop/_meta.json

@@ -3,5 +3,8 @@
     "deploy-superchain-erc20": "Issuing new assets with SuperchainERC20",
     "bridge-crosschain-eth": "Bridging native cross-chain ETH transfers",
     "relay-messages-cast": "Relaying interop messages using `cast`",
-    "relay-messages-viem": "Relaying interop messages using `viem`"
+    "relay-messages-viem": "Relaying interop messages using `viem`",
+    "contract-calls": "Making crosschain contract calls (ping pong)",
+    "event-reads": "Making crosschain event reads (tic-tac-toe)",
+    "event-contests": "Deploying crosschain event composability (contests)"
 }

pages/app-developers/tutorials/interop/contract-calls.mdx

@@ -0,0 +1,9 @@
+---
+title: Making crosschain contract calls (ping pong)
+lang: en-US
+description: Learn how to make crosschain contract calls using ping pong.
+---
+
+import ContractCalls from '@/pages/stack/interop/tutorials/contract-calls.mdx'
+
+<ContractCalls />

pages/app-developers/tutorials/interop/event-contests.mdx

@@ -0,0 +1,9 @@
+---
+title: Deploying crosschain event composability (contests)
+lang: en-US
+description: Learn how to deploy crosschain event composability using contests.
+---
+
+import EventContests from '@/pages/stack/interop/tutorials/event-contests.mdx'
+
+<EventContests />