Commit Graph

12689 Commits

Author SHA1 Message Date
sqrrm
0e7070a5fa
Merge pull request #4679 from ghubstan/5-suggested-changes
Changes suggested in PRs 4672,4673,4674,4675
2020-10-22 16:33:52 +02:00
ghubstan
1f3554ef65
Remove redundant calculateTotalToPay() call
Resolves issue found during https://github.com/bisq-network/bisq/pull/4673
review, and suggested in comment
https://github.com/bisq-network/bisq/pull/4673#discussion_r510111662
2020-10-22 10:55:53 -03:00
ghubstan
d463dd14a0
Remove useless default tx fee calculations
Resolves issue found during https://github.com/bisq-network/bisq/pull/4673
review, and suggested in comment
https://github.com/bisq-network/bisq/pull/4673#discussion_r510110682

Also shortened comment lines to < 90 chars.
2020-10-22 10:41:04 -03:00
ghubstan
31a311903a
Simplify result handler argument
Resolves issue found during https://github.com/bisq-network/bisq/pull/4673
review, and suggested in comment
https://github.com/bisq-network/bisq/pull/4673#discussion_r510089605
2020-10-22 10:17:12 -03:00
ghubstan
fa0e05a336
Remove redundant getTrade(id) method
Resolves issue found during https://github.com/bisq-network/bisq/pull/4673
review, and mentioned in comment
https://github.com/bisq-network/bisq/pull/4673#discussion_r510090257
2020-10-22 10:09:35 -03:00
sqrrm
01d434170f
Merge pull request #4682 from bisq-network/release/v1.4.2
Release/v1.4.2
2020-10-22 10:57:26 +02:00
Christoph Atteneder
177c9c8af3
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.4.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
2020-10-22 09:40:17 +02:00
Christoph Atteneder
f6d8cadee8
Revert to SNAPSHOT version 2020-10-22 09:36:50 +02:00
sqrrm
b9e1398e29
Merge pull request #4672 from ghubstan/1-convert-offerutil-to-injected-singleton
Refactor offer/trade related classes in core and desktop
2020-10-21 20:06:47 +02:00
ghubstan
2ae6bfaf51
Change predicate names isPositiveXYZ -> isNonZeroXYZ
Resolves issue found during https://github.com/bisq-network/bisq/pull/4672
review, and mentioned in comment
https://github.com/bisq-network/bisq/pull/4672#discussion_r509318045
2020-10-21 12:54:28 -03:00
Christoph Atteneder
062b58b65d
Bump version number for v1.4.2 2020-10-21 09:23:51 +02:00
chimp1984
108ca75097
Rename HISTORY to HISTORICAL_RESOURCE_FILE_VERSION_TAGS to make its usage more clear 2020-10-21 09:21:53 +02:00
chimp1984
8bb1c61c76
Fix wrong HISTORY version entry.
This fields contains the versions where we have tagged a resource file.
It does not need to be the latest version in case we have not added a new resource file.
2020-10-21 09:21:46 +02:00
Christoph Atteneder
bbe71fe78d
Merge pull request #4678 from chimp1984/rename-history-field-in-version
Rename history field in version
2020-10-21 09:19:43 +02:00
chimp1984
927004b4be
Rename HISTORY to HISTORICAL_RESOURCE_FILE_VERSION_TAGS to make its usage more clear 2020-10-20 22:08:18 -05:00
chimp1984
fd00048b47
Fix wrong HISTORY version entry.
This fields contains the versions where we have tagged a resource file.
It does not need to be the latest version in case we have not added a new resource file.
2020-10-20 22:06:30 -05:00
ghubstan
ac8ed8dd06
Add 'confirmpaymentreceived' api method
- Implement confirmpaymentsent on server and cli side

- Enable confirmpaymentreceived method tests
2020-10-20 16:51:48 -03:00
ghubstan
3d2b90fb96
Add 'confirmpaymentsent' api method
- Implement confirmpaymentsent on server and cli side

- Enable confirmpaymentsent method tests
2020-10-20 16:20:40 -03:00
ghubstan
e809af37cc
Add 'takeoffer' API method
- Add new core.offer.takeoffer.TakeOfferModel

	Would have been nice to move more logic from
	bisq.desktop.main.offer.takeoffer.TakeOfferDataModel,
	but it has JFX dependencies that cannot be use in :core.

- Add grpc protos to support takeoffer, confirmpaymentsent, confirmpaymentreceived

	Only takeoffer is implemented in this commit.

- Refactor OfferInfo grpc proto wrapper, and add offer state field

- Add new TradeInfo grpc proto wrapper

- Implement takeoffer on server and cli side

- Refactor offer/trade tests, add test cases
2020-10-20 16:00:05 -03:00
ghubstan
ab6be23516
Refactor offer/trade related classes in core and desktop
These refactoring changes are for reducing existing and potential
duplication coming with the addition of new trading protocol support
in the gRPC API.  Some minor styling and logic simplification changes
are also include.

- Convert OfferUtil to injected singleton, and move various offer related
  utility methods into it.

- Delete both MakerFeeProvider classes, which were wrappers around the same
  static old OfferUtil method.

- Inject OfferUtil into CreateOfferDataModel, CreateOfferViewModel,
  TakeOfferDataModel, TakeOfferViewModel, MutableOfferDataModel,
  MutableOfferViewModel, OfferDataModel, EditOfferDataModel,
  EditOfferViewModel

- Refactor TakeOfferViewModel

	Use OfferUtil, remove unused fields & methods.
	Made minor logic simplification, style and formatting changes.

- MutableOfferDataModel

	Made minor logic simplification, style and formatting changes.

- MutableOfferView uses new paymentAccount.isHalCashAccount().

- MutableOfferViewModel

	Refactored to use new VolumeUtil, CoinUtil, OfferUtil.
	Removed unused fields & accessors.
	Made minor style change.

- Refactored OfferDataModel to use new OfferUtil

- Refactor CreateOfferService

	Inject and use OfferUtil
	Move some utility methods to OfferUtil
	Remove unused fields

- Offer

	Refactored to use new VolumeUtil for volume calculations.
	Made stateProperty and errorMessageProperty fields private.

- PaymentAccount

	Moved isHalCashAccount type check to this class.
	Moved getTradeCurrency logic to this class.

- Contract, radeStatistics2, TradeStatistics3

	Refactored to use new VolumeUtil for volume calculations.

- Trade

	Refactored to use new VolumeUtil for volume calculations.
	Made minor logic simplification, style and formatting changes.

- CoinUtil

	Moved some coin utility methods into this class

- CoinUtilTest

	Moved (coin related) tests from CoinCryptoUtilsTest and OfferUtilTest
	into CoinUtilTest, and deleted OfferUtilTest, CoinCryptoUtilsTest.

- Adjust create and edit offer tests to model refactoring
2020-10-20 15:06:44 -03:00
Christoph Atteneder
50e2c89c06
Merge pull request #4615 from chimp1984/fix-trade-protocol-check-at-refund-agent-close
Fix trade protocol check for refund agent ticket close
2020-10-20 09:54:32 +02:00
Christoph Atteneder
ebe4618bfe
Merge pull request #4655 from bisq-network/release/v1.4.0
Release/v1.4.0 and v1.4.1
2020-10-20 09:10:12 +02:00
chimp1984
f2b41d8b20
Fix typo 2020-10-19 18:33:08 -05:00
Christoph Atteneder
b1fb57109e
Revert to SNAPSHOT version 2020-10-19 09:41:33 +02:00
Christoph Atteneder
7ae6e84e02
Bump version number for v1.4.1 2020-10-18 19:22:53 +02:00
Christoph Atteneder
b5d16bcb67
Merge pull request #4658 from oscarguindzberg/moveSegwitCheckbox
Move segwit checkbox
2020-10-17 18:41:46 +02:00
sqrrm
0dea954bfc
Merge pull request #4662 from chimp1984/fix-republish-trade-stats
Fix republish trade stats
2020-10-17 00:29:47 +02:00
sqrrm
b92410772d
Merge pull request #4659 from chimp1984/fix-missing-capability-handling-for-encrypted-msg
Handle Capabilities for encrypted messages (offer availibility request/response)
2020-10-16 23:18:39 +02:00
chimp1984
294b45dbad
Republish trade statistics if not found in existing trade stats.
Remove republishing at SellerProtocol as we don't know the capability of the peer at that moment and as we also want to republish for completed trades.
2020-10-16 14:13:01 -05:00
chimp1984
8cb6a05334
Fix min height for trade statistics table 2020-10-16 14:02:57 -05:00
chimp1984
0b38fccfd2
Add file name to temp file at write to disk 2020-10-16 13:27:21 -05:00
chimp1984
6b4d77fb1b
Handle Capabilities for encrypted messages (offer availibility request/response)
We did check in Connection for SupportedCapabilitiesMessage and if a message is of that type we set the capability.
But encrypted messages are wrapped in a PrefixedSealedAndSignedMessage so the payload is not visible as SupportedCapabilitiesMessage without decrypting it.
We need to call maybeHandleSupportedCapabilitiesMessage at decrypting the message. We do that only for direct messages not for mailbox messages as we likely do not have a connection open to the peer in that case (otherwise it would not be a mailbox msg) and as we don't have the connection available (we get is as AddDataMessage broadcast from an peer, so could could not apply it to the Connection of the sender.
2020-10-16 11:07:36 -05:00
Oscar Guindzberg
3e17058bd5
Move segwit checkbox 2020-10-16 11:54:26 -03:00
Christoph Atteneder
bac1e7b04c
Revert to SNAPSHOT version 2020-10-16 14:47:43 +02:00
Christoph Atteneder
4a20cc8379
Merge pull request #4637 from jmacxx/clickable_urls
Make URLs in popup notices clickable
2020-10-16 14:38:54 +02:00
Christoph Atteneder
20a62e091d
Merge pull request #4653 from oscarguindzberg/removeGetAllAddressesFromActiveKeys
Remove unused getAllAddressesFromActiveKeys()
2020-10-16 14:35:57 +02:00
Christoph Atteneder
10b05aa805
Revert jdk.module.illegalAccess=deny
It doesn't work when running from the release binaries as JFoenix is relying on it right now.
2020-10-15 19:51:51 +02:00
Oscar Guindzberg
21f5cd83e0
Remove getAllAddressesFromActiveKeys() 2020-10-15 14:30:51 -03:00
sqrrm
c83cc04d57
Merge pull request #4652 from ripcurlx/update-data-stores-for-v1.4.0
Update data stores for v1.4.0
2020-10-15 13:38:53 +02:00
Christoph Atteneder
4e2e523beb
Update data stores for v1.4.0 2020-10-15 13:21:46 +02:00
Christoph Atteneder
d46c150aee
Update data stores for v1.4.0 2020-10-15 13:08:16 +02:00
sqrrm
44394adb1e
Merge pull request #4608 from ghubstan/getoffer-for-id
Add new 'getoffer offer-id' api method
2020-10-15 11:14:05 +02:00
sqrrm
101c172ccf
Merge pull request #4651 from ripcurlx/keep-offer-when-canceling
Only remove offer locally when necessary
2020-10-15 10:35:46 +02:00
Christoph Atteneder
c08a9bdac2
Only remove offer locally when necessary 2020-10-15 09:53:01 +02:00
Christoph Atteneder
b7c6c42475
Update bitcoinj checkpoints for v1.4.0 2020-10-15 09:13:17 +02:00
Christoph Atteneder
4f26544333
Merge pull request #4648 from chimp1984/dont-include-dead-txs-in-limit-check
Dont include dead transactions in check for unconfirmed txs chain
2020-10-15 09:12:49 +02:00
Christoph Atteneder
9946496646
Merge pull request #4647 from chimp1984/persist-seen-mediator-warnings
Persist seen mediator warnings
2020-10-15 09:10:19 +02:00
jmacxx
ce1efa1337
Remove unused strings, ref:
https://github.com/bisq-network/bisq/pull/4637#issuecomment-708721299
2020-10-14 20:54:09 -05:00
chimp1984
8b404e1954
Exclude time-locked txs at isUnconfirmedTransactionsLimitHit
For published delayed payout transactions we do not receive the tx confidence
so we cannot check if it is confirmed so we ignore it for that check. The check is any arbitrarily
using a limit of 20, so we don't need to be exact here. Should just reduce the likelihood of issues with
the too long chains of unconfirmed transactions.
2020-10-14 20:17:48 -05:00
ghubstan
8394bd1f64
Tidy up getOffer(id) 2020-10-14 19:26:35 -03:00