From 0b183b7e3ff800daf3f63bb50987bfb6e3365cd5 Mon Sep 17 00:00:00 2001 From: yanyanho Date: Sun, 20 Sep 2020 12:47:10 +0800 Subject: [PATCH] fix the commit compute --- vk.json | 2 +- zeth/mixer_client.py | 4 ++-- zkclientapp/views.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vk.json b/vk.json index eedd957..e4a8b62 100644 --- a/vk.json +++ b/vk.json @@ -1 +1 @@ -{"alpha_g1": ["0x03ecf05bbcfbc53787c29de290d46e00e13ed06d607fc740bc5bdebf0063a66c", "0x25602dde5350b144cedc22735477124fdb9d7db2868e67d5899b8986619d5d28"], "beta_g2": [["0x15875fa12330733a0063cb2bfb823ffe68a5e124784b7cce589d421581d43425", "0x1fb78f55a67d0d74416e8fe0ae916b2949068c21252302a11f5e11f2f4136bb3"], ["0x2dac433199ba9e0605d42d1330be1a5f35717b03856d14b9e2d53a8399e0aefc", "0x021f0ea9e7071e1f7fb4b97ccbec9efc0a1dbbe6504bbdfe09f5ad56c4031626"]], "delta_g2": [["0x0ca76c0e2d42236fb33252375d2e6a4e7ea5ea347b3fe27ba4b660e1f0426a84", "0x20bf35073d75ca5bfc05e234249c6a4ffbc767740e521b677e422c26108bdd5a"], ["0x04c0e2eb239999e9786d8460a75409ff3e3459e6f6112da45ecfa0d86f0b94e2", "0x2b030deafb9c75aacdf9c4258b271cc8e814b99b6c24bd78bda7b4b375f99dd3"]], "abc_g1": [["0x1944093987238391ea80411e2b9f1028c1ecd2e9e5c6cc0b5e05a505c07cf965", "0x2fa65f513264f3ca2f053c76b85140dd10c92537ca2804a62de6d77f833fbd99"], ["0x1cb378c7989d609c31f8d26341dfbf79a9eb10d23ec6846f74ef595854151b7c", "0x061ac0549b534d40c51a714405311bcf6ce4522734fc77b7f97ed9c82e75ca9f"], ["0x125ef6054116f29a5844508e01ae67fc061a4a2c4358934445dbb5a86ca7772d", "0x0e0b07e4784eaa5d81890b81628abe9003ed8b39365cc42217cce23f233deebf"], ["0x253825f7505878e59fb42b6ea50834d523ae058820039f9e9e2436a70fd34793", "0x0c5018d593f31d197d405fa34a2f80028b6c209bfa79b55982ec73bcaacac430"], ["0x21190e9a6d58d4c0092571760af52196dec1fc1a890783fb4cb4db547e760f7f", "0x025c17159874dcc0e1ef966ee1524c3f943f94a8f9173144ee29b2f660900ecb"], ["0x298440eb46ff397779fe7d67a872d4c640b68d8da86ceb0ea428aa798623eb85", "0x1b39abf4f0221b41fbcbecb8567b4517b1cf91f404eaae0e3a800426cffb8886"], ["0x19d38991f26ae1e9e9e32ac3a6c1d294bb58bb14c3a4680c50fd600608f3919b", "0x2e7736762001080e8fc692e1f7ed5fe59608ecc756e0ddeac20227215939856c"], ["0x2927d5db9eade81efdf7ed6fc4caa02439944846aa2e7d6b42df431f5be1731b", "0x2e22f467f6d2222b854230f11cf5d679a4e9aacc812b3d4c301465dc66086ba7"], ["0x2cde0e5f701661d575f2e949c3d3e46b652ec427eb4d9b9ebc2c89bca1b2c3bd", "0x18c1d42fd341b303d3dda6c759dc8a462cca1530d1370ba65058a019c77b4fbb"], ["0x20da6687376f351a499e01b0a4e66342c6b457cd743f97e6a9ed7eb91e3ad124", "0x2d90f18402860be328db6da3fa25dba9e66daae358feee78828a42a0f443e204"], ["0x0d79f34129880989cab5c2bd269216fcdde661db54d315ec1ae5751a424fd350", "0x026ee119e0136ac47f28baa08ec251fd553d2d2c0a9b75f78f85f588d1d849a1"]]} \ No newline at end of file +{"alpha_g1": ["0x096f303415ea2333327365af41eecc2c2d26596a25f0f1ef6dbf48dfbbc94192", "0x0fc7eb583353e5b971303e6db8af04b796ec7e90e068f9e012483bc4307f6166"], "beta_g2": [["0x000dd8e08634a57e3133f9b2047685fafc9dc2135dd7139142ff1a476913aaa8", "0x1f08c4556ca9751fdbd0a0e9ab624e84f02f3be9d5a23d71a615bda5c84eb637"], ["0x160a15634d7a0b8c82bdde2ebc0f571c37bdc980c4b897619b921ba91e8f213d", "0x0f0aaabe526af0f6bd9fb60daeeb5784062bdf0ea32f09722f3ba1194ef10b06"]], "delta_g2": [["0x2abe82e78b7e0d63364398a78de4291e3c2a8a3517b659456fc6e0201230b9f7", "0x24d10ddd84df04829d9502e06be72f459034af81f06b93d22b4a49e92172480c"], ["0x09a7eafbc616e4292c2ebf43545c131c315434dc27b4ac1a06b3a77aa7c5d8e6", "0x1960350c69aaebf6e4b85012d111be91c22e2214dddd146a6d5191980cc36194"]], "abc_g1": [["0x2b099a93b156e0dddc87b3bd5621a47fc39e357c9286bb1d888ca54442138861", "0x1991a17e8279fd07169bf73300365da0d1dd297a3e4eb01c90665a2f0d55a8a9"], ["0x2590c4a255846bc1a194fa3bbb18ec3837501251c0fafbdd0dd0ea9a9c8eae21", "0x0d09df516272719f3a6e3c26a288e5030aca3a764eaa330525a312ade4f89a34"], ["0x2019ef4e1611a0f43dc533fb1c657e835cda62fabc6b22744fe3c6259b9b5369", "0x2dfa4bc3d1bd32863ed9be8b4addfcc7cb748c0f08ba44127f7a54bb4dd5dc15"], ["0x0153b0cd5ca82e36714516e3af8cd44a1ec97ec364d9481358e33dc12cbf6004", "0x2133a3b6cb5be664886598a86ad51fd9da51a16f1e4d64ba14739baf2bc86167"], ["0x2e624255e39527850520f419655dde821a41b8a0a2063de72cae9c8d6eff7a98", "0x2b249c60616851afe42cc399dd795424f86a1a669ada5b2fb2839b7857d8a71f"], ["0x146302bf75d4c9f26a128bc94506e0440f2c1373c146dbf16c743a41b99356e7", "0x282420e48a716c6e1de06a27ac134afd92dc948640fd756f62bba818824c8580"], ["0x045495c807c7b60b9232d3c2c14b57f84811747796e5eed8c047a9e594915c54", "0x02412aa261e9cdc3b230b7a926aef2251b18fefd7fc2a2414fcff8c3feb23104"], ["0x0f93585e11d9cff56ae4a0bb8edbaba2cc0fc600c7d087c57d13feea5d1b80b5", "0x293a5fa609bbc0498aecb4d5b1e8ea92c70d231de78500f62f5ea6fd483cebc8"], ["0x23a2c56ecd63c0c20da24372ee0891c760cbf3d3439c8956e1b34ea0fab6e0b6", "0x18b6ede82058552c89dee47a475c67cb2e912d14e91a485e66822eab7ab1c29c"], ["0x0d74ab68d38b56feabb27e64f4b0a3f2ef26830b00e9dcad1c56d3bf6ed102ea", "0x118ed918253da642b372562cc7af998980d2e34bd6db1faed0967218adc1168d"], ["0x095860be253c099dde8500f0dcd6862d0661237c7efd122c4a9582f5af5e1a11", "0x176fb8eb41191e96e260b982b4ca2e60ab85801264a731ef906de5d9f98fb8c1"]]} \ No newline at end of file diff --git a/zeth/mixer_client.py b/zeth/mixer_client.py index a83060b..ad210d9 100644 --- a/zeth/mixer_client.py +++ b/zeth/mixer_client.py @@ -171,9 +171,9 @@ def compute_commitment(zeth_note: ZethNote) -> bytes: inputs = [] inputs.append(int.from_bytes(bytes.fromhex(zeth_note.trap_r), byteorder="big")) apk = digest_to_binary_string(bytes.fromhex(zeth_note.apk)) - first_94bits_apk = apk[:94] + first_94bits_apk = apk[2:96] rho = digest_to_binary_string(bytes.fromhex(zeth_note.rho)) - first_94bits_rho = rho[:96] + first_94bits_rho = rho[2:96] value = digest_to_binary_string(bytes.fromhex(zeth_note.value)) left_leg_bin = first_94bits_apk + first_94bits_rho + value + "00" left_leg = int(left_leg_bin, 2) diff --git a/zkclientapp/views.py b/zkclientapp/views.py index ca1b4a8..57ce8fd 100644 --- a/zkclientapp/views.py +++ b/zkclientapp/views.py @@ -63,7 +63,7 @@ def deploy_contract(): print("all contract existed") return else: - token_address = resultBac[0][2] + token_address = resultBac[0]['conAddr'] print("deploy mixer contract on bac token contract of: ", token_address) poseidon_address = deployPoseidon() mixer_address = deploy(token_address, poseidon_address)