172 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
poma	1d258715e0	make operator not payable	2019-11-02 11:40:19 +03:00
poma	b578213b0c	check that eth value in ERC20 deposit is zero	2019-11-02 11:39:07 +03:00
poma	bec65f217f	allow fee equal to denomination	2019-11-02 11:24:16 +03:00
Roman Semenov	bc134bbfe8	Merge pull request #13 from Agonical/patch-1 ... Update README.md	2019-11-02 05:10:01 +03:00
Alexey	0484408e82	ERC20Mixer refund tests	2019-10-17 19:19:35 +03:00
Alexey	a13a7306e2	ETHMixer refund test	2019-10-17 18:54:21 +03:00
Roman Semenov	63771560c6	Remove unused var	2019-10-17 16:57:39 +03:00
Roman Semenov	4ce8d1c2ce	fix refund	2019-10-17 16:35:23 +03:00
Agonical	dcbf2ab693	Update README.md	2019-10-15 18:45:14 -07:00
poma	0cbc0ad79b	refund asserts for ETH mixer	2019-10-07 07:15:06 +03:00
poma	c889a88b4d	fix tests, reorder constructor parameters	2019-10-06 08:36:01 +03:00
poma	a77c04ea5a	add refund mechanism for token withdrawal	2019-10-06 08:09:26 +03:00
poma	c7f0ca9dfa	add erc20 to integration test	2019-10-04 19:27:19 +03:00
poma	7a184d67d2	some fixes	2019-10-04 19:17:28 +03:00
poma	55b3644fd7	single argument proof	2019-10-04 18:20:47 +03:00
poma	6035255a49	tests, more docs, minor refactoring	2019-10-04 17:27:47 +03:00
poma	5c3c78e097	allow verifier keys update, and an option to permanently disable it	2019-10-04 16:43:15 +03:00
poma	3624cb7531	fix build command	2019-10-04 16:01:42 +03:00
poma	71b767ade1	rename mimc mentions to a generic hasher	2019-10-04 15:38:08 +03:00
poma	6b067f067f	organize npm commands	2019-10-04 14:35:45 +03:00
poma	bb80cd9788	update circom and snarkjs	2019-09-27 17:20:50 +03:00
Roman Storm	5ef6e33c78	Merge pull request #9 from peppersec/erc20_support ... Erc20 support	2019-09-16 10:43:17 -07:00
Alexey	9e7aa186dc	readme bug	2019-09-16 14:14:49 +03:00
Alexey	9132aeb6d5	max leaves count fix	2019-09-16 13:07:14 +03:00
Roman Storm	a64f41a44e	merge and add cli.js erc20 commands	2019-09-14 11:21:53 -07:00
Roman Storm	13e01755a6	WIP	2019-09-13 18:05:08 -07:00
Alexey	0689d76df1	leafs = 2**(levels - 1)	2019-09-11 11:25:32 +03:00
Alexey	3404acef48	fix leaf count	2019-09-11 11:17:32 +03:00
Alexey	3f4e686899	fix cli.js	2019-09-10 17:31:19 +03:00
Pertsev Alexey	e75740becb	Merge branch 'master' into erc20_support	2019-09-10 17:28:01 +03:00
Pertsev Alexey	7ed13aa8e0	Merge pull request #10 from DryginAlexander/master ... fix Merkle tree capacity	2019-09-10 17:00:02 +03:00
Alexey	010837f92b	fix tests	2019-09-10 16:31:34 +03:00
poma	9009b9c56d	custom relayer	2019-09-06 23:20:49 -04:00
Roman Storm	50872ac342	change fee structure	2019-09-06 17:22:30 -04:00
poma	d39eb3ca4b	add comments, improve readability, improve readme, fix default values	2019-09-05 17:43:06 -04:00
Drygin	374dd420f5	fix test of capacity of Merkle tree	2019-09-04 16:08:11 +03:00
Drygin	ec30e2d357	fix merkle tree capacity	2019-09-04 13:31:10 +03:00
Alexey	0e0c87d533	CLI fix	2019-09-02 17:56:10 +03:00
Alexey	e0ec575745	gas tuning	2019-08-30 13:21:53 +03:00
Alexey	b8c0c1898f	test with real DAI and USDT	2019-08-30 13:06:17 +03:00
Alexey	5006006a20	eslint vuln fix	2019-08-28 11:15:49 +03:00
Alexey	9f33aadd9d	additional eth for the recipient	2019-08-27 23:42:24 +03:00
Alexey	0f5a5df522	withdraw test	2019-08-24 13:18:52 +03:00
Alexey	b8142d03bb	erc20 mixer support WIP	2019-08-20 23:39:21 +03:00
poma	51b06ed661	test cli in travis	2019-08-06 14:51:52 +03:00
Roman Semenov	bc92cd30be	Merge pull request #7 from noiach/master ... fix splitting note in cli	2019-08-06 14:50:13 +03:00
noiach	11b3c98ea2	fix splitting note in cli	2019-08-06 15:20:45 +10:00
Alexey	7997fe2582	fix bugs (public verifier)	2019-08-04 20:57:01 +03:00
Alexey	9b4d3bc34e	operator role	2019-08-02 20:12:30 +03:00
Alexey	aa88f1c04e	bump solidity version	2019-08-02 15:12:11 +03:00