feat: port op-proposer from Optimism fork

.dockerignore

@@ -0,0 +1,3 @@
+/target
+/data
+/execution-reports

.gitignore

@@ -18,11 +18,15 @@ data
 **.txt
 !LICENSE.txt
 
-# DB data
-db/
-
 # Reports
 execution-reports/
 
 # Rollup Config
 **/rollup-config.json
+
+# DB
+db/proofs.db
+
+**/bin/op-proposer
+
+artifact_*

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "contracts/lib/forge-std"]
+	path = contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "contracts/lib/optimism"]
+	path = contracts/lib/optimism
+	url = https://github.com/ethereum-optimism/optimism
+[submodule "contracts/lib/sp1-contracts"]
+	path = contracts/lib/sp1-contracts
+	url = https://github.com/zobront/sp1-contracts
+[submodule "contracts/lib/openzeppelin-contracts"]
+	path = contracts/lib/openzeppelin-contracts
+	url = https://github.com/openzeppelin/openzeppelin-contracts

client-programs/aggregation/src/main.rs

@@ -16,7 +16,7 @@ use std::collections::HashMap;
 /// should verify the proof matches the arbitrary vkey digest stored in the contract. This means
 /// that the aggregate program would no longer need to update this value.
 const MULTI_BLOCK_PROGRAM_VKEY_DIGEST: [u32; 8] = [
-    227309663, 1637133225, 136526498, 1878261023, 2013043842, 450616441, 575447582, 1643259779,
+    1508409308, 1137854487, 973057968, 1803661253, 1268718746, 1191567157, 1407656333, 223218931,
 ];
 
 /// Verify that the L1 heads in the boot infos are in the header chain.

contracts/.env.example

@@ -0,0 +1,2 @@
+# Rollup RPC URL
+L2_NODE_RPC=

contracts/.gitignore

@@ -3,7 +3,7 @@ cache/
 out/
 
 # Ignores development broadcast logs
-!/broadcast
+/broadcast
 /broadcast/*/31337/
 /broadcast/**/dry-run/
 

contracts/README.md

@@ -6,9 +6,19 @@ The `contracts/` directory consists of two things:
 
 2) The `ZKUpgrader.s.sol` script, which deploys the `ZKL2OutputOracle.sol` implementation contract, upgrades an existing `L2OutputOracleProxy` to point to it, and initializes the new contract with values from `zkconfig.json`.
 
-## Deploy
+3) The `ZKDeployer.s.sol` script, which deploys the `ZKL2OutputOracle.sol` implementation contract, upgrades an existing `L2OutputOracleProxy` to point to it, and initializes the new contract with values from `zkconfig.json`.
 
-To deploy and upgrade the contract, run the following command (where `ADMIN_PK` is the private key of the admin address for the L1 proxy contracts):
+## Deploy Fresh Proxy
+
+For OP Sepolia, you can deploy a fresh proxy with the following command:
+
+```shell
+forge script script/ZKDeployer.s.sol:ZKDeployer --rpc-url <L1_RPC> --private-key <ADMIN_PK> --verify --verifier etherscan --etherscan-api-key <ETHERSCAN_API_KEY> --broadcast --slow -vvvv --ffi
+```
+
+## Upgrade Existing Proxy
+
+To deploy and upgrade the contract for existing chains, run the following command (where `ADMIN_PK` is the private key of the admin address for the L1 proxy contracts):
 
 ```shell
 forge script script/ZKUpgrader.s.sol:ZKUpgrader  --rpc-url <L1_RPC> --private-key <ADMIN_PK> --verify --verifier etherscan --etherscan-api-key <ETHERSCAN_API_KEY> --broadcast --slow --vvvv

contracts/foundry.toml

@@ -2,9 +2,23 @@
 src = "src"
 out = "out"
 libs = ["lib"]
-ffi = true
-fs_permissions = [
-    { access = "read", path = "zkconfig.json" }
+remappings = [
+    # Use openzeppelin-contracts v4.7.3 as the some contracts are not compatible with 0.8.15
+    "@openzeppelin/=lib/openzeppelin-contracts/",
+    "@optimism/=lib/optimism/packages/contracts-bedrock/",
+    "@forge-std/=lib/forge-std/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/",
+    "@rari-capital/=lib/optimism/packages/contracts-bedrock/lib/",
+    # Optimism repo uses absolute imports, so we need to have remappings for the paths we use.
+    "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/",
 ]
 
-# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
+# Enable read-write access to zkconfig.json
+fs_permissions = [{ access = "read-write", path = "./zkconfig.json" }]
+
+dotenv = ".env"
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config

contracts/script/ZKDeployer.s.sol

@@ -1,22 +1,27 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { Script } from "forge-std/Script.sol";
-import { ZKL2OutputOracle } from "src/ZKL2OutputOracle.sol";
-import { Utils } from "test/helpers/Utils.sol";
-import { Proxy }  from "@optimism/src/universal/Proxy.sol";
+pragma solidity ^0.8.15;
 
+import {Script} from "forge-std/Script.sol";
+import {ZKL2OutputOracle} from "../src/ZKL2OutputOracle.sol";
+import {Utils} from "../test/helpers/Utils.sol";
+import {Proxy} from "@optimism/src/universal/Proxy.sol";
 
 contract ZKDeployer is Script, Utils {
     function run() public {
         vm.startBroadcast();
 
-        Config memory config = readJson("zkconfig.json");
+        Config memory config = readJsonWithRPCFromEnv("zkconfig.json");
         config.l2OutputOracleProxy = address(new Proxy(msg.sender));
 
         address zkL2OutputOracleImpl = address(new ZKL2OutputOracle());
 
-        upgradeAndInitialize(zkL2OutputOracleImpl, config, address(0), bytes32(0), 0);
+        upgradeAndInitialize(
+            zkL2OutputOracleImpl,
+            config,
+            address(0),
+            bytes32(0),
+            0
+        );
 
         vm.stopBroadcast();
     }

contracts/script/ZKUpgrader.s.sol

@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { Script } from "forge-std/Script.sol";
-import { ZKL2OutputOracle } from "src/ZKL2OutputOracle.sol";
-import { Utils } from "test/helpers/Utils.sol";
+pragma solidity ^0.8.15;
 
+import {Script} from "forge-std/Script.sol";
+import {ZKL2OutputOracle} from "../src/ZKL2OutputOracle.sol";
+import {Utils} from "../test/helpers/Utils.sol";
 
 contract ZKUpgrader is Script, Utils {
     function run() public {
@@ -13,7 +12,13 @@ contract ZKUpgrader is Script, Utils {
         vm.startBroadcast(vm.envUint("ADMIN_PK"));
 
         address zkL2OutputOracleImpl = address(new ZKL2OutputOracle());
-        upgradeAndInitialize(zkL2OutputOracleImpl, config, address(0), bytes32(0), 0);
+        upgradeAndInitialize(
+            zkL2OutputOracleImpl,
+            config,
+            address(0),
+            bytes32(0),
+            0
+        );
 
         vm.stopBroadcast();
     }