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

14399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Atteneder
d8b42d7aac
Merge pull request #5399 from jmacxx/cashbymail_enhance_terms 
CashByMail show terms and conditions upon taking an offer
 2021-04-12 16:05:06 +02:00
Christoph Atteneder
2c3c936af8
Merge pull request #5401 from jmacxx/buyer_wait_for_ack 
Wait for AckMessage before completing BuyerSendCounterCurrencyTransferStartedMessage task
 2021-04-12 16:03:24 +02:00
jmacxx
e5399f189c
Wait for AckMessage before completing task 2021-04-09 09:41:41 -05:00
jmacxx
42428b79b9
CashByMail show terms and conditions upon taking an offer 2021-04-06 22:03:52 -05:00
sqrrm
b6f9231af9
Merge pull request #5357 from ghubstan/02-api-trade-contract-details 
Provide more offer & contract detail to CLI
 2021-04-02 18:44:26 +02:00
ghubstan
bddc273bb2
Fix spelling 2021-04-02 12:58:46 -03:00
ghubstan
6bde12ba40
Improve takeoffer output and failure reason messaging 
- Added AvailabilityResultWithDescription proto for better takeoffer failure msgs.
- Added VerifyBsqSentToAddress impl to api, but don't expose to CLI yet.
- Show BSQ Buyer Address in gettrade output (changed cli output formatting classes).
- Fixed api.model.PaymentAccountPayloadInfo altcoin instant acct support bug
 2021-04-01 16:40:08 -03:00
ghubstan
6299dc33d9
Merge branch '01-api-add-createcryptopaymentacct' into 02-api-trade-contract-details 2021-04-01 15:58:59 -03:00
ghubstan
4fbdc32ba4
Remove space char 2021-04-01 15:45:53 -03:00
ghubstan
58c885efc1
Add support for creating instant altcoin payment accounts in api 
- Added bool tradeInstant field to proto message def.
- Adjusted core createcryptopaymentacct impl to new tradeInstant request param.
- Adjusted cli side createcryptopaymentacct impl to new tradeInstant request param.
- Fixed CliMain's takeoffer help text (was missing the --payment-account opt).
 2021-04-01 15:43:48 -03:00
ghubstan
2d66a5996d
Merge branch 'master' into 01-api-add-createcryptopaymentacct 2021-04-01 14:54:05 -03:00
sqrrm
ad35b2c91b
Merge pull request #5386 from bisq-network/hotfix/v1.6.2 
Hotfix/v1.6.2
 2021-04-01 17:35:45 +02:00
Christoph Atteneder
da866255c7
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.6.2 
# Conflicts:
#	build.gradle
#	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
 2021-04-01 15:47:00 +02:00
Christoph Atteneder
c2834cebd6
Revert to SNAPSHOT version 2021-04-01 15:45:10 +02:00
jmacxx
089e476901
fix NPE in portfolio view when market price n/a 2021-04-01 09:47:12 +02:00
jmacxx
d567170bdb
use semaphore for SPV resync 2021-04-01 09:47:02 +02:00
Christoph Atteneder
dca0d5b5c2
Merge pull request #5385 from jmacxx/fix_npe_portfolio_view 
Fix NPE in Portfolio View when market price n/a
 2021-04-01 09:43:37 +02:00
Christoph Atteneder
8623b7b546
Bump version number for v1.6.2 2021-04-01 09:41:07 +02:00
sqrrm
308d8dec52
Merge pull request #5380 from jmacxx/spv_resync_use_semaphore 
Use semaphore for SPV resync
 2021-03-31 23:00:25 +02:00
jmacxx
e00532a040
fix NPE in portfolio view when market price n/a 2021-03-31 15:13:10 -05:00
jmacxx
26da6cbbe3
use semaphore for SPV resync 2021-03-30 22:42:48 -05:00
sqrrm
f27dc6c77d
Merge pull request #5373 from bisq-network/hotfix/v1.6.1 
Hotfix/v1.6.1
 2021-03-29 21:31:02 +02:00
Christoph Atteneder
6931577e18
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.6.1 
# Conflicts:
#	build.gradle
#	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
 2021-03-29 16:29:12 +02:00
Christoph Atteneder
0c40d35ddb
Revert to SNAPSHOT version 2021-03-29 16:26:28 +02:00
ghubstan
aad998cf3a
Fix maker/taker fee format bug, rename methods 2021-03-28 16:42:55 -03:00
cd2357
6c44f25738
Bump tor to v0.4.5.7 
Bump tor-binary and netlayer dependencies to the newest versions which package tor v0.4.5.7.
 2021-03-28 20:15:19 +02:00
jmacxx
094da74433
allow default fee values in leniency check 2021-03-28 20:14:59 +02:00
jmacxx
22b7d83c04
Fix ClassCastError in Portfolio History Summary Popup 2021-03-28 20:14:34 +02:00
Christoph Atteneder
58d93f6e04
Merge pull request #5363 from jmacxx/fix_ClassCastException2 
Fix ClassCastError in Portfolio History Summary Popup
 2021-03-28 20:14:17 +02:00
Christoph Atteneder
0815a99930
Update translations for v1.6.1 2021-03-28 20:13:34 +02:00
Christoph Atteneder
b7524270dd
Bump version number for v1.6.1 2021-03-28 20:11:26 +02:00
Christoph Atteneder
fd17c5790e
Merge pull request #5365 from jmacxx/fee_validation_default_rate 
Allow default fee values in leniency check
 2021-03-28 20:04:52 +02:00
Christoph Atteneder
4b9641692f
Merge pull request #5364 from cd2357/update-tor-binary-netlayer-v0.4.5.7 
Bump tor to v0.4.5.7
 2021-03-28 20:03:15 +02:00
jmacxx
93da6815b3
allow default fee values in leniency check 2021-03-27 15:50:58 -05:00
cd2357
16b83052aa
Bump tor to v0.4.5.7 
Bump tor-binary and netlayer dependencies to the newest versions which package tor v0.4.5.7.
 2021-03-27 20:15:59 +01:00
jmacxx
f8db8ea299
Fix ClassCastError in Portfolio History Summary Popup 2021-03-26 16:01:51 -05:00
sqrrm
80f654b8da
Merge pull request #5361 from bisq-network/release/v1.6.0 
Release/v1.6.0
 2021-03-26 17:21:47 +01:00
Christoph Atteneder
7aabd1bbec
Revert to SNAPSHOT version 2021-03-26 16:51:47 +01:00
ghubstan
152f4591eb
Remove unused parameter 2021-03-26 11:04:51 -03:00
ghubstan
780be1a93c
Adjust maker gettrade output checks to new column 
The number of gettrade output columns are the same for makers and takers.
 2021-03-26 10:58:47 -03:00
Christoph Atteneder
7ddd8821d9
Merge pull request #5354 from BtcContributor/remove_mediator_hyperlink 
Remove the apparent link for cases where the trade is not available for mediators
 2021-03-26 11:13:27 +01:00
BtcContributor
2cf13e2c11
Fix display issues on TableViews 2021-03-26 09:14:09 +01:00
BtcContributor
e84a3a22cd
Remove the apparent link for cases where the trade is not available 2021-03-26 09:13:57 +01:00
BtcContributor
ba05ae330c
Fix display issues on TableViews 2021-03-26 09:08:13 +01:00
jmacxx
ea87411af9
Fix ClassCastException in Portfolio History screen 2021-03-26 08:48:28 +01:00
Christoph Atteneder
c0cfd25f2f
Merge pull request #5358 from jmacxx/fix_ClassCastException 
Fix ClassCastException in Portfolio History screen
 2021-03-26 08:48:19 +01:00
jmacxx
293872a879
Fix ClassCastException in Portfolio History screen 2021-03-25 17:41:54 -05:00
ghubstan
9e035e5542
Provide more offer & contract detail available to CLI. 
This change adds offer and trade contract detail to the API's Offer
and Trade protos, and improves CLI output formatting.

- Appended missing fields to OfferInfo proto message:
	uint64 sellerSecurityDeposit = 20;
	string offerFeePaymentTxId = 21;
	uint64 txFee = 22;
	uint64 makerFee = 23;

- Added new api proto messages ContractInfo and PaymentAccountPayloadInfo.
  Lighterweight protos are needed because core Trade/Contract classes are
  not visible to CLI.

- Appended ContractInfo field to api proto message TradeInfo.

- Added proto / model converters for ContractInfo and PaymentAccountPayloadInfo,
  and adjusted OfferInfo & TradeInfo.

- Improved CLI output formatting.  Added more trade detail to CLI's gettrade output,
  and prepared to support BTC/BSQ trading pair.  Note a reviewer is advised to
  look at the CLI outout formatting class files instead getting bogged down in the
  many commit changes.
 2021-03-25 19:23:06 -03:00
ghubstan
27b090005d
Add cli side help for createcryptopaymentacct 2021-03-25 18:46:41 -03:00
ghubstan
c3f5669cf8
Add api method createcryptopaymentacct 
This change supports creation of BSQ BLOCKCHAIN payment method accounts.

- Added proto message defs to grpc.proto.
- Added grpc server boilerplate to GrpcPaymentAccountsService.
- Added server impl to CoreApi, CorePaymentAccountsService.
- Added createcryptopaymentacct-help.txt.
- Added CLI side support for new api method.
- Added opt parsing unit tests to OptionParsersTest.

This is the 1st PR in a series, with the goal of supporting the BTC/BSQ trading
pair.  Support for other crypto currency payment accounts will be added later.
 2021-03-25 18:36:26 -03:00