Commit graph

3221 commits

Author SHA1 Message Date
julian
7d2aaa28aa fix merge issue 2023-09-22 13:33:36 -06:00
sneurlax
722a72cff6 Merge remote-tracking branch 'origin/fusion' into fusion 2023-09-22 14:20:50 -05:00
sneurlax
55e6e56a2d replace bitcoindart with coinlib 2023-09-22 14:20:19 -05:00
julian
40b029351d slight change to output mapping 2023-09-22 13:01:02 -06:00
julian
af40bf3667 some FusionTransaction extension TODO cleanup 2023-09-22 12:50:59 -06:00
sneurlax
d1603d5f72 add pubKey to fusion inputs 2023-09-22 12:18:43 -05:00
julian
ec8d3ae1d8 Merge remote-tracking branch 'origin_SW/fusion' into fusion
# Conflicts:
#	lib/services/mixins/fusion_wallet_interface.dart
2023-09-22 10:50:01 -06:00
julian
4b964f611c fix static variable usage 2023-09-22 10:48:14 -06:00
sneurlax
ecdb49d84c add derivationPath in toFusionOutput 2023-09-22 11:45:16 -05:00
julian
b0f0ea48e1 add comment 2023-09-22 09:38:05 -06:00
sneurlax
504fdaa239 query isar for pubkey of address 2023-09-22 00:38:32 -05:00
sneurlax
a2e3a2aafa implement schnorrVerify, documentation, comments, etc 2023-09-21 23:12:08 -05:00
sneurlax
f235fe220b Revert "fuse on click"
This reverts commit 3c092946c3.
2023-09-21 22:31:21 -05:00
sneurlax
3c092946c3 fuse on click 2023-09-21 22:31:14 -05:00
sneurlax
7788ec7ace implement getAddressFromOutputScript in fusiondart and update comments 2023-09-21 16:57:21 -05:00
sneurlax
386fcdc1d8 formatting
remove unused import
2023-09-21 14:57:49 -05:00
sneurlax
f17c6a0875 Merge branch 'staging' into fusion 2023-09-21 14:55:09 -05:00
julian
a6f8d4d779 add note to one time tor popup 2023-09-21 08:51:16 -06:00
julian
9f10b4db5d update animation 2023-09-20 19:17:47 -06:00
ryleedavis
77e638af16 add fusion progress provider to dialog + custom fusion 2023-09-20 16:15:16 -06:00
ryleedavis
0597e317ba WIP: fusion progress provider 2023-09-20 16:15:16 -06:00
julian
7155646f57 desktop tor one time dialog added and hidden dev settings enabled for desktop 2023-09-20 14:52:27 -06:00
julian
157901e33d one time stacy tor dialog 2023-09-20 14:39:06 -06:00
julian
90a913540c button style consistency on desktop network info 2023-09-20 13:39:18 -06:00
julian
eff2d7d539 center desktop tor button in menu 2023-09-20 13:36:59 -06:00
sneurlax
8d6c355b95 revert inadvertent tx_icon change
whoopsie
2023-09-20 13:19:39 -05: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
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
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
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