-
Notifications
You must be signed in to change notification settings - Fork 34
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.
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
Feature/erc20 #13
Feature/erc20 #13
Conversation
This reverts commit e6dc9fd.
TODO: `is MerkelTree` and `insert(leaf)`
miximusTrees[_erc20Address].instantiated = true; | ||
} | ||
require(miximusTrees[_erc20Address].ercInstance.transferFrom(msg.sender, address(this), 1)); | ||
insert(leaf); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@barryWhiteHat I don't know how I should modify that in order to have one MerkelTree per miximusTree
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe putting the MTree
structure into the miximusTree
such as
struct MiximusTree {
ERC20 ercInstance;
bool instantiated;
mapping (bytes32 => bool) roots;
mapping (bytes32 => bool) nullifiers;
Mtree mtree;
}
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes i think that will work.
Is it possible to split the proving & merkle code into a separate common library which is used by both the Ether and Token contracts? |
@HarryR I am not sure what you mean? Do you mean the reuse the zksnark witness generation for both? Or do you mean remove the |
Moved to #29 |
Added ERC20 support instead of erc.
Contract is available in
Miximus_ERC20.sol