Skip to content

Commit

Permalink
Merge #6523: fix(qt): dashify PSBT: it's Partially Signed BLOCKCHAIN …
Browse files Browse the repository at this point in the history
…Transaction

931fc32 fix: dashify PSBT: it's Partially Signed BLOCKCHAIN Transaction in Qt and RPC (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  We don't have "partially signed bitcoin transactions", but we have PSBT and it's an established terminology

  ## What was done?
  Dashified "blockchain transaction"

  ## How Has This Been Tested?
  N/A

  ## Breaking Changes
  N/A

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 931fc32
  PastaPastaPasta:
    utACK 931fc32; though I would probably title this `trivial` instead of fix as it's just changing strings

Tree-SHA512: eadfbe1b9ee3409809ad869be5f8e50919591a10d1e56a08eb964925fbed5813f5427f43be774cc9c7796f85797a72b0f26d2991f94e257babe17810cf86d39b
  • Loading branch information
PastaPastaPasta committed Jan 7, 2025
2 parents 24a0fdd + 931fc32 commit f051036
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,9 @@ void BitcoinGUI::createActions()
verifyMessageAction = new QAction(tr("&Verify message…"), this);
verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Dash addresses"));
m_load_psbt_action = new QAction(tr("&Load PSBT from file…"), this);
m_load_psbt_action->setStatusTip(tr("Load Partially Signed Dash Transaction"));
m_load_psbt_action->setStatusTip(tr("Load Partially Signed Blockchain Transaction"));
m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from clipboard…"), this);
m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction from clipboard"));
m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Blockchain Transaction from clipboard"));

openInfoAction = new QAction(tr("&Information"), this);
openInfoAction->setStatusTip(tr("Show diagnostic information"));
Expand Down
2 changes: 1 addition & 1 deletion src/qt/bitcoingui.h
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ public Q_SLOTS:
void gotoSignMessageTab(QString addr = "");
/** Show Sign/Verify Message dialog and switch to verify message tab */
void gotoVerifyMessageTab(QString addr = "");
/** Load Partially Signed Dash Transaction from file or clipboard */
/** Load Partially Signed Bitcoin Transaction from file or clipboard */
void gotoLoadPSBT(bool from_clipboard = false);

/** Show open dialog */
Expand Down
2 changes: 1 addition & 1 deletion src/qt/sendcoinsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ void SendCoinsDialog::setModel(WalletModel *_model)

if (model->wallet().privateKeysDisabled()) {
ui->sendButton->setText(tr("Cr&eate Unsigned"));
ui->sendButton->setToolTip(tr("Creates a Partially Signed Bitcoin Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
ui->sendButton->setToolTip(tr("Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
}

// set the smartfee-sliders default value (wallets default conf.target or last stored value)
Expand Down
4 changes: 2 additions & 2 deletions src/rpc/rawtransaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ static RPCHelpMan testmempoolaccept()
static RPCHelpMan decodepsbt()
{
return RPCHelpMan{"decodepsbt",
"\nReturn a JSON object representing the serialized, base64-encoded partially signed Dash transaction.\n",
"\nReturn a JSON object representing the serialized, base64-encoded partially signed blockchain transaction.\n",
{
{"psbt", RPCArg::Type::STR, RPCArg::Optional::NO, "The PSBT base64 string"},
},
Expand Down Expand Up @@ -1414,7 +1414,7 @@ static RPCHelpMan decodepsbt()
static RPCHelpMan combinepsbt()
{
return RPCHelpMan{"combinepsbt",
"\nCombine multiple partially signed Dash transactions into one transaction.\n"
"\nCombine multiple partially signed blockchain transactions into one transaction.\n"
"Implements the Combiner role.\n",
{
{"txs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The base64 strings of partially signed transactions",
Expand Down

0 comments on commit f051036

Please sign in to comment.