conflict resolution

automata-network · Feb 28, 2025 · d7931ed · d7931ed
1 parent d4eca8c
commit d7931ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/contracts/bases/QuoteVerifierBase.sol b/contracts/bases/QuoteVerifierBase.sol
@@ -153,6 +153,7 @@ abstract contract QuoteVerifierBase is IQuoteVerifier, EnclaveIdBase, X509ChainB
 
     function checkCollateralHashes(uint256 offset, bytes calldata zkOutput) internal view returns (bool, bytes memory) {
         string memory mismatchMessage = "collateral mismatch";
+
         uint64 timestamp = uint64(bytes8(zkOutput[offset:offset + 8]));
         bytes32 rootCaHash = bytes32(zkOutput[offset + 72:offset + 104]);
         bytes32 tcbSigningHash = bytes32(zkOutput[offset + 104:offset + 136]);

diff --git a/forge-test/AutomataDcapAttestationTest.t.sol b/forge-test/AutomataDcapAttestationTest.t.sol
@@ -107,7 +107,7 @@ contract AutomataDcapAttestationFeeTest is PCCSSetupBase, RiscZeroSetup {
     }
 
     function testRiscZeroProofAttestation() public {
-        bytes32 imageId = vm.envBytes32("DCAP_RISCZERO_IMAGE_ID");
+        bytes32 imageId = 0x83613a8beec226d1f29714530f1df791fa16c2c4dfcf22c50ab7edac59ca637f;
         setUpRiscZero();
         ZkCoProcessorConfig memory riscZeroConfig =
             ZkCoProcessorConfig({dcapProgramIdentifier: imageId, zkVerifier: address(riscZeroVerifier)});

diff --git a/forge-test/utils/PCCSSetupBase.sol b/forge-test/utils/PCCSSetupBase.sol
@@ -81,7 +81,10 @@ abstract contract PCCSSetupBase is Test {
             address(pccsStorage), P256_VERIFIER, address(pcsDao), address(tcbHelper), address(x509)
         );
 
-        pccsStorage.updateDao(address(pcsDao), address(pckDao), address(enclaveIdDao), address(fmspcTcbDao));
+        pccsStorage.grantDao(address(pcsDao));
+        pccsStorage.grantDao(address(pckDao));
+        pccsStorage.grantDao(address(fmspcTcbDao));
+        pccsStorage.grantDao(address(enclaveIdDao));
 
         vm.stopPrank();
     }