Commit graph

4787 commits

Author SHA1 Message Date
julian-CStack
fe6c94fb0a
Merge branch 'staging' into ui-fixes 2023-09-22 14:13:32 -06:00
julian-CStack
12f0dcce18 Merge remote-tracking branch 'origin/ui-fixes' into ui-fixes
# Conflicts:
#	macos/Runner/Release.entitlements
2023-09-22 14:12:06 -06:00
julian-CStack
26feef9d83 enititlements 2023-09-22 14:11:23 -06:00
sneurlax
04403d5e1e fix numBlanks calculation in fusiondart 2023-09-22 15:07:41 -05:00
sneurlax
f2854c0bc6 fix scriptPubKeyHex 2023-09-22 14:49:08 -05:00
julian
15417359a4 Merge remote-tracking branch 'origin_SW/staging' into fusion 2023-09-22 13:45:13 -06:00
julian-CStack
c7c863e802
Merge pull request #673 from cypherstack/ui-fixes
update tor dep version
2023-09-22 13:43:11 -06:00
julian
69e24de4c1 update tor dep version 2023-09-22 13:42:36 -06:00
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
julian-CStack
7613a99ab3
Merge pull request #672 from cypherstack/ui-fixes
macos entitlements
2023-09-22 11:35:15 -06:00
sneurlax
d1603d5f72 add pubKey to fusion inputs 2023-09-22 12:18:43 -05:00
julian-CStack
cc7a37ea9f macos entitlements 2023-09-22 11:09:31 -06:00
julian
0a1523f2ce update fusiondart ref 2023-09-22 10:51:47 -06: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
4072c1929a implement dustLimit 2023-09-21 23:31:53 -05:00
sneurlax
83f7a2d1c2 refactor (use getRandomBytes) 2023-09-21 23:17:28 -05:00
sneurlax
a2e3a2aafa implement schnorrVerify, documentation, comments, etc 2023-09-21 23:12:08 -05:00
sneurlax
cb219d9459 comments 2023-09-21 22:40:14 -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
230a2edea4 implement input-signing 2023-09-21 22:30:48 -05:00
sneurlax
7ed17cfa91 add missing fusing svg 2023-09-21 22:21:41 -05:00
sneurlax
138df153d4 add missing peers svg 2023-09-21 22:21:35 -05:00
sneurlax
bc9cdccf32 add missing up from line svg 2023-09-21 22:21:29 -05:00
sneurlax
1df72ab06a implement pubkeysFromPrivkey and fix toScript 2023-09-21 17:29:12 -05:00
sneurlax
c12566cea9 implement fromScriptPubKey 2023-09-21 17:03:29 -05:00
sneurlax
7788ec7ace implement getAddressFromOutputScript in fusiondart and update comments 2023-09-21 16:57:21 -05:00
Diego Salazar
3a6291241c
Bump build number (191) 2023-09-21 14:50:21 -06: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-CStack
8a0e35b071
Merge pull request #671 from cypherstack/ui-fixes
add note to one time tor popup
2023-09-21 13:02:00 -06:00
julian
ea61f22d93 update tor lib 2023-09-21 13:00:47 -06:00
julian
a6f8d4d779 add note to one time tor popup 2023-09-21 08:51:16 -06:00
julian-CStack
e125d01a3e
Merge pull request #670 from cypherstack/ui-fixes
update animation and rust version for epiccash
2023-09-20 19:18:57 -06:00
julian-CStack
8ed67903d1
Merge branch 'staging' into ui-fixes 2023-09-20 19:18:31 -06:00
julian
9f10b4db5d update animation 2023-09-20 19:17:47 -06:00
Diego Salazar
10ad4f4f4f
Bump version (1.8.0) 2023-09-20 19:12:57 -06:00
julian
758392ede4 epiccash needs an even older rust version 2023-09-20 19:11:56 -06:00
julian-CStack
d67d6f9db6
Merge pull request #669 from cypherstack/ui-fixes
UI fixes
2023-09-20 17:14:16 -06:00
julian
e827ead3fb update monero ref 2023-09-20 17:13:36 -06:00
julian
52288dc4f4 ios rust targets updates/checks 2023-09-20 17:09:12 -06:00
ryleedavis
77e638af16 add fusion progress provider to dialog + custom fusion 2023-09-20 16:15:16 -06:00