mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-01 01:32:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
12124 commits 3 branches 150 tags 4.1 GiB
Commit graph

4386 commits

Author SHA1 Message Date
sqrrm
0b1894a939
Merge pull request #4554 from ghubstan/create-offer 
Change 'createoffer' api method return type
 2020-10-01 14:48:38 +02:00
Christoph Atteneder
0a88ee6bd3
Merge pull request #4581 from oscarguindzberg/fixHostnameSerialization 
Use bitcoinj 0.15.8 (commit 44ddbdc)
 2020-10-01 09:15:47 +02:00
Christoph Atteneder
a1778ed701
Merge pull request #4578 from chimp1984/show-if-maker-has-xmr-autoconf-enabled 
Show if maker has xmr autoconf enabled
 2020-10-01 09:11:45 +02:00
Oscar Guindzberg
5db273010f
Use bitcoinj 0.15.8 (commit 44ddbdc) 2020-09-30 13:10:05 -03:00
Christoph Atteneder
4d7e26d87d
Merge pull request #4576 from chimp1984/fix-filter-bug 
Fix bug with missing remove of old filter when new filter is added.
 2020-09-30 16:30:48 +02:00
chimp1984
5d41574931
Refactor: Rename TradeDataValidation.validatePayoutTx to TradeDataValidation.validateDelayedPayoutTx 2020-09-29 23:46:38 -05:00
chimp1984
18c1fc1410
Fix bug with missing remove of old filter when new filter is added. 
- Add handling for removing invalid filters

When adding a new filter invalid filters get removed if they have been created with the same priv key.
 2020-09-29 23:25:22 -05:00
chimp1984
3926a36c3a
Use params for trace logs. 2020-09-29 12:55:23 -05:00
chimp1984
f46e132195
Add rocket icon to xmr offers which have enabled autoconf 
Add info to tooltip and to offer window
Add center css to actions column. It looks weird that title is left aligned and button is centered.
only "last-column", "avatar-column" worked, making an new style e.g. center-column did not succeed... css is not my friend....
Shorten "Time since signing" to "Signed since" header to avoid truncation
 2020-09-29 00:45:31 -05:00
chimp1984
7280fb822d
Add new extraMap entry for offer. 
If maker is seller and is a xmr offer and has autoConf enabled we set a flag ("1")
 2020-09-28 23:26:29 -05:00
Oscar Guindzberg
1e65af51ea
Remove unused WalletService.freshKey() 2020-09-28 18:37:53 -03:00
sqrrm
20135a1662
Merge pull request #4561 from oscarguindzberg/codeCleanup 
Remove unnecessary WalletService.removeSignatures()
 2020-09-27 14:44:43 +02:00
sqrrm
a408dd5a89
Merge pull request #4552 from oscarguindzberg/WalletConfigCleanup 
Wallet config cleanup
 2020-09-27 14:40:51 +02:00
sqrrm
3174778018
Merge pull request #4560 from jmacxx/fix_xmr_amount_check 
XMR autoconf should get amount from trade not offer
 2020-09-27 14:40:23 +02:00
Oscar Guindzberg
93d321b995
Use bitcoinj 0.15.8 (commit 5312aa3) 2020-09-26 11:36:48 -03:00
chimp1984
423cc7134e
Add changes from merge conflict (class was renamed) 2020-09-25 15:01:20 -05:00
chimp1984
25c4b4d0fc
Merge branch 'master_upstream' into dispute-agent-branch 
# Conflicts:
#	core/src/main/java/bisq/core/trade/DelayedPayoutTxValidation.java
 2020-09-25 14:53:20 -05:00
chimp1984
8ac468d84f
Commit to trigger travis as it got stuck... 2020-09-25 14:23:06 -05:00
chimp1984
f37446b991
Change log level 2020-09-25 09:39:45 -05:00
sqrrm
a2a284ef94
Merge pull request #4551 from oscarguindzberg/replaceBitcoinjDeprecated 
Replace deprecated bitcoinj methods
 2020-09-25 11:29:56 +02:00
Oscar Guindzberg
315b9ff5d7
Remove unnecessary WalletService.removeSignatures() 2020-09-25 02:28:29 -03:00
jmacxx
b842a0789c
XMR autoconf should get amount from trade not offer 
Get the amount from the trade rather than the offer.

Log the expected amount when not matching the explorer result.
It would have made debugging this issue much more straightforward.

Fixes #4557
 2020-09-24 10:57:33 -05:00
ghubstan
3c0c443680
Change API's createoffer return value from bool to Offer 2020-09-22 22:13:42 -03:00
ghubstan
e63a6c5771
Remove comment 2020-09-22 18:45:50 -03:00
ghubstan
8896372a0f
Move test dispute agent type constants to core 
The string constants deleted from the test case are re-defined as enums,
but the test harness still passes around strings (enum.name()) because
the handling of invalid dispute agent type string args needs to be
tested.  (Reminder:  CLI does not accept any enum arguments.)
 2020-09-22 15:31:38 -03:00
Oscar Guindzberg
6ba0d6197e
Remove unnecessary comment 2020-09-22 15:06:43 -03:00
Oscar Guindzberg
f529e463d3
Remove unnecessary code 2020-09-22 15:06:43 -03:00
Oscar Guindzberg
ab4333eaaa
Rename kcg to kcgBuilder 2020-09-22 15:06:43 -03:00
Oscar Guindzberg
4558bf4c0c
Remove unused imports 2020-09-22 15:06:42 -03:00
Oscar Guindzberg
1becf89371
Remove unused WalletConfig.walletFactory 2020-09-22 15:06:42 -03:00
Oscar Guindzberg
59124e3e33
Replace deprecated bitcoinj methods 
Replace output.getAddressFromP2PKHScript() and
output.getAddressFromP2SH() with
output.getScriptPubKey().getToAddress()
 2020-09-22 14:55:47 -03:00
Oscar Guindzberg
c1c9ff3de8
Fix logging message 2020-09-22 14:07:31 -03:00
Christoph Atteneder
e3b3c625b3
Merge pull request #4548 from ghubstan/use-legacyaddress-frombase58 
Remove unused, broken accessor
 2020-09-22 16:32:50 +02:00
Christoph Atteneder
44bf29b67e
Merge pull request #4546 from oscarguindzberg/code-cleanup 
Minor code cleanup changes
 2020-09-22 16:23:31 +02:00
Christoph Atteneder
64d4b9b136
Merge pull request #4544 from oscarguindzberg/removeListeners 
Remove unnecessary listeners in TransactionsView
 2020-09-22 16:22:37 +02:00
Christoph Atteneder
69d533d9ea
Merge pull request #4520 from cd2357/show-qubes-info-popup 
Show info popup if Bisq started under Qubes OS
 2020-09-22 16:21:03 +02:00
ghubstan
86c62c1333
Revert WalletService change (accessor breaks build) 
The accessor added in commit e2bd89f broke the build, and was not
used as originally intended -- by CoreWalletsService -- because the
the api's wallet methods need addresses from the wallet, not just
a valid address.
 2020-09-22 11:16:53 -03:00
sqrrm
3d07c064e4
Merge pull request #4534 from ghubstan/daemon-status-scratch 
Give core api a simple way to verify init status
 2020-09-22 11:41:12 +02:00
sqrrm
dee92670c5
Merge pull request #4539 from ghubstan/refactor-bisqdaemonmain 
Refactor API & add registerdisputeagent method to CLI
 2020-09-22 11:37:18 +02:00
Oscar Guindzberg
64dc4fbf84
Remove unused code from WalletConfig 2020-09-21 18:22:41 -03:00
Oscar Guindzberg
6cf7a9977a
Code cleanup 2020-09-21 17:32:47 -03:00
Oscar Guindzberg
c890d3c02a
Remove unused code 2020-09-21 17:19:01 -03:00
Christoph Atteneder
6af2a46e49
Merge pull request #4542 from chimp1984/refactor-regexvalidator 
Refactor regexvalidator
 2020-09-21 20:16:53 +02:00
Oscar Guindzberg
93f9f83136
Make codacy happy 2020-09-21 12:40:53 -03:00
Oscar Guindzberg
2a33095021
WalletService.isOutputScriptConvertibleToAddress() include segwit outputs 2020-09-21 12:40:53 -03:00
Oscar Guindzberg
e8c82549a8
Use Address.fromString() for btc addresses 
Use Address.fromString() instead of LegacyAddress.fromBase58() for btc addresses.
Trade protocol addresses not migrated yet.
 2020-09-21 12:40:52 -03:00
Oscar Guindzberg
87833fd3fc
Declare returning type as LegacyAddress 2020-09-21 12:40:52 -03:00
Oscar Guindzberg
8a3d403bfc
Rename WalletService.emptyWallet() to emtyBtcWallet() 2020-09-21 12:40:52 -03:00
chimp1984
81bea14af2
Show popup to peer who accepted mediators suggestion once locktime is over 2020-09-21 01:16:47 -05:00
chimp1984
a9f10624c2
Move validation after adding dispute to list 2020-09-21 00:20:12 -05:00