331 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Roman Semenov	447d0a86f4	Update README.md	2019-07-25 21:29:09 +03:00
Alexey	fc5eb51c3b	nullifier hash refactoring	2019-07-25 16:58:21 +03:00
Alexey	63f984b2d5	isSpent fix	2019-07-25 15:16:09 +03:00
Alexey	caaedbc959	leafs sort fix	2019-07-24 19:57:51 +03:00
Pertsev Alexey	46165bafc1	Merge pull request #3 from peppersec/prevent-griefing ... prevent nullifier griefing	2019-07-24 17:58:43 +03:00
Alexey	aa301c035c	readme fix	2019-07-24 17:09:37 +03:00
Roman Storm	e8fa073caf	fix tests	2019-07-23 13:00:45 -07:00
poma	14e15ba6c0	prevent nullifier griefing	2019-07-23 06:23:24 +03:00
Alexey	e6d103b875	Merge branch 'master' of github.com:poma/mixer-huyixer	2019-07-23 00:20:14 +03:00
Alexey	754172a5a4	fix a bug	2019-07-23 00:19:50 +03:00
Roman Storm	93efd2548b	add timestamp	2019-07-22 13:37:02 -07:00
Alexey	13b9a948dc	remove redundant event	2019-07-19 20:08:47 +03:00
poma	66754181f2	fix test, silence ganache in travis	2019-07-19 15:06:06 +03:00
poma	6443ed8a08	deploy contracts for test	2019-07-19 09:12:08 +03:00
poma	dbbd97f98b	travis fix timeout	2019-07-19 05:50:54 +03:00
poma	0e784e1b24	travis	2019-07-19 05:26:12 +03:00
poma	cd3564abe7	fix eslint	2019-07-19 05:17:14 +03:00
poma	69907d6f62	minor comments	2019-07-19 05:17:14 +03:00