Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent field aliasing on Withdraw which would allow double-spend #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent field aliasing on Withdraw which would allow double-spend #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion circuit/miximus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace ethsnarks {
class mod_miximus : public GadgetT
{
public:
typedef MiMC_hash_gadget HashT;
typedef MiMC_e7_hash_gadget HashT;
const size_t tree_depth = MIXIMUS_TREE_DEPTH;

// public inputs
Expand Down
2 changes: 1 addition & 1 deletion ethsnarks
Open in desktop
Submodule ethsnarks updated 35 files
+3 −1 .solhint.json
+23 −2 Makefile
+15 −15 contracts/ETEC.sol
+3 −3 contracts/MerkleTree.sol
+0 −98 contracts/MiMC.sol
+43 −0 contracts/MiMC_hash.sol
+71 −0 contracts/MiMC_permutation.sol
+341 −0 contracts/MiMCpe5_generated.sol
+284 −0 contracts/MiMCpe7_generated.sol
+1 −1 contracts/ModArith.sol
+0 −157 contracts/Pairing.sol
+5 −55 contracts/Verifier.sol
+1 −1 contracts/wNAF.sol
+1 −0 ethsnarks/mimc/__init__.py
+173 −0 ethsnarks/mimc/contract.py
+66 −0 ethsnarks/mimc/contract_sol.py
+85 −69 ethsnarks/mimc/permutation.py
+7 −0 ethsnarks/sha3.py
+11 −0 migrations/2_MiMC_permutation.js
+0 −9 migrations/2_libraries.js
+10 −0 migrations/3_MiMC_hash.js
+9 −0 migrations/4_MerkleTree.js
+9 −6 package.json
+97 −32 src/gadgets/mimc.hpp
+2 −2 src/r1cs_gg_ppzksnark_zok/README.md
+1 −1 src/test/test_merkle_tree.cpp
+2 −2 src/test/test_mimc.cpp
+1 −1 src/test/test_mimc_hash.cpp
+8 −1 src/utils.cpp
+48 −0 test/TestMiMC.js
+15 −4 test/TestMiMC.sol
+45 −29 test/TestVerifier.sol
+39 −0 test/test_mimc_evm.py
+6 −0 truffle.js
+23 −0 utils/generate-artifacts.js
16 changes: 12 additions & 4 deletions solidity/contracts/Miximus.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pragma solidity ^0.5.0;

import "../../ethsnarks/contracts/Verifier.sol";
import "../../ethsnarks/contracts/MerkleTree.sol";
import "../../ethsnarks/contracts/MiMC.sol";
import "../../ethsnarks/contracts/MiMC_hash.sol";


contract Miximus
Expand Down Expand Up @@ -63,7 +63,9 @@ contract Miximus


/**
* Returns leaf offset
* Inserts a new leaf into the tree upon a deposit of the correct amount
*
* Returns the index of the new leaf, and the new merkle root for the tree
*/
function Deposit(uint256 leaf)
public payable returns (uint256 new_root, uint256 new_offset)
Expand All @@ -83,7 +85,7 @@ contract Miximus
{
uint256[] memory vals = new uint256[](1);
vals[0] = secret;
return MiMC.Hash(vals);
return MiMC_hash.MiMCpe7_mp(vals, 0);
}


Expand Down Expand Up @@ -132,7 +134,7 @@ contract Miximus
inputs_to_hash[1] = in_nullifier;
inputs_to_hash[2] = in_exthash;

return MiMC.Hash(inputs_to_hash);
return MiMC_hash.MiMCpe7_mp(inputs_to_hash, 0);
}


Expand Down Expand Up @@ -168,6 +170,12 @@ contract Miximus
)
public
{
// Clamp inputs to the scalar field
// This avoids aliasing, which would allow double spend!
uint256 Q = Verifier.ScalarField();
in_root = in_root % Q;
in_nullifier = in_nullifier % Q;

require( false == nullifiers[in_nullifier], "Cannot double-spend" );

require( true == roots[in_root], "Must specify known merkle tree root" );
Expand Down