-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement api methods 'keepfunds', 'withdrawfunds' #4711
Merged
Merged
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
Added license comment too.
The API is going to need some desktop trade utilities, which should be shared between :desktop and :core.api.
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
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.
- Move output column header specs to its own shared constants class. - Add new TradeFormat class for printing trade details in the console. - Print formatted trade in api trade tests -- to see output before using formatter in CLI (in next PR).
Optionally print the json contract for a given trade id.
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
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).
sqrrm
approved these changes
Oct 31, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
A comment to tend to in a later PR
The usage of the wallet and the key might have to be refactored for safer key handling, but I think that should be done as a focused refactoring.
ghubstan
added a commit
to ghubstan/bisq
that referenced
this pull request
Oct 31, 2020
…instance This change requested at bisq-network#4711 (comment)
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.
The
CoreTradesService
was also refactored to work with the api methods implemented in this PR:keepfunds
-- Close trade, keep funds in Bisq walletwithdrawfunds
-- Close trade, withdraw funds to external BTC walletA
getKey
accessor was added toCoreWalletsService
(needed by withdrawfunds impl).PR #4709 should be reviewed & merged before this PR.