149 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
poma	1498c3a739	split extra constraints back to 2	2019-08-02 12:24:50 +03:00
poma	67ebbfbcb4	update snarkjs version	2019-08-02 12:24:50 +03:00
Roman Storm	5634c0cfb4	Merge branch 'master' of github.com:poma/mixer-huyixer	2019-08-01 17:20:00 -07:00
Roman Storm	e1e989986f	skip migrations	2019-08-01 17:19:52 -07:00
poma	ce9789584e	fix merkle tree depth	2019-08-01 22:31:18 +03:00
poma	f65058dad3	add explicit constraints to fee and receiver inputs	2019-08-01 22:29:40 +03:00
poma	5e6c7392de	add explicit constraints to fee and receiver inputs	2019-08-01 22:12:12 +03:00
Roman Storm	a657860418	Merge pull request #6 from peppersec/reduce-nullifier-bits ... reduce nullifier bits to 31	2019-08-01 10:00:25 -07:00
Roman Storm	42c65b54d5	Merge pull request #5 from peppersec/add_pause ... add pauseDeposits	2019-08-01 10:00:07 -07:00
Roman Storm	3b03a5ea4c	add pause account setter	2019-08-01 09:58:34 -07:00
poma	c7953ae2c6	reduce nullifier bits to 31	2019-08-01 17:49:34 +03:00
poma	e387025992	Merge branch 'master' of github.com:poma/mixer-huyixer	2019-08-01 16:46:46 +03:00
poma	66f6ee9589	cli auto command	2019-08-01 16:46:41 +03:00
Alexey	e116dcee67	fix hardcoded fee in tests	2019-08-01 12:58:57 +03:00
Alexey	00ba6e8685	gas usage	2019-08-01 12:44:20 +03:00
Alexey	4234e56904	update websnark	2019-08-01 12:35:44 +03:00
Alexey	8d50fe1992	remove PAUSEACCOUNT from .env	2019-08-01 11:55:18 +03:00
Roman Storm	d91435dd00	add pauseDeposits	2019-08-01 01:41:22 -07:00
Roman Semenov	4663caa588	Merge pull request #4 from peppersec/fix_overflow ... fix overflow	2019-08-01 10:56:50 +03:00
Roman Storm	9b14a22b0d	remove comment	2019-08-01 00:34:59 -07:00
Roman Storm	242a87569b	clean up tests	2019-08-01 00:34:22 -07:00
Roman Storm	791875ddc5	fix overflow	2019-08-01 00:33:12 -07:00
Roman Semenov	787d1cc5d0	Update README.md	2019-07-25 21:30:50 +03:00