[bisq-network/bisq] API 'getoffer' & 'gettrade' support for BSQ swaps #2 (PR #5863)

[Stan]

Merge API support for BSQ swaps into `gettrade` and `takeoffer`.

Early API support for BSQ swaps was only an aid to coding and testing the feature for release in the UI.  This change merges some of those first rpc service and core implementations into the existing `gettrade` and `takeoffer` API method implementations. API method `takeoffer` now works for both v1 Offers and BSQ swap Offers, and `gettrade` works for both v1 Trades and BSQ swap trades.

API support for creating BSQ swap offers via the existing 'createoffer' method should come with the following PR.

Based on PR https://github.com/bisq-network/bisq/pull/5827.
You can view, comment on, or merge this pull request online at:

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

-- Commit Summary --

  * Adjust bsq-swap-offer related gRPC services & msgs
  * Adjust bsq-swap-offer related gRPC daemon services
  * Partially adjust api proto wrappers for bsq-swap support
  * Add String getRole(BsqSwapTrade trade) method
  * Add conveniences isFiatOffer(offer), isAltcoinOffer(offer)
  * Partially adjust core api for bsq-swap support
  * Paritally adjust bsq-swap-offer related gRPC CLI side classes
  * Paritally adjust bsq-swap-offer related apitest cases
  * Normalize API gRPC bsq-swap related protos & wrappers
  * Merge branch 'master' into 1-basic-api-bsqswap-support
  * Add CLI output IntegerColumn
  * Adjust API 'gettrade' for Bsq swaps
  * Try to hide from pesky codacy
  * Merge branch 'master' into 1-basic-api-bsqswap-support
  * Remove Get/Take BSQSwap Offer/Trade rpc service defs
  * Refactor GrpcTradesService: use GetTrade & TakeOffer services for BSQ swaps
  * Refactor core.api trade service implemenentations for BSQ swaps
  * Adjust CLI to support getting/taking BSQ swaps
  * Adjust apitest cases to rpc BSQ wwap related changes
  * Merge branch 'master' into 2-api-bsq-swap-scratch

-- File Changes --

    M apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java (15)
    M apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java (15)
    M apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java (13)
    M apitest/src/test/java/bisq/apitest/method/trade/BsqSwapTradeTest.java (110)
    M apitest/src/test/java/bisq/apitest/scenario/TradeTest.java (2)
    M cli/src/main/java/bisq/cli/CliMain.java (32)
    M cli/src/main/java/bisq/cli/GrpcClient.java (80)
    M cli/src/main/java/bisq/cli/opts/CancelOfferOptionParser.java (16)
    M cli/src/main/java/bisq/cli/opts/CreateOfferOptionParser.java (2)
    M cli/src/main/java/bisq/cli/opts/CreatePaymentAcctOptionParser.java (2)
    M cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java (27)
    M cli/src/main/java/bisq/cli/opts/GetPaymentAcctFormOptionParser.java (2)
    R cli/src/main/java/bisq/cli/opts/OfferIdOptionParser.java (12)
    M cli/src/main/java/bisq/cli/opts/SetTxFeeRateOptionParser.java (2)
    M cli/src/main/java/bisq/cli/opts/TakeOfferOptionParser.java (17)
    M cli/src/main/java/bisq/cli/request/OffersServiceRequest.java (68)
    M cli/src/main/java/bisq/cli/request/TradesServiceRequest.java (16)
    M cli/src/main/java/bisq/cli/table/builder/AbstractTradeListBuilder.java (40)
    M cli/src/main/java/bisq/cli/table/builder/TableBuilderConstants.java (3)
    M cli/src/main/java/bisq/cli/table/builder/TradeDetailTableBuilder.java (112)
    M cli/src/main/java/bisq/cli/table/builder/TradeTableColumnSupplier.java (88)
    A cli/src/main/java/bisq/cli/table/column/IntegerColumn.java (93)
    M cli/src/test/java/bisq/cli/GetOffersSmokeTest.java (38)
    M core/src/main/java/bisq/core/api/CoreApi.java (33)
    M core/src/main/java/bisq/core/api/CoreOffersService.java (33)
    M core/src/main/java/bisq/core/api/CoreTradesService.java (31)
    M core/src/main/java/bisq/core/api/CoreWalletsService.java (54)
    D core/src/main/java/bisq/core/api/model/BsqSwapOfferInfo.java (227)
    M core/src/main/java/bisq/core/api/model/BsqSwapTradeInfo.java (286)
    M core/src/main/java/bisq/core/api/model/ContractInfo.java (1)
    M core/src/main/java/bisq/core/api/model/OfferInfo.java (293)
    M core/src/main/java/bisq/core/api/model/TradeInfo.java (357)
    M core/src/main/java/bisq/core/api/model/TxInfo.java (24)
    A core/src/main/java/bisq/core/api/model/builder/BsqSwapTradeInfoBuilder.java (113)
    A core/src/main/java/bisq/core/api/model/builder/OfferInfoBuilder.java (223)
    A core/src/main/java/bisq/core/api/model/builder/TradeInfoV1Builder.java (195)
    M core/src/main/java/bisq/core/offer/OfferUtil.java (8)
    M core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java (21)
    M core/src/main/java/bisq/core/trade/protocol/bsq_swap/model/BsqSwapProtocolModel.java (1)
    M daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java (71)
    M daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java (153)
    M proto/src/main/proto/grpc.proto (126)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/5863.patch
https://github.com/bisq-network/bisq/pull/5863.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/5863
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20211124/f35a9704/attachment-0001.htm>