Commit graph

4944 commits

Author SHA1 Message Date
ghubstan
b38507c6e6
Implement api method 'canceloffer' 2020-10-27 15:31:57 -03:00
ghubstan
027a7d5cd3
Stub out canceloffer api method
The implementation will be added to CoreOffersService in the next PR.
2020-10-27 14:54:50 -03:00
ghubstan
a3631a022f
Implement api methods 'keepfunds', 'withdrawfunds'
The CoreTradesService was refactored to work for newly added api methods:

- keepfunds -- close trade, keep funds in bisq wallet

- withdrawfunds -- close trade, withdraw funds to external btc wallet

A getKey accessor was added to CoreWalletsService (needed by withdrawfunds impl).
2020-10-26 20:44:39 -03:00
ghubstan
a8decafc2f
Stub out api methods 'keepfunds', 'withdrawfunds'
This PR adds trade closing method stubs to keep funds in the
Bisq wallet or send them to an external BTC wallet.

- Add grpc protos
- Add new methods to GrpcTradesService, CoreApi
- Stub out implementations in CoreTradesService
- Add methods to CLI
2020-10-26 17:43:08 -03:00
ghubstan
161dbade0d
Add getRole(tradeId) to core api
API users will need to see their role as maker/taker when looking at trade details.

- Add getRole(trade) to TradeUtil.
- Add getTradeRole(tradeId) to CoreApi, CoreTradesService.
- Add role field to TradeInfo proto and its wrapper class.
2020-10-25 16:22:20 -03:00
ghubstan
bbd7a31c88
Remove unused import 2020-10-25 11:38:03 -03:00
ghubstan
95bcb1ef9c
Refactor PendingTradesDataModel methods -> TradeUtil
Scope of this refactoring is small;  more can be done, but the short
term goal is to share trade util logic with core api.

- Removed unused method getCurrencyCode()
- Made minor style changes
- Removed duplicated code block
2020-10-25 11:27:30 -03:00
ghubstan
24ba9215cd
Refactor PendingTradesViewModel methods -> TradeUtil & OfferUtil 2020-10-25 10:41:19 -03:00
ghubstan
ccd3c99f2e
Fix comment typos 2020-10-24 17:45:01 -03:00
ghubstan
296e4f98cb
Replace static TradeUtil with singleton TradeUtil
The API is going to need some desktop trade utilities, which should be
shared between :desktop and :core.api.
2020-10-24 17:26:10 -03:00
ghubstan
63cf436990
Add fields to grpc TradeInfo proto & wrapper 2020-10-24 16:27:03 -03:00
ghubstan
ab20225cd2
Add compiler warning suppression, remove comment 2020-10-24 16:25:20 -03:00
ghubstan
cb65de6d2e
Block on tx-fee-request in core TakeOfferModel init
Added license comment too.
2020-10-23 12:47:06 -03:00
sqrrm
9e76f5fdc3
Merge pull request #4606 from ghubstan/remove-dup-statuscheck
Delete redundant core.api.StatusCheck
2020-10-23 15:42:34 +02:00
sqrrm
380a57a37a
Merge pull request #4685 from chimp1984/update-monitor-with-last-version-from-freimairs-repo
Update monitor with last version from freimairs repo
2020-10-22 23:38:56 +02:00
chimp1984
9a018ccd47
Adopt to new PersistenceManager 2020-10-22 14:49:16 -05: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
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
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
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
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
Oscar Guindzberg
21f5cd83e0
Remove getAllAddressesFromActiveKeys() 2020-10-15 14:30:51 -03: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
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
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
jmacxx
b17c5c9353
Make URLs in popup notices clickable
Fixes #4623

URLs in Javafx label controls are not clickable, so separate them out to
one or more clickable Hyperlinks displayed at the footer of the popup.

The approach taken for this is to embed the tag `[HYPERLINK:]` in the
message around a link that you want to be handled this way.  The links
can be anywhere within the popup message, in the same order that they
will be displayed.  Using the tag has the advantage of being optional,
and does not require new code to be written for each individual popup.

Refactor to be more flexible; allowing inline hyperlinks

Codacy nits.
2020-10-14 13:42:51 -05:00
chimp1984
fe3828e21f
Dont include dead transactions in check for unconfirmed txs chain 2020-10-14 10:13:12 -05:00
chimp1984
feb4e5230f
Use toString for NullPointerException 2020-10-14 09:52:53 -05:00
Christoph Atteneder
06e7e4b8f1
Update bitcoinj checkpoints for v1.4.0 2020-10-14 15:39:21 +02:00
Mike Rosseel
58f5066e0a
Resolve conflict in 'core/src/main/resources/btc_mainnet.seednodes'. 2020-10-14 15:15:30 +02:00
Mike Rosseel
000f319930
Merge branch 'master' into update-mr-seednode 2020-10-14 14:07:09 +02:00
Mike Rosseel
d1b936e7c5
Adding two torv3 seednodes, removing torv2 nodes 2020-10-14 13:54:22 +02:00
wiz
866b227fcc
Replace emzy's v2 seednodes with new v3 seednodes 2020-10-14 12:54:25 +02:00
Christoph Atteneder
b57ae3532f
Merge pull request #4644 from wiz/update-emzy-seednodes-v3
Replace emzy's v2 seednodes with new v3 seednodes
2020-10-14 12:54:05 +02:00
sqrrm
c41bfd7164
Merge pull request #4643 from chimp1984/add-get-inventory-msg
Add GetInventory messages
2020-10-14 12:22:00 +02:00
wiz
1f2002ad0e
Replace emzy's v2 seednodes with new v3 seednodes 2020-10-14 18:24:19 +09:00
chimp1984
5f9d3d1f0d
Add GetInventory messages
This will be used for monitoring seed nodes.
Instead of requesting all data (we cannot request all in fact as it is too large)
we request the number of items the node has.

This code will not have any impact atm. It will be triggered once a new monitor module gets added which
will send the GetInventoryRequest to the seeds.
2020-10-13 23:30:39 -05:00
chimp1984
b0bc3d0c87
Remove lombok getter for date and rename getDate to getDateAsLong and getTradeDate to getDate. 2020-10-13 20:46:05 -05:00
chimp1984
cc5bdfaf9c
Change data response behaviour
Add DateSortedTruncatablePayload interface for TradeStatistics2

We check first if we need to truncate dateSortedTruncatablePayloads, if so we have sorted by date and truncate in the way that we receive the most recent data. We define the maxItems in the class implementing the interface (3000 for trade stats).
Later we apply the maxEntries check the combined list and if we need to truncate here as well (10 000) we have added the dateSortedTruncatablePayloads at the end so those will get truncated with higher prio.

There is also a bit wrong handling in the previous code that we check for max limits before the shouldTransmitPayloadToPeer filter. Should be fixed in another PR for master...
2020-10-13 20:31:09 -05:00
Christoph Atteneder
e30a7e041c
Merge pull request #4632 from oscarguindzberg/fixSendNonBsq
Fix send non bsq funds
2020-10-13 21:57:35 +02:00
Oscar Guindzberg
864700775b
Accept segwit addresses when sending non-BSQ funds 2020-10-13 15:14:40 -03:00