mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 15:29:38 +01:00
Code Issues Projects Releases Packages Wiki Activity
13253 commits 3 branches 150 tags 4.1 GiB
Commit graph

13253 commits

This branch
This branch
All branches
Author SHA1 Message Date
ghubstan
6aa385e494
Append nullable withdrawalTxId field to Trade proto message 
The withdrawalTxId field will be set in TradeManager#onWithdrawRequest
upon successful trade completion and withdrawal of funds.

Persisting withdrawalTxId will allow the api and ui to find the withdrawalTxId
for a completed trade after the seller withdraws funds to an external wallet.
In turn, the withdrawal tx's memo field will be accessible in a new (todo)
api getTx(txID) api method.

Changed:

- Appended field 'string withdrawal_tx_id = 40' to pb.proto's Trade message.

- Added nullable 'String withdrawalTxId' to Trade entity class.

- Added trade.setWithdrawalTxId(transaction.getTxId().toString()) in
  TradeManager#onWithdrawRequest's callback.
 2020-12-12 12:01:55 -03:00
ghubstan
150e2f6851
Use Bisq's UserThread.executor in gRPC server 2020-12-11 18:33:19 -03:00
ghubstan
259bad629a
Merge branch 'master' into 05-use-memo-tx-field 2020-12-10 11:59:28 -03:00
Christoph Atteneder
f4df51c213
Merge pull request #4929 from chimp1984/make-sign-age-column-sortable 
Make sign age column sortable
 2020-12-10 12:00:04 +01:00
Christoph Atteneder
9498fd9b7d
Merge pull request #4917 from chimp1984/handle-invalid-maker-fee-tx 
Detect and handle invalid maker fee tx
 2020-12-10 11:57:32 +01:00
Christoph Atteneder
aa0e091906
Merge pull request #4927 from chimp1984/improve-shutdown-routine 
Improve shutdown routine
 2020-12-10 11:46:16 +01:00
chimp1984
6378f3c602
Add support for sorting by signed account age 
We separate in 4 groups and sort each by days.
1. signed accounts
2. not yet signed account, we use account age
3. not required signing, we use account age
4. no account age and no signing required (altcoins)
 2020-12-09 23:27:16 -05:00
chimp1984
a2d2e6c4fb
Shutdown PriceFeedService and related services 
at shutdown routine
 2020-12-09 18:33:15 -05:00
chimp1984
de2755d2d7
Remove debug log 2020-12-09 18:32:24 -05:00
chimp1984
bcf956530f
Limit delay for remove offer result handler to 3 sec 2020-12-09 18:14:50 -05:00
sqrrm
63fc486896
Merge pull request #4918 from bisq-network/hotfix/v1.5.1 
Hotfix/v1.5.1
 2020-12-09 22:21:52 +01:00
ghubstan
478c8f4eb2
Remove unused imports 2020-12-09 17:38:20 -03:00
ghubstan
bd66008062
Support tx memo field for btc withdrawals from api 
- Added optional memo parameter to the api's sendbtc and
  withdrawfunds commands.

- Removed the @Nullable annotation was removed because protobuf
  does not support null.

- Visibility in two wallet check methods were changed from private
  to pkg protected so the CoreTradeService could use them.

- Adjusted affected tests.  (Asserting the memo field was set on a
  transaction cannot be checked from apitest yet.)
 2020-12-09 16:51:56 -03:00
chimp1984
c962c1a183
Refactor: Rename presentation to displayString (no code change) 2020-12-09 14:02:57 -05:00
chimp1984
ed099981fa
Make findWitness public 
Improve logs if trade limit was violated
 2020-12-09 13:58:16 -05:00
ghubstan
144c5a82cc
Merge branch 'master' into 04-add-sendbtc-impl 2020-12-09 10:44:17 -03:00
Christoph Atteneder
af6c2d23f3
Merge pull request #4902 from deusmax/market-offer-filter-bugfix 
Refactor outlier filtering for Market Offer chart.
 2020-12-09 10:13:55 +01:00
Christoph Atteneder
d65e0b5cfb
Merge pull request #4921 from chimp1984/add-move-to-failed-trades-button-if-deposit-tx-is-missing 
Detect missing deposit tx to allow moving to failed trades
 2020-12-09 10:12:48 +01:00
Christoph Atteneder
a340a83343
Merge pull request #4914 from chimp1984/ui-improvements 
UI improvements
 2020-12-09 09:45:49 +01:00
Christoph Atteneder
933ed9ffb1
Merge pull request #4920 from chimp1984/revert-mailbox-msg-ttl 
Revert TTL to original value of 15 days.
 2020-12-09 09:17:52 +01:00
Christoph Atteneder
09b253e155
Merge pull request #4923 from chimp1984/fix-sorting-of-table-columns 
Fix sorting of table columns
 2020-12-09 09:12:17 +01:00
chimp1984
860e918f33
Fix in correct sort fields 
Cleanups
 2020-12-08 19:35:17 -05:00
ghubstan
6c9f0c252d
Add new api method 'sendbtc' and test 
Takes an address, amount, and optional txfeerate param,
returns a lightweight TxInfo proto.

Also overloaded two BtcWalletService methods to allow sendbtc
to pass in the tx fee rate -- overriding the fee service and
custom fee rate setting.
 2020-12-08 21:12:02 -03:00
chimp1984
29ceccadd9
Remove duplicates 2020-12-08 19:10:51 -05:00
chimp1984
bc0e2e65d5
Use display string for sorting payment method columns 2020-12-08 19:07:22 -05:00
chimp1984
a3a0770e60
Show hidden columns (txFeeColumn, tradeFeeColumn, 
buyerSecurityDepositColumn, sellerSecurityDepositColumn) if app width get scaled up larger.
Fix sorting of columns.
Fix display of trade fee (BSQ/BTC)
Use num trades for avatar sorting
 2020-12-08 19:02:49 -05:00
chimp1984
d91954ea66
Add sort for memo column 
Include prefix at address column in sort
Use details if available for details column
 2020-12-08 17:33:01 -05:00
chimp1984
ce68f2e24a
Check also for depositTxId in trade and check if both 
txId and tx.getId are the same.

We got some reports where users have no deposit tx displayed in the
trade after spv resync but cannot move the trade to failed trades.
It seems the invalid txId is still stored in the trade but the tx itself
got removed from the wallet after reysnc. We check not that both the tx
and the txId need to be present.
 2020-12-08 17:11:58 -05:00
ghubstan
2842070afd
Merge branch 'master' into 03-add-txFeeRate-param 2020-12-08 19:04:27 -03:00
chimp1984
f8ebd075cd
Revert TTL to original value of 15 days. 2020-12-08 16:46:37 -05:00
Christoph Atteneder
29c2e0002d
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.1 
# Conflicts:
#	build.gradle
#	core/src/main/java/bisq/core/btc/setup/WalletConfig.java
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
#	seednode/src/main/java/bisq/seednode/SeedNodeMain.java
 2020-12-08 22:19:11 +01:00
Christoph Atteneder
a04cc7bfe2
Revert to SNAPSHOT version 2020-12-08 22:14:56 +01:00
chimp1984
960b835f3f
Check if maker fee tx is already spent or has invalid structure. 
If so show popup to remove that offer.
Add maker fee tx ix to offer details window.
If invalid, add error msg to offer details window.
 2020-12-08 15:45:51 -05:00
chimp1984
eb40c777ee
Make paymentGroupBox local 2020-12-08 11:28:22 -05:00
chimp1984
9a5ffeecb3
Remove unused method 2020-12-08 11:28:22 -05:00
chimp1984
c1e702c507
Remove BUYER_SECURITY_DEPOSIT_NEWS (was used in 0.9.5) 2020-12-08 11:28:22 -05:00
chimp1984
2411f2d9c8
Use setMinHeight instead of setPrefHeight for textArea in F2FForm and USPostalMoneyOrderForm and sue 70 px for both 2020-12-08 11:28:21 -05:00
chimp1984
bd736be956
Use full width for altcoin accounts view (as it was already in fiat accounts) 2020-12-08 11:28:21 -05:00
chimp1984
2ead91c961
Increase height of account list when account is selected to make scrolling easier. 2020-12-08 11:28:21 -05:00
Christoph Atteneder
6adf8503df
Merge pull request #4907 from chimp1984/avoid-persistence-write-call-before-read 
Prevent that we write data at shutdown before we have read the data.
 2020-12-08 16:36:38 +01:00
Christoph Atteneder
6431d639ae
Merge pull request #4908 from chimp1984/add-memo-field-at-step4 
Add memo field at step4
 2020-12-08 16:35:16 +01:00
Christoph Atteneder
1ab4766600
Merge pull request #4909 from chimp1984/fix-bsq-to-fiat-calculation 
Fix bsq to fiat calculation
 2020-12-08 16:26:20 +01:00
Christoph Atteneder
ce04a8fc95
Merge pull request #4913 from chimp1984/fix-warning-log-with-address-is-null-at-startup 
Avoid logging warning at startup
 2020-12-08 16:15:38 +01:00
chimp1984
455c9b0ff3
Avoid logging warning at startup 2020-12-08 10:13:31 -05:00
Christoph Atteneder
d41692602a
Merge pull request #4903 from oscarguindzberg/bloomFilterFix 
Upate bitcoinj to commit dcf8af0 - Bloom filter fix
 2020-12-08 15:03:28 +01:00
Christoph Atteneder
89e55774c7
Merge pull request #4910 from chimp1984/remove-log-entry 
Improve logs
 2020-12-08 15:03:09 +01:00
sqrrm
2a2f05f408
Merge pull request #4912 from chimp1984/add-serialized-tx-as-hex-to-trade-details 
Add "Raw deposit transaction as hex" to details window
 2020-12-08 12:28:15 +01:00
chimp1984
25d227556b
Add "Raw deposit transaction as hex" to details window 
Rename Contract as json button to detail data
 2020-12-07 20:25:29 -05:00
chimp1984
d0005e45f4
Add logs of tx in case of exceptions 2020-12-07 19:47:44 -05:00
chimp1984
a3df372ecd
Apply project format rules (no code change) 2020-12-07 19:47:05 -05:00