From 834604caf5f0e7df1ac6597751a32a27d2c11c41 Mon Sep 17 00:00:00 2001 From: sirasistant Date: Wed, 16 Aug 2023 10:31:04 +0000 Subject: [PATCH 1/4] feat: updated noir version --- yarn-project/aztec.js/src/abis/ecdsa_account_contract.json | 3 ++- yarn-project/aztec.js/src/abis/schnorr_account_contract.json | 3 ++- .../aztec.js/src/abis/schnorr_single_key_account_contract.json | 1 + yarn-project/noir-compiler/src/compile/nargo.ts | 2 +- .../noir-compiler/src/fixtures/test_contract/Nargo.toml | 2 +- yarn-project/noir-contracts/scripts/compile.sh | 2 +- yarn-project/noir-contracts/scripts/install_noir.sh | 2 +- .../noir-contracts/src/contracts/child_contract/Nargo.toml | 2 +- .../src/contracts/easy_private_token_contract/Nargo.toml | 2 +- .../src/contracts/ecdsa_account_contract/Nargo.toml | 2 +- .../noir-contracts/src/contracts/escrow_contract/Nargo.toml | 2 +- .../contracts/example_public_state_increment_BROKE/Nargo.toml | 2 +- .../src/contracts/import_test_contract/Nargo.toml | 2 +- .../noir-contracts/src/contracts/lending_contract/Nargo.toml | 2 +- .../src/contracts/non_native_token_contract/Nargo.toml | 2 +- .../noir-contracts/src/contracts/parent_contract/Nargo.toml | 2 +- .../src/contracts/pending_commitments_contract/Nargo.toml | 2 +- .../src/contracts/pokeable_token_contract/Nargo.toml | 2 +- .../src/contracts/private_token_airdrop_contract/Nargo.toml | 2 +- .../src/contracts/private_token_contract/Nargo.toml | 2 +- .../src/contracts/public_token_contract/Nargo.toml | 2 +- .../src/contracts/schnorr_account_contract/Nargo.toml | 2 +- .../contracts/schnorr_single_key_account_contract/Nargo.toml | 2 +- .../noir-contracts/src/contracts/test_contract/Nargo.toml | 2 +- .../noir-contracts/src/contracts/uniswap_contract/Nargo.toml | 2 +- 25 files changed, 27 insertions(+), 24 deletions(-) diff --git a/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json b/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json index 3b1c5f54ec1..dd4839ad996 100644 --- a/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json +++ b/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json @@ -84,7 +84,7 @@ } ], "returnTypes": [], - "bytecode": "H4sIAAAAAAAA/+1dZ3QU1xV+kkCYYoxTbBBCCCGEEEK82V0hiSp675A47ghWGBewibDBcZy49957Se9O74nj9N57juM4juM4juM4juPkR07mijvwdLOSdna/2Z17su+cp6u7s+fu933T3szcuW9jmTGGOptyvw/h/wN/qPArhX+M349w/GOFP1b444RfJfzxwq8W/gTh1wh/ovBrhT9J+HXCnyz8euFPEX6D8KcKv1H404TfJPzpwm8W/gzhtwh/pvCt8D3hJ4SfFH5K+K3s03ZhWF9qtB3Quh/L67iK12U1r7MaXje1vA7qWOt61rSBtWtkjZpYi2bm3MLcLHNIMNYUYwrwzRJ424TfLvwO4c8W/hzhzxX+POHPF/4C4XcKf6HwFwl/sfCXCH+p8JcJf7nwVwh/pfBXCX+18NcIf63w1wl/vfA3CH+j8DcJf7Pwtwh/qzm8PdJnteZgo+2gjdd3B6/XObz+5vF6WsDrYyHrvpj1Xco6Lme9VrIuq5n/Wua5nvlsZNybGd9WxlJp+u4f/zEH9xGyY9mOY1vFdjzbarYT2Nawnci2lu0ktnVsJ7OtZzuFbQPbqWwb2U5j28R2OttmtjPYtrCdyday9dgm2CbZpti2OvFe5/fXZ9BmFn+njW072w62s9nOYTuX7Ty289kuYNvJdiHbRWwXs13CdinbZWyXs13BdiXbVWxXs13Ddi3bdWzXs93AdiPbTWw3s93CdqujzXF+f4Pp2/jU3MuHWtLOSqXSbYm0l/S22URHV3urTbV2zWr32r3W9tYdifZkMt2eam/r6Oposx1eKpn2uls7kt32YDveiWXzbFHiPEEJzhOV4DxJCc6TleA8RQnOU5Xg3KYEZ5cSnNuV4NyhBGdaCc5uJTh3AnEGY8kxHI/GmDSmOo7t8WxPYHsi25PYnsz2FLanst3GtovtdrY72KbZdrPdaQ6P5U7z+y7Tt6E1PB2noRdoGGA8nbnQZ2f4/UzBpUJwoRg2j3aM5JJHtGOBGj9uotmfMuhn82E9NhPOHKONA+r328LqZ3NlXdUfzhyijQfq90Th9bO5sK4eCGfIaBOA+v2uOPrZsKxrBsMZItpEoH5PFk8/G4Z1bTY4s4w2Cajf74urn82WdV22OLOINhmo31PF189mw7o+DM5Bok0B6veHeOhnB2PdEBbnANGmAvV7Oj762YFYN+aCs59o04D6/TFe+tn+WDflijNDtOlA/Z6Jn342E+vmfHCKaDOA+v0pnvpZybolX5xOtJlA/Z6Nr362D2sETo7mAfX7c7z166VLfxIonH60JFC/5+KvHzUvBYz1OFC/vyjRD3ifyHsCqN/zSvQD3ufwngTq91cl+gGv072ngPq9oEQ/4HWm9zRQv78p0Q94neQ9A9TvRSX6Acf53rNA/f6uRD/gONV7DqjfS0r0A46zvOeB+v1DiX7AcYL3AlC/l5XoBzzPeS8C9funEv2Ax2nvJaB+ryjRD3ic8V4G6vcvJfoB9xPvFaB+/y6QfvniPAuoH3Cb8Qqln80z/2qWweVftQHX69iygu6/ObNuN7j8qw6gfuPKCn78y4n1bIPLv5oD1K+q8PrZXFjPNbj8q3lA/cYXRz8blvV8g8u/WgDUr7p4+tkwrDtNFjizjLYQqN+E4upns2W9yGSJM4toi4H61RRfP5sN6yUmBM5Boi0F6jcxHvrZwVgvMyFxDhBtOVC/2vjoZwdivcLkgLOfaCuB+k2Kl362P9arTI44M0RbDdSvLn762Uys15g8cIpoa4H6TY6nflayXmfyxOlEWw/Urz6++lmX9QYDwMnRNgL1mxJv/WzAepMB4fSjbQbq1xB//ah5W4Cx3HtO+eo3VYl+wPtEXhVQv0Yl+gHvc3jVQP2mKdEPeJ3u1QD1a1KiH/A606sF6jddiX7A6ySvDqhfsxL9gON8rx6o3wwl+gHHqV4DUL8WJfoBx1leI1C/mUr0A44TvCagflaJfsDznNcM1M9Toh/wOO21APVLKNEPeJzxLFC/pBL9gPuJlwDqlyqQfvni3A1cF8BtxkPqF9TICupeU86ZW992t+lb07WcLbU9fj/b9G3oemDnANdBwLWc453DXPY4nPb6/Y28LVWY/lsnENNQEXvi//5GLOuQ8Uexq+/lfByrulliUWzqUWVYHIs6T/18pej1kwb4WlHrEg3y1aLV+7GDt6LU0bHZtYLXp7HZt4LWfbHhWsHqqdjwrSB1SmxuLfL6Hzb3FmldDZtfQ9arOHRdIcezNr/mtUaAET1ejOq9Cf4odu8jOB/HKs9fLIpN/nyGxbHIS+/nK0XP9x7ga0XNox7kq0XLT7aDt6Lk/drsWsHzaW32raB5qjZcK1j+pw3fCpJXaXNrkecr2txbpHmANr+GzK+LbLy4VQHG8ggwRoFzLxBnmYOzx/l/FNvh5uCco9TKnc8qBLfhzvKgVTr/d2Lwtlbi9bR03/oIh4cRfEfz8qPZ372nZ1f3gcV709t60jvW7elJuyIGN8ErMgQqcz53b5YPcX68Uix3hQ2WDTOHRTjUOg1EDa8iU3CD34p7TDRb8b4MwrpbZoUjJpqTEb8jdRxtIlxxUa2kfRHEPdfgHq1Fxftc/DqK9LSA1LRQBwHkKbfMwRjs5Of5fb/fDzgcjmRboFOWjeqUVenwCJp7yqLlQ7C/m3RP/cbR22TQzTi/T6fPYEixM92zYV/Xmbu2r04fyLTOKjLEdYce8gzrrsdgWaRnyOD5u7uR0XP3/WwPsD3K7+f7/U0CBzq/A7gTeecDcV2Aw1WwAxISs4v3zc7/pVFJnjEvYEHRcS808R6VEO8L8eso0lEJUlPaeGWSURSYo7oRAF5vXpQanGd0bF/7DfaAXUpiKyWxZdNKSWzhotWaLPbTUhLboVZKYgsXrZTEFi5aKYktZLT8Y5WS2HJsHKaUxNaL2ubcSkls4VopiS1ctFISW7hopSS2cNFKSWzhopWS2MJFKyWxhYtWSmKLH8aonqiX8/9v8ftbzeE2nq2bu+TmM2V6Wvv/kFA2wuFhBN8goWwM++mzdvUs3b1974Gze9I71uzZ6T6MG8Z2aIY4rq7Uhjj/D3X0lDlllQ6uTgznxHBzOInOOL/ttk7n/+EOlhFYLL371kjntwJcwe+MdJYPc3CMxOLoTRQYIfi7GCL63V7+owbhPyoDjlEF5O8mmI4QON19P1gWaUaHGxNd+eEigz9pRIHzYiU4L1GC81IlOC9TgvNyJTivUILzSiU4r1KC82olOK9RgvNaJTivU4LzeiU4b8Dg7E4lUpHivFGJnjcpwXmzEpy3KMF5qxKctynBebsSnHcowXmnEpx3KcF5txKc9yjBea8SnPcpwXm/EpwPKMH5oBKcDynB+XBEOMsFTptf672pjuL8NiWcy4Gc366EcwWQ8zuUcB4C5PxOJZyHAjm/SwnnSiDndyvhfBqQ83uUcL4IyPm9SjhfDOT8PiWcLwFyfr8SzpcCOX9ACefLgJw/qITz5UDOH1LC+Qog50eUcL4SyPnDSjjvBXL+iBLOVwE5f1QJ56uBnD+mhPM1QM4fV8L5DCDnTyjhfC2Q8yeVcL4OyPlTSjhfD+T8aSWcbwBy/owSzjcCOX9WCeebgJw/p4TzzUDOn1fC+RYg5y8o4XwrkPMXlXC+Dcj5USWcbwdy/pISzncAOT+mhPOdQM5fVsL5LiDnryjhfDeQ81eVcL4HyPlrSjjfC+T8dSWc7wNy/oYSzvcDOX9TCecHgJy/pYTzg0DO31bC+SEg5+8o4fwwkPN3lXAeBuT8PSWcjwBy/r4SzsOBnH+ghPMIIOcfKuE8Esj5R0o4jwJy/rESzkcCOf9ECefRQM4/VcL5KCDnnynhPAbI+edKOB8N5PwLJZxfBeT8SyWcXw3k/CslnF8D5PxrJZxfC+T8mwg4b2UbFKKkd6PoXaFgGkS6LqTrpKCYXFDgjsYddB6m8xIdp+m4Rfsxbde0nok3TchDE+nQBDg0cQ1NOENFLWmCF5qYhSZUoaLutX6f5Pc6v9NEHzRBB02sQRNi0EQWNAEFTRxBEz7QRA00wQJNjEATGtBEBESGCs1RwX4qtE8F8qkAPRV4p8LsVFCdCqFTAXMqPE4Fw6nQNxXoDgprL/T7Ir9T4Wgq+EyFmqnAMhVGpoLGVIiYCghT4V8q2EuFdqlALhW23eB3KiRLBWCpcOsW1nU2a0vvAtK7cfSuGL07Re8S0bs19K4JvXtB7yJQbj7lqlPuNuUyP+J3ynWl3E/KhaTcQMqVo9wxyqWi3CLKtaHcE8rFoNwEelZPz67pWe6jfqdnfY/5nZ4F0bMRelZA987pXjLdW6V7jXTvje5F0b0ZuldB1+50LUvXdnStQ2N/GgvT2JDGSjR2oHMpnVvoWEvHHtoXadv8L9Aai4RW7wAA", + "bytecode": "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", "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f" }, { @@ -96,6 +96,7 @@ "name": "payload", "type": { "kind": "struct", + "name": "EntrypointPayload", "fields": [ { "name": "flattened_args_hashes", diff --git a/yarn-project/aztec.js/src/abis/schnorr_account_contract.json b/yarn-project/aztec.js/src/abis/schnorr_account_contract.json index 7a0f83664a7..c8dd19618c6 100644 --- a/yarn-project/aztec.js/src/abis/schnorr_account_contract.json +++ b/yarn-project/aztec.js/src/abis/schnorr_account_contract.json @@ -72,7 +72,7 @@ } ], "returnTypes": [], - "bytecode": "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", + "bytecode": "H4sIAAAAAAAA/+2c93MTRxiG15ItcAIGUmw6pne4U7El0wymhBKbEiCEatknYzA2GBkwJSGkd9J7IKT3Xv66TO6Lv5ssFzH5Qe9peGfYmZ1XspjV8+ydbvfu9vjTGHPNjJQqv8b8Wq2vg/c1ofcJfW2X4H2rZsppSqe95qTnptxOJ5nLZzNOOpNvyrpZN5PNdCezqZSXTWebc/lcs5Nz0ynPLWRyqYIzUiZabTlllig5J5FwTibhnELCOZWEcxoJ53QSzhkknI0knDNJOGeRcM4m4ZxDwjmXhHMeCed8Es4FJJwLSTgXkXAuJuFcQsK5lIRzGQnnchJOh4TTJeFMknCmSDjTJJwZIKewybW7Rm2v3q9/+bVBc6LmJM3JmlM0p2pO05yuOUOzUXOm5izN2ZpzNOdqztOcr7lAc6HmIs3Fmks0l2ou01yu6Wi6mknNlGZaM2O11+TXZnNzQW/DrOHY13IknC0knCtIOFeScK4i4VxNwrmGhLOVhHMtCec6Es42Es71JJwbSDg3Gvycd7y2J/M9mftlNXOaLZorNFdqrtJcrblGs1VzreY6zTbN9ZobNDeaf+ecm/z6gLm5oPtwM64P3aAPA8bN6iJ/2+LXrfqZvI/rvwmfW8Q0pWzz64MR+7dH4B/T9trVZZvl1OHX7eofN7curUCm+P/0oVNecesN/niBZmwgYIyZyhx3nfKK22Gwx92g7LBej9GsNSPrjKTErL/FQ2611udBSVivWzG8qQS+Px1ZNzXa8jAh3zr9fIK+7x8o9haG2wa9zqLX3T5Q9OxOrNGMl2jIPhjYn1dbX54ItWN3bPDZKPPfhV2wvSteqnGD34t3mGj24p0lOtbeM+NWZ6KdTOh7wv1YZyLccFFtpJ0RtLvL4KYQUXnvwm+jSIcFZJ9W6iCAHHKrLMbgR/6QX3f7dY/lMFazQkOWE9WQlbA8gmIPWfJ5NfZ7U/bQb6z+NiX6zVjfL8NnMKXo8Yrbh/J9vV1bveFS2yxeol176hEeYe3tGHwW6QgZPoeSnUzOL3Zr7tEc59e9fn04xBEP8ZT7YwX+iNy9QK59OK6KHZCQzDbvI9brO7OSMtvcpx2Kbne/ub1nJeK9H7+NIp2VoPv0Vpzltn2gQv1ZLudBEs5DJJyHSTiPkHB2knDmSTi7SDi7STg9Es4CCWcPCedREs5eEs5jGM5COpmOlPM4SX/2kXCeIOHsJ+EcIOE8ScJ5ioRzkITzNAlnkYRziITzDAnnWRLOcyScwySc50k4L5BwXiThvBQRZyzE6ZRX/rlJiHJ+lMQ5BnR+jMQ5DnS+TOJcDXR+nMS5Buh8hcQ5AXR+gsR5E9D5SRLnA0Dnp0icDwKdnyZxPgR0fobE+TDQ+VkS5yNA5+dInDuBzs+TOOeBzi+QOHcBnV8kce4AOr9E4twNdH6ZxNkDOr9C4lwAOl8lcd4CdH6VxLkH6PwaifNRoPPrJM69QOc3SJyPAZ3fJHE+DnR+i8S5D+j8NonzCaDzOyTO/UDnd0mcB4DO75E4nwQ6v0/ifAro/AGJ8yDQ+UMS59NA549InItA52skzkNA5+skzmeAzh+TOJ8FOt8gcT4HdP6ExHkY6PwpifN5oPNnJM4XgM6fkzhfBDp/QeJ8Cej8JYnzKKDzVyTOo4HOX5M41wKdvyFxvgvo/C2J891A5+9InMcAnb8ncR4LdP6BxLkO6PwjifM4oPNPJM7jgc4/kzhPADr/QuJ8D9D5VxLne4HOv5E43wd0/p3E+X6g8x8RODdoVqm7PBslzwoF/1upnBfKeZKcN8g8WuaVMs+SeYeMwzIuyXFajlvyO5b9WrazeNdr+y36HfJMnDwjdtmv8gzRFb/KMybyzIU8gyBr8mWNuqzZljXMsqZX1rjKmk9ZAylrAmWN3FW/yhoqWVMka2xkzYmswZA1CXKPXu5Zyz1cuacp9/jknpfcA5J7InKP4Lpf5RryDb/KNUa55ibXoOSajFyjkHN2OYeVczo5x5E5v8yBZU4ocySZM8gYKmOKHGPlmCO/QdknZRv9DY571iv5gQAA", "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f" }, { @@ -84,6 +84,7 @@ "name": "payload", "type": { "kind": "struct", + "name": "EntrypointPayload", "fields": [ { "name": "flattened_args_hashes", diff --git a/yarn-project/aztec.js/src/abis/schnorr_single_key_account_contract.json b/yarn-project/aztec.js/src/abis/schnorr_single_key_account_contract.json index b74a7de8350..84f0fff8039 100644 --- a/yarn-project/aztec.js/src/abis/schnorr_single_key_account_contract.json +++ b/yarn-project/aztec.js/src/abis/schnorr_single_key_account_contract.json @@ -19,6 +19,7 @@ "name": "payload", "type": { "kind": "struct", + "name": "EntrypointPayload", "fields": [ { "name": "flattened_args_hashes", diff --git a/yarn-project/noir-compiler/src/compile/nargo.ts b/yarn-project/noir-compiler/src/compile/nargo.ts index f2f220afab1..9b38dd71ae2 100644 --- a/yarn-project/noir-compiler/src/compile/nargo.ts +++ b/yarn-project/noir-compiler/src/compile/nargo.ts @@ -28,7 +28,7 @@ export class NargoContractCompiler { const nargoBin = this.opts.nargoBin ?? 'nargo'; execSync(`${nargoBin} --version`, { cwd: this.projectPath, stdio }); emptyDirSync(this.getTargetFolder()); - execSync(`${nargoBin} compile --contracts `, { cwd: this.projectPath, stdio }); + execSync(`${nargoBin} compile `, { cwd: this.projectPath, stdio }); return Promise.resolve(this.collectArtifacts()); } diff --git a/yarn-project/noir-compiler/src/fixtures/test_contract/Nargo.toml b/yarn-project/noir-compiler/src/fixtures/test_contract/Nargo.toml index e223a13fde4..6b453ec8c63 100644 --- a/yarn-project/noir-compiler/src/fixtures/test_contract/Nargo.toml +++ b/yarn-project/noir-compiler/src/fixtures/test_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "test" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] test = { path = "../test_lib" } diff --git a/yarn-project/noir-contracts/scripts/compile.sh b/yarn-project/noir-contracts/scripts/compile.sh index 6ad7bd25ed4..b333829a07c 100755 --- a/yarn-project/noir-contracts/scripts/compile.sh +++ b/yarn-project/noir-contracts/scripts/compile.sh @@ -38,7 +38,7 @@ build() { rm -f target/* # If the compilation fails, rerun the compilation with 'nargo' and show the compiler output. - nargo compile --contracts; + nargo compile; } echo "Using $(nargo --version)" diff --git a/yarn-project/noir-contracts/scripts/install_noir.sh b/yarn-project/noir-contracts/scripts/install_noir.sh index 126cd93c1e8..2067172f43a 100755 --- a/yarn-project/noir-contracts/scripts/install_noir.sh +++ b/yarn-project/noir-contracts/scripts/install_noir.sh @@ -2,7 +2,7 @@ # Script to install noirup and the latest aztec nargo set -eu -VERSION="aztec" +VERSION="nightly" # Install nargo noirup -v $VERSION \ No newline at end of file diff --git a/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml index 66dbffc56af..ee16960f684 100644 --- a/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "child_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml index 78d480cc66b..b12c667a3a7 100644 --- a/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "easy_private_token_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml index 38ed88d7c94..fafe0d80e0d 100644 --- a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "ecdsa_account_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml index 1f198c43ddc..1659fd53bd1 100644 --- a/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "escrow_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/example_public_state_increment_BROKE/Nargo.toml b/yarn-project/noir-contracts/src/contracts/example_public_state_increment_BROKE/Nargo.toml index f833b9612f9..ecf14c9d70b 100644 --- a/yarn-project/noir-contracts/src/contracts/example_public_state_increment_BROKE/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/example_public_state_increment_BROKE/Nargo.toml @@ -2,7 +2,7 @@ name = "example_public_state_increment_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml index 41b131fcc79..1dfaf41bec9 100644 --- a/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "import_test_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml index 13d01409d0b..8de71f3fdf1 100644 --- a/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "lending_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml index bd6fc1bc260..a114d29bd83 100644 --- a/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "non_native_token_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml index 7f679650686..5c12622f00f 100644 --- a/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "parent_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml index 2d794f60fbf..052b4bff730 100644 --- a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "pending_commitments_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml index 7f11017fb72..0e36de1f22c 100644 --- a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "pokeable_token_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml index 9dbab5c7d3c..b198e85407d 100644 --- a/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "private_token_airdrop_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml index f787ae48c25..4bdd80daff0 100644 --- a/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml @@ -3,7 +3,7 @@ name = "private_token_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] # highlight-next-line:importing-aztec diff --git a/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml index 29df41c221a..3f6be8e4142 100644 --- a/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "public_token_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml index 33be6fb3c9b..1ea6bf3dbe6 100644 --- a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "schnorr_account_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml index d00f9b6a944..f21b6ca513c 100644 --- a/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "schnorr_single_key_account_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml index 49e599200d7..fd7213c7a9a 100644 --- a/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "test_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } diff --git a/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml index 99ea910215b..d02ae559dd1 100644 --- a/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml +++ b/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml @@ -2,7 +2,7 @@ name = "uniswap_contract" authors = [""] compiler_version = "0.1" -type = "bin" +type = "contract" [dependencies] aztec = { path = "../../../../noir-libs/noir-aztec" } From ac840084db56f2d367d8978ba94f86d050d93d7a Mon Sep 17 00:00:00 2001 From: sirasistant Date: Wed, 16 Aug 2023 13:27:47 +0000 Subject: [PATCH 2/4] chore: update noir version again --- yarn-project/aztec.js/src/abis/ecdsa_account_contract.json | 2 +- yarn-project/aztec.js/src/abis/schnorr_account_contract.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json b/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json index dd4839ad996..07166efc208 100644 --- a/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json +++ b/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json @@ -84,7 +84,7 @@ } ], "returnTypes": [], - "bytecode": "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", + "bytecode": "H4sIAAAAAAAA/+1dZ3QU1xV+kkCYYoxTbBBCCCGEEEK82V0hiSp675A47ghWGBewibDBcZy49957Se9O74nj9N57juM4juM4juM4juPkR07mijvwdLOSdna/2Z17su+cp6u7s+fu933T3szcuW9jmTGGOptyvw/h/wN/qPArhX+M349w/GOFP1b444RfJfzxwq8W/gTh1wh/ovBrhT9J+HXCnyz8euFPEX6D8KcKv1H404TfJPzpwm8W/gzhtwh/pvCt8D3hJ4SfFH5K+K3s03ZhWF9qtB3Quh/L67iK12U1r7MaXje1vA7qWOt61rSBtWtkjZpYi2bm3MLcLHNIMNYUYwrwzRJ424TfLvwO4c8W/hzhzxX+POHPF/4C4XcKf6HwFwl/sfCXCH+p8JcJf7nwVwh/pfBXCX+18NcIf63w1wl/vfA3CH+j8DcJf7Pwtwh/qzm8PdJnteZgo+2gjdd3B6/XObz+5vF6WsDrYyHrvpj1Xco6Lme9VrIuq5n/Wua5nvlsZNybGd9WxlJp+u4f/zEH9xGyY9mOY1vFdjzbarYT2Nawnci2lu0ktnVsJ7OtZzuFbQPbqWwb2U5j28R2OttmtjPYtrCdyday9dgm2CbZpti2OvFe5/fXZ9BmFn+njW072w62s9nOYTuX7Ty289kuYNvJdiHbRWwXs13CdinbZWyXs13BdiXbVWxXs13Ddi3bdWzXs93AdiPbTWw3s93CdqujzXF+f4Pp2/jU3MuHWtLOSqXSbYm0l/S22URHV3urTbV2zWr32r3W9tYdifZkMt2eam/r6Oposx1eKpn2uls7kt32YDveiWXzbFHiPEEJzhOV4DxJCc6TleA8RQnOU5Xg3KYEZ5cSnNuV4NyhBGdaCc5uJTh3AnEGY8kxHI/GmDSmOo7t8WxPYHsi25PYnsz2FLanst3GtovtdrY72KbZdrPdaQ6P5U7z+y7Tt6E1PB2noRdoGGA8nbnQZ2f4/UzBpUJwoRg2j3aM5JJHtGOBGj9uotmfMuhn82E9NhPOHKONA+r328LqZ3NlXdUfzhyijQfq90Th9bO5sK4eCGfIaBOA+v2uOPrZsKxrBsMZItpEoH5PFk8/G4Z1bTY4s4w2Cajf74urn82WdV22OLOINhmo31PF189mw7o+DM5Bok0B6veHeOhnB2PdEBbnANGmAvV7Oj762YFYN+aCs59o04D6/TFe+tn+WDflijNDtOlA/Z6Jn342E+vmfHCKaDOA+v0pnvpZybolX5xOtJlA/Z6Nr362D2sETo7mAfX7c7z166VLfxIonH60JFC/5+KvHzUvBYz1OFC/vyjRD3ifyHsCqN/zSvQD3ufwngTq91cl+gGv072ngPq9oEQ/4HWm9zRQv78p0Q94neQ9A9TvRSX6Acf53rNA/f6uRD/gONV7DqjfS0r0A46zvOeB+v1DiX7AcYL3AlC/l5XoBzzPeS8C9funEv2Ax2nvJaB+ryjRD3ic8V4G6vcvJfoB9xPvFaB+/y6QfvniPAuoH3Cb8Qqln80z/2qWweVftQHX69iygu6/ObNuN7j8qw6gfuPKCn78y4n1bIPLv5oD1K+q8PrZXFjPNbj8q3lA/cYXRz8blvV8g8u/WgDUr7p4+tkwrDtNFjizjLYQqN+E4upns2W9yGSJM4toi4H61RRfP5sN6yUmBM5Boi0F6jcxHvrZwVgvMyFxDhBtOVC/2vjoZwdivcLkgLOfaCuB+k2Kl362P9arTI44M0RbDdSvLn762Uys15g8cIpoa4H6TY6nflayXmfyxOlEWw/Urz6++lmX9QYDwMnRNgL1mxJv/WzAepMB4fSjbQbq1xB//ah5W4Cx3HtO+eo3VYl+wPtEXhVQv0Yl+gHvc3jVQP2mKdEPeJ3u1QD1a1KiH/A606sF6jddiX7A6ySvDqhfsxL9gON8rx6o3wwl+gHHqV4DUL8WJfoBx1leI1C/mUr0A44TvCagflaJfsDznNcM1M9Toh/wOO21APVLKNEPeJzxLFC/pBL9gPuJlwDqlyqQfvni3A1cF8BtxkPqF9TICupeU86ZW992t+lb07WcLbU9fj/b9G3oemDnANdBwLWc453DXPY4nPb6/Y28LVWY/lsnENNQEXvi//5GLOuQ8Uexq+/lfByrulliUWzqUWVYHIs6T/18pej1kwb4WlHrEg3y1aLV+7GDt6LU0bHZtYLXp7HZt4LWfbHhWsHqqdjwrSB1SmxuLfL6Hzb3FmldDZtfQ9arOHRdIcezNr/mtUaAET1ejOq9Cf4odu8jOB/HKs9fLIpN/nyGxbHIS+/nK0XP9x7ga0XNox7kq0XLT7aDt6Lk/drsWsHzaW32raB5qjZcK1j+pw3fCpJXaXNrkecr2txbpHmANr+GzK+LbLy4VQHG8ggwRoFzLxBnmYOzx/l/FNvh5uCco9TKnc8qBLfhzvKgVTr/d2Lwtlbi9bR03/oIh4cRfEfz8qPZ372nZ1f3gcV709t60jvW7elJuyIGN8ErMgQqcz53b5YPcX68Uix3hQ2WDTOHRTjUOg1EDa8iU3CD34p7TDRb8b4MwrpbZoUjJpqTEb8jdRxtIlxxUa2kfRHEPdfgHq1Fxftc/DqK9LSA1LRQBwHkKbfMwRjs5Of5fb/fDzgcjmRboFOWjeqUVenwCJp7yqLlQ7C/m3RP/cbR22TQzTi/T6fPYEixM92zYV/Xmbu2r04fyLTOKjLEdYce8gzrrsdgWaRnyOD5u7uR0XP3/WwPsD3K7+f7/U0CBzq/A7gTeecDcV2Aw1WwAxISs4v3zc7/pVFJnjEvYEHRcS808R6VEO8L8eso0lEJUlPaeGWSURSYo7oRAF5vXpQanGd0bF/7DfaAXUpiKyWxZdNKSWzhotWaLPbTUhLboVZKYgsXrZTEFi5aKYktZLT8Y5WS2HJsHKaUxNaL2ubcSkls4VopiS1ctFISW7hopSS2cNFKSWzhopWS2MJFKyWxhYtWSmKLH8aonqiX8/9v8ftbzeE2nq2bu+TmM2V6Wvv/kFA2wuFhBN8goWwM++mzdvUs3b1974Gze9I71uzZ6T6MG8Z2aIY4rq7Uhjj/D3X0lDlllQ6uTgznxHBzOInOOL/ttk7n/+EOlhFYLL371kjntwJcwe+MdJYPc3CMxOLoTRQYIfi7GCL63V7+owbhPyoDjlEF5O8mmI4QON19P1gWaUaHGxNd+eEigz9pRIHzYiU4L1GC81IlOC9TgvNyJTivUILzSiU4r1KC82olOK9RgvNaJTivU4LzeiU4b8Dg7E4lUpHivFGJnjcpwXmzEpy3KMF5qxKctynBebsSnHcowXmnEpx3KcF5txKc9yjBea8SnPcpwXm/EpwPKMH5oBKcDynB+XBEOMsFTptf672pjuL8NiWcy4Gc366EcwWQ8zuUcB4C5PxOJZyHAjm/SwnnSiDndyvhfBqQ83uUcL4IyPm9SjhfDOT8PiWcLwFyfr8SzpcCOX9ACefLgJw/qITz5UDOH1LC+Qog50eUcL4SyPnDSjjvBXL+iBLOVwE5f1QJ56uBnD+mhPM1QM4fV8L5DCDnTyjhfC2Q8yeVcL4OyPlTSjhfD+T8aSWcbwBy/owSzjcCOX9WCeebgJw/p4TzzUDOn1fC+RYg5y8o4XwrkPMXlXC+Dcj5USWcbwdy/pISzncAOT+mhPOdQM5fVsL5LiDnryjhfDeQ81eVcL4HyPlrSjjfC+T8dSWc7wNy/oYSzvcDOX9TCecHgJy/pYTzg0DO31bC+SEg5+8o4fwwkPN3lXAeBuT8PSWcjwBy/r4SzsOBnH+ghPMIIOcfKuE8Esj5R0o4jwJy/rESzkcCOf9ECefRQM4/VcL5KCDnnynhPAbI+edKOB8N5PwLJZxfBeT8SyWcXw3k/CslnF8D5PxrJZxfC+T8mwg4b2UbFKKkd6PoXaFgGkS6LqTrpKCYXFDgjsYddB6m8xIdp+m4Rfsxbde0nok3TchDE+nQBDg0cQ1NOENFLWmCF5qYhSZUoaLutX6f5Pc6v9NEHzRBB02sQRNi0EQWNAEFTRxBEz7QRA00wQJNjEATGtBEBESGCs1RwX4qtE8F8qkAPRV4p8LsVFCdCqFTAXMqPE4Fw6nQNxXoDgprL/T7Ir9T4Wgq+EyFmqnAMhVGpoLGVIiYCghT4V8q2EuFdqlALhW23eB3KiRLBWCpcOsW1nU2a0vvAtK7cfSuGL07Re8S0bs19K4JvXtB7yJQbj7lqlPuNuUyP+J3ynWl3E/KhaTcQMqVo9wxyqWi3CLKtaHcE8rFoNwEelZPz67pWe6jfqdnfY/5nZ4F0bMRelZA987pXjLdW6V7jXTvje5F0b0ZuldB1+50LUvXdnStQ2N/GgvT2JDGSjR2oHMpnVvoWEvHHtoXadv8L9Aai4RW7wAA", "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f" }, { diff --git a/yarn-project/aztec.js/src/abis/schnorr_account_contract.json b/yarn-project/aztec.js/src/abis/schnorr_account_contract.json index c8dd19618c6..65807285b49 100644 --- a/yarn-project/aztec.js/src/abis/schnorr_account_contract.json +++ b/yarn-project/aztec.js/src/abis/schnorr_account_contract.json @@ -72,7 +72,7 @@ } ], "returnTypes": [], - "bytecode": "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", + "bytecode": "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", "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f" }, { From ef92abacb80f33fefe7cf6dc384e187eec2a3dbc Mon Sep 17 00:00:00 2001 From: sirasistant Date: Wed, 16 Aug 2023 13:46:18 +0000 Subject: [PATCH 3/4] style: remove comptime from noir contracts --- .../circuits.js/src/cbind/constants.in.ts | 2 +- .../noir-libs/noir-aztec/src/constants_gen.nr | 142 +++++++++--------- .../noir-libs/noir-aztec/src/entrypoint.nr | 12 +- .../messaging/get_commitment_getter_data.nr | 2 +- .../messaging/l1_to_l2_message_getter_data.nr | 4 +- .../oracle/enqueue_public_function_call.nr | 2 +- .../noir-libs/noir-aztec/src/oracle/notes.nr | 8 +- .../noir-libs/noir-aztec/src/types/vec.nr | 4 +- .../noir-libs/noir-aztec/src/utils.nr | 2 +- 9 files changed, 89 insertions(+), 89 deletions(-) diff --git a/yarn-project/circuits.js/src/cbind/constants.in.ts b/yarn-project/circuits.js/src/cbind/constants.in.ts index fe1c186b0c0..7b198754c81 100644 --- a/yarn-project/circuits.js/src/cbind/constants.in.ts +++ b/yarn-project/circuits.js/src/cbind/constants.in.ts @@ -110,7 +110,7 @@ function processEnumTS(enumName: string, enumValues: { [key: string]: number }): function processConstantsNoir(constants: { [key: string]: number }, prefix = ''): string { const code: string[] = []; Object.entries(constants).forEach(([key, value]) => { - code.push(`global ${prefix}${key}: comptime Field = ${value};`); + code.push(`global ${prefix}${key}: Field = ${value};`); }); return code.join('\n') + '\n'; } diff --git a/yarn-project/noir-libs/noir-aztec/src/constants_gen.nr b/yarn-project/noir-libs/noir-aztec/src/constants_gen.nr index aac66a0a8d7..359d20b5042 100644 --- a/yarn-project/noir-libs/noir-aztec/src/constants_gen.nr +++ b/yarn-project/noir-libs/noir-aztec/src/constants_gen.nr @@ -1,75 +1,75 @@ // GENERATED FILE - DO NOT EDIT, RUN yarn remake-constants in circuits.js -global ARGS_LENGTH: comptime Field = 16; -global RETURN_VALUES_LENGTH: comptime Field = 4; -global MAX_NEW_COMMITMENTS_PER_CALL: comptime Field = 4; -global MAX_NEW_NULLIFIERS_PER_CALL: comptime Field = 4; -global MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL: comptime Field = 4; -global MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL: comptime Field = 4; -global MAX_NEW_L2_TO_L1_MSGS_PER_CALL: comptime Field = 2; -global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: comptime Field = 8; -global MAX_PUBLIC_DATA_READS_PER_CALL: comptime Field = 8; -global MAX_READ_REQUESTS_PER_CALL: comptime Field = 4; -global MAX_NEW_COMMITMENTS_PER_TX: comptime Field = 16; -global MAX_NEW_NULLIFIERS_PER_TX: comptime Field = 16; -global MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX: comptime Field = 8; -global MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX: comptime Field = 8; -global MAX_NEW_L2_TO_L1_MSGS_PER_TX: comptime Field = 2; -global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: comptime Field = 8; -global MAX_PUBLIC_DATA_READS_PER_TX: comptime Field = 8; -global MAX_NEW_CONTRACTS_PER_TX: comptime Field = 1; -global MAX_OPTIONALLY_REVEALED_DATA_LENGTH_PER_TX: comptime Field = 4; -global MAX_READ_REQUESTS_PER_TX: comptime Field = 16; -global NUM_ENCRYPTED_LOGS_HASHES_PER_TX: comptime Field = 1; -global NUM_UNENCRYPTED_LOGS_HASHES_PER_TX: comptime Field = 1; -global NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP: comptime Field = 16; -global KERNELS_PER_BASE_ROLLUP: comptime Field = 2; -global VK_TREE_HEIGHT: comptime Field = 3; -global FUNCTION_TREE_HEIGHT: comptime Field = 4; -global CONTRACT_TREE_HEIGHT: comptime Field = 16; -global PRIVATE_DATA_TREE_HEIGHT: comptime Field = 32; -global PUBLIC_DATA_TREE_HEIGHT: comptime Field = 254; -global NULLIFIER_TREE_HEIGHT: comptime Field = 16; -global L1_TO_L2_MSG_TREE_HEIGHT: comptime Field = 16; -global ROLLUP_VK_TREE_HEIGHT: comptime Field = 8; -global CONTRACT_SUBTREE_HEIGHT: comptime Field = 1; -global CONTRACT_SUBTREE_SIBLING_PATH_LENGTH: comptime Field = 15; -global PRIVATE_DATA_SUBTREE_HEIGHT: comptime Field = 5; -global PRIVATE_DATA_SUBTREE_SIBLING_PATH_LENGTH: comptime Field = 27; -global NULLIFIER_SUBTREE_HEIGHT: comptime Field = 5; -global HISTORIC_BLOCKS_TREE_HEIGHT: comptime Field = 16; -global NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH: comptime Field = 11; -global L1_TO_L2_MSG_SUBTREE_HEIGHT: comptime Field = 4; -global L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH: comptime Field = 12; -global FUNCTION_SELECTOR_NUM_BYTES: comptime Field = 4; -global MAPPING_SLOT_PEDERSEN_SEPARATOR: comptime Field = 4; -global NUM_FIELDS_PER_SHA256: comptime Field = 2; -global L1_TO_L2_MESSAGE_LENGTH: comptime Field = 8; -global L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH: comptime Field = 26; -global MAX_NOTE_FIELDS_LENGTH: comptime Field = 20; -global GET_NOTE_ORACLE_RETURN_LENGTH: comptime Field = 23; -global MAX_NOTES_PER_PAGE: comptime Field = 10; -global VIEW_NOTE_ORACLE_RETURN_LENGTH: comptime Field = 212; -global CALL_CONTEXT_LENGTH: comptime Field = 6; -global HISTORIC_BLOCK_DATA_LENGTH: comptime Field = 7; -global FUNCTION_DATA_LENGTH: comptime Field = 4; -global CONTRACT_DEPLOYMENT_DATA_LENGTH: comptime Field = 6; -global PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH: comptime Field = 58; -global CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH: comptime Field = 3; -global CONTRACT_STORAGE_READ_LENGTH: comptime Field = 2; -global PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH: comptime Field = 77; -global GET_NOTES_ORACLE_RETURN_LENGTH: comptime Field = 86; -global EMPTY_NULLIFIED_COMMITMENT: comptime Field = 1000000; -global CALL_PRIVATE_FUNCTION_RETURN_SIZE: comptime Field = 64; -global PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: comptime Field = 47; -global PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: comptime Field = 48; -global COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP: comptime Field = 1024; -global NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP: comptime Field = 1024; -global PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP: comptime Field = 1024; -global CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP: comptime Field = 64; -global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP: comptime Field = 128; -global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED: comptime Field = 104; -global L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP: comptime Field = 128; -global LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP: comptime Field = 128; +global ARGS_LENGTH: Field = 16; +global RETURN_VALUES_LENGTH: Field = 4; +global MAX_NEW_COMMITMENTS_PER_CALL: Field = 4; +global MAX_NEW_NULLIFIERS_PER_CALL: Field = 4; +global MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL: Field = 4; +global MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL: Field = 4; +global MAX_NEW_L2_TO_L1_MSGS_PER_CALL: Field = 2; +global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: Field = 8; +global MAX_PUBLIC_DATA_READS_PER_CALL: Field = 8; +global MAX_READ_REQUESTS_PER_CALL: Field = 4; +global MAX_NEW_COMMITMENTS_PER_TX: Field = 16; +global MAX_NEW_NULLIFIERS_PER_TX: Field = 16; +global MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX: Field = 8; +global MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX: Field = 8; +global MAX_NEW_L2_TO_L1_MSGS_PER_TX: Field = 2; +global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: Field = 8; +global MAX_PUBLIC_DATA_READS_PER_TX: Field = 8; +global MAX_NEW_CONTRACTS_PER_TX: Field = 1; +global MAX_OPTIONALLY_REVEALED_DATA_LENGTH_PER_TX: Field = 4; +global MAX_READ_REQUESTS_PER_TX: Field = 16; +global NUM_ENCRYPTED_LOGS_HASHES_PER_TX: Field = 1; +global NUM_UNENCRYPTED_LOGS_HASHES_PER_TX: Field = 1; +global NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP: Field = 16; +global KERNELS_PER_BASE_ROLLUP: Field = 2; +global VK_TREE_HEIGHT: Field = 3; +global FUNCTION_TREE_HEIGHT: Field = 4; +global CONTRACT_TREE_HEIGHT: Field = 16; +global PRIVATE_DATA_TREE_HEIGHT: Field = 32; +global PUBLIC_DATA_TREE_HEIGHT: Field = 254; +global NULLIFIER_TREE_HEIGHT: Field = 16; +global L1_TO_L2_MSG_TREE_HEIGHT: Field = 16; +global ROLLUP_VK_TREE_HEIGHT: Field = 8; +global CONTRACT_SUBTREE_HEIGHT: Field = 1; +global CONTRACT_SUBTREE_SIBLING_PATH_LENGTH: Field = 15; +global PRIVATE_DATA_SUBTREE_HEIGHT: Field = 5; +global PRIVATE_DATA_SUBTREE_SIBLING_PATH_LENGTH: Field = 27; +global NULLIFIER_SUBTREE_HEIGHT: Field = 5; +global HISTORIC_BLOCKS_TREE_HEIGHT: Field = 16; +global NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH: Field = 11; +global L1_TO_L2_MSG_SUBTREE_HEIGHT: Field = 4; +global L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH: Field = 12; +global FUNCTION_SELECTOR_NUM_BYTES: Field = 4; +global MAPPING_SLOT_PEDERSEN_SEPARATOR: Field = 4; +global NUM_FIELDS_PER_SHA256: Field = 2; +global L1_TO_L2_MESSAGE_LENGTH: Field = 8; +global L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH: Field = 26; +global MAX_NOTE_FIELDS_LENGTH: Field = 20; +global GET_NOTE_ORACLE_RETURN_LENGTH: Field = 23; +global MAX_NOTES_PER_PAGE: Field = 10; +global VIEW_NOTE_ORACLE_RETURN_LENGTH: Field = 212; +global CALL_CONTEXT_LENGTH: Field = 6; +global HISTORIC_BLOCK_DATA_LENGTH: Field = 7; +global FUNCTION_DATA_LENGTH: Field = 4; +global CONTRACT_DEPLOYMENT_DATA_LENGTH: Field = 6; +global PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH: Field = 58; +global CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH: Field = 3; +global CONTRACT_STORAGE_READ_LENGTH: Field = 2; +global PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH: Field = 77; +global GET_NOTES_ORACLE_RETURN_LENGTH: Field = 86; +global EMPTY_NULLIFIED_COMMITMENT: Field = 1000000; +global CALL_PRIVATE_FUNCTION_RETURN_SIZE: Field = 64; +global PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 47; +global PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 48; +global COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 1024; +global NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP: Field = 1024; +global PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP: Field = 1024; +global CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 64; +global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP: Field = 128; +global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED: Field = 104; +global L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP: Field = 128; +global LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP: Field = 128; global GENERATOR_INDEX__COMMITMENT = 1; global GENERATOR_INDEX__COMMITMENT_NONCE = 2; global GENERATOR_INDEX__UNIQUE_COMMITMENT = 3; diff --git a/yarn-project/noir-libs/noir-aztec/src/entrypoint.nr b/yarn-project/noir-libs/noir-aztec/src/entrypoint.nr index bad450d75db..efb4c9aa1f6 100644 --- a/yarn-project/noir-libs/noir-aztec/src/entrypoint.nr +++ b/yarn-project/noir-libs/noir-aztec/src/entrypoint.nr @@ -4,11 +4,11 @@ use crate::context::PrivateContext; use crate::private_call_stack_item::PrivateCallStackItem; use crate::public_call_stack_item::PublicCallStackItem; -global ACCOUNT_MAX_PRIVATE_CALLS: comptime Field = 2; -global ACCOUNT_MAX_PUBLIC_CALLS: comptime Field = 2; -global ACCOUNT_MAX_CALLS: comptime Field = 4; +global ACCOUNT_MAX_PRIVATE_CALLS: Field = 2; +global ACCOUNT_MAX_PUBLIC_CALLS: Field = 2; +global ACCOUNT_MAX_CALLS: Field = 4; // 1 (ARGS_HASH) + 1 (FUNCTION_SELECTOR) + 1 (TARGET_ADDRESS) -global FUNCTION_CALL_SIZE: comptime Field = 3; +global FUNCTION_CALL_SIZE: Field = 3; struct FunctionCall { args_hash: Field, @@ -23,8 +23,8 @@ impl FunctionCall { } // FUNCTION_CALL_SIZE * (ACCOUNT_MAX_PUBLIC_CALLS + ACCOUNT_MAX_PRIVATE_CALLS) + 1 -global ENTRYPOINT_PAYLOAD_SIZE: comptime Field = 13; -global ENTRYPOINT_PAYLOAD_SIZE_IN_BYTES: comptime Field = 416; +global ENTRYPOINT_PAYLOAD_SIZE: Field = 13; +global ENTRYPOINT_PAYLOAD_SIZE_IN_BYTES: Field = 416; struct EntrypointPayload { // Noir doesnt support nested arrays or structs yet so we flatten everything diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr b/yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr index 5eaaa7e63e2..07d826d41d7 100644 --- a/yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr +++ b/yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr @@ -6,7 +6,7 @@ struct CommitmentGetterData { root: Field, } -fn make_commitment_getter_data(fields: [Field; COMMITMENT_GETTER_LENGTH], start: comptime Field) -> CommitmentGetterData { +fn make_commitment_getter_data(fields: [Field; COMMITMENT_GETTER_LENGTH], start: Field) -> CommitmentGetterData { CommitmentGetterData { message: fields[start], leaf_index: fields[start + 1], diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr b/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr index d82977a1579..70ae8137ae8 100644 --- a/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr +++ b/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr @@ -12,11 +12,11 @@ struct L1ToL2MessageGetterData { root: Field, } -fn l1_to_l2_message_getter_len() -> comptime Field { +fn l1_to_l2_message_getter_len() -> Field { L1_TO_L2_MESSAGE_LENGTH + 1 + L1_TO_L2_MSG_TREE_HEIGHT + 1 } -fn make_l1_to_l2_message_getter_data(fields: [Field; N], start: comptime Field, secret: Field) -> L1ToL2MessageGetterData { +fn make_l1_to_l2_message_getter_data(fields: [Field; N], start: Field, secret: Field) -> L1ToL2MessageGetterData { L1ToL2MessageGetterData { message: L1ToL2Message::deserialize(arr_copy_slice(fields, [0; L1_TO_L2_MESSAGE_LENGTH], start), secret, fields[start + L1_TO_L2_MESSAGE_LENGTH]), leaf_index: fields[start + L1_TO_L2_MESSAGE_LENGTH], diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr b/yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr index 0c2a216a377..4e767ceeeb7 100644 --- a/yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr +++ b/yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr @@ -4,7 +4,7 @@ // crate::abi::FUNCTION_DATA_SIZE + // crate::abi::CALL_CONTEXT_SIZE + // = 2 + 4 + 6 -global ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_SIZE: comptime Field = 12; +global ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_SIZE: Field = 12; #[oracle(enqueuePublicFunctionCall)] fn enqueue_public_function_call_oracle( diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr b/yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr index 9deeadcea62..bd364569b66 100644 --- a/yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr +++ b/yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr @@ -77,10 +77,10 @@ unconstrained fn get_notes( let set_header = note_interface.set_header; for i in 0..placeholder_opt_notes.len() { if i as u32 < num_notes { - // comptime lengths named as per typescript. - let return_header_length: comptime Field = 2; // num_notes & contract_address. - let extra_preimage_length: comptime Field = 2; // nonce & is_some. - let read_offset: comptime Field = return_header_length + i * (N + extra_preimage_length); + // lengths named as per typescript. + let return_header_length: Field = 2; // num_notes & contract_address. + let extra_preimage_length: Field = 2; // nonce & is_some. + let read_offset: Field = return_header_length + i * (N + extra_preimage_length); let nonce = fields[read_offset]; let header = NoteHeader { contract_address, nonce, storage_slot }; let is_some = fields[read_offset + 1] as bool; diff --git a/yarn-project/noir-libs/noir-aztec/src/types/vec.nr b/yarn-project/noir-libs/noir-aztec/src/types/vec.nr index 4cb9ce09cbb..4f0e1c95701 100644 --- a/yarn-project/noir-libs/noir-aztec/src/types/vec.nr +++ b/yarn-project/noir-libs/noir-aztec/src/types/vec.nr @@ -1,7 +1,7 @@ struct BoundedVec { storage: [T; MaxLen], - len: comptime Field, + len: Field, } impl BoundedVec { @@ -9,7 +9,7 @@ impl BoundedVec { BoundedVec { storage: [initial_value; MaxLen], len: 0 } } - fn get(mut self: Self, index: comptime Field) -> T { + fn get(mut self: Self, index: Field) -> T { assert(index as u64 < self.len as u64); self.storage[index] } diff --git a/yarn-project/noir-libs/noir-aztec/src/utils.nr b/yarn-project/noir-libs/noir-aztec/src/utils.nr index adb72816b0d..83b9863a2e3 100644 --- a/yarn-project/noir-libs/noir-aztec/src/utils.nr +++ b/yarn-project/noir-libs/noir-aztec/src/utils.nr @@ -1,7 +1,7 @@ fn arr_copy_slice( src: [T; N], mut dst: [T; M], - offset: comptime Field, + offset: Field, ) -> [T; M] { for i in 0..dst.len() { dst[i] = src[i + offset]; From 67d799b8fc29d2361afb4de2f4d2582f131d147e Mon Sep 17 00:00:00 2001 From: sirasistant Date: Wed, 16 Aug 2023 14:29:53 +0000 Subject: [PATCH 4/4] chore: update to use latest aztec tag --- build_manifest.json | 7 +++++-- yarn-project/noir-contracts/scripts/install_noir.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build_manifest.json b/build_manifest.json index 7d994bb3751..c3ac0c9dd8c 100644 --- a/build_manifest.json +++ b/build_manifest.json @@ -148,6 +148,7 @@ "^l1-contracts/", "^yarn-project/l1-artifacts/", "^yarn-project/noir-contracts/", + "^yarn-project/noir-libs/", "^yarn-project/noir-compiler/", "^yarn-project/yarn-project-base/", "^yarn-project/yarn.lock" @@ -366,7 +367,8 @@ "projectDir": "yarn-project/noir-contracts", "dockerfile": "noir-contracts/Dockerfile.build", "rebuildPatterns": [ - "^yarn-project/noir-contracts/" + "^yarn-project/noir-contracts/", + "^yarn-project/noir-libs/" ], "dependencies": [ "aztec.js", @@ -379,7 +381,8 @@ "projectDir": "yarn-project/noir-contracts", "dockerfile": "noir-contracts/Dockerfile", "rebuildPatterns": [ - "^yarn-project/noir-contracts/" + "^yarn-project/noir-contracts/", + "^yarn-project/noir-libs/" ], "dependencies": [ "aztec.js", diff --git a/yarn-project/noir-contracts/scripts/install_noir.sh b/yarn-project/noir-contracts/scripts/install_noir.sh index 2067172f43a..126cd93c1e8 100755 --- a/yarn-project/noir-contracts/scripts/install_noir.sh +++ b/yarn-project/noir-contracts/scripts/install_noir.sh @@ -2,7 +2,7 @@ # Script to install noirup and the latest aztec nargo set -eu -VERSION="nightly" +VERSION="aztec" # Install nargo noirup -v $VERSION \ No newline at end of file