feat: deploy risc0 groth16 verifier contracts in anvil (#1876)

MarcosNicolau · web-flow · commit 3ef297602422 · 2025-04-28T18:50:29.000Z
diff --git a/Makefile b/Makefile
@@ -75,6 +75,10 @@ anvil_deploy_eigen_contracts:
 	@echo "Deploying Eigen Contracts..."
 	. contracts/scripts/anvil/deploy_eigen_contracts.sh
 
+anvil_deploy_risc0_contracts:
+	@echo "Deploying RISC0 Contracts..."
+	. contracts/scripts/anvil/deploy_risc0_contracts.sh
+
 anvil_deploy_sp1_contracts:
 	@echo "Deploying SP1 Contracts..."
 	. contracts/scripts/anvil/deploy_sp1_contracts.sh
diff --git a/contracts/deployments/31337.json b/contracts/deployments/31337.json
@@ -1,5 +1,5 @@
 {
   "CREATE2_SALT": "0x0000000000000000000000000000000000000000000000000000000000000009",
-  "SP1_VERIFIER_GATEWAY_GROTH16": "0xbC42A182543d5AF01f51040955D149A74C015098",
-  "V4_0_0_RC3_SP1_VERIFIER_GROTH16": "0x737A46c3A4579A452302130D762eFa66C6f81e28"
-}
+  "SP1_VERIFIER_GATEWAY_GROTH16": "0xB146FbFdFeC2a5182b3Cef9becE03290224256D5",
+  "V4_0_0_RC3_SP1_VERIFIER_GROTH16": "0x93a993C79738eA5D8836e42C6c422259684639Dc"
+}
diff --git a/contracts/remappings.txt b/contracts/remappings.txt
@@ -7,3 +7,4 @@ forge-std/=lib/forge-std/src/
 @openzeppelin-upgrades/contracts/=lib/eigenlayer-middleware/lib/openzeppelin-contracts-upgradeable/contracts/
 @sp1-contracts/=lib/sp1-contracts/contracts/src/
 @risc0-contracts/=lib/risc0-ethereum/contracts/src/
+openzeppelin/=lib/risc0-ethereum/lib/openzeppelin-contracts
diff --git a/contracts/script/deploy/Risc0Groth16VerifierDeployer.s.sol b/contracts/script/deploy/Risc0Groth16VerifierDeployer.s.sol
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {Script} from "forge-std/Script.sol";
+import {console2} from "forge-std/console2.sol";
+import {IRiscZeroVerifier} from "@risc0-contracts/IRiscZeroVerifier.sol";
+import {ControlID, RiscZeroGroth16Verifier} from "@risc0-contracts/groth16/RiscZeroGroth16Verifier.sol";
+
+contract Risc0VerifierRouterDeployer is Script {
+    function run() external {
+        uint256 deployerKey = uint256(vm.envBytes32("DEPLOYER_PRIVATE_KEY"));
+
+        vm.startBroadcast(deployerKey);
+
+        IRiscZeroVerifier verifier = new RiscZeroGroth16Verifier(ControlID.CONTROL_ROOT, ControlID.BN254_CONTROL_ID);
+        console2.log("Deployed RiscZeroGroth16Verifier to", address(verifier));
+
+        vm.stopBroadcast();
+    }
+}
diff --git a/contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.config.json b/contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.config.json
@@ -1,7 +1,7 @@
 {
   "address": {
-    "sp1VerifierAddress": "0xbC42A182543d5AF01f51040955D149A74C015098",
-    "risc0VerifierAddress": "0x00000000000000000000000000000000000000FF",
+    "sp1VerifierAddress": "0xB146FbFdFeC2a5182b3Cef9becE03290224256D5",
+    "risc0VerifierAddress": "0x663F3ad617193148711d28f5334eE4Ed07016602",
     "alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
     "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
   },
diff --git a/contracts/script/deploy/config/holesky/proof-aggregator-service.holesky.config.json b/contracts/script/deploy/config/holesky/proof-aggregator-service.holesky.config.json
@@ -1,6 +1,7 @@
 {
   "address": {
     "sp1VerifierAddress": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
+    "risc0VerifierAddress": "0xf70aBAb028Eb6F4100A24B203E113D94E87DE93C",
     "alignedAggregatorAddress": "0x9403dF48130621f87974a5A1d1d11d3aF1222A82"
   },
   "permissions": {
diff --git a/contracts/script/deploy/config/holesky/proof-aggregator-service.holesky.config.stage.json b/contracts/script/deploy/config/holesky/proof-aggregator-service.holesky.config.stage.json
@@ -1,6 +1,7 @@
 {
   "address": {
     "sp1VerifierAddress": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
+    "risc0VerifierAddress": "0xf70aBAb028Eb6F4100A24B203E113D94E87DE93C",
     "alignedAggregatorAddress": "0x3595aa7d30f89f65933e7421dec77e4478d9fb01"
   },
   "permissions": {
diff --git a/contracts/script/deploy/config/mainnet/proof-aggregator-service.mainnet.config.json b/contracts/script/deploy/config/mainnet/proof-aggregator-service.mainnet.config.json
@@ -1,6 +1,7 @@
 {
   "address": {
     "sp1VerifierAddress": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
+    "risc0VerifierAddress": "0x8EaB2D97Dfce405A1692a21b3ff3A172d593D319",
     "alignedAggregatorAddress": "<aligned_aggregator_address>"
   },
   "permissions": {
diff --git a/contracts/script/deploy/config/mainnet_staging/proof-aggregator-service.mainnet.config.json b/contracts/script/deploy/config/mainnet_staging/proof-aggregator-service.mainnet.config.json
@@ -1,6 +1,7 @@
 {
   "address": {
     "sp1VerifierAddress": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
+    "risc0VerifierAddress": "0x8EaB2D97Dfce405A1692a21b3ff3A172d593D319",
     "alignedAggregatorAddress": "<aligned_aggregator_address>"
   },
   "permissions": {
diff --git a/contracts/script/deploy/config/sepolia/proof-aggregator-service.sepolia.config.json b/contracts/script/deploy/config/sepolia/proof-aggregator-service.sepolia.config.json
@@ -1,6 +1,7 @@
 {
   "address": {
     "sp1VerifierAddress": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
+    "risc0VerifierAddress": "0x925d8331ddc0a1F0d96E68CF073DFE1d92b69187",
     "alignedAggregatorAddress": "<aligned_aggregator_address>"
   },
   "permissions": {
diff --git a/contracts/script/output/devnet/alignedlayer_deployment_output.json b/contracts/script/output/devnet/alignedlayer_deployment_output.json
@@ -19,7 +19,7 @@
   },
   "chainInfo": {
     "chainId": 31337,
-    "deploymentBlock": 3
+    "deploymentBlock": 4
   },
   "permissions": {
     "alignedLayerAggregator": "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
diff --git a/contracts/scripts/anvil/deploy_aligned_contracts.sh b/contracts/scripts/anvil/deploy_aligned_contracts.sh
@@ -72,7 +72,8 @@ forge script script/deploy/AlignedProofAggregationServiceDeployer.s.sol \
     --rpc-url "http://localhost:8545" \
     --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" \
     --broadcast \
-    --sig "run(string configPath, string outputPath)"
+    --sig "run(string configPath, string outputPath)" \
+    --via-ir
 
 # Deploy proof aggregation service contract with Mocked Verifier
 forge script script/deploy/AlignedProofAggregationServiceDeployer.s.sol \
@@ -81,7 +82,8 @@ forge script script/deploy/AlignedProofAggregationServiceDeployer.s.sol \
     --rpc-url "http://localhost:8545" \
     --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" \
     --broadcast \
-    --sig "run(string configPath, string outputPath)"
+    --sig "run(string configPath, string outputPath)" \
+    --via-ir
 
 # Kill the anvil process to save state
 pkill anvil
diff --git a/contracts/scripts/anvil/deploy_risc0_contracts.sh b/contracts/scripts/anvil/deploy_risc0_contracts.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# cd to the directory of this script so that this can be run from anywhere
+parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+# At this point we are in tests/integration
+cd "$parent_path"
+
+# Start an empty anvil chain in the background and dump its state to a json file upon exit
+anvil --load-state state/eigenlayer-deployed-anvil-state.json --dump-state state/risc0-deployed-anvil-state.json &
+
+# cd to /contracts
+cd ../../
+
+sleep 1
+
+export RPC_DEVNET='http://localhost:8545'
+
+# Anvil account #2
+export DEPLOYER_PRIVATE_KEY='0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a'
+
+forge script script/deploy/Risc0Groth16VerifierDeployer.s.sol:Risc0VerifierRouterDeployer \
+    --rpc-url $RPC_DEVNET \
+    --private-key $DEPLOYER_PRIVATE_KEY \
+    --broadcast \
+    --via-ir
+
+# Kill the anvil process to save state
+pkill anvil
diff --git a/contracts/scripts/anvil/deploy_sp1_contracts.sh b/contracts/scripts/anvil/deploy_sp1_contracts.sh
@@ -6,7 +6,7 @@ parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
 cd "$parent_path"
 
 # Start an empty anvil chain in the background and dump its state to a json file upon exit
-anvil --load-state state/eigenlayer-deployed-anvil-state.json --dump-state state/sp1-deployed-anvil-state.json &
+anvil --load-state state/risc0-deployed-anvil-state.json --dump-state state/sp1-deployed-anvil-state.json &
 
 # cd to /contracts
 cd ../../
diff --git a/contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json b/contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
diff --git a/contracts/scripts/anvil/state/eigenlayer-deployed-anvil-state.json b/contracts/scripts/anvil/state/eigenlayer-deployed-anvil-state.json
diff --git a/contracts/scripts/anvil/state/risc0-deployed-anvil-state.json b/contracts/scripts/anvil/state/risc0-deployed-anvil-state.json
diff --git a/contracts/scripts/anvil/state/sp1-deployed-anvil-state.json b/contracts/scripts/anvil/state/sp1-deployed-anvil-state.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"CREATE2_SALT": "0x0000000000000000000000000000000000000000000000000000000000000009",`
`3`		`- "SP1_VERIFIER_GATEWAY_GROTH16": "0xbC42A182543d5AF01f51040955D149A74C015098",`
`4`		`- "V4_0_0_RC3_SP1_VERIFIER_GROTH16": "0x737A46c3A4579A452302130D762eFa66C6f81e28"`
`5`		`-}`
	`3`	`+ "SP1_VERIFIER_GATEWAY_GROTH16": "0xB146FbFdFeC2a5182b3Cef9becE03290224256D5",`
	`4`	`+ "V4_0_0_RC3_SP1_VERIFIER_GROTH16": "0x93a993C79738eA5D8836e42C6c422259684639Dc"`
	`5`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"address": {`
`3`	`3`	`"sp1VerifierAddress": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",`
	`4`	`+ "risc0VerifierAddress": "0xf70aBAb028Eb6F4100A24B203E113D94E87DE93C",`
`4`	`5`	`"alignedAggregatorAddress": "0x9403dF48130621f87974a5A1d1d11d3aF1222A82"`
`5`	`6`	`},`
`6`	`7`	`"permissions": {`