Skip to content

fix: use payment-account-id param name consistently #7432

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use payment-account-id param name consistently #7432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apitest/scripts/limit-order-simulation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ done

printdate "ALICE: Creating $DIRECTION $CURRENCY_CODE offer with payment acct $ALICE_ACCT_ID."
CMD="$CLI_BASE --port=$ALICE_PORT createoffer"
CMD+=" --payment-account=$ALICE_ACCT_ID"
CMD+=" --payment-account-id=$ALICE_ACCT_ID"
CMD+=" --direction=$DIRECTION"
CMD+=" --currency-code=$CURRENCY_CODE"
CMD+=" --amount=$AMOUNT"
Expand Down
4 changes: 2 additions & 2 deletions apitest/scripts/trade-simulation-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ gencreateoffercommand() {
PORT="$1"
ACCT_ID="$2"
CMD="$CLI_BASE --port=$PORT createoffer"
CMD+=" --payment-account=$ACCT_ID"
CMD+=" --payment-account-id=$ACCT_ID"
CMD+=" --direction=$DIRECTION"
CMD+=" --currency-code=$CURRENCY_CODE"
CMD+=" --amount=$AMOUNT"
Expand Down Expand Up @@ -476,7 +476,7 @@ executetrade() {
printdate "First offer found: $OFFER_ID"

# Take Alice's offer.
CMD="$CLI_BASE --port=$BOB_PORT takeoffer --offer-id=$OFFER_ID --payment-account=$BOB_ACCT_ID --fee-currency=BSQ"
CMD="$CLI_BASE --port=$BOB_PORT takeoffer --offer-id=$OFFER_ID --payment-account-id=$BOB_ACCT_ID --fee-currency=BSQ"
printdate "BOB CLI: $CMD"
TRADE=$($CMD)
commandalert $? "Could not take offer."
Expand Down
4 changes: 2 additions & 2 deletions cli/src/main/java/bisq/cli/CliMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ private static void printHelp(OptionParser parser, @SuppressWarnings("SameParame
stream.println();
stream.format(rowFormat, gettransaction.name(), "--transaction-id=<transaction-id>", "Get transaction with id");
stream.println();
stream.format(rowFormat, createoffer.name(), "--payment-account=<payment-account-id> \\", "Create and place an offer");
stream.format(rowFormat, createoffer.name(), "--payment-account-id=<payment-account-id> \\", "Create and place an offer");
stream.format(rowFormat, "", "--direction=<buy|sell> \\", "");
stream.format(rowFormat, "", "--currency-code=<currency-code> \\", "");
stream.format(rowFormat, "", "--amount=<btc-amount> \\", "");
Expand Down Expand Up @@ -950,7 +950,7 @@ private static void printHelp(OptionParser parser, @SuppressWarnings("SameParame
stream.format(rowFormat, "", "--currency-code=<currency-code>", "");
stream.println();
stream.format(rowFormat, takeoffer.name(), "--offer-id=<offer-id> \\", "Take offer with id");
stream.format(rowFormat, "", "[--payment-account=<payment-account-id>]", "");
stream.format(rowFormat, "", "[--payment-account-id=<payment-account-id>]", "");
stream.format(rowFormat, "", "[--fee-currency=<btc|bsq>]", "");
stream.format(rowFormat, "", "[--amount=<min-btc-amount >= amount <= btc-amount>]", "");
stream.println();
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/resources/help/createoffer-help.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ createoffer
--currency-code=<bsq|eur|usd|...>
--direction=<buy|sell>
--fixed-price=<btc-price> | --market-price-margin=<percent>
--payment-account=<payment-acct-id>
--payment-account-id=<payment-acct-id>
--security-deposit=<percent>
--swap=<true|false>
[--fee-currency=<bsq|btc>]
Expand Down Expand Up @@ -59,7 +59,7 @@ OPTIONS
The % above or below market BTC price, e.g., 1.00 (1%).
If --market-price-margin is not present, --fixed-price must be.

--payment-account
--payment-account-id
The ID of the fiat payment account used to send or receive funds during the trade.

--security-deposit
Expand All @@ -82,7 +82,7 @@ To create a BUY 0.125 BTC with EUR offer
using a payment account with ID 7413d263-225a-4f1b-837a-1e3094dc0d77,
putting up a 30 percent security deposit,
and paying the Bisq maker trading fee in BSQ:
$ ./bisq-cli --password=xyz --port=9998 createoffer --payment-account=7413d263-225a-4f1b-837a-1e3094dc0d77 \
$ ./bisq-cli --password=xyz --port=9998 createoffer --payment-account-id=7413d263-225a-4f1b-837a-1e3094dc0d77 \
--direction=buy \
--currency-code=eur \
--amount=0.125 \
Expand All @@ -95,7 +95,7 @@ To create a SELL 0.006 BTC for USD offer
using a payment account with ID 7413d263-225a-4f1b-837a-1e3094dc0d77,
putting up a 25 percent security deposit,
and paying the Bisq maker trading fee in BTC:
$ ./bisq-cli --password=xyz --port=9998 createoffer --payment-account=7413d263-225a-4f1b-837a-1e3094dc0d77 \
$ ./bisq-cli --password=xyz --port=9998 createoffer --payment-account-id=7413d263-225a-4f1b-837a-1e3094dc0d77 \
--direction=sell \
--currency-code=usd \
--amount=0.006 \
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/resources/help/takeoffer-help.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SYNOPSIS
--------
takeoffer (Bisq v1 Protocol)
--offer-id=<offer-id>
--payment-account=<payment-acct-id>
--payment-account-id=<payment-acct-id>
[--fee-currency=<btc|bsq>]
[--amount=<offer.min-btc-amount >= amount <= offer.btc-amount>]

Expand All @@ -25,7 +25,7 @@ Take an existing offer. There are currently two types offers and trade protocols
The takeoffer command only requires an offer-id parameter, and sufficient BSQ and/or BTC
to cover the trade amount and the taker fee.
The amount parameter is optional.
The payment-account parameter is invalid; BSQ Swap transactions use the default BsqSwapAccount.
The payment-account-id parameter is invalid; BSQ Swap transactions use the default BsqSwapAccount.
The fee-currency parameter is invalid; BSQ is always used to pay BSQ swap trade fees.
The swap will be executed immediately after being successfully taken.

Expand All @@ -39,7 +39,7 @@ OPTIONS
--offer-id
The ID of the buy or sell offer to take.

--payment-account
--payment-account-id
The ID of the fiat payment account used to send or receive funds during the Bisq v1 protocol trade.
The payment account's payment method must match that of the offer.
This parameter is not valid for taking BSQ Swaps, due to swaps' different transaction structure,
Expand All @@ -66,6 +66,6 @@ To take an offer with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea
paying the Bisq trading fee in BSQ,
and setting the trade amount = the offer's min-amount (0.025 BTC):
$ ./bisq-cli --password=xyz --port=9998 takeoffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \
--payment-account=fe20cdbd-22be-4b8a-a4b6-d2608ff09d6e \
--payment-account-id=fe20cdbd-22be-4b8a-a4b6-d2608ff09d6e \
--fee-currency=bsq \
--amount=0.025
Loading