-
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
Validate offer <-> payment-acct in createoffer #5284
Merged
sqrrm
merged 36 commits into
bisq-network:master
from
ghubstan:07-validate-paymentacct-n-new-offer
Mar 9, 2021
Merged
Validate offer <-> payment-acct in createoffer #5284
sqrrm
merged 36 commits into
bisq-network:master
from
ghubstan:07-validate-paymentacct-n-new-offer
Mar 9, 2021
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
The offer volume is shown so traders know how much fiat they are sending or receiving without having to call getoffer. Changed the 'Fiat Sent' and 'Fiat Received' column headers to show which fiat is being transfered, e.g., 'EUR Sent', 'EUR Received'. Adjusted apitest's trade-simulation-utils.sh to the modified gettrade output.
A new handleExceptionAsWarning method logs warn(ex.msg) instead of the full stack trace.
The gRPC interceptor was not using the correct method/ratemeter map key, and failing to find a rate meter for the server call. - Fix the rate meter key lookup bug. - Disable most strict, default call rate meters in tests. Made an adjustment to the test harness' scaffold setup so an interceptor testing or disabling config file is always picked up by bob and alice daemons. - Set arbitration daemon's registerDisputeAgent rate @ 10/second, so it does not interfere with the test harness. (There is no pre-existing arb node appDataDir before that daemon starts.) Note: The test harness cannot install the custom rate metering file in an arb daemon's appDataDir before it starts because there is no dao-setup file for that node type. TODO: Adjust api simulation scripts to interceptor bug fix.
This change replaces the hard coded strings used as keys in interceptor rate-metering lookup maps. Now, the fullMethodName defined in each bisq.proto.grpc.* class' io.grpc.MethodDescriptor is used, not a hard coded String. For example, the rate metering lookup key for 'GetBalances', in 'GrpcWalletsService', is the fullMethodName = SERVICE_NAME + '/' + "GetBalances", where SERVICE_NAME = "io.bisq.protobuffer.Wallets". Also adjusted affected tests, and tidy'd up interceptor logging.
- Fix tx-fee-rate opt validation bug. - Tell user what option value is not a number. - Append ", server may not be running" text to "io exception" exception msg.
Now prints '<integer> sats/byte' to console.
Unset empty string default values on some the createoffer method's required option declarations in CreateOfferOptionParser, and adds a check for presence of required currency-code option. - Removes default "" value from required opt direction. - Removes default "" value from required opt currency-code. - Removes default "" value from required opt amount. - Removes default "" value from required opt min-amount. - Removes default "" value from required opt fixed-price. - Removes default "" value from required opt security-deposit. - Check for required currency-code option. Unset empty string default values on some of the createoffer method's required option declarations in TakeOfferOptionParser. - Removes default "" value from required opt offer-id. - Removes default "" value from required opt payment-account. Other opt parser default values removed from: - CancelOfferOptionParser#offer-id - CreatePaymentAcctOptionParser#payment-account-form - GetAddressBalanceOptionParser#address - GetBTCMarketPriceOptionParser#currency-code - GetOfferOptionParser#offer-id - GetOffersOptionParser#direction - GetOffersOptionParser#currency-code - GetPaymentAcctFormOptionParser#payment-method-id - GetTradeOptionParser#trade-id - GetTransactionOptionParser#transaction-id - RegisterDisputeAgentOptionParser#registration-key - RegisterDisputeAgentOptionParser#dispute-agent-type - RemoveWalletPasswordOptionParser#wallet-password - SendBsqOptionParser#address - SendBsqOptionParser#amount - SendBtcOptionParser#address - SendBtcOptionParser#amount - SetTxFeeRateOptionParser#tx-fee-rate - SetWalletPasswordOptionParser#wallet-password - UnlockWalletOptionParser#wallet-password - UnlockWalletOptionParser#timeout - WithdrawFundsOptionParser#trade-id - WithdrawFundsOptionParser#address
Make sure non-empty opt values are present in the parsers' custom validation, or jsimpleopt will throw exceptions with stylistically inconsisent messages.
Does not check every combination of options for every method, but we finally have an option parser test case to build on.
This change ensure a stylistically consistent error message is printed to the CLI console if an option is present, but without the '=' sign.
This change prohibits creation of new offers with incompatible payment accounts with the api. - PaymentAccountUtil Renamed isAnyTakerPaymentAccountValidForOffer -> isAnyPaymentAccountValidForOffer. Renmaed isTakerPaymentAccountValidForOffer -> isPaymentAccountValidForOffer. Deleted commented code. - PaymentAccounts: Adjusted to PaymentAccountUtil method name changes. - OfferFilter: Adjusted to PaymentAccountUtil method name changes. - OfferBookViewModelTest: Adjusted to PaymentAccountUtil method name changes. - Add CoreOffersService#verifyPaymentAccountIsValidForOffer - ValidateCreateOfferTest, OfferTest: Added test cases.
These changes make tradeCurrencies a required twise acct form field. Addresses issue bisq-network#5281 - Added comment to PaymentAccountForm about special 'tradeCurrencies' field handling. - Added support for Transferwise 'tradeCurrencies' to PaymentAccountTypeAdapter. - Added instance of isTransferwiseAccount check to PaymentAccount. - Added methods to CurrencyUtil to convert comma delimited code list to TradeCurrency list. - Added methods to ReflectionUtil for getting fields and methods on class. - Added required field check to CorePaymentAccountsService. - Added CreatePaymentAccount test cases.
If a new account has a trading currency, assign it as the selected trading currency. Also fixed a payment acct console formatting issue (left justify the ccy code).
Commit de59c0a did not persist the assigned selected currency, this fixes the bug.
Issue #5281 should be resolved. |
sqrrm
previously approved these changes
Mar 9, 2021
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
sqrrm
approved these changes
Mar 9, 2021
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
Closes #5281 |
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 prohibits creation of new offers with incompatible payment accounts with the api.
PaymentAccountUtil
Renamed isAnyTakerPaymentAccountValidForOffer -> isAnyPaymentAccountValidForOffer.
Renamed isTakerPaymentAccountValidForOffer -> isPaymentAccountValidForOffer.
Deleted commented code.
PaymentAccounts
: Adjusted to PaymentAccountUtil method name changes.OfferFilter
: Adjusted to PaymentAccountUtil method name changes.OfferBookViewModelTest
: Adjusted to PaymentAccountUtil method name changes.Added
CoreOffersService#verifyPaymentAccountIsValidForOffer
ValidateCreateOfferTest
,OfferTest
: Added test cases.PR #5274 should be reviewed & merged before this one.