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/SUMMARY.md

@@ -22,4 +22,6 @@
   - [Upgrade Contract](./contracts/upgrade.md)
   - [Update Contract Parameters](./contracts/update-parameters.md)
   - [Modifications to Original `L2OutputOracle`](./contracts/modifications.md)
+- [Experimental](./experimental/intro.md)
+  - [OptimismPortalV2](./experimental/optimism-portal-v2.md)
 - [FAQ](./faq.md)

book/experimental/intro.md

@@ -0,0 +1,3 @@
+# Experimental
+
+This section contains experimental topics for OP Succinct.

book/experimental/optimism-portal-v2.md

@@ -0,0 +1,46 @@
+# OptimismPortalV2
+
+If you want to use `OptimismPortalV2` or conform to Optimism `IDisputeGame`, you can follow this section that describe how to deploy 2 contracts:
+
+* `OPSuccinctDisputeGame` a thin wrapper around `OPSuccinctL2OutputOracle` that implements `IDisputeGame`
+* `OPSuccinctDisputeGameFactory` the proposer entry point when creating new dispoute game
+
+And instruct how to configure the proposer to use them.
+
+After having done the step 2) either in mock or full mode, with `L2OO_ADDRESS` set with the address of the `OPSuccinctL2OutputOracle` contract in your `.env` file,
+run the following to deploy the contracts:
+
+```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.
+
+In order to have the poposer to use it, you have to add a new variable `DGF_ADDRESS` to your `.env` file with the value above.

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.
 

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.
 
@@ -125,6 +125,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 |

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

contracts/opsuccinctl2ooconfig-test.json

@@ -0,0 +1,15 @@
+{
+  "challenger": "0x0000000000000000000000000000000000000000",
+  "finalizationPeriod": 3600,
+  "l2BlockTime": 2,
+  "owner": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
+  "proposer": "0x0000000000000000000000000000000000000000",
+  "rollupConfigHash": "0x0d7101e2acc7eae1fb42cfce5c604d14da561726e4e01b509315e5a9f97a9816",
+  "startingBlockNumber": 5726082,
+  "startingOutputRoot": "0xafcc854e9d3af302a5c749703bb4593fff9471f2ea1b55ec0ade1e1d3c4a0d6e",
+  "startingTimestamp": 1733804652,
+  "submissionInterval": 1200,
+  "verifier": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",  
+  "aggregationVkey": "0x00d4e72bc998d0528b0722a53bedd9c6f0143c9157af194ad4bb2502e37a496f",
+  "rangeVkeyCommitment": "0x33e3678015df481724af3aac49d000923caeec277027610b1490f857769f9459"
+}

contracts/script/OPSuccinctDGFDeployer.s.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+import {Script} from "forge-std/Script.sol";
+import {OPSuccinctL2OutputOracle} from "../src/OPSuccinctL2OutputOracle.sol";
+import {OPSuccinctDisputeGame} from "../src/OPSuccinctDisputeGame.sol";
+import {OPSuccinctDisputeGameFactory} from "../src/OPSuccinctDisputeGameFactory.sol";
+import {Utils} from "../test/helpers/Utils.sol";
+import {Proxy} from "@optimism/src/universal/Proxy.sol";
+import {console} from "forge-std/console.sol";
+
+contract OPSuccinctDFGDeployer is Script, Utils {
+    function run() public returns (address) {
+        vm.startBroadcast();
+
+        OPSuccinctL2OutputOracle l2OutputOracleProxy = OPSuccinctL2OutputOracle(vm.envAddress("L2OO_ADDRESS"));
+
+        l2OutputOracleProxy.addProposer(address(0));
+
+        // Initialize the dispute game based on the existing L2OO_ADDRESS.
+        OPSuccinctDisputeGame game = new OPSuccinctDisputeGame(address(l2OutputOracleProxy));
+        OPSuccinctDisputeGameFactory gameFactory = new OPSuccinctDisputeGameFactory(msg.sender, address(game));
+
+        vm.stopBroadcast();
+
+        return address(gameFactory);
+    }
+}