Skip to content
This repository has been archived by the owner on Nov 29, 2024. It is now read-only.

Commit

Permalink
deps: using sp1 v1.0.1 (#74)
Browse files Browse the repository at this point in the history 
* deps: bumped sp1

* deps(contracts): bumped sp1 contracts

* fix: resolved conflicts

* imp: regenerated programs

* fix: resolved more conflicts

* imp: regenerated mock fixtures

* imp: generated membership fixture

* imp: other fixtures

* test: fixed 2 test cases

* deps: using major version

* imp: regenerated mock fixtures

* imp: generated fixtures

* test: fixed tests

* ci: added sp1 toolchain to e2e

* ci: reverted changes
  • Loading branch information
@srdtrk
srdtrk authored Jul 23, 2024
1 parent 5346419 commit af38efa
Show file tree
Hide file tree
Showing 28 changed files with 378 additions and 245 deletions.
476 changes: 307 additions & 169 deletions Cargo.lock
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ authors = ["srdtrk <[email protected]>"]

[workspace.dependencies]
# Used by the programs
sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.5-testnet" }
sp1-helper = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.5-testnet" }
sp1-zkvm = "1.0.1"
sp1-helper = "1.0.1"

sp1-ics07-tendermint-solidity = { path = "./packages/solidity/" }
sp1-ics07-tendermint-update-client = { path = "./programs/update-client/" }
Expand All @@ -40,7 +40,7 @@ serde_cbor = "0.11.2"
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }

# Used by the operator
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.5-testnet", features = ["plonk"] }
sp1-sdk = "1.0.1"

sp1-ics07-tendermint-utils = { path = "./packages/utils/" }

Expand Down
Binary file modified bun.lockb
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions contracts/fixtures/memberships_fixture.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f800000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000",
"trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0",
"commitmentRoot": "c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1",
"updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7",
"membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179",
"ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd",
"updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874",
"membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699",
"ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a",
"publicValues": "0x0000000000000000000000000000000000000000000000000000000000000020c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"proof": "0x059dc6140e1633afdd916832043c08bd313166a9dc86b9f72e2a7501ef063bf50e607f8b114ee7548dc849c4c2532ff7c7f9f5391dc50a34067095a73431b2a72ff36838f087ff277dc5d82a62b677cdf7408bca2e8fda4c19be5f035717c0dc218435ece82292f98fc4e7fe835ef7c3c9a5ccb8c3fb7922d1439d5f22e0a17c1bb3dec0d13ec9b42566be76ec8cd3f17d61f91798a43e692067cd8fef7facfa2bd4eb7b8ac0f9b60cddad52144770d3ca63272d980730f9813ac0273df04bfc10ea4880955d997509565aec859ac29e4ae27d2a01be850ad6efcc0b028b8775057d609bb9f0353c3200e8edecaf2b41e370026aff73c74e9fd452f2c0c8ad092e7a9666c0e5fa13861d081833385e1f0889fab507c9898b61d5d744eaf6d5ef1f456db613f7eed98546856c4c7e1b798e7d1ffee4b3e16056b0939f6b8da3d42daccc0016d16dbf83cb74ed15b9f3cc110fe16990058f5f9e40e4c1cdf4ed8c1ff44a065ec83dfce5674aa9537c455d6d2798558fc5e776b6c703922644f5550e981eca973963c7ccb175d23a8321328969b7e2ae53ef35cd128af6dc03e762165ca436295fa57959ac6085db1b3cb8f0fb3e821b0e56c3d3906d7f40c8c4cc0abe9024988c98733def1734305a2e56929d3dd5a7dfb4886ade8c86c8fedb31102b2cd7b5f982577dbb9ec07bbe9a70c61514b4af7a36e79e3aff267b512302021861d7cd5ba61fc21ace6c1eb472786e7cca5abcae0365a0143979e8392d240e4ae4d254c98137d52e2b994aa9220dce748da70fb551f6f631d617324be53a1c4c3b7797e9d6d1e8c94b30d291f77f91a3886f291e99d3ac97abfbcae8d95416491bfce5531947c5d917b172f3005f9730619e3b60f87b93716659c61219f617433868d0c60563477118f484e9cc3b74b508382c45d122d067c97c90c3a9c80b80044fa1bef6dd95689b87ffcd525e822f3f4331b316354ba20949df9b31b42edd7a619a21c6155e2c919e88b68d885060aafec5c102df0a94f2074dea4992107fd7eb6fdcbe19bd60a9900013160fbc4339ec560c1aeb9ad93be725c269f20b041d1f4b3fec16291740b0259f38ab723506e0d042468fb045f9ba354db8a11282441e5563fc160490021dd4c8a8a2c27e74fa4b816c763689c19a61fce3041ae23bcbea69fee812e9427945f4942176dd1af5f026ac55d5f64461adaab082",
"proof": "0xfedc1fcc0d7ce7cded093ee9ea239b40a14d94d862c98581a515584f993201fddd76b61003c363fcdccd6bd357cab083e3e967f7d37acf1383608ffbe5296e0b3c1cd41006b44efd613ced41440446f2acff6063b1508656848e15f509485bc383809c4826351b46edaf232b4b44a04eb29b0551c012a37efde7989f5d496ee9fb3d43410b17ecd1e1f81163fefcbba1afe0705ba3fa3f0fbfcda32a1423abdb608041a52f8afb70b2056ea04efe5d0e47c51ae03dff3c02790cf199c843298525f73bfc1519b1efdd55b1c4527fc95c2005ee517099ad4e4f75446ff224b31bd05483ba0fcb63ef34d1a8130a73af17d358c76381a06f44e06c36232d00f719b78f9aa00fd74d520a84cd2a2e865ebb98cd0c7d6719c3f1c3a04181f0f4b64e127c74390147594b132eb6cec4953da49baa5caa59e809f55d840cb450a7df53e5397c0726c0585e8f23c9ba98fb42670260fd6b8727c6e82cf3d1d718399eec621f8f970461de49dd59f99f2953aecd0be123f0b8ad087b68ba7aa7253a2f13f1c61a5b0fddd966840c6d7327e6428a9464aec9c4b0ddaf1ea7d207d8ae2cf0308bf0e920b2e4c0d381cadcddf10a83a73d1b712cb36d2056c7e26fec17d1046dd5f6fc19a4282115b13046cb032f9400e0ebf6ea935ec02dde17f8c1b83f04bf20d55f0e1c268a7aec8efccd3437351dfaa4e949257f90874c6ea20c6b869b0cb4860512bd2f331d1ca86b7f43855e565d55cad6a19553c7462f585aff8feeaf7a34041188c73c10bd6f54581a34c7568a1fc0ad23986c093ffc2cd551429f3d034a110a586174300baf80f4cbb5f99179d059520e31db66667a27f0ae32f1ddb7acbe1d3b88813d31f33e4dba96b9f2e4b95194825f54d9e5dbb5d0f7a0c751b8b20e0665fdbbe0def677bef9aab811ce863c7072aa5a0b974b72448cd1eebe0cd13a2ec7085201dc1b5b91567e1250e7ca10dc5f6534c0b5e485f5fcb2a2fdb97a6c26fa6f3bfd0cd0f2597402c306e3cc893eded6576efdc30474d738664ecf042124925db8bb6445832f77fb3e7bf3f0dc9f68c810300c9127957513bbe0efef3609ada795538a83288d4880deabf69dfcbd0ecdb709f552c18dc29b631d15f0e81095be7244df9aa4ea6dc303c394bf3c700ecb7e289aa4a7488f98b76dc8332b225bd0d3ba2da065e98a237a8505ce8c07f3bc45c6656e3f674ddbfffa4370b6",
"kvPairs": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
}
8 changes: 4 additions & 4 deletions contracts/fixtures/mock_memberships_fixture.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f800000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000",
"trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0",
"commitmentRoot": "c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1",
"updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7",
"membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179",
"ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd",
"updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874",
"membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699",
"ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a",
"publicValues": "0x0000000000000000000000000000000000000000000000000000000000000020c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"proof": "0x",
"proof": "0x00000000",
"kvPairs": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
}
Loading

0 comments on commit af38efa

Please sign in to comment.