⬆️ circuits: use noir v0.16

cruzdanilo · Oct 9, 2023 · 989a8e8 · 989a8e8
1 parent 1237f46
commit 989a8e8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -12,7 +12,7 @@ jobs:
       - uses: foundry-rs/foundry-toolchain@v1
       - uses: noir-lang/noirup@v0.1.3
         with:
-          toolchain: v0.10.5
+          toolchain: v0.16.0
       - uses: actions/setup-node@v3
         with:
           node-version: latest
@@ -22,9 +22,12 @@ jobs:
           cache: pip
           cache-dependency-path: contracts/requirements.txt
 
+      - run: nargo backend install acvm-backend-barretenberg https://github.com/noir-lang/barretenberg-js-binary/raw/master/run-bb.tar.gz
+
       - run: bun install
       - run: pip install -r contracts/requirements.txt
       - run: npx playwright install chromium webkit --with-deps
+
       - run: npm test
 
       - uses: actions/upload-artifact@v3

diff --git a/circuits/Nargo.toml b/circuits/Nargo.toml
@@ -1,4 +1,4 @@
 [package]
 name = "receba"
 type = "bin"
-compiler_version = "0.10.5"
+compiler_version = "0.16.0"
diff --git a/circuits/src/merkle.nr b/circuits/src/merkle.nr
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 use dep::std::hash::poseidon::bn254::hash_2;
 
-fn compute_root<N>(leaf: Field, index: Field, hash_path: [Field; N]) -> Field {
+pub fn compute_root<N>(leaf: Field, index: Field, hash_path: [Field; N]) -> Field {
   let n = hash_path.len();
   let index_bits = index.to_le_bits(n as u32);
   let mut current = leaf;

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   },
   "engines": {
     "foundry": ">=0.2.0",
-    "noir": "0.10.5",
+    "noir": ">=0.16.0",
     "node": ">=20.0.0",
     "python": "~3.11.0"
   },

diff --git a/test/Receba.t.sol b/test/Receba.t.sol
@@ -35,7 +35,7 @@ contract RecebaTest is Test, ERC721Holder {
       33,
       0x2432ed3bfbc63acf84c018272f20505534230dbac3746bf9fbd7d95ddfc80f45,
       nullifierHash,
-      hex"0972875d385e251d6ad07b464efb4f8e2193dd0f174c11ca2d68b8730d4c2d6e2b955a6eeeaafbc30f9d85e4687c06204c0b80f62cfb875b6c9b12ddadffeda813dc70509d289317d7bee48d3309688ccfc8355b1f5b23023e51b1933efc1d381e9ac57f31f7dd9cfe364cd0b20adeaa6af7e0e2083618e99961372bfe59f18a0eb97f014ca7aeaebc97f5d21f8e45a6eefca374f809c363c07bb938cd503ca7026b65d3c2a2c64b2171963dab2d28ed4791f4f5e5c3aee03abb0c7c45126fc41291a5f131a8bd6c2f9149f318b819b57b3385d286804848237c979fb9a306f2205d110019cba636e566f7b1249a5ec57f658fbf5846f28d85e7e4d62f16a1421eba775dbd40ed2622348270146f0e7382b98396978e39d8edbddec482f79a8f21c7bf48a12ae196702152594a2aa8dfd7203034a087f8ac405663dd3a8d932c07ba9c848746c83fc6d206605cdd04064737a13b682fa84cb458b241262c08662ce168a945fd35c02a91555699cc521e46ccceb3be916f4f0c5157e2fc3e99400a3b41101c8e3784176a562cfc53d2b6ce4d52faf5ac06ad89197b03f05c5668108d3c90fa78ef8d2ab958feb121b01240731d72736b1c0bec62ce91b9a6cdea196bc30e2d1cc0bb3d5bb848a91136471b718d16c80e292c24936061e145501a2ff1aee3f15368f411584fe1dec048c14fd7ece386cc5997d61d0ef31facef622904a99112ee4d653f5394c003074f769f65eee23e8a5ef075de93e4dd5374012086e880aa43ae1c094b1970f4633f6b935e398327949ebd3d8bbaaf41d2db9f185d59300a80111fe77b1e211f5898eb9236b5fd901275e34f31dc3d006514b4294cd9f079ea9bf2707d2b2aa1c898fd885fd17c31e9214878e0c2fb550b707105cb573a66b3ff667866974a8d6bef5cd2a7863993a2833de81ac42869b64fa1274f2058011857f50a2f5ae26568410037e377f107ff3b6a623713cfa1e1b0e120b9dec7f8116ebffab5a0c376b2f8ff6998d157a4db47958f51ef54015a516c21c6665f338ba1e9d1d786060b91937fc41c43dc244aed9258c92ca8912f80bb056397efae8c29a568f5a3d31ab56460d5393e2e1f2c042364e0674933a4429315c1af975f66cf9975b3bcd749fd4ef805c2fdd98b319d2d72265c2142bf070917fe7b66a32e673e5be9e7d691d0af76ed12505772e6573c5f725cab5432a36d0132156015d939d33b556bde6899981d5226547d594f64fd596bfd60024f3b1b0febe06bd5635605e6669a30667c140696857503c55b95aaca815747ba492bca1347f13c92cfec5ba7c28639fa9a5d840fa13216cae9c8de32675ede58f8db1504c60ab77a2ac995adafd387edd8c953e02500e804e31619926d9475d7b537ac23ab55fe4976dc9221e4dc83081531355d5171768bac5a214cf6381749cd319523fdf3d8852bfaa636a0c83be178746a4f5c97be7274d93cf38b61bd4d0b068f0637e98a0456a91bb979d2fcc398cb27ddb0bfe473e7f16499c769729efc04cf18f030c5fd0cfe72bec133cae1c34bf19bdd61c2276657fc05184f685fc4657c1b0f93cc15eaca2253c268091fb07f2c656886f4fa18b0cb0ad193b06a4f570b19255b35575aba90ad1f28a07a772614a6987230b8cde7d12a5a9f6137d385740de068f2f2621eae193f93f8019b697ea79e1470adc7cd7d721e2f8540c485b40f6b1f46d46d05a4ff9bf9be3aacae1af3216c0b6bc18efd2976df779d4c22c80405a62167d36eaf84fedb006e8b39fded6eb6990bd5cbc6d49bcfa5a9882e591aa86bcd94d40c0e9e0eea202d0174006f802708655bc5103a74ee72b145db990808e65a8ffa9fb56ed33085b90b7ba45bed68a5c89ff68a2b6cd4ed44f8054e265738e9b178c3427d336abed1eb50a0039903848df867ffb9d0fc33b948a8a112808bee9882d392cc54c54aaccf37538a281b40e7b511fc98283f5c565b5cf0140b42427a8dba89b2b12b10e5e07befd5ab72dba5aed37c4f80ef4eb2e2fa041595f8965c98a180990d90d71ef1c08c212eca7663a894fc06d99f410f6a97181720aeea3ea388777f69f69d580305286cb2221121a2567bbe324f336bf2342c10f5d59ab677ec9be5f85f8473bdf2b73ea4c3a629bb507ce0cf8f69f9d3bfdc1f9bbe62e79b6f2681da9cef3a75c41c8ade812816e5793854281aadb5bc6fdd2635e9799ea548f99c4d9c4d1873fb86a6dc42acc06bd934c74d44558140e2160c4ff067842b8f1195c835d6f1804faa9667ac55884efb62bab0b357da3eb51710987d0ca7464a661307d7f60d0269a4fb384768d587f3098a8bbedbc7995763117fd7322a05c3222e07e314b3e59862c3ec310bd423b3db1e0202b133fe31fa07c895fe2371bea94f1d52bdf5c53d5270980045443bcaf790db213831cb7ef428d3a84d1a85d6cb1663a52300664abfc5a9acd178c7cc3e4714a8aa51a0b9f02ed61020204c4dc40ec6f23edfa40f1e7ff2602adc6d5933d93959897e24db9b01da242b2e1336a33cfd4dce9fcfaa25932b3b172c24ccab9a93be7eb10feea70bc836199b44f6c181eac5a7b9943cf2f994a9a8dcfa0da11758a915fb4d81891d2634712cc4f9532ad0a837c260cbeee39aa685c763371c0870d06988b41d6420416fa9e1d422ce2b999d8feb93985fc4b634900ba090f8992b6e0dbc00ed790ec7c2f2d6d122f8a26fa2fa893f5596445a6d7dd9e0ae261efb90e6925656982db264aeacffc34cd195ee1ba86c6b29ec328eb421da3be4e8ada95358abbfb81c38b7f7a1fcc377486bf386461828606bd6c7a1f01a59126e7dcc2c2f0128d72a2024c927ecb2916baac3e6bfec1ad5b3751e1b5bcec16f482c68fb618c137b295e451a3efab01aa06a8db5f7aafd8bb0aea37a17b5e2982237589731169c7800d76912a9abe8fb87af06aa58c0c11fdca1dded7818f0f1ded299dd047f7cd4108a56a05bac21f4d9a82b8f4707ef3761825c2a63473c80003dd95e7715e014"
+      hex"29b20490fd3df4e08ce94463113e899e742cf06c57edb631de6aea09702f4489151ee6550171a218d4d1fac424be3ec37429a1b089172f65da6d049737fda9502563c6498f009e1db11e2ab796fbd25967bc5281e5876e0cc7f2f66865ad6908264c61535abaf2f36210007bfeb1a717bface6e3a6fc3b6d62988853d0d2464f0ca68cdda5aff41553bf0510ae743757d694cd0e41ced8292ca1b76ae3d6817723c574b42f13fa0322d60653e3d0585517a40bc632f1a69dae61ff1ecb337980274cd0b875d4ce3d56b9afb019759f6c8b241cc1dc06bc6b1f1f6a10732c4c0e15bb2ea6cd4577a5f67db2280192e3b497aeea672ab756d28b14944033f0e85e2c6d376f1c0feed62c3697c3f0f310c1a7877334db902b03d1844e74d69f5ed419c4862bf53a5552cfef985b68c66643bb2f16b1c527858edeb964fe51e6d399156cbbc33953b00431fb36794f5481118440afe1093a0c2232437c5f4a820857183b9f2976116a6e8d03b27870e7c4ada45971009d04c0652bf23e68a79d170021e2a6b94f2906dd0dfb5c5dd2f798dafe8d0f766257bf46b2ce233502d4afb505c029f8ea50554ebedb0b997473705c10ec217fb999568cdcf4871f67bd5db318f49c1e74ec999e1644e9b59e92ec1f1f29ed6bd02a7d66633c20bc92e9c6e62afc12203d738c204f0ca4452426344f59c5756de9e2b3a89ce2f05db76903ba12439880eb47890561eb5bdf30b08955e4082c37d29f84a0419e28d8b2139eae1965c939bfb4ae857d2d31dfe598c81ca5ca3fc707c8110c8f86bca6c5be04bd19d2920f71d69a5b138a7a28bbdb256b4d56657133448e709554f0c133a768d800f551ba291f219af996e5c25d9883137b17b1b70fae58480c318a88841035e90c49dd68ffa21542c9d33c7a9e46b41dfde0c68b1bfaa8fdc8ca02cbfdfcc4c40f357c113dd404e7a1adc1205ef53828899034d7fe1ba7cbdde9ab52b5885a912f95ad959b943ecc719016d973a6072a428d4524e051cf8a502c5cfc870932e80a2d1525fc285077c2c162c4cb6697d2db32fea5dc3e3d3784a2885e09c7b405070a9fd4c69097c24a4bb923aec15b395d1c962811b33040a94cb1f37a1177712202947e7f0d2de5b6687e48afb42734ca7ceffe6e8301a7285275473c21074c0b39d450d97aa7ce85f9de74be879d97b7453a8b4b42e5b2131bbb451c70461b0df0c6e44f85caf58a2357f4081c38307a515871cddd20a0c68517484325a3b421a7b229d25fc3e6650642348e4248ea8316522eb5477450749f44baa8a3887f0f064f220b023aea691823528396faefd78476d3d3f2292f61056936e26132f70f26f936fe3477e1f4310bbf4560f28a8bb5980e90771d770fd08fd2796775b8203c96691c1044830dd08b6cc1ce7ca836f230492d30557ffbc14ad5012d236201bd2b6bb1da5ccfa441eb616e909a61944061fd9162b417bffac0ab3557ec7e13632341a965186a6709aa6ca5c65a93141dd1a9faefe9e3e6282fecf560a1901bcd2f44c18d339984e96b0de55ca122b9fa733c2606be72c701c49bf2e71166265a4f9fb4652ed71728fe2bad8dbcd7a0192c28c45dbf21021ccd57a219d0691d540a927bf604de77f4efc4f0761aa36300b0e450bbeb48a9b2b29696dd2de20d306d9e623babc096f01d933e80f5d6c896d519c34492d3b83a5b717fddaa3a012b47198525ed3c9182362e612e71fb5310a283fd4681ef03be8017e232ee6c0c07dc7d7408aaf2ff89ddd0ecb5d34d2cb8a0bb275524f2c34cd44c4eb9619919a3a3091b6c128647fb3865a8e4a4088bef8e8b2418ee6b0025010d06ff9e5f28bcc1faa2d809b299ec300df24e9c1009e5f496c446e07c3fe76c25d1db24bc22f06213e030b64ed134940b14fd3ca967444d328908a8212d80b2e9967c305f1195e77dd84f8fab73ead219a8abf273b61e7177af06191a4af879ecaa7ce2f802eba0a209f050ebd578f709a0e47e88f7e502d42a5e2056ba973239be074b3724a5a8391cc2b255ef5761b01a9e62fb61df7c791f6f98246e17e01ac191b37715fb615d4e63739650e586a012d6ef10a3a60dd59ac79f60ddb69867d51c1bb620402e59a6aece6b125cad29b073665e7457e01b33ae11dddb59c19f96f27ab92b51a875e4dea8c8c6b341724079186a6ef6d42fba9ef06b0d8ce6fe3cdbec870f0efe67cc6e43f6b18c5a94d14e8a11a5be61afd83c039aaff9cbc67a77175612bfb7012540e743994aeb66a732bdc1b94ef86d5c13cf1106eae5dc717d6f942e28a39fc19ca4be3ab596d32d33df3ac8e68ec12a93fded7bee76323aaa5c0c28094b4885d0e85cd059eddaae62e02d11542f146504974767d7a06ad2a241971ea39024cf3231eb79acbdc9de4356d1641da160b813841e53fa209a11001b4c2ed7430378083e45feb640ae4beeb0eac216839912704ba2ed490e0f9167ffed030e44211d100a06be185d65353ae8cc94c163ef06dd6c657259f4170f7210d717c1a344c7c10a59d07a4edf1d83b71429f5d49a1563a3e78379a4ceb493b1e32bbf32dab9d7a0acc9e08c593f58f4e1b9ce76360d843e62f5f0a86a6c9fd69f21a36a0fbe283bb9a7678f2fb77ec0d6fe952ebdf83af8b0b7e2ecb271fc7bca1dc8e1e905041d8d3c5a652d8594e33e14f30e63a8610ba02a4ae05ca64fa5d020444a11c56f2003ac0c9846a60bf62dec074f96a113cc982dd11db9b42b9e4c22bfb23a85da227a1bbecb5fc683091dc31b90c999c68d9031575b16c20796c8253b1a63464524f08b70fe78e6fa1c0d9a2fd1fc92794e8834dd9873cfe38f44096f1829146192f3e7c06ef4a71ee1a5f7695b44a83b7f39e468fb7e82299da5267b52c10ecfe8f5250a3f7ba9a02bac2b2bf338d92a8e4034d70fd2729f697211bd77858fbeaa010c29b3a52a8d5b01ef61135cd8805f02d40be8017ba91b8903af93f1e62dbcd39fad1ebef4dd0bd94a5764254ebabdd15f8516a5a64d4e85"
     );
   }