4627 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
julian	1781774d45	script error wording	2023-09-20 10:32:07 -06:00
julian	f98d2e405b	rust version change for epiccash building	2023-09-20 10:19:21 -06:00
sneurlax	c898ffb30f	Merge branch 'arti' into fusion	2023-09-20 11:05:54 -05:00
sneurlax	eec0d2d7df	revert firo changes to wallet settings view	2023-09-20 10:58:40 -05:00
sneurlax	57a5bdc1a7	Merge remote-tracking branch 'origin/arti' into fusion	2023-09-20 10:18:01 -05:00
sneurlax	6b0dd30dee	refactor address model changes back into fusion interface	2023-09-20 10:17:52 -05:00
julian	c2489cdd68	remove tor build scripts	2023-09-20 09:16:35 -06:00
julian	67c73076a2	run loading futures together	2023-09-20 09:10:29 -06:00
julian	d5977d5d3d	remove unused	2023-09-20 08:57:27 -06:00
julian	98b6db7284	ensure usable exchanges are up to date when update() is called	2023-09-20 08:53:42 -06:00
sneurlax	c43cf94c38	Merge branch 'arti' into fusion	2023-09-19 23:59:10 -05:00
sneurlax	f4dc9035ac	remove old tor gitignores	2023-09-19 23:58:33 -05:00
sneurlax	2dc9979db2	return from connect	2023-09-19 23:58:29 -05:00
sneurlax	5bd399a625	use tor-package-exported SOCKSSocket	2023-09-19 23:58:23 -05:00
sneurlax	0d0d309da7	documentation	2023-09-19 23:58:15 -05:00
sneurlax	75e66d0a61	error formatting	2023-09-19 23:58:08 -05:00
sneurlax	04999f49c5	use package import	2023-09-19 23:57:58 -05:00
sneurlax	12b3dd58a8	remove prints from prod	2023-09-19 23:57:52 -05:00
sneurlax	4180cf6c44	refactor interface changes back into the interface	2023-09-19 22:14:34 -05:00
sneurlax	ef38e58b57	query electrum for missing tx info	2023-09-19 17:58:55 -05:00
sneurlax	93cfca7ddf	update fusiondart ref	2023-09-19 17:58:17 -05:00
ryleedavis	abd6e6fcca	fix typo	2023-09-19 14:16:11 -06:00
ryleedavis	0ef9759434	svgs for fusion progress dialog	2023-09-19 14:15:15 -06:00
ryleedavis	8f629426db	fusion progress dialog	2023-09-19 14:14:45 -06:00
sneurlax	ecb45f77bf	Merge remote-tracking branch 'origin/fusion' into fusion	2023-09-19 14:28:25 -05:00
sneurlax	183ac9dd27	placeholder pubkey and comment updates	2023-09-19 14:28:15 -05:00
ryleedavis	e5800d4ec2	resolve merge conflicts	2023-09-18 15:51:00 -06:00
ryleedavis	2d20d0856d	WIP: fusion rounds drop down menu	2023-09-18 15:44:20 -06:00
ryleedavis	13ac3ac10c	WIP: tor status section works + cash fusion info dialog	2023-09-18 15:44:20 -06:00
ryleedavis	932c8d6bb9	Changed Tor info dialogs so padding looks better	2023-09-18 15:43:14 -06:00
sneurlax	309fce399f	WIP null "safety" ... it's as "safe" as it is "short", "straightforward", and "elegant"	2023-09-18 16:03:28 -05:00
sneurlax	1e8b5ed700	hook up start button to fuse() ... TODO link form inputs to fusion	2023-09-18 15:56:40 -05:00
sneurlax	289a369965	add derivationPath ... with hack. needs null safety checks	2023-09-18 14:02:15 -05:00
sneurlax	ef43bc802d	Merge remote-tracking branch 'origin/arti' into fusion	2023-09-18 11:16:13 -05:00
sneurlax	7c4d3038ad	remove tor as submodule	2023-09-18 11:13:50 -05:00
julian	c900f8f779	fix tests	2023-09-15 18:17:48 -06:00
julian	d6d0e9a9af	no more tor as submodule	2023-09-15 18:05:09 -06:00
julian	122e170ae0	update gradle	2023-09-15 17:59:34 -06:00
julian	21295703aa	update gradle	2023-09-15 17:45:30 -06:00
julian	28bd7bf97f	update gradle.build so tor builds correctly	2023-09-15 17:24:05 -06:00
julian	706cf464e6	update lib tor ref	2023-09-15 17:19:45 -06:00
ryleedavis	aa8dfea99f	Merge branch 'fusion' of https://github.com/cypherstack/stack_wallet into fusion	2023-09-15 16:42:35 -06:00
sneurlax	4695ed2b8f	progress cashfusion into startround phase	2023-09-15 17:41:17 -05:00
ryleedavis	ecb6860e39	WIP: cashfusion card, server settings and rounds of fusion	2023-09-15 16:39:08 -06:00
ryleedavis	346d255280	WIP: cashfusion ui; app bar and text card	2023-09-15 16:39:08 -06:00
julian	4ca352e713	update onion animation and some tor settings refactoring	2023-09-15 16:14:01 -06:00
sneurlax	2dcb82f049	update tor handling in fusion wallet interface ... removed inaccurate comments ... Stack shouldn't use Tor unless useTor	2023-09-15 16:02:25 -05:00
sneurlax	ea223ff7cd	docs	2023-09-15 16:01:31 -05:00
sneurlax	b2203a6cc7	resolve the futures	2023-09-15 16:01:23 -05:00
sneurlax	28b2f4f6b6	Merge remote-tracking branch 'origin/arti' into fusion	2023-09-15 15:06:10 -05:00