[bisq-network/bisq] API 'getoffer' & 'gettrade' support for BSQ swaps (PR #5827)
Stan
notifications at github.com
Sun Nov 14 18:22:49 CET 2021
This change is a partial adjustment in the API for BSQ swaps, mostly related to how it fetches and displays v1 and new swap offers and trades.
- The `currencyCode` param was removed from the `GetBsqSwapOffer` service request.
- `BsqSwapOfferInfo` fields were merged into `OfferInfo`, and `BsqSwapOfferInfo` was removed.
- New rpc service `GetOfferCategory` was added for later use, to determine what kind of rpc request to send in CLI `takeoffer` calls (v1-offer or bsq-swap offer).
- Added new `coreApi.getRole(BsqSwapTrade)` method.
- Normalized (removed duplication) recently merged `BsqSwapTradeInfo` with the existing `TradeInfo` gRPC proto defs and wrappers. A `bsqSwapTradeInfo` field was appended to the old `TradeInfo` proto message. The API's `gettrade` and `gettrades` (todo) methods' reply messages can still return the same gRPC response message data type (`TradeInfo`, or `List<TradeInfo>` for `gettrades`), and may represent v1 trade and/or bisq-swap trade details.
- Adjusted the CLI console output to display v1 or bsq-swap trade details returned by the CLI's `gettrade` method.
BSQ swap offer create & take support in the CLI should come with the next 1-3 PRs.
Based on `master`.
You can view, comment on, or merge this pull request online at:
https://github.com/bisq-network/bisq/pull/5827
-- 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
-- File Changes --
M apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java (6)
M apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java (15)
M apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java (4)
M apitest/src/test/java/bisq/apitest/method/trade/BsqSwapTradeTest.java (80)
M apitest/src/test/java/bisq/apitest/scenario/TradeTest.java (2)
M cli/src/main/java/bisq/cli/GrpcClient.java (69)
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 (37)
M core/src/main/java/bisq/core/api/CoreApi.java (24)
M core/src/main/java/bisq/core/api/CoreOffersService.java (33)
M core/src/main/java/bisq/core/api/CoreTradesService.java (16)
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 (25)
M proto/src/main/proto/grpc.proto (111)
-- Patch Links --
https://github.com/bisq-network/bisq/pull/5827.patch
https://github.com/bisq-network/bisq/pull/5827.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/5827
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20211114/7514fbd3/attachment.htm>
More information about the bisq-github
mailing list