feat: migrate OPSuccinctL2OutputOracle to OptimismPortalV2

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "contracts/lib/sp1-contracts"]
 	path = contracts/lib/sp1-contracts
 	url = https://github.com/succinctlabs/sp1-contracts
+[submodule "contracts/lib/solady"]
+	path = contracts/lib/solady
+	url = https://github.com/vectorized/solady

Cargo.toml

@@ -88,10 +88,10 @@ op-alloy-rpc-types-engine = { version = "0.6.8", default-features = false }
 op-alloy-network = { version = "0.6.8", default-features = false }
 
 # sp1
-sp1-lib = { version = "4.0.0-rc.9", features = ["verify"] }
-sp1-sdk = { version = "4.0.0-rc.9" }
-sp1-zkvm = { version = "4.0.0-rc.9", features = ["verify"] }
-sp1-build = { version = "4.0.0-rc.9" }
+sp1-lib = { version = "4.0.0-rc.10", features = ["verify"] }
+sp1-sdk = { version = "4.0.0-rc.10" }
+sp1-zkvm = { version = "4.0.0-rc.10", features = ["verify"] }
+sp1-build = { version = "4.0.0-rc.10" }
 
 [profile.release-client-lto]
 inherits = "release"

book/quick-start/full.md

@@ -25,7 +25,7 @@ In the root directory, create a file called `.env` and set the following environ
 
 There are additional optional parameters that you can set in the `.env` file. See the [Advanced Parameters](../contracts/configuration.md#optional-advanced-parameters) section for more information.
 
-### 2) Deploy the `OPSuccinctL2OutputOracle` contract.
+### 2) Deploy the `OPSuccinctL2OutputOracle` contract
 
 This contract is a modification of the `L2OutputOracle` contract which verifies a proof along with the proposed state root.
 
@@ -70,6 +70,44 @@ Estimated amount required: 0.00431887950806754 ETH
 
 In these deployment logs, `0xde4656D4FbeaC0c0863Ab428727e3414Fa251A4C` is the address of the proxy for the `OPSuccinctL2OutputOracle` contract. This deployed proxy contract is used to track the verified state roots of the OP Stack chain on L1.
 
+#### 3.1) *Optional:* Deploy the `OPSuccinctDisputeGameFactory` contract
+
+Optionally, deploy the `OPSuccinctDisputeGameFactory` contract.
+
+```shell
+just deploy-dispute-game-factory
+```
+
+If successful, you should see the following output:
+
+```
+[⠊] Compiling...
+[⠊] Compiling 1 files with Solc 0.8.15
+[⠒] Solc 0.8.15 finished in 1.93s
+Compiler run successful!
+Script ran successfully.
+
+== Return ==
+0: address 0x6A04B767f15055aebFFd21157D12aB12e8B764Ed
+
+## Setting up 1 EVM.
+
+==========================
+
+Chain 3151908
+
+Estimated gas price: 1.000000014 gwei
+
+Estimated total gas used for script: 1614671
+
+Estimated amount required: 0.001614671022605394 ETH
+
+==========================
+```
+
+In these deployment logs, `0x6A04B767f15055aebFFd21157D12aB12e8B764Ed` is the address of the proxy for the `OPSuccinctDisputeGameFactory` contract.
+
+
 ### 3) `op-succinct` service environment variables
 
 To start the `op-succinct` service, add the following parameters to the `.env` file in the root directory:
@@ -80,6 +118,10 @@ To start the `op-succinct` service, add the following parameters to the `.env` f
 | `NETWORK_PRIVATE_KEY` | The private key for the account that will be submitting proofs to the L1. |
 | `NETWORK_RPC_URL` | The RPC endpoint for the Succinct Prover Network. The default endpoint (`https://rpc.succinct.xyz`) is not suitable for use in OP Succinct. Reach out to the Succinct team to get access with OP Succinct. |
 
+If you want the proposer to use the `OPSuccinctDisputeGameFactory` contract, you must add an additional parameter `DGF_ADDRESS` to the `.env` file
+with the `OPSuccinctDisputeGameFactory` contract address.
+
+
 Now, you should have the following in your `.env` file:
 
 | Parameter | Description |
@@ -91,6 +133,7 @@ Now, you should have the following in your `.env` file:
 | `PRIVATE_KEY` | Private key for the account that will be deploying the contract and relaying proofs on-chain. |
 | `ETHERSCAN_API_KEY` | Etherscan API key for verifying the deployed contracts. |
 | `L2OO_ADDRESS` | The address of the `OPSuccinctL2OutputOracle` contract from the previous step. |
+| `DGF_ADDRESS` | *Optional* The address of the `OPSuccinctDisputeGameFactory` contract from the previous step. |
 | `NETWORK_PRIVATE_KEY` | The private key for the account that will be submitting proofs to the L1. |
 | `NETWORK_RPC_URL` | Reach out to the Succinct team to get access [here](https://docs.google.com/forms/d/e/1FAIpQLSd2Yil8TrU54cIuohH1WvDvbxTusyqh5rsDmMAtGC85-Arshg/viewform?ref=https://succinctlabs.github.io/op-succinct/). The default endpoint (`https://rpc.succinct.xyz`) is not suitable for use in OP Succinct. |
 

book/quick-start/mock.md

@@ -65,7 +65,7 @@ If you have multiple environments, you can pass the environment file to the `dep
 just deploy-mock-verifier <env_file>
 ```
 
-### 3) Deploy the `OPSuccinctL2OutputOracle` contract.
+### 3) Deploy the `OPSuccinctL2OutputOracle` contract
 
 This contract is a modification of the `L2OutputOracle` contract which verifies a proof along with the proposed state root.
 
@@ -116,6 +116,43 @@ Estimated amount required: 0.00431887950806754 ETH
 
 In these deployment logs, `0xde4656D4FbeaC0c0863Ab428727e3414Fa251A4C` is the address of the proxy for the `OPSuccinctL2OutputOracle` contract. This deployed proxy contract is used to track the verified state roots of the OP Stack chain on L1.
 
+#### 3.1) *Optional:* Deploy the `OPSuccinctDisputeGameFactory` contract
+
+Optionally, deploy the `OPSuccinctDisputeGameFactory` contract.
+
+```shell
+just deploy-dispute-game-factory
+```
+
+If successful, you should see the following output:
+
+```
+[⠊] Compiling...
+[⠊] Compiling 1 files with Solc 0.8.15
+[⠒] Solc 0.8.15 finished in 1.93s
+Compiler run successful!
+Script ran successfully.
+
+== Return ==
+0: address 0x6B3342821680031732Bc7d4E88A6528478aF9E38
+
+## Setting up 1 EVM.
+
+==========================
+
+Chain 3151908
+
+Estimated gas price: 1.000000014 gwei
+
+Estimated total gas used for script: 1614671
+
+Estimated amount required: 0.001614671022605394 ETH
+
+==========================
+```
+
+In these deployment logs, `0x6B3342821680031732Bc7d4E88A6528478aF9E38` is the address of the proxy for the `OPSuccinctDisputeGameFactory` contract.
+
 ### 4) Set `op-succinct` service environment variables
 
 To start the mock `op-succinct` service, add the following parameters to the `.env` file in the root directory:
@@ -125,6 +162,9 @@ To start the mock `op-succinct` service, add the following parameters to the `.e
 | `L2OO_ADDRESS` | The address of the `OPSuccinctL2OutputOracle` contract from the previous step. |
 | `OP_SUCCINCT_MOCK` | Set to `true` for mock mode. |
 
+If you want the proposer to use the `OPSuccinctDisputeGameFactory` contract, you must add an additional parameter `DGF_ADDRESS` to the `.env` file
+with the `OPSuccinctDisputeGameFactory` contract address.
+
 Now, you should have the following in your `.env` file:
 
 | Parameter | Description |
@@ -136,6 +176,7 @@ Now, you should have the following in your `.env` file:
 | `PRIVATE_KEY` | Private key for the account that will be deploying the contract and relaying proofs on-chain. |
 | `ETHERSCAN_API_KEY` | Etherscan API key for verifying the deployed contracts. |
 | `L2OO_ADDRESS` | The address of the `OPSuccinctL2OutputOracle` contract from the previous step. |
+| `DGF_ADDRESS` | *Optional* The address of the `OPSuccinctDisputeGameFactory` contract from the previous step. |
 | `OP_SUCCINCT_MOCK` | Set to `true` for mock mode. |
 
 ### 5) Start the `op-succinct` service in mock mode.

contracts/foundry.toml

@@ -7,6 +7,7 @@ remappings = [
     "@openzeppelin/=lib/openzeppelin-contracts/",
     "@optimism/=lib/optimism/packages/contracts-bedrock/",
     "@forge-std/=lib/forge-std/src/",
+    "@solady/=lib/solady/src",
     # Note: Use zobront/sp1-contracts as the current version for SP1 contracts is not compatible with the hard
     # version for 0.8.15 on some Optimism contracts.
     "@sp1-contracts/=lib/sp1-contracts/contracts/",
@@ -15,9 +16,13 @@ remappings = [
     "src/libraries/=lib/optimism/packages/contracts-bedrock/src/libraries/",
     "src/L1/=lib/optimism/packages/contracts-bedrock/src/L1/",
     "src/L2/=lib/optimism/packages/contracts-bedrock/src/L2/",
+    "src/dispute/=lib/optimism/packages/contracts-bedrock/src/dispute/"
 ]
 
 # Enable read-write access to opsuccinctl2ooconfig.json
-fs_permissions = [{ access = "read-write", path = "./opsuccinctl2ooconfig.json" }]
+fs_permissions = [
+    { access = "read-write", path = "./opsuccinctl2ooconfig.json" },
+    { access = "read-write", path = "./opsuccinctl2ooconfig-test.json" }
+]
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config