Skip to content

Commit 5ebe7db

Browse files
committed
Merge pull request #6257
ef2a3de Add paytxfee to getwalletinfo, warnings to getnetworkinfo (Stephen)
2 parents f3d4dbb + ef2a3de commit 5ebe7db

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

qa/rpc-tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Run all possible tests with `qa/pull-tester/rpc-tests.sh -extended`.
2525

2626
Possible options:
2727

28-
````
28+
```
2929
-h, --help show this help message and exit
3030
--nocleanup Leave bitcoinds and test.* datadir on exit or error
3131
--noshutdown Don't stop bitcoinds after the test execution

src/rpcnet.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
408408
" }\n"
409409
" ,...\n"
410410
" ]\n"
411+
" \"warnings\": \"...\" (string) any network warnings (such as alert messages) \n"
411412
"}\n"
412413
"\nExamples:\n"
413414
+ HelpExampleCli("getnetworkinfo", "")
@@ -439,5 +440,6 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
439440
}
440441
}
441442
obj.push_back(Pair("localaddresses", localAddresses));
443+
obj.push_back(Pair("warnings", GetWarnings("statusbar")));
442444
return obj;
443445
}

src/wallet/rpcwallet.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2201,6 +2201,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
22012201
" \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
22022202
" \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n"
22032203
" \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
2204+
" \"paytxfee\": x.xxxx, (numeric) the transaction fee configuration, set in btc/kb\n"
22042205
"}\n"
22052206
"\nExamples:\n"
22062207
+ HelpExampleCli("getwalletinfo", "")
@@ -2219,6 +2220,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
22192220
obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize()));
22202221
if (pwalletMain->IsCrypted())
22212222
obj.push_back(Pair("unlocked_until", nWalletUnlockTime));
2223+
obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK())));
22222224
return obj;
22232225
}
22242226

0 commit comments

Comments
 (0)