-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Refactor gRPC service error handling #4960
Refactor gRPC service error handling #4960
Commits on Dec 4, 2020
-
Refactor BtcWalletService to let api override fee rates
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.
Configuration menu - View commit details
-
Copy full SHA for dc6144d - Browse repository at this point
Copy the full SHA dc6144dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 900d498 - Browse repository at this point
Copy the full SHA 900d498View commit details -
Add optional txFeeRate parameter to api sendbsq
If present in the sendbsq command, the parameter will override the fee service and custom fee rate setting for the BSQ transaction. Also changed the sendbsq grpc return type to a lightweight TX proto wrapper. Besides some small refactoring in the CLI, all the changes are adjustments for this new sendbsq parameter and its new grpc return value.
Configuration menu - View commit details
-
Copy full SHA for 159d4cc - Browse repository at this point
Copy the full SHA 159d4ccView commit details
Commits on Dec 8, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 2842070 - Browse repository at this point
Copy the full SHA 2842070View commit details
Commits on Dec 9, 2020
-
Add new api method 'sendbtc' and test
Takes an address, amount, and optional txfeerate param, returns a lightweight TxInfo proto. Also overloaded two BtcWalletService methods to allow sendbtc to pass in the tx fee rate -- overriding the fee service and custom fee rate setting.
Configuration menu - View commit details
-
Copy full SHA for 6c9f0c2 - Browse repository at this point
Copy the full SHA 6c9f0c2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 144c5a8 - Browse repository at this point
Copy the full SHA 144c5a8View commit details -
Support tx memo field for btc withdrawals from api
- Added optional memo parameter to the api's sendbtc and withdrawfunds commands. - Removed the @nullable annotation was removed because protobuf does not support null. - Visibility in two wallet check methods were changed from private to pkg protected so the CoreTradeService could use them. - Adjusted affected tests. (Asserting the memo field was set on a transaction cannot be checked from apitest yet.)
Configuration menu - View commit details
-
Copy full SHA for bd66008 - Browse repository at this point
Copy the full SHA bd66008View commit details -
Configuration menu - View commit details
-
Copy full SHA for 478c8f4 - Browse repository at this point
Copy the full SHA 478c8f4View commit details
Commits on Dec 10, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 259bad6 - Browse repository at this point
Copy the full SHA 259bad6View commit details
Commits on Dec 11, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 150e2f6 - Browse repository at this point
Copy the full SHA 150e2f6View commit details
Commits on Dec 12, 2020
-
Append nullable withdrawalTxId field to Trade proto message
The withdrawalTxId field will be set in TradeManager#onWithdrawRequest upon successful trade completion and withdrawal of funds. Persisting withdrawalTxId will allow the api and ui to find the withdrawalTxId for a completed trade after the seller withdraws funds to an external wallet. In turn, the withdrawal tx's memo field will be accessible in a new (todo) api getTx(txID) api method. Changed: - Appended field 'string withdrawal_tx_id = 40' to pb.proto's Trade message. - Added nullable 'String withdrawalTxId' to Trade entity class. - Added trade.setWithdrawalTxId(transaction.getTxId().toString()) in TradeManager#onWithdrawRequest's callback.
Configuration menu - View commit details
-
Copy full SHA for 6aa385e - Browse repository at this point
Copy the full SHA 6aa385eView commit details
Commits on Dec 14, 2020
-
Add new api method gettransaction
This change was prompted by the recent changes in the main branch to allow a tx memo field to be set from the UI and API. This and the prior PR address the API's need to be able to fetch a tx (with a memo). The API can now get a completed trade's withdrawal txid and pass it as a gettransaction parameter. See previous PR "Append nullable withdrawalTxId field to Trade". bisq-network#4937 A summary of changes by file: grpc.proto - Added withdrawalTxId field to existing TradeInfo proto & wrapper. - Reordered fields in TradeInfo proto. - Added new fields to be displayed by TxInfo proto in CLI. - Fixed typo: unsetTxFeeRatePreference -> UnsetTxFeeRatePreference. - Added new GetTransaction rpc. GrpcWalletsService - Added new getTransaction gRPC boilerplate. CoreWalletsService - Added new getTransaction implementation. TxInfo - Added the new fields for displaying a tx summary from CLI. This is not intended to be more than a brief summary; a block explorer or bitcoin-core client should be used to see the complete definition. TradeInfo - Added the new withdrawalTxId field defined in grpc.proto. CliMain - Added new 'case gettransaction'. TransactionFormat - Formats a TxInfo sent from the server to CLI. ColumnHeaderConstants - Added console headers used by TransactionFormat. TradeFormat - Displays a completed trade's WithdrawalTxId if present. Apitest - Adjusted affected tests: assert tx memo is persisted and test gettransaction.
Configuration menu - View commit details
-
Copy full SHA for 5522d0c - Browse repository at this point
Copy the full SHA 5522d0cView commit details -
Configuration menu - View commit details
-
Copy full SHA for a0f1c22 - Browse repository at this point
Copy the full SHA a0f1c22View commit details -
Adjust create TransferwiseAccount test
As per commit 88f26f9, do not autofill all currencies by default but keep all unselected.
Configuration menu - View commit details
-
Copy full SHA for 0384642 - Browse repository at this point
Copy the full SHA 0384642View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4be87a6 - Browse repository at this point
Copy the full SHA 4be87a6View commit details
Commits on Dec 15, 2020
-
Configuration menu - View commit details
-
Copy full SHA for a341173 - Browse repository at this point
Copy the full SHA a341173View commit details
Commits on Dec 16, 2020
-
Add new CoreApiExceptionHandler to gRPC services
This change reduces gRPC service error handling duplication by moving it into a @singleton encapsulating everything needed to wrap an expected or unexpected core api exception into a gRPC StatusRuntimeException before sending it to the client. It also fixes some boilerpate classes were gRPC error handling was missing.
Configuration menu - View commit details
-
Copy full SHA for e6c6d3b - Browse repository at this point
Copy the full SHA e6c6d3bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1cd47fd - Browse repository at this point
Copy the full SHA 1cd47fdView commit details -
Configuration menu - View commit details
-
Copy full SHA for c60605f - Browse repository at this point
Copy the full SHA c60605fView commit details -
Configuration menu - View commit details
-
Copy full SHA for f7c1103 - Browse repository at this point
Copy the full SHA f7c1103View commit details
Commits on Dec 21, 2020
-
Revert "Append nullable withdrawalTxId field to Trade proto message"
This reverts commit 6aa385e.
Configuration menu - View commit details
-
Copy full SHA for 672eb79 - Browse repository at this point
Copy the full SHA 672eb79View commit details -
Configuration menu - View commit details
-
Copy full SHA for bdde24a - Browse repository at this point
Copy the full SHA bdde24aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 64c2ac5 - Browse repository at this point
Copy the full SHA 64c2ac5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 97dcac2 - Browse repository at this point
Copy the full SHA 97dcac2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3a770f4 - Browse repository at this point
Copy the full SHA 3a770f4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4aa4270 - Browse repository at this point
Copy the full SHA 4aa4270View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1507a2c - Browse repository at this point
Copy the full SHA 1507a2cView commit details -
Merge branch '08-gettransaction' into 09-refactor-grpc-error-handling
Adjust to reverting 6aa385e.
Configuration menu - View commit details
-
Copy full SHA for 8ee3a15 - Browse repository at this point
Copy the full SHA 8ee3a15View commit details