Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(protocol): upgrade sp1 contract to v4.0.0-rc.3 #18740

Merged
merged 7 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,668 changes: 859 additions & 809 deletions packages/protocol/contract_layout_layer1.md

Large diffs are not rendered by default.

773 changes: 396 additions & 377 deletions packages/protocol/contract_layout_layer2.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@
"p256-verifier": "github:taikoxyz/p256-verifier#v0.1.0",
"risc0-ethereum": "github:risc0/risc0-ethereum#v1.1.2",
"solady": "github:Vectorized/solady#v0.0.231",
"sp1-contracts": "github:succinctlabs/sp1-contracts#v3.0.0"
"sp1-contracts": "github:succinctlabs/sp1-contracts#v4.0.0-rc.3"
}
}
3 changes: 2 additions & 1 deletion packages/protocol/script/layer1/DeployProtocolOnL1.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ pragma solidity ^0.8.24;

import "@openzeppelin/contracts/utils/Strings.sol";
import "@risc0/contracts/groth16/RiscZeroGroth16Verifier.sol";
import { SP1Verifier as SuccinctVerifier } from "@sp1-contracts/src/v3.0.0/SP1VerifierPlonk.sol";
import { SP1Verifier as SuccinctVerifier } from
"@sp1-contracts/src/v4.0.0-rc.3/SP1VerifierPlonk.sol";

// Actually this one is deployed already on mainnet, but we are now deploying our own (non via-ir)
// version. For mainnet, it is easier to go with one of:
Expand Down
3 changes: 2 additions & 1 deletion packages/protocol/script/layer1/DeploySP1Verifier.s.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;

import { SP1Verifier as SuccinctVerifier } from "@sp1-contracts/src/v3.0.0/SP1VerifierPlonk.sol";
import { SP1Verifier as SuccinctVerifier } from
"@sp1-contracts/src/v4.0.0-rc.3/SP1VerifierPlonk.sol";
import "test/shared/DeployCapability.sol";
import "src/layer1/verifiers/SP1Verifier.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/script/layer1/UpdateSP1Verifier.s.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;

import "@sp1-contracts/src/v3.0.0/SP1VerifierPlonk.sol";
import "@sp1-contracts/src/v4.0.0-rc.3/SP1VerifierPlonk.sol";
import "test/shared/DeployCapability.sol";

contract UpdateSP1Verifier is DeployCapability {
Expand Down
53 changes: 27 additions & 26 deletions packages/protocol/test/layer1/verifiers/SP1PlonkVerifier.t.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;

import { SP1Verifier as SuccinctVerifier } from "@sp1-contracts/src/v3.0.0/SP1VerifierPlonk.sol";
import { SP1Verifier as SuccinctVerifier } from
"@sp1-contracts/src/v4.0.0-rc.3/SP1VerifierPlonk.sol";
import "../based/TaikoL1TestBase.sol";

contract SuccinctVerifierTest is TaikoL1TestBase {
Expand Down Expand Up @@ -29,7 +30,7 @@ contract SuccinctVerifierTest is TaikoL1TestBase {
);

sp1.setProgramTrusted(
bytes32(0x004e167a367ef584f118c2fac6ffdda82e5349913a165703fb1895f0da412bff), true
bytes32(0x00dfac9a61cdc96d58296817c977da485dfdfd5cc0900b00d839dfd22a34748b), true
);
}

Expand All @@ -42,8 +43,8 @@ contract SuccinctVerifierTest is TaikoL1TestBase {
vm.startPrank(Emma);

bytes memory sp1Proof =
hex"54bdcae329f3f04a73d0e51b60e37a3dc2eb812b6c818895fbda375c24ce943d40a1a3541655911e01acabfb1ed0a04027e641f5e492e883d2ca77a03266b485a61563fe1c751fa9821101c5e755f8963df8493e967224867963a4b459457ca1ae23b7c62e7b320dcb495d119ca771ce2030f6aeeb44c328bc03f8a892c69da84aa43ca1201baeb122781539d987fc6fd706123398a8d50f837817873890c18269c3d3dd0e782114074808a1ff3548b49f0b499424c689e4bf5d74cb876237240d6473dc1ab63fc429bee770b10527113efff5ee6f2705031d6c7370d0a60154f19e8dd20ba14bd5fd5683ac1094f7981b122d908442fa6cd1ca460ffbf49e7e162fbc0d25280c78297ab4f7026a04448422da8e376ebb2b359d6c7be1ec1a660d07dfa82ac8c2d89f04fa02cb3a86a2066188f92895f2f42dc2f6f7e5713067a14a925a02fdffdcb99f7ad1df29281d3120d1196595b53b22a386a3eae6043435445f140976aafc537cbad06c46ca5ad2b16a7da0c4bd45ac880aef87078e7347cb464f0db47c51e064400751c2f032fd0fb92d8e4cf42c5bdda442d7a3c28e3dce3bdd10d8e014089f3a9ddc8c56dd154fe487beaf0ac01e73da68271378808786e69b1b709cfdd5666f53d46c569c965ea013a17e733efa740beddb8e56183138db1723e68dc91a3c893c7d05439388d387ed0fbeb19c7e996083b39858b07762a87c21ae07df5ea0fe21cb4974dc52d4e21553864af5e7d7042bfd0703aed1cf80171006aec8456ef123dc1ae4ec805c9d301f0dfe4788a0c5c599ff7a3ed17390bb1f260665e92e3647d7b89fab2681bc7237943c4b45243f68705d53c2ce8e4c5303b8ae78d556d0c4a1efaa48aedbb7feef62a27332a462fbd4e7dff75f3df8d92ea73b5afcc5a42c1a564bcdd99f2dcfe8e0c9873fa0470753900a20f7e01bcd1b3e6c62b2f8cdbd7de3068b7f5dcbfd6c0e9a511baccef6c7adfc41dee3f2dd2bb2409707d3d21594e3f425f6f6873b5245ec7dd2473b9b14b7f80576e776f3068e65e12da6663c8fff51ab2cdf1960225945dea081c5a38231f62439ad08032e4131a32f5b70566b1b86b7fb0138d4e2497621d71b31580ec36043f2c57330190c8b7d5a408a9ca109ae6dc5b90c6f86b4c15d54d2da991591369cb03c3d9c0c5030e89f7de4a5b6e7975fad4d321b1e01863dc0dbe8d49517006c7587a38b";
bytes32 vKey = bytes32(0x004e167a367ef584f118c2fac6ffdda82e5349913a165703fb1895f0da412bff);
hex"1b34fe11280520b1b0825805dec273da83c5b9ca82b9c7c705bc61ba238c68d208152c7026bb3ddae13e13dd26ab7209813731305383f5342ced5984ed0c9244c32375b42d23c99c3e423a7983c4974f1a61e8bd0f76a6be5f9cb562d70a54e93d0511a225b96b0e180ffbb7f782798b5ac3c8c926d7b4e8d2a585936d96b67f094c7e7702649013cb970c69af4c2ac100eec7832fb7f42416e1d0b9addb41a805085c74081c28bc0baa90398d7bfad7fd51def40e5536448943787ab671bd27d691a81f1d388fc4491158e220262c45328c6fc9fa02a5847798c54281c8a2b25fa2e6c02bda153ed705c1d420cb68bb7b407cbf04bf721e1b0be0da60bbe84fd378b2d91c52de38a6e43ec9c2822762138bf1739fc5b6545cc68a8c4b779ef7becef09b01d52c34911395e1e051cefe8ad81d32d8c3af332bf4d1d0b2111131600aea0f01c721ec8ce6bdc5e938834cfc732b99f39f56b98a56f6a530000d6eae33442504f9cd8eda82f1c57492d2179632ae87654d4af618eaba05b93f038e329790c52355cc1de1293c05142a60e35b5b06d9cbaedf9b4c9dbdb2e02dea0768aefb8f21a2c0b6e38237ce63c2ad14a47873785dc69ef3a0e7fc89c3c183b4bc949d95177c7983905856234978ac4cbc3fc195fc8c2868496ca44bb85742e5367dc9340c41f941b67ef002a984ec84483c4ffbb1d0f6816aee6896a168f44a356c8ab30ae02fc12f5cf349a1ca21f8e068915e6201a4103134ca191eb8cd121679340e23cf7c52bed3cdae355a4a28fb7e73312df109f7db12a5ed2c5c32336f398f3b20d7cd156ff16fbc43f3aae2daee4e193a290e62ee060bf15656dbcbdc1b5e2301a7eab60766f7cbdea648012ff5e0927e15e67841563b8e496c1d2e642d7bf210d63c50a3bf42b066432d9015f1ca08154f41000e8eae64868f8d1e18d016f619532981ffc3a4a5385d3868fa09c567f237a0edaf9b4b4db8bfff3c2e2a2d1629d413fbe860363e2daf4e3c85d048a34d5164b57f2d4c5190d958617732915b28db9585dfe4d5a92dbbc3e23e0dde9b18257deabc3bdfdec0bc93cc9da60ede1c320ad60b2b4cb414a13556407792549a8eb7fa32f51e1c98ccad56fa5077932be2f5daf75e3e6c73ef38fff0f537d292bea5410dca40bac3f7fd4a3ace99cb297c1be62e5e95661215f27a702831421f611b789a59c103edebe477b532e931";
bytes32 vKey = bytes32(0x00dfac9a61cdc96d58296817c977da485dfdfd5cc0900b00d839dfd22a34748b);
console2.logBytes(abi.encodePacked(vKey, sp1Proof));
// TierProof
TaikoData.TierProof memory proof =
Expand Down Expand Up @@ -79,20 +80,20 @@ contract SuccinctVerifierTest is TaikoL1TestBase {
{
// Context
ctx = IVerifier.Context({
metaHash: bytes32(0xd7efb262f6f25cc817452a622009a22e5868e53e1f934d899d3ec68d8c4f2c5b),
blobHash: bytes32(0x015cc9688f24b8d2195e46829b3f726ce006884d5fd2760b7cf414bab9a1b231),
metaHash: bytes32(0xa0c8136633dff06ad1f03ed6fbb277096e6cae13f39e02ac1cff397b22aafeac),
blobHash: bytes32(0x0143051e11b9886c061ccb939bf7317cee20378f0d3ac8d1930140f1ba42d99f),
prover: address(0x70997970C51812dc3A010C7d01b50e0d17dc79C8),
msgSender: address(0),
blockId: 223_248, //from mainnet
blockId: 749_050, //from mainnet
isContesting: false,
blobUsed: true
});

// Transition
transition = TaikoData.Transition({
parentHash: 0x317de24b32f09629524133334ad552a14e3de603d71a9cf9e88d722809f101b3,
blockHash: 0x9966d3cf051d3d1e44e2a740169627506a619257c95374e812ca572de91ed885,
stateRoot: 0x3ae3de1afa16b93a5c7ea20a0b36b43357061f5b8ef857053d68b2735c3df860,
parentHash: 0xaa47a56db9be323d923a56002612b168ba73621a98269835e768ec48799fcc95,
blockHash: 0x405a8978474fbe72d40fa4e2fc6b2edfcc0d439002c6d941ac1385a5a349535d,
stateRoot: 0xadbeff96af5a990b979135850926fdd7c0d9c5af967e12e60d7b2a473fcf04c9,
graffiti: 0x8008500000000000000000000000000000000000000000000000000000000000
});
}
Expand All @@ -104,51 +105,51 @@ contract SuccinctVerifierTest is TaikoL1TestBase {
// proof generation elf vk digest which is not a bn254 hash
// but a sha256 hash from the same Sp1Verifykey.
sp1.setProgramTrusted(
bytes32(0x270b3d1b1fbd613c23185f586ffdda82729a4c8968595c0f76312be15a412bff), true
bytes32(0x6fd64d3073725b56052d02f9177da4856fefeae602402c033073bfa42a34748b), true
);
// proof aggregation elf
sp1.setProgramTrusted(
bytes32(0x00d5ff4ed163b73e75aa1f60c399b3c778df24abe584fc6eee1ce5c444b74bcd), true
bytes32(0x004d3bbf89c01e56c34beec7b553675bdad5345addf094dd79afbcae0708cae7), true
);

vm.startPrank(address(L1));

// Context
IVerifier.ContextV2[] memory ctxs = new IVerifier.ContextV2[](2);
ctxs[0] = IVerifier.ContextV2({
metaHash: 0x207b2833fb6d804612da24d8785b870a19c7a3f25fa4aaeb9799cd442d65b031,
blobHash: 0x01354e8725e60ad91b32ec4ab19158572a0a5b06b2d4d83f6269c9a7d068f49b,
prover: 0x70997970C51812dc3A010C7d01b50e0d17dc79C8,
metaHash: bytes32(0xa0c8136633dff06ad1f03ed6fbb277096e6cae13f39e02ac1cff397b22aafeac),
blobHash: bytes32(0x0143051e11b9886c061ccb939bf7317cee20378f0d3ac8d1930140f1ba42d99f),
prover: address(0x70997970C51812dc3A010C7d01b50e0d17dc79C8),
msgSender: 0x70997970C51812dc3A010C7d01b50e0d17dc79C8,
blockId: 393_333,
blockId: 749_050,
isContesting: false,
blobUsed: true,
tran: TaikoData.Transition({
parentHash: 0xce519622a374dc014c005d7857de26d952751a9067d3e23ffe14da247aa8a399,
blockHash: 0x941d557653da2214cbf3d30af8d9cadbc7b5f77b6c3e48bca548eba04eb9cd79,
stateRoot: 0x4203a2fd98d268d272acb24d91e25055a779b443ff3e732f2cee7abcf639b5e9,
parentHash: 0xaa47a56db9be323d923a56002612b168ba73621a98269835e768ec48799fcc95,
blockHash: 0x405a8978474fbe72d40fa4e2fc6b2edfcc0d439002c6d941ac1385a5a349535d,
stateRoot: 0xadbeff96af5a990b979135850926fdd7c0d9c5af967e12e60d7b2a473fcf04c9,
graffiti: 0x8008500000000000000000000000000000000000000000000000000000000000
})
});
ctxs[1] = IVerifier.ContextV2({
metaHash: 0x946ba1a9c02fc2f01da49e31cb5be83c118193d0389987c6be616ce76426b44d,
blobHash: 0x01abac8c1fb54f87ff7b0cbf14259b9d5ee7a8de458c587dd6eda43ef8354b4f,
metaHash: 0xd385182abb3db17267b32b4e475c5ed9306f52107a8f8cc5309f13af0af3b2a8,
blobHash: 0x0181040be344c40efb3f4cfd9df5ba02c8474e6c18e15d959ab345de1ee264b7,
prover: 0x70997970C51812dc3A010C7d01b50e0d17dc79C8,
msgSender: 0x70997970C51812dc3A010C7d01b50e0d17dc79C8,
blockId: 393_334,
blockId: 749_051,
isContesting: false,
blobUsed: true,
tran: TaikoData.Transition({
parentHash: 0x941d557653da2214cbf3d30af8d9cadbc7b5f77b6c3e48bca548eba04eb9cd79,
blockHash: 0xc0dad38646ab264be30995b7b7fd02db65e7115126fb52bfad94c0fc9572287c,
stateRoot: 0x222061caab95b6bd0f8dd398088030979efbe56e282cd566f7abd77838558eb9,
parentHash: 0x405a8978474fbe72d40fa4e2fc6b2edfcc0d439002c6d941ac1385a5a349535d,
blockHash: 0x8547cf9c2eb9ead5ab55c02d92b9f712ebbc6bbf92915869609016779bf302ef,
stateRoot: 0x5c37ab91105743f67e5508ae8f4f6f01c44a4ad21da52637bbaf792eba57cf66,
graffiti: 0x8008500000000000000000000000000000000000000000000000000000000000
})
});

// TierProof
bytes memory data =
hex"00d5ff4ed163b73e75aa1f60c399b3c778df24abe584fc6eee1ce5c444b74bcd270b3d1b1fbd613c23185f586ffdda82729a4c8968595c0f76312be15a412bff54bdcae3236b956a67d15b4682d972d50fbb3632ac950bd712dad2d4cc9c302856c11e6c2ed6722fc3e4904ed204eb05a9f32bae3f8e7d4fbdd854c3d269a33e601c39c90d02026cdcdd55268090e316df3ffc0eee6de2765eb0d767f1455cd35af89da20ade1e61dc074884d5317f0206abb720acf8c023d2740b41fe37f2cb00fe561725269f4321543b30d528ee3e8884ea493fc6b1629e9a7537e65353fb0afd7e8021d502cb556e7a2b600e859f3fc524ad681df470d8d0ccc463775434ca56de661b34a3b620726aed8affc8a90d7b798a92d6500dacd9fb7d43a37c301d70e59d2d192fa85b2f6689bd9a6d47df9ea45163a228c8291e8d6d0ed5d7d7be8bd6391d6496989df139eaff5fca0f9d47eccad8ff6fb7aa0b8bb3da8e73fa4ff825d208b0ce5a639f30501f200c12f8fa1bf5c4ac42c4a58ceb34bbb3b012121f6ff31ed772d57c421a75813f987888e7e3b984bff8465bbfbdd30d45fae9904816a21c99ca4a903ed19af479d4ce0a1b4e78e2a9b3bdb8dde8986e8f028da0dd37e3129a184b4d36427d130075802421e5c693297f4705a030454b105b91f3ce8be111967dd8016ec9aed42e42ed3ab53e1dc42a0b796557e05b658203ae972378db1a109898a02ac97adfe3d5b24e1ab0d49f7702b69d137e23264e5b2c5b6e72fc2b2a4562b793a2c00ead94de8890700aa3c2fe5baf59ab8b7f524d38ba3b71712151edd00307dc3c9f24ea9d1bbac6687c8f30dbe845663f7aaddaec9df8d1fd15ced22fa58272184fe02aad68fd5a90ee249fced2ef955c0af40e02be0621e7162413e629b4428cb929d0a2bd87375dcec17664fec3a5a6cd2f7039723d41f10b77f5f3b7b052db1043c302795d3d739eecd2d2f686c2c474dcc67d9e844ca50bdabc7ac085aeb02aff0b3cbf17aaa0114ba85eff4a938d87db17680a5995a90347b2a5eccaeeb1be204a6dd83da39fe9485822667a43d4a5451f494063075007f152eeb46e0bad0675cf6219b53b36b1ca474f13f6dae87d1efad3c71f89cd05a04a6c76f6703858650a5fd6e2b45be3bf299386595d8eca6c8c55d537e8b3263828c7be68c92bdae0be0ed101f89c0c4c16154867228dc47ff0a4fccb4bb72b7cf8aa2c4a9bd4fd01254e51a7fbf680f408b5ae9c189466625b0f41636d94060e805eb6da30eab1202b65d8226918c4b99a73a6874089dbc5eac08cfab3d7";
hex"004d3bbf89c01e56c34beec7b553675bdad5345addf094dd79afbcae0708cae76fd64d3073725b56052d02f9177da4856fefeae602402c033073bfa42a34748b1b34fe112b89047863e8359c941412fe6917b175d2f2bfcf19a15ae94a3e8507d65421411c970709a64de649185b10028c219920a9ca3f6f9c1025a0f257037c04e5ee851ae62e8cb43f445b755080b8b70c3e13e1e54498425b6ebb13bccd35f477c87c2d7ed662ef7d81081dba559aeeb68fa0b4e11d8b6f6b3950ab63af9ec5d49bc82bdfd806c3b08360bfed2f9cdace70ab0052ab1354b36731bdd1bebe4b1525cf17c7488cf82d7ab917f71b0f369f88e96fd5efc627a9747d039a0975de58311b2bf4211c68693d3538419a661f2c9fe7e4e8a8105fc1eaa1378665dad714477f0a6f71b4739c7d9d86a6ac9df2ddd42e3e887852138023a9d00cf5ae13b1252c137b9adb5c9691034ccf15f03dec77c8d9434c0e4814b766703886d3bcb87c780888dc8bcebd53fd34e51f69dcd8df122bef2c7bb5ee4fe7353dbe6d7484a4900ac4b769b883b1f6535f3248802d899a26ed9935e6958401c30c89c549deecb41534f16afd675b4076cdfd076ea7b6fcc0ec3a7e724f8dcdc9a4c5f88f8497c125479e465ebaf464e4fef5536ac9fa9a8917d1ee572429478077a2cf3371a22401fc34694210f9714ddff1028565c9ab2ee6a1bc8a95aa09b0197a5dc2a16ec32404031908a006e94e582fed32087193ee954f4e182282836c3e8b23a1e5bb740c0fcf29b797356803905e4e12c1c928b4269f034c6f92ab1da28ea09baec6de305dcf4f887d36053b6241c52bc7b4507efda81f97773bd641ed576dfeffa57218d10bd5e24720901f21327737508d58113b90ec691f93a533ddfd0a7dc9658014451083b9720245107f7f48a92f46133dd6a2b3e54907ae75dae216cd6bccfc07d62ff61f7ec17ec1b34ea98e701bfcaed544b02b54adcdb913c9d70413e70e1106bb981bffbafcb001b09cddac53edb3201ea71bd242fe1bd66233cc0adbb62fdc9efdd5f2416b3b8f7547b04bc5d172b33635f91fa6bc48f8d9dc0d400a8f194ad54bdbe815786c70c1aac3e304c2615bd7469c45165a96b7c1cab50969df114068631e8d46ae14058a6da10ef08ef8babe229e6523ffb278cd61ecd08d3f225bf2e21d411fc803adc9d281805cc5c5ecdeb086a585709c88f348b66f0ead1722d93e88b11d42098089a4ad333b7e72b1df781824f5215d73092b6f9c0e3a0e81ec5ec4f008246772e4fd61d3c1debfb8c7fbcdf1a5d0698eb3f24447c5d3";
TaikoData.TierProof memory proof = TaikoData.TierProof({ tier: 0, data: data });

// `verifyProof()`
Expand Down
11 changes: 6 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.