[bisq-network/bisq] Implement api methods 'keepfunds', 'withdrawfunds' (#4711)

Stan notifications at github.com
Mon Oct 26 23:50:32 UTC 2020


The `CoreTradesService` was also refactored to work with the api methods implemented in this PR:

- `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).

PR https://github.com/bisq-network/bisq/pull/4709 should be reviewed & merged before this PR.
You can view, comment on, or merge this pull request online at:

  https://github.com/bisq-network/bisq/pull/4711

-- Commit Summary --

  * Block on tx-fee-request in core TakeOfferModel init
  * Add compiler warning suppression, remove comment
  * Add fields to grpc TradeInfo proto & wrapper
  * Replace static TradeUtil with singleton TradeUtil
  * Fix comment typos
  * Refactor PendingTradesViewModel methods -> TradeUtil & OfferUtil
  * Remove trailing spaces for codacy
  * Refactor PendingTradesDataModel methods -> TradeUtil
  * Remove unused import
  * Add getRole(tradeId) to core api
  * Refactor CLI output formatting code & add trade formatter
  * Add license comment
  * Move semicolon up from blank line
  * Add 'gettrade' to api method CLI
  * Add boolean 'showcontract' argument to api's 'gettrade'
  * Stub out api methods 'keepfunds', 'withdrawfunds'
  * Implement api methods 'keepfunds', 'withdrawfunds'

-- File Changes --

    M apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java (1)
    M apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java (6)
    M apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java (7)
    M cli/src/main/java/bisq/cli/CliMain.java (54)
    A cli/src/main/java/bisq/cli/ColumnHeaderConstants.java (55)
    M cli/src/main/java/bisq/cli/TableFormat.java (26)
    A cli/src/main/java/bisq/cli/TradeFormat.java (118)
    M core/src/main/java/bisq/core/api/CoreApi.java (12)
    M core/src/main/java/bisq/core/api/CoreTradesService.java (129)
    M core/src/main/java/bisq/core/api/CoreWalletsService.java (6)
    M core/src/main/java/bisq/core/api/model/OfferInfo.java (8)
    M core/src/main/java/bisq/core/api/model/TradeInfo.java (148)
    M core/src/main/java/bisq/core/offer/OfferUtil.java (4)
    M core/src/main/java/bisq/core/offer/takeoffer/TakeOfferModel.java (38)
    M core/src/main/java/bisq/core/trade/TradeManager.java (5)
    A core/src/main/java/bisq/core/trade/TradeUtil.java (228)
    D core/src/main/java/bisq/core/trade/TradeUtils.java (79)
    M core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java (7)
    M daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java (37)
    M desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java (83)
    M desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java (110)
    M proto/src/main/proto/grpc.proto (49)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/4711.patch
https://github.com/bisq-network/bisq/pull/4711.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/4711
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20201026/db9c3fe5/attachment.html>


More information about the bisq-github mailing list