From a11594e8488517d3746b3efff49d696af91a3c5c Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 29 Aug 2023 08:51:00 +0000 Subject: [PATCH 01/17] try remove base64 --- circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh | 6 +++--- .../barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp | 8 +------- circuits/cpp/barretenberg/ts/src/main.ts | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh index 20845e978a03..f4489292fd73 100755 --- a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh +++ b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh @@ -7,7 +7,7 @@ set -e BB=$PWD/${BB:-../cpp/build/bin/bb} CRS_PATH=~/.bb-crs -BRANCH=master +BRANCH=kw/remove-base64-decode # Pull down the test vectors from the noir repo, if we don't have the folder already. if [ ! -d acir_tests ]; then @@ -18,10 +18,10 @@ if [ ! -d acir_tests ]; then git clone -b $BRANCH --filter=blob:none --no-checkout https://github.com/noir-lang/noir.git cd noir git sparse-checkout init --cone - git sparse-checkout set crates/nargo_cli/tests/execution_success + git sparse-checkout set crates/nargo_cli/tests/acir_artifacts git checkout cd .. - mv noir/crates/nargo_cli/tests/execution_success acir_tests + mv noir/crates/nargo_cli/tests/acir_artifacts acir_tests rm -rf noir fi fi diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp index 755dca2a1181..2c7af46cfca5 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp @@ -6,12 +6,6 @@ */ inline std::vector get_bytecode(const std::string& bytecodePath) { -// base64 on mac is different from linux -#ifdef __APPLE__ - std::string command = "base64 -D -i " + bytecodePath + " | gunzip"; -#else - std::string command = "base64 -d " + bytecodePath + " | gunzip"; -#endif - + std::string command = "gunzip -c \"" + bytecodePath + "\""; return exec_pipe(command); } \ No newline at end of file diff --git a/circuits/cpp/barretenberg/ts/src/main.ts b/circuits/cpp/barretenberg/ts/src/main.ts index 6cf21570c994..c77c49a76daa 100755 --- a/circuits/cpp/barretenberg/ts/src/main.ts +++ b/circuits/cpp/barretenberg/ts/src/main.ts @@ -18,7 +18,7 @@ const MAX_CIRCUIT_SIZE = 2 ** 19; function getBytecode(bytecodePath: string) { const encodedCircuit = readFileSync(bytecodePath, 'utf-8'); - const buffer = Buffer.from(encodedCircuit, 'base64'); + const buffer = Buffer.from(encodedCircuit); const decompressed = gunzipSync(buffer); return decompressed; } From ddb25550d38b1705c9b24ac038ad0c8b97e72b9f Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 29 Aug 2023 18:33:02 +0000 Subject: [PATCH 02/17] base64 decode file --- .../ts/bin-test/target/main.bytecode | Bin 1752 -> 1312 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/circuits/cpp/barretenberg/ts/bin-test/target/main.bytecode b/circuits/cpp/barretenberg/ts/bin-test/target/main.bytecode index fee406537ed10d74a673475bd5751f7fcc024c65..8cb63950a99afff9a0a64f9f079dfb8290b3c849 100644 GIT binary patch literal 1312 zcmV+*1>gD~iwFP!00000|LxdgjAUsTK;iDOr^mK!tH-uIv$ip|ZQHhOYi*8g&-U!8 z^y$rH|L!KUoAgbdoZMTLPF3Ej?^b^ugM)%%28AEd?FW{Jf}$WQqWO4?pz!C%LTtoA zT*O0sBtSxhAQ2KH36dfik|PCDA{A024bmbV(jx;hA`>zr3$h{`vLgp_A{TNa5Aq@( z@}mF>q7VwB2#TT@ilYQdq7+J_49cP$%A*28Q4y6;8C6gf)leNZP!qLK8+A|@^-v!T z&=8H#7){U=&Cnbz&=RfC8g0-P?a&?_&=D`-MZAQU@d{qWYj_=R;7z=RxA6|%#d~<) zSw?r3?VRg}_y`~46MTwJ=!`Dtif-tR9_Wc)=#4(;i+<>j0T_ru7>pqpieVUz5g3V4 z7>zL)i*Xo_37CjUn2afyifNdR8JLM#n2kA@i+Pxj1z3nhSd1lDie*@i6Th(~ygC-?(lcp4P`27?g=Q4tN%5hJkHAQoaH4&ovn z;v)ePA_R$$7)g*6$&ef=kP@ko8flOg>5v{7kP(@X8Cj4O*^nJMkQ2F(8+niy`H&w4 zP!NSs7)4MN#ZVk2P!gq38f8!xjl{=S;{KK4in6nCVZh^+IF>Ndx z+s3hRZ9E&_Ca?)@h)rY@+axxrO=gqZ6gH(zWmDTUHmyx()7uO-qs?S9+blM#&1SRP z95$!TWpmp+Hm}WR^VLQ-cGO+?Ib(d zPO($%G&|kSuruu}JKN5&bL~7k-!8BV?IOF_F0o7PGP~Tauq*84c}68vMio>=HB?6p)I=@RMjg~eJ=8~o$Qxhejn9VK$QxgH|7$nC)1IHPXYDzA z-d?a5?InBJUa?p0HGAFOus7{3d)wZzckMlU-#)Mp?IZixKCu!1fJAs|0}D`~!8VGG zYNOfcHinI9W7*g?j*V;M+4werO=v@GBAeJIu}N(*o7|?bDQzm7+NQB-Z91FYX0RD; zCY#x2u~}_4o89KHIc+YR+vc%(Z9bdd7O(|vAzRoMu|;h$TilkgC2c8N+Lp0pZ8=-s zRNe)h%}xKPPfwpDCZTg_ItHEc~=%htAaY+YN=*0&8JJ}AD9hMYG- zV>CfiG(&T=KufejYqUXIv_pGz2o8V4e(oc8?}GmSyLXYhb? W_k4EXB94D+UHub^Se}C_82|u|MR5-R literal 1752 zcmXZd&CY^27>3~kVgVGiu$V;=5c~l|EXuA`5d1(CDn*Ze-bse!&b4?pkTfMQ$B_L0 zsETp9nDZY?Yhsqm`DK-evndb{^b?OY;_9jR7Tn+Aef!=m%J6%);wm_FKkq;xL;fAStrt4pF_hgg ztRYE3NE#p{_usIFPWe@@Po)FwCf~ zOs`dIW_(?)dber3CW_;!W?otMR-M-dHn7Z<_q_fkz4nVk0a?3GSVMC7gfGbCpRk2A z{0RkQ1!Y)6@~M!hE}j0Q-kA%BB85YdddFDm4aqOfJ~o@MG@HHSHKErO*?>06NN zwjjrMK^QAYzAQ+&E=bxHq{s_GQ9*8TL9$Olcv+CMQjp4_o0`p1+*_&`+Yl(w~++uEd*& zf=oOdSij5J4$WKiTIuc49>3x(MPW^R_24Hu94TK@K2xUa`K;$wl8YT3Ih_K1IO{wx zxOAEJ$ma*L4oF<}@oG;iF&qV7|M&h($N7wr+un{h0sAzp`zvD4aMC?vwHjoS-4;Y=6^GVUP*f!$PO~lTf_;2ukIFs1; zF6BzmnvZ?|jHgNLhv_;DWWdKaM(^d!6m9vj7oX9Y#AcWZKKLAG3>)QA#)|g&*wbe` zPa+wnDi}zBk3L4ua!wU(F70nQt}3yurjeT}QQ!-Q*}D7ZcD(KK*xskghO z>)@99$t?};)}5b~WArmQ`#Pd36MKj-&Ymx2E);E1+KX~@DzQ0F#d+}0IHTCOEoG!= zqO_-SJXaz)PgOFI1RoQO+~w?53Q2?dO{6&Vdk;0e{_gE(AN4F^c~T&k#gBY?pz4n9 zC%r!)*>v{38&9p+zozSJATNG=bM$62%e7@^FS^lb#pX2?#o!k_W85g2jC1YN*;6;3 zTamn`${&c&k3L5Zo6}sIbNic*D=M~hV(s9!JZrhpGTEoW&y~HZJ~3P?7|nHQp7w1n zS~^lXMRd68+|&8jX6TmBx7<>5A+;uH8s*WmYou)+k>_WT7yX3i?1Z-&gy(bNMfgVU zab-mcZXyGlJ4MC9_~SzVq0-n5&cSimrh;qJ$A7ME%*b4A;|htJn#S9FvvjxhAN Date: Tue, 29 Aug 2023 18:40:13 +0000 Subject: [PATCH 03/17] Empty-Commit From 8478337c088b40181bf875939cf19cd83e7b2fb5 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Thu, 31 Aug 2023 09:36:47 +0000 Subject: [PATCH 04/17] remove .json for .bytecode --- .../cpp/bin-test/target/main.bytecode | Bin 0 -> 1312 bytes .../barretenberg/cpp/bin-test/target/main.json | 1 - 2 files changed, 1 deletion(-) create mode 100644 circuits/cpp/barretenberg/cpp/bin-test/target/main.bytecode delete mode 100644 circuits/cpp/barretenberg/cpp/bin-test/target/main.json diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/main.bytecode b/circuits/cpp/barretenberg/cpp/bin-test/target/main.bytecode new file mode 100644 index 0000000000000000000000000000000000000000..8cb63950a99afff9a0a64f9f079dfb8290b3c849 GIT binary patch literal 1312 zcmV+*1>gD~iwFP!00000|LxdgjAUsTK;iDOr^mK!tH-uIv$ip|ZQHhOYi*8g&-U!8 z^y$rH|L!KUoAgbdoZMTLPF3Ej?^b^ugM)%%28AEd?FW{Jf}$WQqWO4?pz!C%LTtoA zT*O0sBtSxhAQ2KH36dfik|PCDA{A024bmbV(jx;hA`>zr3$h{`vLgp_A{TNa5Aq@( z@}mF>q7VwB2#TT@ilYQdq7+J_49cP$%A*28Q4y6;8C6gf)leNZP!qLK8+A|@^-v!T z&=8H#7){U=&Cnbz&=RfC8g0-P?a&?_&=D`-MZAQU@d{qWYj_=R;7z=RxA6|%#d~<) zSw?r3?VRg}_y`~46MTwJ=!`Dtif-tR9_Wc)=#4(;i+<>j0T_ru7>pqpieVUz5g3V4 z7>zL)i*Xo_37CjUn2afyifNdR8JLM#n2kA@i+Pxj1z3nhSd1lDie*@i6Th(~ygC-?(lcp4P`27?g=Q4tN%5hJkHAQoaH4&ovn z;v)ePA_R$$7)g*6$&ef=kP@ko8flOg>5v{7kP(@X8Cj4O*^nJMkQ2F(8+niy`H&w4 zP!NSs7)4MN#ZVk2P!gq38f8!xjl{=S;{KK4in6nCVZh^+IF>Ndx z+s3hRZ9E&_Ca?)@h)rY@+axxrO=gqZ6gH(zWmDTUHmyx()7uO-qs?S9+blM#&1SRP z95$!TWpmp+Hm}WR^VLQ-cGO+?Ib(d zPO($%G&|kSuruu}JKN5&bL~7k-!8BV?IOF_F0o7PGP~Tauq*84c}68vMio>=HB?6p)I=@RMjg~eJ=8~o$Qxhejn9VK$QxgH|7$nC)1IHPXYDzA z-d?a5?InBJUa?p0HGAFOus7{3d)wZzckMlU-#)Mp?IZixKCu!1fJAs|0}D`~!8VGG zYNOfcHinI9W7*g?j*V;M+4werO=v@GBAeJIu}N(*o7|?bDQzm7+NQB-Z91FYX0RD; zCY#x2u~}_4o89KHIc+YR+vc%(Z9bdd7O(|vAzRoMu|;h$TilkgC2c8N+Lp0pZ8=-s zRNe)h%}xKPPfwpDCZTg_ItHEc~=%htAaY+YN=*0&8JJ}AD9hMYG- zV>CfiG(&T=KufejYqUXIv_pGz2o8V4e(oc8?}GmSyLXYhb? W_k4EXB94D+UHub^Se}C_82|u|MR5-R literal 0 HcmV?d00001 diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/main.json b/circuits/cpp/barretenberg/cpp/bin-test/target/main.json deleted file mode 100644 index 7452a628b5aa..000000000000 --- a/circuits/cpp/barretenberg/cpp/bin-test/target/main.json +++ /dev/null @@ -1 +0,0 @@ -{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"verification_key","type":{"kind":"array","length":114,"type":{"kind":"field"}},"visibility":"private"},{"name":"proof","type":{"kind":"array","length":94,"type":{"kind":"field"}},"visibility":"private"},{"name":"public_inputs","type":{"kind":"array","length":1,"type":{"kind":"field"}},"visibility":"private"},{"name":"key_hash","type":{"kind":"field"},"visibility":"private"},{"name":"input_aggregation_object","type":{"kind":"array","length":16,"type":{"kind":"field"}},"visibility":"private"},{"name":"proof_b","type":{"kind":"array","length":94,"type":{"kind":"field"}},"visibility":"private"}],"param_witnesses":{"input_aggregation_object":[211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226],"key_hash":[210],"proof":[115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208],"proof_b":[227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320],"public_inputs":[209],"verification_key":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114]},"return_type":{"kind":"array","length":16,"type":{"kind":"field"}},"return_witnesses":[337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352]},"bytecode":"H4sIAAAAAAAA/+3Yc4zcWQDA8d22W2Nr27a1tW23Zxu1bdu2bVtns7bda+872e9emvv3Luldsi/55JvfbyabmbzZ92Zeh+CgoBhB4SPEfmB5KCgKoiKaj0cPCn9+TMRCbMRBXMRDfCRAKBIiERIjCZIiGZIjBVIiFVIjDdIiHdIjAzIiEzIjC7IiG7IjB3IiF3IjD/IiH/KjAAqiEAqjCIqiGIqjBEqiFEqjDMqiHMojDBVQEZVQGVVQFdVQHTVQE7VQG3VQF/VQHw3QEI3QGE3QFM3QHC3QEq3QGm3QFu3QHh3wAl7ES3gZr+BVvIbX8QbexFt4G+/gXbyH953LEOeyrfP6IT7Cx/gEn6IjOqEzuqAruqE7eqAneqE3+qAv+qE/BmAgBmEwhmAohmE4RmAkRmE0xmAsxmE8JmAiJmEypmAqpmE6ZmAmZmE25mAu5mE+FmAhFmExlmAplmE5VmAlVmE11mAt1mE9NmAjNmEztmArtmE7dmAndmE39mAv9mE/DuAgDuEwjuAojuE4TuCk8xDFuQiMz7wX+N8K9d4X+BJf4Wt8g2/xHb7HD/gRP+Fn/IJf8Rt+9+8FRMz1KZzGGZzFOZzHBVzEJVzGFVzFNVzHDdzELdzGHdzFPdzHAzzEIzzGH3iCp0HhbzAYURAV0RCC6IG1BjERC7ERB3ERD/GRAKFIiERIjCRIimRIjhRIiVRIjTRIi3RIjwzIiEzIjCzIimzIjhzIiVzIjTzIi3zIjwIoiEIojCIoimIojhIoiVIojTIoi3Ioj7Dg8DkOrIfPrqVPnP9Ao9poNsRGtzFsTBvLxrZxbFwbz8a3CWyoTWgT2cQ2iU1qk9nkNoVNaVPZ1DaNTWvT2fQ2g81oM9nMNovNarPZ7DaHzWlz2dw2j81r89n8toAtaAvZwraILWqL2eK2hC1pS9nStowta8vZ8jbMVrAVbSVb2VaxVW01W93WsDVtLVvb1rF1bT1b3zawDW0j29g2sU1tM9vctrAtbSvb2raxbW072952sC/YF+1L9mX7in3VvmZft2/YN+1b9m37jn3Xvmfftx888zoD40OvP7If20/sp7aj7WQ72y62q+1mu9setqftZXvbPrav7Wf72wF2oB1kB9shdqgdZofbEXakHWVH2zF2rB1nx9sJdqKdZCfbKXaqnWan2xl2pp1lZ9s5dq6dZ+fbBXahXWQX2yV2qV1ml9sVdqVdZVfbNXatXWfX2w12o91kN9stdqvdZrfbHXan3WV32z12r91n99sD9qA9ZA/bI/aoPWaP2xP2pH32u0fg+nP71xeQCjyjIiqhMqqgKqqhOmqgJmqhNuqgLuqhfuTGF7nx2TAbufGF97+28Z3y+rQ9Y8/ac/a8vWAv2kv2sr1ir9pr9rq9YW/aW/a2vWPv2nv2vn1gH9pH9rGN+AES4akNLECBBtsoNqqNZkNsdBvDxrSxbGwbx8a18Wx8m8CG2oQ2kU1sk9ikNplNblPYlDaVTW3T2LQ2nU1vM9iMNpPNbLPYrDabzW5z2Jw2l81t89i8Np/NbwvYgraQLWyL2KK2mC1uS9iStpQtbcvYsracLW/DIuY/KHz8feMLfnbjC9yoaCvZyraKrWqr2eq2hq1pa9nato6ta+vZ+hEfFF9HA64bohEaowmaohmaowVaohVaow3aoh3aB4e/YT/3kad3Qf//07vI07rnc1oXWCgCi8Q/PZGLPIF7PidwEePfWlf/BBWx6A0qGQAA","proving_key":null,"verification_key":null} \ No newline at end of file From e9cbb70dba3daae2837aa6b6a9091a18ef65ef4c Mon Sep 17 00:00:00 2001 From: kevaundray Date: Thu, 31 Aug 2023 10:00:29 +0000 Subject: [PATCH 05/17] remove test when building dockerfile should be a part of yarn test --- circuits/cpp/barretenberg/ts/Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/circuits/cpp/barretenberg/ts/Dockerfile b/circuits/cpp/barretenberg/ts/Dockerfile index 14f47a9ea566..1a94506a443a 100644 --- a/circuits/cpp/barretenberg/ts/Dockerfile +++ b/circuits/cpp/barretenberg/ts/Dockerfile @@ -13,9 +13,4 @@ RUN yarn --immutable COPY . . ENV DOCKER_ENV=true RUN yarn formatting && yarn build:ts:browser && yarn build:ts:node - -# Run bb.js binary tests -WORKDIR /usr/src/barretenberg/ts/bin-test -RUN ./bin-test.sh - CMD ["yarn", "test"] From ab12d7400a6aec8f79f6ab9c1fb4038d85d16a73 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Thu, 31 Aug 2023 10:08:21 +0000 Subject: [PATCH 06/17] remove extraneous buffer instance --- circuits/cpp/barretenberg/ts/src/main.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circuits/cpp/barretenberg/ts/src/main.ts b/circuits/cpp/barretenberg/ts/src/main.ts index c77c49a76daa..95140bea0e84 100755 --- a/circuits/cpp/barretenberg/ts/src/main.ts +++ b/circuits/cpp/barretenberg/ts/src/main.ts @@ -18,8 +18,7 @@ const MAX_CIRCUIT_SIZE = 2 ** 19; function getBytecode(bytecodePath: string) { const encodedCircuit = readFileSync(bytecodePath, 'utf-8'); - const buffer = Buffer.from(encodedCircuit); - const decompressed = gunzipSync(buffer); + const decompressed = gunzipSync(encodedCircuit); return decompressed; } From 0b30745eebf64915489adc08001e30670ce64fd2 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Fri, 1 Sep 2023 23:18:20 +0000 Subject: [PATCH 07/17] revert branch rename --- circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh index 2201759e29bf..ee6bef88d8f6 100755 --- a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh +++ b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh @@ -7,7 +7,7 @@ set -e BB=$PWD/${BB:-../cpp/build/bin/bb} CRS_PATH=~/.bb-crs -BRANCH=kw/acvm-0-24 +BRANCH=kw/remove-base64-decode # Pull down the test vectors from the noir repo, if we don't have the folder already. From a1b48a582cc4dd0a1892b3f6432f502f9cfb80a7 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Mon, 4 Sep 2023 19:46:02 +0000 Subject: [PATCH 08/17] use witness.gz and acir.gz --- .../cpp/barretenberg/acir_tests/run_acir_tests.sh | 8 ++++---- .../barretenberg/cpp/src/barretenberg/bb/main.cpp | 4 ++-- circuits/cpp/barretenberg/ts/src/main.ts | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh index 46f65742ed16..19f2eeb2ba60 100755 --- a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh +++ b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh @@ -41,7 +41,7 @@ function test() { return fi - if [[ ! -f ./$1/target/$dir_name.bytecode || ! -f ./$1/target/witness.tr ]]; then + if [[ ! -f ./$1/target/acir.gz || ! -f ./$1/target/witness.gz ]]; then echo -e "\033[33mSKIPPED\033[0m (uncompiled)" return fi @@ -50,9 +50,9 @@ function test() { set +e if [ -n "${VERBOSE:-}" ]; then - $BB prove_and_verify -v -c $CRS_PATH -b ./target/$dir_name.bytecode + $BB prove_and_verify -v -c $CRS_PATH -b ./target/acir.gz else - $BB prove_and_verify -c $CRS_PATH -b ./target/$dir_name.bytecode > /dev/null 2>&1 + $BB prove_and_verify -c $CRS_PATH -b ./target/acir.gz > /dev/null 2>&1 fi result=$? set -eu @@ -62,7 +62,7 @@ function test() { else echo -e "\033[31mFAILED\033[0m" # Run again verbose. - $BB prove_and_verify -v -c $CRS_PATH -b ./target/$dir_name.bytecode + $BB prove_and_verify -v -c $CRS_PATH -b ./target/acir.gz exit 1 fi diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp index 35365ada13a1..079811598c9e 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp @@ -296,8 +296,8 @@ int main(int argc, char* argv[]) std::string command = args[0]; - std::string bytecode_path = getOption(args, "-b", "./target/main.bytecode"); - std::string witness_path = getOption(args, "-w", "./target/witness.tr"); + std::string bytecode_path = getOption(args, "-b", "./target/acir.gz"); + std::string witness_path = getOption(args, "-w", "./target/witness.gz"); std::string proof_path = getOption(args, "-p", "./proofs/proof"); std::string vk_path = getOption(args, "-k", "./target/vk"); CRS_PATH = getOption(args, "-c", "./crs"); diff --git a/circuits/cpp/barretenberg/ts/src/main.ts b/circuits/cpp/barretenberg/ts/src/main.ts index 95140bea0e84..f67144e7c6a4 100755 --- a/circuits/cpp/barretenberg/ts/src/main.ts +++ b/circuits/cpp/barretenberg/ts/src/main.ts @@ -248,8 +248,8 @@ function handleGlobalOptions() { program .command('prove_and_verify') .description('Generate a proof and verify it. Process exits with success or failure code.') - .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/main.bytecode') - .option('-w, --witness-path ', 'Specify the witness path', './target/witness.tr') + .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/acir.gz') + .option('-w, --witness-path ', 'Specify the witness path', './target/witness.gz') .option('-r, --recursive', 'prove and verify using recursive prover and verifier', false) .action(async ({ bytecodePath, witnessPath, recursive, crsPath }) => { handleGlobalOptions(); @@ -260,8 +260,8 @@ program program .command('prove') .description('Generate a proof and write it to a file.') - .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/main.bytecode') - .option('-w, --witness-path ', 'Specify the witness path', './target/witness.tr') + .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/acir.gz') + .option('-w, --witness-path ', 'Specify the witness path', './target/witness.gz') .option('-r, --recursive', 'prove using recursive prover', false) .option('-o, --output-path ', 'Specify the proof output path', './proofs/proof') .action(async ({ bytecodePath, witnessPath, recursive, outputPath, crsPath }) => { @@ -272,7 +272,7 @@ program program .command('gates') .description('Print gate count to standard output.') - .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/main.bytecode') + .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/acir.gz') .action(async ({ bytecodePath: bytecodePath }) => { handleGlobalOptions(); await gateCount(bytecodePath); @@ -293,7 +293,7 @@ program program .command('contract') .description('Output solidity verification key contract.') - .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/main.bytecode') + .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/acir.gz') .option('-o, --output-path ', 'Specify the path to write the contract', './target/contract.sol') .requiredOption('-k, --vk ', 'path to a verification key. avoids recomputation.') .action(async ({ outputPath, vk }) => { @@ -304,7 +304,7 @@ program program .command('write_vk') .description('Output verification key.') - .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/main.bytecode') + .option('-b, --bytecode-path ', 'Specify the bytecode path', './target/acir.gz') .requiredOption('-o, --output-path ', 'Specify the path to write the key') .action(async ({ bytecodePath, outputPath, crsPath }) => { handleGlobalOptions(); From 16079ee0190104172ddff9c8ed31cb9c7ff68cb7 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Mon, 4 Sep 2023 20:11:08 +0000 Subject: [PATCH 09/17] change files in bin-test --- .../cpp/barretenberg/cpp/bin-test/target/acir.gz | Bin 0 -> 1313 bytes .../cpp/bin-test/target/main.bytecode | Bin 1312 -> 0 bytes .../barretenberg/cpp/bin-test/target/witness.gz | Bin 0 -> 8388 bytes .../barretenberg/cpp/bin-test/target/witness.tr | Bin 8258 -> 0 bytes .../cpp/barretenberg/ts/bin-test/target/acir.gz | Bin 0 -> 1313 bytes .../ts/bin-test/target/main.bytecode | Bin 1312 -> 0 bytes .../barretenberg/ts/bin-test/target/witness.gz | Bin 0 -> 8388 bytes .../barretenberg/ts/bin-test/target/witness.tr | Bin 8258 -> 0 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 circuits/cpp/barretenberg/cpp/bin-test/target/acir.gz delete mode 100644 circuits/cpp/barretenberg/cpp/bin-test/target/main.bytecode create mode 100644 circuits/cpp/barretenberg/cpp/bin-test/target/witness.gz delete mode 100644 circuits/cpp/barretenberg/cpp/bin-test/target/witness.tr create mode 100644 circuits/cpp/barretenberg/ts/bin-test/target/acir.gz delete mode 100644 circuits/cpp/barretenberg/ts/bin-test/target/main.bytecode create mode 100644 circuits/cpp/barretenberg/ts/bin-test/target/witness.gz delete mode 100644 circuits/cpp/barretenberg/ts/bin-test/target/witness.tr diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/acir.gz b/circuits/cpp/barretenberg/cpp/bin-test/target/acir.gz new file mode 100644 index 0000000000000000000000000000000000000000..d1fe5b039c4050ee4b3e8e427d15665965d95cfa GIT binary patch literal 1313 zcmcK1k5f{2003}JP|HM7MEr$IPgiZa^@}tX_G8wyR%4slb(CB0orwCrcw3ucl*>%Q zAJA)C+}T@Nx;V>I;URA*J?ZtIl$Xu*y!^EL%kh1i zN7rPmTq)#x<>D;OM+^q_bNc;3m{OIM#e|Y+&Lp-o**_wQQjM~9p^PCkeia&V6^$)K zna@#n3`(y@V-BEEHZ&m%FyUJG?B^=ui~?^`HX&kdD76CQ<8uZXWDhe(dqPwKHqTucTe$)v-2x>w+6kG#-_+k%^}@Qaox>9$C{## zHHXbNCCr(WP*h2TJs~{AkW_nk!i8WGP*g zz0RL!!~45}>mFQ>_Lf&kUWFX5?wH=t)BBs3Ht7obTi!UmuDrLy8~VHN&63Gcc^6Ny zE~EBH#@P^qe7B+QJwr{gK^bSL78n#%UB4kr2o4U`jDQi zvApwt?8L_N1}k1q+w|-2&4nEq?)#4H`7DuhfhaDN5c13~9LE&5u)m9@Ab~{x+ zgnWzLQg>cOim(B-{yB0C>lJp^BSNfSsJ9`dSf9JI3lU?3Zv7lmF1X3;tU?Y8ZZq}$ z$Txyps?IA&pR|m)q0J%&?YXnULaI$V9MG}G_;k(S!KjIfM8ZN zQ4hodtBN=efWt}<7eNWvs`OBOO(%wWkgv2I_OTaJo=~6q#N8e+seNUC^TOw;EXXVP z`uMZgJ3X+k`mMPXzX+loqoulW5at;1;5R^`W6Yy_OZst5G`x}w=bCA{J~Ej5NQpO- zEUrbVbCDG8!@c-VB!fG;S2sc~=Z*~HIx?O+HmsW^ml#dycr6)WG^gwClFN*b+VNI0 z)@W(hO_71dhhiKfnZ{AE&Oy?QBQJ3y$u^F?)cHt%sfmrBA?Z>xTQ^89l|E{~A1ru+ z5B?xtocI6YTtUvZ{G6@(a<+eO-m=HM4VbqcGH*YzUjEpdw2>EAl)SNLdSQ&yGm_V+ zEg&6yno0n6uN3CWM+8kc!!a z+5>=tjk`6OARTkKwPk>ZO)@o9utH#EYO}!_!DE#s1*{U-RoZ-zDVWIBT&B+^GI$F; zGt?~O3{{+ip9fKb(Olgq2o;Q2a6L#6j9GNAL8UybrlWbqn8L)`V`AJl#iyAf+Dx&) z#3W7Zgj0Q!nnvH95#y!B#pj3qEF7QBYzujxQIYLzY`Bx%aC38Gq(MGY($-3MeP%y6 KBwQQg=l2gwqm()T literal 0 HcmV?d00001 diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/main.bytecode b/circuits/cpp/barretenberg/cpp/bin-test/target/main.bytecode deleted file mode 100644 index 8cb63950a99afff9a0a64f9f079dfb8290b3c849..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1312 zcmV+*1>gD~iwFP!00000|LxdgjAUsTK;iDOr^mK!tH-uIv$ip|ZQHhOYi*8g&-U!8 z^y$rH|L!KUoAgbdoZMTLPF3Ej?^b^ugM)%%28AEd?FW{Jf}$WQqWO4?pz!C%LTtoA zT*O0sBtSxhAQ2KH36dfik|PCDA{A024bmbV(jx;hA`>zr3$h{`vLgp_A{TNa5Aq@( z@}mF>q7VwB2#TT@ilYQdq7+J_49cP$%A*28Q4y6;8C6gf)leNZP!qLK8+A|@^-v!T z&=8H#7){U=&Cnbz&=RfC8g0-P?a&?_&=D`-MZAQU@d{qWYj_=R;7z=RxA6|%#d~<) zSw?r3?VRg}_y`~46MTwJ=!`Dtif-tR9_Wc)=#4(;i+<>j0T_ru7>pqpieVUz5g3V4 z7>zL)i*Xo_37CjUn2afyifNdR8JLM#n2kA@i+Pxj1z3nhSd1lDie*@i6Th(~ygC-?(lcp4P`27?g=Q4tN%5hJkHAQoaH4&ovn z;v)ePA_R$$7)g*6$&ef=kP@ko8flOg>5v{7kP(@X8Cj4O*^nJMkQ2F(8+niy`H&w4 zP!NSs7)4MN#ZVk2P!gq38f8!xjl{=S;{KK4in6nCVZh^+IF>Ndx z+s3hRZ9E&_Ca?)@h)rY@+axxrO=gqZ6gH(zWmDTUHmyx()7uO-qs?S9+blM#&1SRP z95$!TWpmp+Hm}WR^VLQ-cGO+?Ib(d zPO($%G&|kSuruu}JKN5&bL~7k-!8BV?IOF_F0o7PGP~Tauq*84c}68vMio>=HB?6p)I=@RMjg~eJ=8~o$Qxhejn9VK$QxgH|7$nC)1IHPXYDzA z-d?a5?InBJUa?p0HGAFOus7{3d)wZzckMlU-#)Mp?IZixKCu!1fJAs|0}D`~!8VGG zYNOfcHinI9W7*g?j*V;M+4werO=v@GBAeJIu}N(*o7|?bDQzm7+NQB-Z91FYX0RD; zCY#x2u~}_4o89KHIc+YR+vc%(Z9bdd7O(|vAzRoMu|;h$TilkgC2c8N+Lp0pZ8=-s zRNe)h%}xKPPfwpDCZTg_ItHEc~=%htAaY+YN=*0&8JJ}AD9hMYG- zV>CfiG(&T=KufejYqUXIv_pGz2o8V4e(oc8?}GmSyLXYhb? W_k4EXB94D+UHub^Se}C_82|u|MR5-R diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/witness.gz b/circuits/cpp/barretenberg/cpp/bin-test/target/witness.gz new file mode 100644 index 0000000000000000000000000000000000000000..b250bdfe7bcba64748c742805a950877e2a6b4fe GIT binary patch literal 8388 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 aVXU{mFxER<80&Et#`*`PB6RwQXaE4t>{CJj literal 0 HcmV?d00001 diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/witness.tr b/circuits/cpp/barretenberg/cpp/bin-test/target/witness.tr deleted file mode 100644 index 82e8cf3ff57ff728998a3c03148be7a7c94acc09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8258 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 KBwQQg=l2gwqm()T literal 0 HcmV?d00001 diff --git a/circuits/cpp/barretenberg/ts/bin-test/target/main.bytecode b/circuits/cpp/barretenberg/ts/bin-test/target/main.bytecode deleted file mode 100644 index 8cb63950a99afff9a0a64f9f079dfb8290b3c849..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1312 zcmV+*1>gD~iwFP!00000|LxdgjAUsTK;iDOr^mK!tH-uIv$ip|ZQHhOYi*8g&-U!8 z^y$rH|L!KUoAgbdoZMTLPF3Ej?^b^ugM)%%28AEd?FW{Jf}$WQqWO4?pz!C%LTtoA zT*O0sBtSxhAQ2KH36dfik|PCDA{A024bmbV(jx;hA`>zr3$h{`vLgp_A{TNa5Aq@( z@}mF>q7VwB2#TT@ilYQdq7+J_49cP$%A*28Q4y6;8C6gf)leNZP!qLK8+A|@^-v!T z&=8H#7){U=&Cnbz&=RfC8g0-P?a&?_&=D`-MZAQU@d{qWYj_=R;7z=RxA6|%#d~<) zSw?r3?VRg}_y`~46MTwJ=!`Dtif-tR9_Wc)=#4(;i+<>j0T_ru7>pqpieVUz5g3V4 z7>zL)i*Xo_37CjUn2afyifNdR8JLM#n2kA@i+Pxj1z3nhSd1lDie*@i6Th(~ygC-?(lcp4P`27?g=Q4tN%5hJkHAQoaH4&ovn z;v)ePA_R$$7)g*6$&ef=kP@ko8flOg>5v{7kP(@X8Cj4O*^nJMkQ2F(8+niy`H&w4 zP!NSs7)4MN#ZVk2P!gq38f8!xjl{=S;{KK4in6nCVZh^+IF>Ndx z+s3hRZ9E&_Ca?)@h)rY@+axxrO=gqZ6gH(zWmDTUHmyx()7uO-qs?S9+blM#&1SRP z95$!TWpmp+Hm}WR^VLQ-cGO+?Ib(d zPO($%G&|kSuruu}JKN5&bL~7k-!8BV?IOF_F0o7PGP~Tauq*84c}68vMio>=HB?6p)I=@RMjg~eJ=8~o$Qxhejn9VK$QxgH|7$nC)1IHPXYDzA z-d?a5?InBJUa?p0HGAFOus7{3d)wZzckMlU-#)Mp?IZixKCu!1fJAs|0}D`~!8VGG zYNOfcHinI9W7*g?j*V;M+4werO=v@GBAeJIu}N(*o7|?bDQzm7+NQB-Z91FYX0RD; zCY#x2u~}_4o89KHIc+YR+vc%(Z9bdd7O(|vAzRoMu|;h$TilkgC2c8N+Lp0pZ8=-s zRNe)h%}xKPPfwpDCZTg_ItHEc~=%htAaY+YN=*0&8JJ}AD9hMYG- zV>CfiG(&T=KufejYqUXIv_pGz2o8V4e(oc8?}GmSyLXYhb? W_k4EXB94D+UHub^Se}C_82|u|MR5-R diff --git a/circuits/cpp/barretenberg/ts/bin-test/target/witness.gz b/circuits/cpp/barretenberg/ts/bin-test/target/witness.gz new file mode 100644 index 0000000000000000000000000000000000000000..b250bdfe7bcba64748c742805a950877e2a6b4fe GIT binary patch literal 8388 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 aVXU{mFxER<80&Et#`*`PB6RwQXaE4t>{CJj literal 0 HcmV?d00001 diff --git a/circuits/cpp/barretenberg/ts/bin-test/target/witness.tr b/circuits/cpp/barretenberg/ts/bin-test/target/witness.tr deleted file mode 100644 index 82e8cf3ff57ff728998a3c03148be7a7c94acc09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8258 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 Date: Mon, 4 Sep 2023 21:00:42 +0000 Subject: [PATCH 10/17] remove utf8 when reading file --- circuits/cpp/barretenberg/ts/src/main.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/circuits/cpp/barretenberg/ts/src/main.ts b/circuits/cpp/barretenberg/ts/src/main.ts index f67144e7c6a4..bba81b18c925 100755 --- a/circuits/cpp/barretenberg/ts/src/main.ts +++ b/circuits/cpp/barretenberg/ts/src/main.ts @@ -17,22 +17,23 @@ const debug = createDebug('bb.js'); const MAX_CIRCUIT_SIZE = 2 ** 19; function getBytecode(bytecodePath: string) { - const encodedCircuit = readFileSync(bytecodePath, 'utf-8'); + const encodedCircuit = readFileSync(bytecodePath); const decompressed = gunzipSync(encodedCircuit); return decompressed; } -async function getGates(bytecodePath: string, api: BarretenbergApiAsync) { - const { total } = await computeCircuitSize(bytecodePath, api); - return total; -} - function getWitness(witnessPath: string) { const data = readFileSync(witnessPath); const decompressed = gunzipSync(data); return decompressed; } +async function getGates(bytecodePath: string, api: BarretenbergApiAsync) { + const { total } = await computeCircuitSize(bytecodePath, api); + return total; +} + + async function computeCircuitSize(bytecodePath: string, api: BarretenbergApiAsync) { debug(`computing circuit size...`); const bytecode = getBytecode(bytecodePath); From 603a7a785a2cbbf490411aee45e120700a9f7203 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Mon, 4 Sep 2023 21:03:34 +0000 Subject: [PATCH 11/17] formatting --- circuits/cpp/barretenberg/ts/src/main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/circuits/cpp/barretenberg/ts/src/main.ts b/circuits/cpp/barretenberg/ts/src/main.ts index bba81b18c925..62ce4dd0f31f 100755 --- a/circuits/cpp/barretenberg/ts/src/main.ts +++ b/circuits/cpp/barretenberg/ts/src/main.ts @@ -33,7 +33,6 @@ async function getGates(bytecodePath: string, api: BarretenbergApiAsync) { return total; } - async function computeCircuitSize(bytecodePath: string, api: BarretenbergApiAsync) { debug(`computing circuit size...`); const bytecode = getBytecode(bytecodePath); From 51eb53b6ca5dd6230b70a4b88739c6a07a0e6745 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Mon, 4 Sep 2023 21:33:00 +0000 Subject: [PATCH 12/17] modify bb bash scripts --- .../cpp/barretenberg/acir_tests/flows/prove_and_verify.sh | 4 ++-- circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh b/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh index 945b6194da00..881e90ad9da5 100755 --- a/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh +++ b/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh @@ -4,7 +4,7 @@ set -eu NAME=$(basename $PWD) if [ -n "$VERBOSE" ]; then - $BIN prove_and_verify -v -c $CRS_PATH -b ./target/$NAME.bytecode + $BIN prove_and_verify -v -c $CRS_PATH -b ./target/acir.gz else - $BIN prove_and_verify -c $CRS_PATH -b ./target/$NAME.bytecode > /dev/null 2>&1 + $BIN prove_and_verify -c $CRS_PATH -b ./target/acir.gz > /dev/null 2>&1 fi \ No newline at end of file diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh index ef94f6df3e6c..abf872b39b6b 100755 --- a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh +++ b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh @@ -7,7 +7,7 @@ set -eu BIN=${BIN:-../cpp/build/bin/bb} FLOW=${FLOW:-prove_and_verify} CRS_PATH=~/.bb-crs -BRANCH=master +BRANCH=kw/remove-base64-decode VERBOSE=${VERBOSE:-} NAMED_TEST=${1:-} @@ -73,7 +73,7 @@ else continue fi - if [[ ! -f ./$TEST_NAME/target/$TEST_NAME.bytecode || ! -f ./$TEST_NAME/target/witness.tr ]]; then + if [[ ! -f ./$TEST_NAME/target/acir.gz || ! -f ./$TEST_NAME/target/witness.gz ]]; then echo -e "\033[33mSKIPPED\033[0m (uncompiled)" continue fi From 660becd88f4d290c333327eec8fdb19f25d16fe4 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Mon, 4 Sep 2023 21:35:07 +0000 Subject: [PATCH 13/17] rename extension --- .../cpp/barretenberg/acir_tests/headless-test/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts b/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts index 25ebf033248a..ec92497f4128 100644 --- a/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts +++ b/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts @@ -61,12 +61,12 @@ program .option( "-b, --bytecode-path ", "Specify the bytecode path", - "./target/main.bytecode" + "./target/acir.gz" ) .option( "-w, --witness-path ", "Specify the witness path", - "./target/witness.tr" + "./target/witness.gz" ) .action(async ({ bytecodePath, witnessPath, recursive }) => { const acir = readBytecodeFile(bytecodePath); From e1f12d2736166213f41be809c48f1d2c94a5ae32 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Mon, 4 Sep 2023 21:46:37 +0000 Subject: [PATCH 14/17] expand description --- .../cpp/barretenberg/acir_tests/headless-test/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts b/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts index ec92497f4128..f65d83df87d0 100644 --- a/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts +++ b/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts @@ -60,12 +60,12 @@ program ) .option( "-b, --bytecode-path ", - "Specify the bytecode path", + "Specify the path to the gzip encoded ACIR bytecode", "./target/acir.gz" ) .option( "-w, --witness-path ", - "Specify the witness path", + "Specify the path to the gzip encoded ACIR witness", "./target/witness.gz" ) .action(async ({ bytecodePath, witnessPath, recursive }) => { From 339053e27d421b6644417c4016ac1eff05c3c804 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Mon, 4 Sep 2023 21:46:59 +0000 Subject: [PATCH 15/17] use acir.gz instead of DIR_NAME.bytecode --- circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh | 4 +--- .../cpp/barretenberg/acir_tests/flows/prove_and_verify.sh | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh b/circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh index 1055f712a4c1..dda4353fb6f0 100755 --- a/circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh +++ b/circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh @@ -1,15 +1,13 @@ #!/bin/sh set -eu -NAME=$(basename $PWD) - if [ -n "${VERBOSE:-}" ]; then VFLAG="-v" else VFLAG="" fi -BFLAG="-b ./target/${NAME}.bytecode" +BFLAG="-b ./target/acir.gz" FLAGS="-c $CRS_PATH $VFLAG" # Test we can perform the proof/verify flow. diff --git a/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh b/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh index 881e90ad9da5..216c3742a65a 100755 --- a/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh +++ b/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh @@ -1,8 +1,6 @@ #!/bin/sh set -eu -NAME=$(basename $PWD) - if [ -n "$VERBOSE" ]; then $BIN prove_and_verify -v -c $CRS_PATH -b ./target/acir.gz else From 98f47a2519fcf52aa26fb4645500c93191171a01 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Mon, 4 Sep 2023 22:08:06 +0000 Subject: [PATCH 16/17] remove base64 encoding as this is ran on acir_tests --- .../cpp/barretenberg/acir_tests/headless-test/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts b/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts index f65d83df87d0..5c91dc8fa15f 100644 --- a/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts +++ b/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts @@ -38,8 +38,8 @@ function formatAndPrintLog(message: string): void { } const readBytecodeFile = (path: string): Uint8Array => { - const data = fs.readFileSync(path, "ascii"); - const buffer = gunzipSync(Buffer.from(data, "base64")); + const data = fs.readFileSync(path); + const buffer = gunzipSync(data); return buffer; }; From 5b32bef3e96ce1418ceb2ca2426d52d8958474ab Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 5 Sep 2023 09:34:31 +0100 Subject: [PATCH 17/17] Update run_acir_tests.sh --- circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh index abf872b39b6b..7b97f2873856 100755 --- a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh +++ b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh @@ -7,7 +7,7 @@ set -eu BIN=${BIN:-../cpp/build/bin/bb} FLOW=${FLOW:-prove_and_verify} CRS_PATH=~/.bb-crs -BRANCH=kw/remove-base64-decode +BRANCH=master VERBOSE=${VERBOSE:-} NAMED_TEST=${1:-}