Skip to content

Commit f051036

Browse files
Merge #6523: fix(qt): dashify PSBT: it's Partially Signed BLOCKCHAIN 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
2 parents 24a0fdd + 931fc32 commit f051036

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/qt/bitcoingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,9 @@ void BitcoinGUI::createActions()
409409
verifyMessageAction = new QAction(tr("&Verify message…"), this);
410410
verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Dash addresses"));
411411
m_load_psbt_action = new QAction(tr("&Load PSBT from file…"), this);
412-
m_load_psbt_action->setStatusTip(tr("Load Partially Signed Dash Transaction"));
412+
m_load_psbt_action->setStatusTip(tr("Load Partially Signed Blockchain Transaction"));
413413
m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from clipboard…"), this);
414-
m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction from clipboard"));
414+
m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Blockchain Transaction from clipboard"));
415415

416416
openInfoAction = new QAction(tr("&Information"), this);
417417
openInfoAction->setStatusTip(tr("Show diagnostic information"));

src/qt/bitcoingui.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public Q_SLOTS:
338338
void gotoSignMessageTab(QString addr = "");
339339
/** Show Sign/Verify Message dialog and switch to verify message tab */
340340
void gotoVerifyMessageTab(QString addr = "");
341-
/** Load Partially Signed Dash Transaction from file or clipboard */
341+
/** Load Partially Signed Bitcoin Transaction from file or clipboard */
342342
void gotoLoadPSBT(bool from_clipboard = false);
343343

344344
/** Show open dialog */

src/qt/sendcoinsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ void SendCoinsDialog::setModel(WalletModel *_model)
233233

234234
if (model->wallet().privateKeysDisabled()) {
235235
ui->sendButton->setText(tr("Cr&eate Unsigned"));
236-
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));
236+
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));
237237
}
238238

239239
// set the smartfee-sliders default value (wallets default conf.target or last stored value)

src/rpc/rawtransaction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ static RPCHelpMan testmempoolaccept()
11611161
static RPCHelpMan decodepsbt()
11621162
{
11631163
return RPCHelpMan{"decodepsbt",
1164-
"\nReturn a JSON object representing the serialized, base64-encoded partially signed Dash transaction.\n",
1164+
"\nReturn a JSON object representing the serialized, base64-encoded partially signed blockchain transaction.\n",
11651165
{
11661166
{"psbt", RPCArg::Type::STR, RPCArg::Optional::NO, "The PSBT base64 string"},
11671167
},
@@ -1414,7 +1414,7 @@ static RPCHelpMan decodepsbt()
14141414
static RPCHelpMan combinepsbt()
14151415
{
14161416
return RPCHelpMan{"combinepsbt",
1417-
"\nCombine multiple partially signed Dash transactions into one transaction.\n"
1417+
"\nCombine multiple partially signed blockchain transactions into one transaction.\n"
14181418
"Implements the Combiner role.\n",
14191419
{
14201420
{"txs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The base64 strings of partially signed transactions",

0 commit comments

Comments
 (0)