env, scripts and forge-test updates

.env.example

@@ -1,7 +1,7 @@
 # Environment Configuration
 PRIVATE_KEY=0x
 RPC_URL=""
-DCAP_IMAGE_ID=0x4052beb38db7869b15596d53c2d5c02c9307faffca9215e69b0f0d0e1812a6c2
+DCAP_RISCZERO_IMAGE_ID=0x4052beb38db7869b15596d53c2d5c02c9307faffca9215e69b0f0d0e1812a6c2
 
 # On-Chain PCCS Configurations
 ENCLAVE_IDENTITY_HELPER=0xfd4a34b578B352FE1896CDafaEb0f45f993352Bf

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
     workflow_dispatch:
 
 env:
-  DCAP_IMAGE_ID: "0x4052beb38db7869b15596d53c2d5c02c9307faffca9215e69b0f0d0e1812a6c2"
+  DCAP_RISCZERO_IMAGE_ID: "0x4052beb38db7869b15596d53c2d5c02c9307faffca9215e69b0f0d0e1812a6c2"
 
 jobs:
   check:

forge-script/AttestationScript.s.sol

@@ -8,8 +8,6 @@ import "../contracts/AutomataDcapAttestation.sol";
 
 contract AttestationScript is Script {
     uint256 deployerKey = uint256(vm.envBytes32("PRIVATE_KEY"));
-    address riscZeroVerifier = vm.envAddress("RISC0_VERIFIER");
-    bytes32 riscZeroImageId = vm.envBytes32("DCAP_IMAGE_ID");
 
     function deployEntrypoint() public {
         vm.startBroadcast(deployerKey);

forge-script/DeployRouter.s.sol

@@ -27,8 +27,21 @@ contract DeployRouter is Script {
         vm.stopBroadcast();
     }
 
+    function updateConfig() public {
+        vm.startBroadcast(deployerKey);
+
+        PCCSRouter router = PCCSRouter(vm.envAddress("PCCS_ROUTER"));
+        router.setConfig(enclaveIdDaoAddr, tcbDaoAddr, pcsDaoAddr, pckDaoAddr, pckHelperAddr, crlHelperAddr);
+
+        vm.stopBroadcast();
+    }
+
     function setAuthorizedCaller(address caller, bool authorized) public {
+        vm.startBroadcast(deployerKey);
+
         PCCSRouter router = PCCSRouter(vm.envAddress("PCCS_ROUTER"));
         router.setAuthorized(caller, authorized);
+
+        vm.stopBroadcast();
     }
 }

forge-test/AutomataDcapAttestationFeeTest.t.sol

@@ -21,7 +21,7 @@ contract AutomataDcapAttestationFeeTest is PCCSSetupBase, RiscZeroSetup {
     AutomataDcapAttestationFee attestation;
     PCCSRouter pccsRouter;
 
-    bytes32 imageId = vm.envBytes32("DCAP_IMAGE_ID");
+    bytes32 imageId = vm.envBytes32("DCAP_RISCZERO_IMAGE_ID");
     address user = address(69);
 
     function setUp() public override {

forge-test/utils/succinct/Groth16Setup.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import {SP1Verifier} from "@sp1-contracts/v3.0.0/SP1VerifierGroth16.sol";
+
+contract Groth16Setup {
+    function setup() public returns (address verifier) {
+        SP1Verifier groth16Verifier = new SP1Verifier();
+        verifier = address(groth16Verifier);
+    }
+}

forge-test/utils/succinct/PlonkSetup.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import {SP1Verifier} from "@sp1-contracts/v3.0.0/SP1VerifierPlonk.sol";
+
+contract PlonkSetup {
+    function setup() public returns (address verifier) {
+        SP1Verifier plonkVerifier = new SP1Verifier();
+        verifier = address(plonkVerifier);
+    }
+}