265 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexey	68a861ed35	Merge branch 'master' into migrationScript	2019-12-13 23:21:25 +03:00
Alexey	ea93af3243	Merge branch 'master' into migrationScript	2019-12-13 23:12:49 +03:00
Alexey	bb3c4aae52	fix cli.js	2019-12-13 23:01:38 +03:00
Roman Storm	4a5921d8c2	Merge pull request #31 from tornadocash/rename ... rename variables	2019-12-13 11:04:05 -08:00
poma	4114f7b52c	rename variables	2019-12-13 20:49:19 +07:00
Pertsev Alexey	8623e4092a	Merge pull request #30 from tornadocash/migration-temp ... Migration temp	2019-12-11 23:08:12 +03:00
Pertsev Alexey	2671aab17b	Merge branch 'migrationScript' into migration-temp	2019-12-11 23:07:59 +03:00
Alexey	1be468c863	done	2019-12-11 23:04:38 +03:00
Alexey	265540067a	WIP	2019-12-11 20:05:28 +03:00
poma	917892ef13	wip	2019-12-11 23:49:43 +07:00
Alexey	2c28e1d5aa	tidy	2019-12-11 17:01:34 +03:00
poma	b6b8aa9619	fix subtrees	2019-12-11 19:30:25 +07:00
poma	ae44615198	make finishMigration payable	2019-12-11 19:29:03 +07:00
poma	1515959a01	change tree depth to 20	2019-12-11 19:29:03 +07:00
Roman Storm	5140e1b38f	finish migration	2019-12-10 07:48:11 -08:00
Roman Semenov	6ae2fe612c	Update README.md	2019-12-09 23:40:10 -08:00
poma	2a0f0ccfd9	remove unused import	2019-12-09 23:40:10 -08:00
poma	0e9732625e	fix address formatting in tests	2019-12-09 23:40:10 -08:00
Roman Storm	656673b690	add migration script	2019-12-09 23:40:10 -08:00
Roman Semenov	d9f4b16076	Update README.md	2019-12-05 22:52:01 +07:00
Pertsev Alexey	beceeaae6e	Merge pull request #28 from peppersec/fix-test ... fix address formatting in tests	2019-12-02 11:45:24 +03:00
poma	e83f528f6f	remove unused import	2019-11-28 15:04:09 +07:00
Roman Semenov	62a9814aae	Merge pull request #27 from peppersec/isSpentPR ... add isSpendArray view function	2019-11-28 11:54:28 +07:00
poma	2962f30ed5	fix address formatting in tests	2019-11-28 11:52:17 +07:00
Roman Storm	a6cda4a501	add isSpendArray view function	2019-11-27 19:45:52 -08:00
Pertsev Alexey	f5486f0943	Merge pull request #25 from peppersec/circuit-fix ... check selector in mixer	2019-11-25 19:47:19 +03:00
Pertsev Alexey	2de4f9c721	Merge pull request #26 from peppersec/audit-circuit-fix-2 ... Audit circuit fix 2	2019-11-25 19:46:25 +03:00
poma	a58d60623b	rename MerkleTree to make more clear that it has no output	2019-11-24 13:31:02 +04:00
poma	0c4c27b7b6	remove private modifiers from non-main templates	2019-11-24 13:30:58 +04:00
poma	c5d1ef7734	check selector in mixer	2019-11-20 20:27:08 +03:00
Roman Storm	d0e312eb80	Merge pull request #24 from peppersec/audit-6 ... Audit 6	2019-11-18 12:03:44 -08:00
Roman Storm	93f8a8943e	Merge pull request #23 from peppersec/audit-5 ... Audit 5	2019-11-15 12:57:29 -08:00
poma	24a21ac88f	fix test	2019-11-15 22:42:59 +03:00
poma	c0e81f2a37	rename multiplexor	2019-11-15 11:44:07 +03:00
poma	e6a4208b52	change zero value constant	2019-11-15 11:44:07 +03:00
Alexey	ce550eea58	return refund to a relayer in case of failure	2019-11-15 10:59:06 +03:00
Alexey	a6519fb280	move nonReentrant modifier	2019-11-14 20:49:34 +03:00
Alexey	0393ee9c05	fix test	2019-11-14 20:41:31 +03:00
Alexey	5b60e44a7e	debug message fix	2019-11-14 14:01:11 +03:00
Roman Storm	df395187bf	Merge pull request #22 from peppersec/cli-refactor ... Cli refactor, relay support	2019-11-11 11:46:14 -08:00
Roman Storm	dec0f4487c	Merge pull request #21 from peppersec/remove-toggleDeposits ... remove toggleDeposits	2019-11-11 11:46:05 -08:00
Roman Storm	a48858fd34	Merge pull request #20 from peppersec/audit-4 ... ether sending	2019-11-11 11:45:56 -08:00
Alexey	83c9ba7296	nonReentrant guards	2019-11-11 19:12:17 +03:00
poma	d01018db9f	support relay in CLI, refactor	2019-11-10 03:48:09 +03:00
poma	1a17e7eea3	make sure pathIndex is always a number (fixes bug with string concat instead of integer addition)	2019-11-10 03:46:27 +03:00
poma	183847ad67	remove toggleDeposits	2019-11-09 02:48:35 +03:00
Alexey	e6cce0c7ce	ether sending	2019-11-08 14:41:39 +03:00
Roman Semenov	bc8d0b20fc	Merge pull request #19 from peppersec/audit-3 ... Audit fixes (batch 3)	2019-11-08 13:30:25 +03:00
poma	313713a061	fix tests	2019-11-08 07:39:22 +03:00
poma	a94281ccc5	update dependencies	2019-11-08 04:11:29 +03:00