Refactor BtcWalletService to let api override fee rates #4896
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
BtcWalletService was changed to allow the api to override tx fee rates from the sendbsq and sendbtc methods. The api methods will still be able to use the network fee service and custom tx fee rate preference, and set / unset the custom tx fee rate preference, but the change will permit the addition of an optional txFeeRate parameter to the sendbsq and sendbtc methods (todo). A few other minor changes (style and removal of never thrown ex spec) were also made to this class. Two BtcWalletService methods were refactored. - The redundant (was always true) boolean isSendTx argument was removed from the completePreparedVoteRevealTx method signature. - The redundant (was always true) boolean useCustomTxFee was removed from the completePreparedBsqTx method signature. - The completePreparedSendBsqTx method was overloaded with a 2nd parameter (Coin txFeePerVbyte) to allow api to override fee service and custom tx fee rate when sending BSQ or BTC. - The completePreparedBsqTx method was overloaded with a 3rd parameter (Coin txFeePerVbyte) to allow api to override fee service and custom tx fee rate when sending BSQ or BTC. The following line was deleted from the completePreparedBsqTx method because txFeePerVbyte is now an argument: Coin txFeePerVbyte = useCustomTxFee ? getTxFeeForWithdrawalPerVbyte() : feeService.getTxFeePerVbyte(); This useCustomTxFee value was always true, and redudant here because getTxFeeForWithdrawalPerVbyte() returns feeService.getTxFeePerVbyte() or the custom fee rate preference. i.e., Coin txFeePerVbyte = useCustomTxFee ? getTxFeeForWithdrawalPerVbyte() : feeService.getTxFeePerVbyte(); is equivalent to Coin txFeePerVbyte = getTxFeeForWithdrawalPerVbyte(); LockupTxService, UnlockTxService, BsqSendView, and BsqTransferService were adjusted to this BtcWalletService refactoring.
|
force travis build after jar download failed |
sqrrm
reviewed
Dec 7, 2020
There was a problem hiding this comment.
I think the changes look ok.
Needs review from @ManfredKarrer
core/src/main/java/bisq/core/dao/governance/bond/lockup/LockupTxService.java
Show resolved
Hide resolved
As per commit 88f26f9, do not autofill all currencies by default but keep all unselected.
chimp1984
approved these changes
Dec 21, 2020
core/src/main/java/bisq/core/dao/governance/bond/lockup/LockupTxService.java
Show resolved
Hide resolved
|
Review and merged with #4966. |
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.
BtcWalletServicewas changed to allow the api to override tx fee rates from thesendbsqandsendbtcmethods. The api methods will still be able to use the network fee service and custom tx fee rate preference, and set / unset the custom tx fee rate preference, but the change will permit the addition of an optionaltxFeeRateparameter to thesendbsqandsendbtcmethods (todo). A few other minor changes (style and removal of never thrown ex spec) were also made to this class.Two
BtcWalletServicemethods were refactored.The redundant (was always true)
boolean isSendTxargument was removed from thecompletePreparedVoteRevealTxmethod signature.The redundant (was always true)
boolean useCustomTxFeewas removed from thecompletePreparedBsqTxmethod signature.The
completePreparedSendBsqTxmethod was overloaded with a 2nd parameter (Coin txFeePerVbyte) to allow api to override fee service and custom tx fee rate when sending BSQ or BTC.The
completePreparedBsqTxmethod was overloaded with a 3rd parameter (Coin txFeePerVbyte) to allow api to override fee service and custom tx fee rate when sending BSQ or BTC.The following line was deleted from the
completePreparedBsqTxmethod becausetxFeePerVbyteis now an argument:This
useCustomTxFeevalue was always true, and redundant here becausegetTxFeeForWithdrawalPerVbyte()returnsfeeService.getTxFeePerVbyte()or the custom fee rate preference. i.e.,Coin txFeePerVbyte = useCustomTxFee ? getTxFeeForWithdrawalPerVbyte() : feeService.getTxFeePerVbyte();is equivalent to
Coin txFeePerVbyte = getTxFeeForWithdrawalPerVbyte();LockupTxService,UnlockTxService,BsqSendView, andBsqTransferServicewere adjusted to theBtcWalletServicerefactoring.This is the 2nd in a chain of PRs beginning with #4884.
PR #4884 should be reviewed before this one.