Skip to content
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

Provide more offer & contract detail to CLI #5357

Merged
merged 12 commits into from
Apr 2, 2021

Conversation

ghubstan
Copy link
Member

@ghubstan ghubstan commented Mar 25, 2021

This change adds offer and trade contract detail to the API's Offer and Trade protos, and improves CLI output formatting.

  • Appended missing fields to OfferInfo proto message:
    uint64 sellerSecurityDeposit = 20;
    string offerFeePaymentTxId = 21;
    uint64 txFee = 22;
    uint64 makerFee = 23;

  • Added new api proto messages ContractInfo and PaymentAccountPayloadInfo.
    Lighterweight protos are needed because core Trade/Contract classes are not visible to CLI.

  • Appended ContractInfo field to api proto message TradeInfo.

  • Added proto / model converters for ContractInfo and PaymentAccountPayloadInfo, and adjusted OfferInfo & TradeInfo.

  • Improved CLI output formatting. Added more trade detail to CLI's gettrade output, and prepared to support BTC/BSQ trading pair. Note a reviewer is advised to look at the CLI outout formatting class files instead getting bogged down in the many commit changes.

This is the 2nd PR in a series, with the goal of supporting the BTC/BSQ trading pair.
PR #5356 must be reviewed/merge before this one.

This change supports creation of BSQ BLOCKCHAIN payment method accounts.

- Added proto message defs to grpc.proto.
- Added grpc server boilerplate to GrpcPaymentAccountsService.
- Added server impl to CoreApi, CorePaymentAccountsService.
- Added createcryptopaymentacct-help.txt.
- Added CLI side support for new api method.
- Added opt parsing unit tests to OptionParsersTest.

This is the 1st PR in a series, with the goal of supporting the BTC/BSQ trading
pair.  Support for other crypto currency payment accounts will be added later.
This change adds offer and trade contract detail to the API's Offer
and Trade protos, and improves CLI output formatting.

- Appended missing fields to OfferInfo proto message:
	uint64 sellerSecurityDeposit = 20;
	string offerFeePaymentTxId = 21;
	uint64 txFee = 22;
	uint64 makerFee = 23;

- Added new api proto messages ContractInfo and PaymentAccountPayloadInfo.
  Lighterweight protos are needed because core Trade/Contract classes are
  not visible to CLI.

- Appended ContractInfo field to api proto message TradeInfo.

- Added proto / model converters for ContractInfo and PaymentAccountPayloadInfo,
  and adjusted OfferInfo & TradeInfo.

- Improved CLI output formatting.  Added more trade detail to CLI's gettrade output,
  and prepared to support BTC/BSQ trading pair.  Note a reviewer is advised to
  look at the CLI outout formatting class files instead getting bogged down in the
  many commit changes.
@ghubstan ghubstan changed the title Provide more offer & contract detail available to CLI Provide more offer & contract detail to CLI Mar 25, 2021
The number of gettrade output columns are the same for makers and takers.
- Added bool tradeInstant field to proto message def.
- Adjusted core createcryptopaymentacct impl to new tradeInstant request param.
- Adjusted cli side createcryptopaymentacct impl to new tradeInstant request param.
- Fixed CliMain's takeoffer help text (was missing the --payment-account opt).
- Added AvailabilityResultWithDescription proto for better takeoffer failure msgs.
- Added VerifyBsqSentToAddress impl to api, but don't expose to CLI yet.
- Show BSQ Buyer Address in gettrade output (changed cli output formatting classes).
- Fixed api.model.PaymentAccountPayloadInfo altcoin instant acct support bug
Copy link
Member

@sqrrm sqrrm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@sqrrm sqrrm merged commit b6f9231 into bisq-network:master Apr 2, 2021
@ghubstan ghubstan deleted the 02-api-trade-contract-details branch April 2, 2021 17:03
@ripcurlx ripcurlx added this to the v1.6.3 milestone Apr 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants