Skip to content

Commit

Permalink
Update: batch query circuit proving keys & snark verifier to use new …
Browse files Browse the repository at this point in the history
…trusted setup (#13)

* feat(batch_query): add AxiomV1Query readme to bin/

* update(batch_query): shasums and Yul code using new trusted setup
  • Loading branch information
jonathanpwang authored Jul 3, 2023
1 parent 927f65b commit e032a24
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 51 deletions.
62 changes: 31 additions & 31 deletions axiom-eth/data/tests/batch_query/final_2.yul
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ mstore(0x2c0, mod(calldataload(0x2a0), f_q))
mstore(0x2e0, mod(calldataload(0x2c0), f_q))
mstore(0x300, mod(calldataload(0x2e0), f_q))
mstore(0x320, mod(calldataload(0x300), f_q))
mstore(0x0, 9990344841004121443508147239314748645763433289166582887839854113757608871028)
mstore(0x0, 18785606250233129449375664622106018768209554682525334786816107630995751978567)

{
let x := calldataload(0x320)
Expand Down Expand Up @@ -1512,116 +1512,116 @@ mstore(0x60a0, mload(0x5fc0))
mstore(0x60e0, mload(0x6040))
mstore(0x6100, mload(0x6060))
success := and(eq(staticcall(gas(), 0x6, 0x60a0, 0x80, 0x60a0, 0x40), 1), success)
mstore(0x6120, 0x00cc220045e1876953ba639a05a4c1aca08e5fa15d0bba22a7289c5c4cad49c3)
mstore(0x6140, 0x18e8ca9f988d5bfa0620553c77e53ff68e072ffe45951345eb7a3d309edda0a6)
mstore(0x6120, 0x0d312cc48aa0f99b7d45cdbb3b0c065f59c375ce6906b49db395fe10321c5538)
mstore(0x6140, 0x2f84b4e64a0c57b3a721355991e2522c5f0caa9d0d4cb93a11dc638fd085581a)
mstore(0x6160, mload(0x5420))
success := and(eq(staticcall(gas(), 0x7, 0x6120, 0x60, 0x6120, 0x40), 1), success)
mstore(0x6180, mload(0x60a0))
mstore(0x61a0, mload(0x60c0))
mstore(0x61c0, mload(0x6120))
mstore(0x61e0, mload(0x6140))
success := and(eq(staticcall(gas(), 0x6, 0x6180, 0x80, 0x6180, 0x40), 1), success)
mstore(0x6200, 0x2192633be96c041a0f5153dbc32317753fcba8582fe35193aeaba1152c707982)
mstore(0x6220, 0x17b607ab3b8920817e7d35efd451379021722d7fd97c1900fc55158372bdd325)
mstore(0x6200, 0x0e2cfd6511d4d1c61e962f12c418e57becff05ca67c40fd45569857815f2f5cf)
mstore(0x6220, 0x2244b468d846e5da4bf8421f60829c7d3b5ea7be1d05fc80b74e1304c3c54889)
mstore(0x6240, mload(0x5440))
success := and(eq(staticcall(gas(), 0x7, 0x6200, 0x60, 0x6200, 0x40), 1), success)
mstore(0x6260, mload(0x6180))
mstore(0x6280, mload(0x61a0))
mstore(0x62a0, mload(0x6200))
mstore(0x62c0, mload(0x6220))
success := and(eq(staticcall(gas(), 0x6, 0x6260, 0x80, 0x6260, 0x40), 1), success)
mstore(0x62e0, 0x0a685d3bada38ead79faae078736b8f59099f1182da515495606a5cffe4d1141)
mstore(0x6300, 0x14d74b30a856f01c65b791b5c568186cef57a6190b8bdf8d0350565b3db24166)
mstore(0x62e0, 0x213e9b5c40c6d7ab1e319be843af1c99a1da1a199212e0e7b495f1294b32d165)
mstore(0x6300, 0x22bc14a27bb6f51d9bbc1886857eea3590a5558b8fd6095734bbf14ae88a565f)
mstore(0x6320, mload(0x5460))
success := and(eq(staticcall(gas(), 0x7, 0x62e0, 0x60, 0x62e0, 0x40), 1), success)
mstore(0x6340, mload(0x6260))
mstore(0x6360, mload(0x6280))
mstore(0x6380, mload(0x62e0))
mstore(0x63a0, mload(0x6300))
success := and(eq(staticcall(gas(), 0x6, 0x6340, 0x80, 0x6340, 0x40), 1), success)
mstore(0x63c0, 0x2b24e16fa33e6e1ef5b9a38c7645ece96fd12a8083475e2012c96aefd0b6d23c)
mstore(0x63e0, 0x148f6b8b316854b74f1bb307507a288c99ec9cd7dc6d83a91a8e5bc5c687ad6f)
mstore(0x63c0, 0x1d881272547a28d65138142b349a63846b30ba0ccfed12e1d4a650ffdc9ef069)
mstore(0x63e0, 0x04c1bbc1c2e96c0970f73b47d506c78fb0234cbe1b63e45f8d150a4244500dcd)
mstore(0x6400, mload(0x5480))
success := and(eq(staticcall(gas(), 0x7, 0x63c0, 0x60, 0x63c0, 0x40), 1), success)
mstore(0x6420, mload(0x6340))
mstore(0x6440, mload(0x6360))
mstore(0x6460, mload(0x63c0))
mstore(0x6480, mload(0x63e0))
success := and(eq(staticcall(gas(), 0x6, 0x6420, 0x80, 0x6420, 0x40), 1), success)
mstore(0x64a0, 0x30371678a7355deb3a48da7c0254f8372aef787a72ac76865a685f08d1b47406)
mstore(0x64c0, 0x1212a2b934d56b6cba3fc5e50a88160d0ffc76625b26556d1ea9afaecc8b7228)
mstore(0x64a0, 0x0d26c5d7f4890bde7d349ce1160ccc9da16c0715113a57f91e420f491dad8f22)
mstore(0x64c0, 0x094e76f5de64f6b50318df604dcbb188f4b1abfdc88aec0ddb68679fff30c129)
mstore(0x64e0, mload(0x54a0))
success := and(eq(staticcall(gas(), 0x7, 0x64a0, 0x60, 0x64a0, 0x40), 1), success)
mstore(0x6500, mload(0x6420))
mstore(0x6520, mload(0x6440))
mstore(0x6540, mload(0x64a0))
mstore(0x6560, mload(0x64c0))
success := and(eq(staticcall(gas(), 0x6, 0x6500, 0x80, 0x6500, 0x40), 1), success)
mstore(0x6580, 0x2913e5d2e55149c28e6f6141cbe0859487749ad860a79db179bc84f008210c8d)
mstore(0x65a0, 0x244520bf1e4fa29d5d4e47c5f23d3dc1c5b0ea5342b611447757b7c0ef6c7c6c)
mstore(0x6580, 0x178cda6eece071601ddca6840f562ff46832453c8cdf478b55b9e523a78027ce)
mstore(0x65a0, 0x04f828dec2a0e137a9cf3e950a69df39da1320911552da0a5c589f4e6f0492ca)
mstore(0x65c0, mload(0x54c0))
success := and(eq(staticcall(gas(), 0x7, 0x6580, 0x60, 0x6580, 0x40), 1), success)
mstore(0x65e0, mload(0x6500))
mstore(0x6600, mload(0x6520))
mstore(0x6620, mload(0x6580))
mstore(0x6640, mload(0x65a0))
success := and(eq(staticcall(gas(), 0x6, 0x65e0, 0x80, 0x65e0, 0x40), 1), success)
mstore(0x6660, 0x1782258424ac6a56f6c9050c5ee8b0ee94d2835301efcf7fa2ffac8cd46fe051)
mstore(0x6680, 0x02085b2fb16ce7163e4d127dd4b84b4a2d442c733e6ee308c40f957b63e63eed)
mstore(0x6660, 0x26397f679e4c79e9bb06cef725ce017fc6b8afe1a92420483b333876c5548c2e)
mstore(0x6680, 0x1f4acd941c8113494f1f7ecb22d328f16daf98fd46a172de5c4e1333d75d0e87)
mstore(0x66a0, mload(0x54e0))
success := and(eq(staticcall(gas(), 0x7, 0x6660, 0x60, 0x6660, 0x40), 1), success)
mstore(0x66c0, mload(0x65e0))
mstore(0x66e0, mload(0x6600))
mstore(0x6700, mload(0x6660))
mstore(0x6720, mload(0x6680))
success := and(eq(staticcall(gas(), 0x6, 0x66c0, 0x80, 0x66c0, 0x40), 1), success)
mstore(0x6740, 0x24d0cfc629f45d52209bb4c745d84e4e8d609e0b468803261c0b63c113f90860)
mstore(0x6760, 0x1298f0f9abd6c0fabaa2544dbc66387395fccea5adc422e1223a8a8071a7807a)
mstore(0x6740, 0x1b0282ef1b006c1168a05018aee6ed05febe98a963c5d8164e783b5c5a263ac9)
mstore(0x6760, 0x18d722e4fb14e021718d63b2e36e46ea40639ec3cb404dd1c8d4ff5b7745fc15)
mstore(0x6780, mload(0x5500))
success := and(eq(staticcall(gas(), 0x7, 0x6740, 0x60, 0x6740, 0x40), 1), success)
mstore(0x67a0, mload(0x66c0))
mstore(0x67c0, mload(0x66e0))
mstore(0x67e0, mload(0x6740))
mstore(0x6800, mload(0x6760))
success := and(eq(staticcall(gas(), 0x6, 0x67a0, 0x80, 0x67a0, 0x40), 1), success)
mstore(0x6820, 0x1ea2a5b364fabd33bc8367d0c79b4c23ca12f1f61aa31e9de4576e49cbebc362)
mstore(0x6840, 0x1b10ef25d0ae6c1575d6540136af75091bef66e0dfd434bc98c6984f3efb0cd9)
mstore(0x6820, 0x24b8713bd1d4e117d7574333f59b3005fd149a1e296e0343cff3fbf5dac48476)
mstore(0x6840, 0x28a20357bcd214278d6d3ea712959c8c677e90f8881563eecd8737885f7b5d36)
mstore(0x6860, mload(0x5520))
success := and(eq(staticcall(gas(), 0x7, 0x6820, 0x60, 0x6820, 0x40), 1), success)
mstore(0x6880, mload(0x67a0))
mstore(0x68a0, mload(0x67c0))
mstore(0x68c0, mload(0x6820))
mstore(0x68e0, mload(0x6840))
success := and(eq(staticcall(gas(), 0x6, 0x6880, 0x80, 0x6880, 0x40), 1), success)
mstore(0x6900, 0x04ca8b9f8cf0befb0563fccc3e9e7f0abdd48cc784ece101a3bf20024a908cf6)
mstore(0x6920, 0x2209f6bfdcf9874364a6ce608ce0fb6080ae9f25547ef2053db42f367a1cc1a2)
mstore(0x6900, 0x22716eab9a52b238d2b2bebddffbcacbc4446f1b278d1ce5eb5273cfd8c6eb07)
mstore(0x6920, 0x1f4ab95a9d5d4f4f9d08e6d47417288c4a830e27b48d02b01ac90d0007cf4a5c)
mstore(0x6940, mload(0x5540))
success := and(eq(staticcall(gas(), 0x7, 0x6900, 0x60, 0x6900, 0x40), 1), success)
mstore(0x6960, mload(0x6880))
mstore(0x6980, mload(0x68a0))
mstore(0x69a0, mload(0x6900))
mstore(0x69c0, mload(0x6920))
success := and(eq(staticcall(gas(), 0x6, 0x6960, 0x80, 0x6960, 0x40), 1), success)
mstore(0x69e0, 0x190cdaa8341aa9c280a8cc45def465f282d26793c6ae248237dfe793763d6e50)
mstore(0x6a00, 0x09b1c2259dd02fa90e7f6c2c75dc08eeb478a7901a71fae9aae1a392aef36761)
mstore(0x69e0, 0x142b840183f331d08e3f15836f6859f923592228e91499804db01ff960387dd6)
mstore(0x6a00, 0x09b7f62dd3b5f489195c10aaf84b69e222dc3ac096c3009dfe40bb38e3ca7086)
mstore(0x6a20, mload(0x5560))
success := and(eq(staticcall(gas(), 0x7, 0x69e0, 0x60, 0x69e0, 0x40), 1), success)
mstore(0x6a40, mload(0x6960))
mstore(0x6a60, mload(0x6980))
mstore(0x6a80, mload(0x69e0))
mstore(0x6aa0, mload(0x6a00))
success := and(eq(staticcall(gas(), 0x6, 0x6a40, 0x80, 0x6a40, 0x40), 1), success)
mstore(0x6ac0, 0x031fd8e6a123f1d59760f40a9fa7fa6232501973966a6d3d826b5179ccead03b)
mstore(0x6ae0, 0x2ef50aae0d481e526bd247d2b3848ee882e54cc528f0d3b1e63363f5127ed89f)
mstore(0x6ac0, 0x2d75ed8054668bb4e6b779881ce4d0e3510c80c25479d3b4fe4d613b0febf149)
mstore(0x6ae0, 0x141cf41139c5907be1e1bdd004cc2314b2867e563044f7468c95a53b1d956d0c)
mstore(0x6b00, mload(0x5580))
success := and(eq(staticcall(gas(), 0x7, 0x6ac0, 0x60, 0x6ac0, 0x40), 1), success)
mstore(0x6b20, mload(0x6a40))
mstore(0x6b40, mload(0x6a60))
mstore(0x6b60, mload(0x6ac0))
mstore(0x6b80, mload(0x6ae0))
success := and(eq(staticcall(gas(), 0x6, 0x6b20, 0x80, 0x6b20, 0x40), 1), success)
mstore(0x6ba0, 0x09fb3e41ba2806e59703c92a6eeac970464c40ba010449e678a0a891cc5da83c)
mstore(0x6bc0, 0x1b12bbce3975cff98a9cab482298a2b276a1422f3cd09a85a3f4c5edd310506f)
mstore(0x6ba0, 0x037ff8ee2356bc855124c7330f5aba3993b778fe9cc86ff9ec7a2656e667a1f6)
mstore(0x6bc0, 0x1d8f0ec8c0bdace10b8857d43fccf3238c2e068931a65e5f15aa9adb9f2f5b54)
mstore(0x6be0, mload(0x55a0))
success := and(eq(staticcall(gas(), 0x7, 0x6ba0, 0x60, 0x6ba0, 0x40), 1), success)
mstore(0x6c00, mload(0x6b20))
Expand Down Expand Up @@ -1775,10 +1775,10 @@ mstore(0x7a80, 0x198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c
mstore(0x7ae0, 0x12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa)
mstore(0x7b00, mload(0x79c0))
mstore(0x7b20, mload(0x79e0))
mstore(0x7b40, 0x186282957db913abd99f91db59fe69922e95040603ef44c0bd7aa3adeef8f5ac)
mstore(0x7b60, 0x17944351223333f260ddc3b4af45191b856689eda9eab5cbcddbbe570ce860d2)
mstore(0x7b80, 0x06d971ff4a7467c3ec596ed6efc674572e32fd6f52b721f97e35b0b3d3546753)
mstore(0x7ba0, 0x06ecdb9f9567f59ed2eee36e1e1d58797fd13cc97fafc2910f5e8a12f202fa9a)
mstore(0x7b40, 0x138d5863615c12d3bd7d3fd007776d281a337f9d7f6dce23532100bb4bb5839d)
mstore(0x7b60, 0x0a3bb881671ee4e9238366e87f6598f0de356372ed3dc870766ec8ac005211e4)
mstore(0x7b80, 0x19c9d7d9c6e7ad2d9a0d5847ebdd2687c668939a202553ded2760d3eb8dbf559)
mstore(0x7ba0, 0x198adb441818c42721c88c532ed13a5da1ebb78b85574d0b7326d8e6f4c1e25a)
success := and(eq(staticcall(gas(), 0x8, 0x7a40, 0x180, 0x7a40, 0x20), 1), success)
success := and(eq(mload(0x7a40), 1), success)

Expand Down
36 changes: 18 additions & 18 deletions axiom-eth/data/tests/batch_query/shasums.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// These are generated via `sha256sum` on Ubuntu. On macOS use `shasum -a 256`.

4ad2fc71e23f9a6bc8eb424cbb6d07e3b2f540599827841d4a07fd0a92609c51 data/tests/batch_query/account_3.pk
2dd100517825060bda1f1c51db6b09469b79d91f97a23ff62357105b32cef6ec data/tests/batch_query/account_3_6_0.pk
9c9b2224250ebd807042aaa40dd17527faf8295fe269e7dfa9406d648e1ef9fd data/tests/batch_query/account_3_6_1.pk
ba448e91eeb1ce05932da3f98c2c2472aadb675a12749a5c072b7a1d83d9fa34 data/tests/batch_query/account_3_6_2.pk
1bc5f620efaa8057ad249447bcf18703f5137dd0f9893e38349083d9325ceb27 data/tests/batch_query/account_4.pk
67a147d2fbfeecdf6693cc67b7dac1171463e383a867304badc80ed0af9329fd data/tests/batch_query/account_5.pk
588fa07245b64f637059bb89355cb9e3621ba6395db81233ea3e82ea1a8c9256 data/tests/batch_query/final_0.pk
0d348f7589361df4eaac888bcc026680e93d6c74c8e1263b15055580462d27b1 data/tests/batch_query/final_1.pk
cc4b26fd45b33f106ee1773f22b86becf79543d88e16bb7723fe7555e86ab03d data/tests/batch_query/final_2.pk
e2039ac72d4b50ce68f2cdc55226c2ee263bfe1a2e4cf80da0536ea92510e201 data/tests/batch_query/mainnet_block_6.pk
fd8fb7e1b5a444b667bf8070478d1d61d0025635ed9ba319a295b46fe0b6daba data/tests/batch_query/row_6.pk
07b6005328ef68726b2ca27ea702897f4793b8c8bfc7f3c4a3e8990d7cb7d317 data/tests/batch_query/storage_3.pk
c4dbd4f5de408b60aca8846c1d55384194b754b214c2bec46bad838d49d41488 data/tests/batch_query/storage_3_6_0.pk
b3e8db6bd2d4ef01a43bb836d7177a7c7e904f28581a8ab7d8a0d61ce1f86817 data/tests/batch_query/storage_3_6_1.pk
241b6b057280f109a650fe7f904ca4973c7d77577f828f9d83645e2eb0922357 data/tests/batch_query/storage_3_6_2.pk
587a0c31e98abd8bb2c3cfef33094943e6d4a0b3677b4d638181ae2e150050ac data/tests/batch_query/storage_4.pk
4e30f6cc658a0c239cdaa54b2b631b90c00805361a128721c81dca435241522b data/tests/batch_query/storage_5.pk
43ac70e81f3ac38f6875ef4ad7b6b2280d5dfef3e6228a73732659f4b8a9608e data/tests/batch_query/account_3.pk
8e58b7f7781913b92d957d35a49ab329a7b81572d4d2a8a6f93990c8a59c427b data/tests/batch_query/account_3_6_0.pk
1fb77be0c528d4faa60c155a2eba09dc80a360a983f9a18788eb54430970b787 data/tests/batch_query/account_3_6_1.pk
451e9181972851521d93fa8b4161fea5472f25a014ca55f38e99d2dc67ed3d73 data/tests/batch_query/account_3_6_2.pk
4e0aed9f382d1eb1c18a0d30240ceeea5b5af918050fad4c21d8dd8663835fb7 data/tests/batch_query/account_4.pk
cfc849730078fa3281b09dbed8d7f516e8813a58ddecbecf646ad61009f44b39 data/tests/batch_query/account_5.pk
0d97ba6aeb9aef83581dca85efd7ade0aa153ab95c2f5aa5d9a91eede4b54083 data/tests/batch_query/final_0.pk
5870a59ac4909857f9371a3c5750eef6c48a9a851ef14b5d7e262316b28e3645 data/tests/batch_query/final_1.pk
b450910797d24e92693e9f491990ef3b4d04ff4c40c175be448f72daa65b3538 data/tests/batch_query/final_2.pk
9a0fb5d78af7dffed150686389c23007f351e06f31d26b58a2251ee547245aa0 data/tests/batch_query/mainnet_block_6.pk
461d5b39193d54e90708927677a8dab151257124ff35361a8961825300d8ee24 data/tests/batch_query/row_6.pk
cc38f49d880dfba2eb13a87d6da6fd93127b82865cc594f9e01618c3fa9ba125 data/tests/batch_query/storage_3.pk
474c13b4c67660eadc4a856499395d918986824315a63d0d70f9cae5d6b8cbaa data/tests/batch_query/storage_3_6_0.pk
de69177ac1b65e87b6c9a7c0b3d591a669a537bd32caf671a0d45e978f779bee data/tests/batch_query/storage_3_6_1.pk
d83994d25f52b5c2c299f77874e860398b849dde9808141db4f66def01183e2f data/tests/batch_query/storage_3_6_2.pk
237fcc11e6dc51e0456e35d06e5a4f8729bec3edab452e877238407716a5a8f3 data/tests/batch_query/storage_4.pk
31164e15403255ae2091ef117fc7fde8a7a8dcf708ce3df65893c67ec2b86235 data/tests/batch_query/storage_5.pk

c1717278590ad66f0b1247c21992d6e254f464984d793e7b938a07f10f08058a data/tests/batch_query/final_2.yul
30b83ac7101eec9e57d98c0663deb4908db910db254bd3f73e3bd789f6197ed3 data/tests/batch_query/final_2.yul
Loading

0 comments on commit e032a24

Please sign in to comment.