diff --git a/forge-test/AutomataDcapAttestationTest.t.sol b/forge-test/AutomataDcapAttestationTest.t.sol index 5132836..4bb370f 100644 --- a/forge-test/AutomataDcapAttestationTest.t.sol +++ b/forge-test/AutomataDcapAttestationTest.t.sol @@ -128,7 +128,7 @@ contract AutomataDcapAttestationTest is PCCSSetupBase, RiscZeroSetup, SuccinctSe } function testSuccintGroth16ProofAttestation() public { - bytes32 vk = 0x00d580241a5df56fe4b722a58827285d9020e52d4b62cec69b53763a22542f3b; + bytes32 vk = 0x0016d421d8599b43498eee7c30e6eca5e7aa05c02e38e5bf392937c98736fda6; ISP1Verifier sp1Verifier = setupSP1Verifier(ProveOpt.Groth16); ZkCoProcessorConfig memory riscZeroConfig = ZkCoProcessorConfig({dcapProgramIdentifier: vk, zkVerifier: address(sp1Verifier)}); @@ -151,7 +151,7 @@ contract AutomataDcapAttestationTest is PCCSSetupBase, RiscZeroSetup, SuccinctSe bytes memory output = hex"55020004000000810790c06f000000040102000000000000000000000000009790d89a10210ec6968a773cee2ca05b5aa97309f36727a968527be4606fc19e6f73acce350946c9d46a9bf7a63f843000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000080e702060000000000f2dd2696f69b950645832bdc095ffd11247eeff687eeacdb57a58d2ddb9a9f94fea40c961e19460c00ffa31420ecbc180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000998204508d58dcbfebe5e11c48669f7a921ac2da744dfb7d014ecdff2acdff1c9f665fdad52aadacf296a1df9909eb2383d100224f1716aeb431f7cb3cf028197dbd872487f27b0f6329ab17647dc9953c7014109818634f879e6550bc60f93eecfc42ff4d49278bfdbb0c77e570f4490cff10a2ee1ac11fbd2c2b49fa6cfa3cf1a1cb755c72522dd8a689e9d47906a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000278e753482976c8a7351fe2113609c7350d491cdae3d449eefc202fa41b2ad6840239cc2ba084c2d594b4e6dabeae0fcbf71c96daf0d0c9ecf0e9810c045790000a51167000000009d15153a84fbc62bcf79a13967729408838fc92c0c97eb85d628db3566af265467eebe27bf6dc0aa227bc8ad11c55c22370f4f7e7246c6c65bef5205342142090fa74a3f32c80b978c8ad671395dabf24283eef9091bc3919fd39b9915a87f1adf3061c165c0191e2658256a2855cac9267f179aafb1990c9e918d6452816adf9953f245d005b9d7d8e36a842a60b51e5cf85b2c2072ae397c178535c9985b77607c9c42db9df0b9b1a68b4172b8f2303edbf0a41308850a850bcbfb713318b0"; bytes memory proofBytes = - hex"026a2906ac1b3ec56bc5651cfd534cc42b977ee263764060e7468f9eb329b75352a2ce92ac1e082808abd97ec61a8186118df13bd58ecb36021183734e5ae1ffee10cd571a29987b3db6b1899ffbd2b00860a53259f5cb4612350342aaa5a5932c3d054fa015af6e3e4188d5c441630151e6074a724f65998a87564a5f06f647e7be0e171c18682ae3a4e6a8e310c2ddb89fe9bed7cf598606a5fb55cd94155524f43a56930ac3ff863fd724e2025725db8d3ab90729d2ce248180ad5ca865b1c34577bea924f66eecaa4142282edd7bd64b1f195e42320cfed0bb744ea668aa06d41d97531a13673a083765adabcfabe4f041029b7a63906efe9ceb7ee09d3bb685c592f5"; + hex"02090690900c2a14e85adb02593ae269bb6a4e0d8098d1939b32d057cf8fe73dcab26603701c1090beae84c08953e144aee41731878b00a5f68a830627ccddb609635f9d91107248fe5ad6d9ade4052829b574c4f124449172bbb0275ba7538bccc791b4b21eec494d2a3df1124de1bb6c10e7b7802364b7c76867af56809c9db027283ed200fbf3b39f1bb34751e7319002d988ab248f1ada5c2443ad4f75732da53412d228618160bb5ab7f6356eb0ca1aa7d6267c71291216217975a1738dae8f4f76d42a72e01519936b19c7ef38d15d1364854a62702abeedab435edc0390c50f542c23ce879c0bf941c2256b58b146731f7d5780a5e45dda5949ce18d27b866bd698"; (bool success, bytes memory ret) = attestation.verifyAndAttestWithZKProof(output, proofBytes); @@ -162,7 +162,7 @@ contract AutomataDcapAttestationTest is PCCSSetupBase, RiscZeroSetup, SuccinctSe } // function testSuccintPlonkProofAttestation() public { - // bytes32 vk = 0x00d580241a5df56fe4b722a58827285d9020e52d4b62cec69b53763a22542f3b; + // bytes32 vk = 0x0016d421d8599b43498eee7c30e6eca5e7aa05c02e38e5bf392937c98736fda6; // ISP1Verifier sp1Verifier = setupSP1Verifier(ProveOpt.Plonk); // ZkCoProcessorConfig memory riscZeroConfig = ZkCoProcessorConfig({ // dcapProgramIdentifier: vk, @@ -187,7 +187,7 @@ contract AutomataDcapAttestationTest is PCCSSetupBase, RiscZeroSetup, SuccinctSe // vm.stopPrank(); // bytes memory output = hex"55020004000000810790c06f000000040102000000000000000000000000009790d89a10210ec6968a773cee2ca05b5aa97309f36727a968527be4606fc19e6f73acce350946c9d46a9bf7a63f843000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000080e702060000000000f2dd2696f69b950645832bdc095ffd11247eeff687eeacdb57a58d2ddb9a9f94fea40c961e19460c00ffa31420ecbc180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000998204508d58dcbfebe5e11c48669f7a921ac2da744dfb7d014ecdff2acdff1c9f665fdad52aadacf296a1df9909eb2383d100224f1716aeb431f7cb3cf028197dbd872487f27b0f6329ab17647dc9953c7014109818634f879e6550bc60f93eecfc42ff4d49278bfdbb0c77e570f4490cff10a2ee1ac11fbd2c2b49fa6cfa3cf1a1cb755c72522dd8a689e9d47906a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000278e753482976c8a7351fe2113609c7350d491cdae3d449eefc202fa41b2ad6840239cc2ba084c2d594b4e6dabeae0fcbf71c96daf0d0c9ecf0e9810c045790000a51167000000009d15153a84fbc62bcf79a13967729408838fc92c0c97eb85d628db3566af265467eebe27bf6dc0aa227bc8ad11c55c22370f4f7e7246c6c65bef5205342142090fa74a3f32c80b978c8ad671395dabf24283eef9091bc3919fd39b9915a87f1adf3061c165c0191e2658256a2855cac9267f179aafb1990c9e918d6452816adf9953f245d005b9d7d8e36a842a60b51e5cf85b2c2072ae397c178535c9985b77607c9c42db9df0b9b1a68b4172b8f2303edbf0a41308850a850bcbfb713318b0"; - // bytes memory proofBytes = hex"024aca240a0c76e7a148037fcdf3301c6b5bc6b3e800a2b34ff058fe96a80dcbf564a99ca327e0b47520d964e543b91dffede43253394e24f8a795fbf9feb92fb6077e5791230d9c37d21c52495f871f94c1d2ee72a24e64965a4dd37b37e0c3e059121adc1df28bdb24f52648e79239dc017105c6e3d9ad52129e96a5c96a7972123eb3930eca0c5e1ae3ab7e99dad263de4b347eaf5889fc6b7fee029e2003804defecce1a6dd1563d99727d87d39277b2bbfbd7e8fc5c2b9cf286272a65b831d5df1af70db79c590e6ae4abac713271d4532dfb656280dd9bc1af395fbdb3377c6242d709454fc11a3469791f17e66ef60af67a27d012e8f88825f7631a2e7269a79fad1bc00dd6c1de413158bf68f4f7f9cae83e5f6bbced00bff89fa0e34a53da82a9019fd0fe0cd27d2846485ce45a55bc9f41305946d51901a679e671a8651e1a612bd2066e7ad00f77aa5efaabc8b381d5e16d4e125f0511594089b1e1575e08d02001390e2886fe0d8e31813856ad0b717c1597dadf8a1a7b94d2afdf1d5f3b75004928081485baa90d9dd5702c63fd1e23dc4b30661d6e9e720f932bb2d94fff1354e317c1296fac2065742933d58e9c3d71ace1a590bc9b7d7bcb16461d3e59266411b53f65ab5e7a94c29fdc7d798af1fbfb3f19de78a9e1ff760828c9ab4b0ddba3b031bb7a0e2bfa1e89b8f9f5e3fc63820c397313e12ecc9981331d0a342926812640c2388b560eee2748ad2b8f1659ea4bc244a7e72cd4caea316cebf412eca0fd347cf6f560cc412f59fc91196768563c733203906bab1bf51354cdce0983a14df7c1acdcaefdf16373b0aa85de65904da6630216fc90e122bd8cf00e290ec4228c48850ead400e4781282bf58003d8769a189095c62bd812f7b33ae713b0346aa988dd2e593cae0ce0854d473b638a863a98f22d666926e1f923a5022ade2d9fdb608527c7ba7a12d81572c5fdb87d03dae7aff5871295146f93999e2ffd67d665bdd8e512695357c531e08585bdef69e63e3a64ad6d30ae19e6518829cacabb40cf4394440c8577e8badc04e31613783bc5f5ce7d4301618cbb2fec1306780aa5b4ed688d2820f09a7b256f92047564af83f853691a2a3bdd24c1171f4fa01c836b4cdc66f5180251f72a2f74b6d73b808b1ea5cba2cbeed6cc13991cbb92415569bbac2c219b92133f7129cf4f1ee988ffa3a928308f45f7b309a1"; + // bytes memory proofBytes = hex"0254bdcae302c578c28074b9f5ac6a7e1e9d69e05e7bb172edb4eb01713796f79ccb2b6b9b2e568cfe8abcd85e9a17e77bfa229040f66d3fc32050fe311061e3adfc86743f02515ab315c0009061a14b917fd88bc98a466d898527c4b987eac8f1353df6c60cbff6bc50adffc0e087b67f3d75ecf4ed1e502b1ce05743b935d0e79ed6a9770a857a91081bf0bcfd0ed51395fa9ce83f310b903b9d2ff6f137a3c1f4fe0c1d0b886eafdf8027f7b0d6e49354c2f0b6246a5f75f5a031d2140ce2656faa7ab60ab2ee2b0361df8e3b8aef629277d61bc5ab732528e0a74c319c7cacd140d98c2dc54c9e5cb9ae7544ba6fdd4f90191670d50225a37775faa55ec091f7b9301607243d4652182abdd7f74dd0240484aed21291a4250cf04a84fe315bf46f0b310d24ff86efcee8318ee43aeba8df0adca1ffe9f7b19c0b978d324f9d7e34e8cf1ccc6e484de6432b4670b1de5aa994a4c04d50cb5aa506c03a063e70ded3ad480bff382e1da7104c808558107a51a95e1aa5e4426ba3660aa6894a9c45c8cc571b495f4c7f3c5802cbb1322e7683ae8bf9e9b4bcb7c72c4fa5661c215363abf32bbbdcdb69160a1b2e54e3bdd9a643db1551a7be5bee8bc228b001826129b4991782eb98e1ed29c845133be823df7c3425645fde880a683b536e4ed39752e23f01db352b7d70fce79bb667841b03c3782dd02a1d1a08acd09843833ee5e0d78b1c7be7c86e3f83da02862eddd46aaf8c71e652d6daf9bc16c469a6bdf79e2fa229bf14a36c37c3b23b6c6f4ca54e566b715bc749344c0043200aef11755e7ff0161a99d097dd5de337ae52bc5b7524ca8203d8ec5838e320c8fe21eb693c014e27139525e35eef0faa954aa6f7047b35e72a8b186a22245df8ab7b4c25fddad4044a53021931815e8a958e6a2c885bea3064e3202f5cca7f27fa10a207c48309206bc23b51714911511194e1ea0b5ae30dbdfa63c39bb50ec600a71d1b4f94561e479b720036334d248b8f7637aaeadd45bf1a601a67860073fa0704b5a4b7ed1e406d758fc71319a5e52d6590a00694020b16f6b67933c9b1f0490a86185b79205debb05323cac965a159d7e73b4ce292e36d88b6b0f53d30cf5db5e4d26d5412e29ac4a20a780c9e341bcd95eef81bc3ce6970c9797cc5493eaadb5dade98c2a9735c052860ecd31a7d9e27b5f03ee13159ae8aeb0bfcf0dee1071649c6975"; // (bool success, bytes memory ret)= attestation.verifyAndAttestWithZKProof( // output, diff --git a/forge-test/utils/SuccinctSetup.sol b/forge-test/utils/SuccinctSetup.sol index 5bb2127..eec2898 100644 --- a/forge-test/utils/SuccinctSetup.sol +++ b/forge-test/utils/SuccinctSetup.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.13; -import {SP1Verifier} from "@sp1-contracts/v2.0.0/SP1VerifierGroth16.sol"; -// import {SP1Verifier} from "@sp1-contracts/v2.0.0/SP1VerifierPlonk.sol"; +// import {SP1Verifier} from "@sp1-contracts/v3.0.0/SP1VerifierGroth16.sol"; +import {SP1Verifier} from "@sp1-contracts/v3.0.0/SP1VerifierPlonk.sol"; import {ISP1Verifier} from "@sp1-contracts/ISP1Verifier.sol"; enum ProveOpt {