API daemon 'getoffer' & 'gettrade' support for BSQ swaps #1 #5827
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Adjust GetBsqSwapOffer(s) rpc services to remove currency param. - Adjust OfferInfo and remove BsqSwapOfferInfo. - Add GetOfferCategory service so CLI can determine what kind of takeoffer service is to be used. - Add comment about adding sub-message BsqSwapTradeInfo field to TradeInfo.
- Add GetOfferCategory service so CLI can determine what kind of takeoffer service is to be used. - Adjust to removal of BsqSwapOfferInfo proto. - Call new coreApi.getRole(BsqSwapTrade) before building BsqSwapTradeInfo proto.
- Complete BsqSwapTradeInfo impl. - Merge BsqSwapOfferInfo fields into OfferInfo and remove BsqSwapOfferInfo. - Change all model builders to private static class Builder.
- Add core api methods to help CLI determine which type of offer to take for a given offerId. CLI's 'takeoffer` will need to determine which gRPC/proto request type to send to server. - Add implemetations for getBsqSwapTradeRole(), for tradeId or trade.
- Adjust to removal of BsqSwapOfferInfo proto, use ammended OfferInfo instead. - Remove currency-code param from all get(My)BsqSwapOffer(s) requests. - Add new OfferCategory getAvailableOfferCategory(String offerId) service. CLI uses this to determine which kind of gRPC request object should be sent with a 'takeoffer' request. - Adjust GetOffersSmokeTest to help see offer/swap-offer CLI output.
- Adjust to removal of BsqSwapOfferInfo proto, use ammended OfferInfo instead. - Remove currency-code param from all get(My)BsqSwapOffer(s) requests.
This commit refactors the first cut of the BsqSwapTradeInfo and TradeInfo gRPC proto defs and wrappers. The change avoids duplication of fields between BsqSwapTradeInfo and TradeInfo, and adds a bsqSwapTradeInfo field to the old TradeInfo proto & wrapper. The immediate goal is moving towards getting the API's 'gettrade' method to work for both Bisq v1 trades and BSQ swap trades: the TradeInfo proto sent to the CLI should represent either a Bisq v1 trade or a BSQ swap trade. A mid-term term goal is to also make a new 'gettrades' method return a List<TradeInfo> to the CLI, where items in the List<TradeInfo> can be either v1 trades or bsq-swap trades.
- Made several adjustments to CLI's 'gettrade' output related code so it can show single trade details for either Bisq v1 trades, or BSQ swap trades. - Did minor refactoring of API's core to retrieve # tx confirmations for an addresses and transactions. - Show # of tx confirmations in bsq swap trade detail.
|
I tried |
I have not addressed the CLI side of this, and do not expect it to work. (The PR title should have specified these are incremental changes, mostly on the server side.) This will require 2-3 more PRs. I am a bit surprised that Please un-comment the |
ghubstan
changed the title
ghubstan
changed the title
ghubstan
changed the title
ghubstan
changed the title
sqrrm
previously approved these changes
Dec 9, 2021
Comment on lines
+495
to
+497
| public static boolean isAltcoinOffer(Offer offer) { | ||
| return offer.getCounterCurrencyCode().equals("BTC") && !offer.isBsqSwapOffer(); | ||
| } |
There was a problem hiding this comment.
Is swapOffer not considered an altcoin trade? I guess it makes some sense but also somewhat odd.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
currencyCodeparam was removed from theGetBsqSwapOfferservice request.BsqSwapOfferInfofields were merged intoOfferInfo, andBsqSwapOfferInfowas removed.New rpc service
GetOfferCategorywas added for later use, to determine what kind of rpc request to send in CLItakeoffercalls (v1-offer or bsq-swap offer).Added new
coreApi.getRole(BsqSwapTrade)method.Normalized (removed duplication) recently merged
BsqSwapTradeInfowith the existingTradeInfogRPC proto defs and wrappers. AbsqSwapTradeInfofield was appended to the oldTradeInfoproto message. The API'sgettradeandgettrades(todo) methods' reply messages can still return the same gRPC response message data type (TradeInfo, orList<TradeInfo>forgettrades), 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
gettrademethod.BSQ swap offer create & take support in the CLI should come with the next 1-3 PRs.
Based on
master.