feat: anvil deployment and config

MarcosNicolau · MarcosNicolau · commit 3d31c3bb4481 · 2025-04-30T18:34:27.000-03:00
diff --git a/contracts/script/deploy/AlignedProofAggregationServiceDeployer.s.sol b/contracts/script/deploy/AlignedProofAggregationServiceDeployer.s.sol
@@ -12,7 +12,11 @@ contract AlignedProofAggregationServiceDeployer is Script {
 
         address alignedAggregatorAddress = stdJson.readAddress(config_data, ".address.alignedAggregatorAddress");
         address sp1VerifierAddress = stdJson.readAddress(config_data, ".address.sp1VerifierAddress");
+        bytes32 sp1AggregationProgramVKHash =
+            stdJson.readBytes32(config_data, ".programs_id.sp1AggregationProgramVKHash");
         address risc0VerifierAddress = stdJson.readAddress(config_data, ".address.risc0VerifierAddress");
+        bytes32 risc0AggregationProgramImageId =
+            stdJson.readBytes32(config_data, ".programs_id.risc0AggregationProgramImageId");
 
         address ownerAddress = stdJson.readAddress(config_data, ".permissions.owner");
 
@@ -23,11 +27,13 @@ contract AlignedProofAggregationServiceDeployer is Script {
         ERC1967Proxy proxy = new ERC1967Proxy(
             address(alignedProofAggregationService),
             abi.encodeWithSignature(
-                "initialize(address,address,address,address)",
+                "initialize(address,address,address,address,bytes32,bytes32)",
                 ownerAddress,
                 alignedAggregatorAddress,
                 sp1VerifierAddress,
-                risc0VerifierAddress
+                risc0VerifierAddress,
+                risc0AggregationProgramImageId,
+                sp1AggregationProgramVKHash
             )
         );
 
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,11 +1,15 @@
 {
-  "address": {
-    "sp1VerifierAddress": "0xB146FbFdFeC2a5182b3Cef9becE03290224256D5",
-    "risc0VerifierAddress": "0x663F3ad617193148711d28f5334eE4Ed07016602",
-    "alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-    "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
-  },
-  "permissions": {
-    "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
-  }
+    "address": {
+        "sp1VerifierAddress": "0xB146FbFdFeC2a5182b3Cef9becE03290224256D5",
+        "risc0VerifierAddress": "0x663F3ad617193148711d28f5334eE4Ed07016602",
+        "alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
+        "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
+    },
+    "programs_id": {
+        "sp1AggregationProgramVKHash": "0x00964e05feb8c81d33714c9a9d66d0941210996853b8886d40e8c85ed3a4fa39",
+        "risc0AggregationProgramImageId": "0x616eccca41e741062c79481078c0cbaa034da436c2ba254b09de8c2cf20bdd86"
+    },
+    "permissions": {
+        "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
+    }
 }
diff --git a/contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.mock.config.json b/contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.mock.config.json
@@ -5,6 +5,10 @@
     "alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
     "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
   },
+  "programs_id": {
+    "sp1AggregationProgramVKHash": "0x00964e05feb8c81d33714c9a9d66d0941210996853b8886d40e8c85ed3a4fa39",
+    "risc0AggregationProgramImageId": "0x616eccca41e741062c79481078c0cbaa034da436c2ba254b09de8c2cf20bdd86"
+  },
   "permissions": {
     "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
   }
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
@@ -4,6 +4,10 @@
     "risc0VerifierAddress": "0xf70aBAb028Eb6F4100A24B203E113D94E87DE93C",
     "alignedAggregatorAddress": "0x9403dF48130621f87974a5A1d1d11d3aF1222A82"
   },
+  "programs_id": {
+    "sp1AggregationProgramVKHash": "0x00964e05feb8c81d33714c9a9d66d0941210996853b8886d40e8c85ed3a4fa39",
+    "risc0AggregationProgramImageId": "0x616eccca41e741062c79481078c0cbaa034da436c2ba254b09de8c2cf20bdd86"
+  },
   "permissions": {
     "owner": "0x97aEC5F28181abe5d2aD40dBe7FbaEe014529b7D"
   }
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
@@ -4,6 +4,10 @@
     "risc0VerifierAddress": "0xf70aBAb028Eb6F4100A24B203E113D94E87DE93C",
     "alignedAggregatorAddress": "0x3595aa7d30f89f65933e7421dec77e4478d9fb01"
   },
+  "programs_id": {
+    "sp1AggregationProgramVKHash": "0x00964e05feb8c81d33714c9a9d66d0941210996853b8886d40e8c85ed3a4fa39",
+    "risc0AggregationProgramImageId": "0x616eccca41e741062c79481078c0cbaa034da436c2ba254b09de8c2cf20bdd86"
+  },
   "permissions": {
     "owner": "0xE3C695b73dbe27106aF4530b152de3e57456B385"
   }
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
@@ -4,6 +4,10 @@
     "risc0VerifierAddress": "0x8EaB2D97Dfce405A1692a21b3ff3A172d593D319",
     "alignedAggregatorAddress": "<aligned_aggregator_address>"
   },
+  "programs_id": {
+    "sp1AggregationProgramVKHash": "0x00964e05feb8c81d33714c9a9d66d0941210996853b8886d40e8c85ed3a4fa39",
+    "risc0AggregationProgramImageId": "0x616eccca41e741062c79481078c0cbaa034da436c2ba254b09de8c2cf20bdd86"
+  },
   "permissions": {
     "owner": "<owner_address>"
   }
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
@@ -4,6 +4,10 @@
     "risc0VerifierAddress": "0x8EaB2D97Dfce405A1692a21b3ff3A172d593D319",
     "alignedAggregatorAddress": "<aligned_aggregator_address>"
   },
+  "programs_id": {
+    "sp1AggregationProgramVKHash": "0x00964e05feb8c81d33714c9a9d66d0941210996853b8886d40e8c85ed3a4fa39",
+    "risc0AggregationProgramImageId": "0x616eccca41e741062c79481078c0cbaa034da436c2ba254b09de8c2cf20bdd86"
+  },
   "permissions": {
     "owner": "<owner_address>"
   }
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
@@ -4,6 +4,10 @@
     "risc0VerifierAddress": "0x925d8331ddc0a1F0d96E68CF073DFE1d92b69187",
     "alignedAggregatorAddress": "<aligned_aggregator_address>"
   },
+  "programs_id": {
+    "sp1AggregationProgramVKHash": "0x00964e05feb8c81d33714c9a9d66d0941210996853b8886d40e8c85ed3a4fa39",
+    "risc0AggregationProgramImageId": "0x616eccca41e741062c79481078c0cbaa034da436c2ba254b09de8c2cf20bdd86"
+  },
   "permissions": {
     "owner": "<owner_address>"
   }
diff --git a/contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json b/contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
