Skip to content

Commit

Permalink
fix locks and add rpc command listpendingtransactions
Browse files Browse the repository at this point in the history
  • Loading branch information
alex v committed Aug 18, 2024
1 parent f0c4850 commit e3411ff
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 16 deletions.
14 changes: 6 additions & 8 deletions src/blsct/wallet/txfactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ TxFactoryBase::BuildTx(const blsct::DoublePublicKey& changeDestination, const CA
std::vector<Signature> txSigs = outputSignatures;

for (auto& in_ : vInputs) {
auto tokenFee = (in_.first == TokenId() ? nFee : 0);

for (auto& in : in_.second) {
tx.vin.push_back(in.in);
gammaAcc = gammaAcc + in.gamma;
Expand Down Expand Up @@ -134,16 +132,13 @@ TxFactoryBase::BuildTx(const blsct::DoublePublicKey& changeDestination, const CA
std::optional<CMutableTransaction> TxFactoryBase::CreateTransaction(const std::vector<InputCandidates>& inputCandidates, const blsct::DoublePublicKey& changeDestination, const SubAddress& destination, const CAmount& nAmount, std::string sMemo, const TokenId& token_id, const CreateTransactionType& type, const CAmount& minStake)
{
auto tx = blsct::TxFactoryBase();
CAmount inAmount = 0;

if (type == STAKED_COMMITMENT) {
CAmount inputFromStakedCommitments = 0;

for (const auto& output : inputCandidates) {
if (output.is_staked_commitment)
inputFromStakedCommitments += output.amount;
if (!output.is_staked_commitment)
inAmount += output.amount;

tx.AddInput(output.amount, output.gamma, output.spendingKey, output.token_id, COutPoint(output.outpoint.hash, output.outpoint.n));
}
Expand Down Expand Up @@ -225,10 +220,9 @@ TxFactory::BuildTx()
return TxFactoryBase::BuildTx(std::get<blsct::DoublePublicKey>(km->GetNewDestination(-1).value()));
}

void TxFactoryBase::AddAvailableCoins(wallet::CWallet* wallet, blsct::KeyMan* blsct_km, const wallet::CoinFilterParams& coins_params, std::vector<InputCandidates>& inputCandidates) EXCLUSIVE_LOCKS_REQUIRED(wallet->cs_wallet)
void TxFactoryBase::AddAvailableCoins(wallet::CWallet* wallet, blsct::KeyMan* blsct_km, const wallet::CoinFilterParams& coins_params, std::vector<InputCandidates>& inputCandidates)
{
LOCK(wallet->cs_wallet);

AssertLockHeld(wallet->cs_wallet);
for (const wallet::COutput& output : AvailableCoins(*wallet, nullptr, std::nullopt, coins_params).All()) {
auto tx = wallet->GetWalletTx(output.outpoint.hash);

Expand All @@ -244,6 +238,8 @@ void TxFactoryBase::AddAvailableCoins(wallet::CWallet* wallet, blsct::KeyMan* bl

void TxFactoryBase::AddAvailableCoins(wallet::CWallet* wallet, blsct::KeyMan* blsct_km, const TokenId& token_id, const CreateTransactionType& type, std::vector<InputCandidates>& inputCandidates)
{
AssertLockHeld(wallet->cs_wallet);

wallet::CoinFilterParams coins_params;
coins_params.min_amount = 0;
coins_params.only_blsct = true;
Expand All @@ -260,6 +256,8 @@ void TxFactoryBase::AddAvailableCoins(wallet::CWallet* wallet, blsct::KeyMan* bl

std::optional<CMutableTransaction> TxFactory::CreateTransaction(wallet::CWallet* wallet, blsct::KeyMan* blsct_km, const SubAddress& destination, const CAmount& nAmount, std::string sMemo, const TokenId& token_id, const CreateTransactionType& type, const CAmount& minStake)
{
LOCK(wallet->cs_wallet);

std::vector<InputCandidates> inputCandidates;

TxFactoryBase::AddAvailableCoins(wallet, blsct_km, token_id, type, inputCandidates);
Expand Down
2 changes: 1 addition & 1 deletion src/blsct/wallet/txfactory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class TxFactoryBase
std::optional<CMutableTransaction> BuildTx(const blsct::DoublePublicKey& changeDestination, const CAmount& minStake = 0, const CreateTransactionType& type = NORMAL, const bool& fSubtractedFee = false);
static std::optional<CMutableTransaction> CreateTransaction(const std::vector<InputCandidates>& inputCandidates, const blsct::DoublePublicKey& changeDestination, const SubAddress& destination, const CAmount& nAmount, std::string sMemo, const TokenId& token_id = TokenId(), const CreateTransactionType& type = NORMAL, const CAmount& minStake = 0);
static void AddAvailableCoins(wallet::CWallet* wallet, blsct::KeyMan* blsct_km, const wallet::CoinFilterParams& coins_params, std::vector<InputCandidates>& inputCandidates) EXCLUSIVE_LOCKS_REQUIRED(wallet->cs_wallet);
static void AddAvailableCoins(wallet::CWallet* wallet, blsct::KeyMan* blsct_km, const TokenId& token_id, const CreateTransactionType& type, std::vector<InputCandidates>& inputCandidates);
static void AddAvailableCoins(wallet::CWallet* wallet, blsct::KeyMan* blsct_km, const TokenId& token_id, const CreateTransactionType& type, std::vector<InputCandidates>& inputCandidates) EXCLUSIVE_LOCKS_REQUIRED(wallet->cs_wallet);
};

class TxFactory : public TxFactoryBase
Expand Down
2 changes: 1 addition & 1 deletion src/blsct/wallet/txfactory_global.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using Points = Elements<Point>;
using Scalar = T::Scalar;
using Scalars = Elements<Scalar>;

#define BLSCT_DEFAULT_FEE 50
#define BLSCT_DEFAULT_FEE 125

namespace blsct {
struct UnsignedOutput {
Expand Down
115 changes: 109 additions & 6 deletions src/wallet/rpc/transactions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,18 @@ static void MaybePushAddress(UniValue & entry, const CTxDestination &dest)
* @param filter_label Optional label string to filter incoming transactions.
*/
template <class Vec>
static void ListTransactions(const CWallet& wallet, const CWalletTx& wtx, int nMinDepth, bool fLong,
static void ListTransactions(const CWallet& wallet, const CWalletTx& wtx, int nMinDepth, int nMaxDepth, bool fLong,
Vec& ret, const isminefilter& filter_ismine, const std::optional<std::string>& filter_label,
bool include_change = false)
bool include_change = false, bool include_staking = true)
EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
{
CAmount nFee;
std::list<COutputEntry> listReceived;
std::list<COutputEntry> listSent;

if (wallet.GetTxDepthInMainChain(wtx) > nMaxDepth)
return;

CachedTxGetAmounts(wallet, wtx, listReceived, listSent, nFee, filter_ismine, include_change);

bool involvesWatchonly = CachedTxIsFromMe(wallet, wtx, ISMINE_WATCH_ONLY);
Expand Down Expand Up @@ -368,6 +371,8 @@ static void ListTransactions(const CWallet& wallet, const CWalletTx& wtx, int nM
if (address_book_entry) {
label = address_book_entry->GetLabel();
}
if (label == "Staking" && !include_staking)
continue;
if (filter_label.has_value() && label != filter_label.value()) {
continue;
}
Expand Down Expand Up @@ -515,7 +520,105 @@ RPCHelpMan listtransactions()
// iterate backwards until we have nCount items to return:
for (CWallet::TxItems::const_reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) {
CWalletTx* const pwtx = (*it).second;
ListTransactions(*pwallet, *pwtx, 0, true, ret, filter, filter_label);
ListTransactions(*pwallet, *pwtx, 0, 100000000, true, ret, filter, filter_label);
if ((int)ret.size() >= (nCount + nFrom)) break;
}
}

// ret is newest to oldest

if (nFrom > (int)ret.size())
nFrom = ret.size();
if ((nFrom + nCount) > (int)ret.size())
nCount = ret.size() - nFrom;

auto txs_rev_it{std::make_move_iterator(ret.rend())};
UniValue result{UniValue::VARR};
result.push_backV(txs_rev_it - nFrom - nCount, txs_rev_it - nFrom); // Return oldest to newest
return result;
},
};
}

RPCHelpMan listpendingtransactions()
{
return RPCHelpMan{
"listpendingtransactions",
"\nIf a label name is provided, this will return only incoming transactions paying to addresses with the specified label.\n"
"\nReturns up to 'count' unconfirmed transactions skipping the first 'from' transactions.\n",
{
{"label|dummy", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "If set, should be a valid label name to return only incoming transactions\n"
"with the specified label, or \"*\" to disable filtering and return all transactions."},
{"count", RPCArg::Type::NUM, RPCArg::Default{10}, "The number of transactions to return"},
{"skip", RPCArg::Type::NUM, RPCArg::Default{0}, "The number of transactions to skip"},
{"include_watchonly", RPCArg::Type::BOOL, RPCArg::DefaultHint{"true for watch-only wallets, otherwise false"}, "Include transactions to watch-only addresses (see 'importaddress')"},
},
RPCResult{
RPCResult::Type::ARR, "", "", {
{RPCResult::Type::OBJ, "", "", Cat(Cat<std::vector<RPCResult>>({
{RPCResult::Type::BOOL, "involvesWatchonly", /*optional=*/true, "Only returns true if imported addresses were involved in transaction."},
{RPCResult::Type::STR, "address", /*optional=*/true, "The bitcoin address of the transaction (not returned if the output does not have an address, e.g. OP_RETURN null data)."},
{RPCResult::Type::STR, "category", "The transaction category.\n"
"\"send\" Transactions sent.\n"
"\"receive\" Non-coinbase transactions received.\n"
"\"generate\" Coinbase transactions received with more than 100 confirmations.\n"
"\"immature\" Coinbase transactions received with 100 or fewer confirmations.\n"
"\"orphan\" Orphaned coinbase transactions received."},
{RPCResult::Type::STR_AMOUNT, "amount", "The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and is positive\n"
"for all other categories"},
{RPCResult::Type::STR, "label", /*optional=*/true, "A comment for the address/transaction, if any"},
{RPCResult::Type::NUM, "vout", /*optional=*/true, "the vout value"},
{RPCResult::Type::STR_AMOUNT, "fee", /*optional=*/true, "The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the\n"
"'send' category of transactions."},
},
TransactionDescriptionString()),
{
{RPCResult::Type::BOOL, "abandoned", "'true' if the transaction has been abandoned (inputs are respendable)."},
})},
}},
RPCExamples{"\nList the most recent 10 transactions in the systems\n" + HelpExampleCli("listpendingtransactions", "") + "\nList transactions 100 to 120\n" + HelpExampleCli("listpendingtransactions", "\"*\" 20 100") + "\nAs a JSON-RPC call\n" + HelpExampleRpc("listpendingtransactions", "\"*\", 20, 100")},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
if (!pwallet) return UniValue::VNULL;

// Make sure the results are valid at least up to the most recent block
// the user could have gotten from another RPC command prior to now
pwallet->BlockUntilSyncedToCurrentChain();

std::optional<std::string> filter_label;
if (!request.params[0].isNull() && request.params[0].get_str() != "*") {
filter_label.emplace(LabelFromValue(request.params[0]));
if (filter_label.value().empty()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Label argument must be a valid label name or \"*\".");
}
}
int nCount = 10;
if (!request.params[1].isNull())
nCount = request.params[1].getInt<int>();
int nFrom = 0;
if (!request.params[2].isNull())
nFrom = request.params[2].getInt<int>();
isminefilter filter = ISMINE_SPENDABLE | ISMINE_SPENDABLE_BLSCT;

if (ParseIncludeWatchonly(request.params[3], *pwallet)) {
filter |= ISMINE_WATCH_ONLY;
}

if (nCount < 0)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative count");
if (nFrom < 0)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative from");

std::vector<UniValue> ret;
{
LOCK(pwallet->cs_wallet);

const CWallet::TxItems& txOrdered = pwallet->wtxOrdered;

// iterate backwards until we have nCount items to return:
for (CWallet::TxItems::const_reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) {
CWalletTx* const pwtx = (*it).second;
ListTransactions(*pwallet, *pwtx, -100000000, 0, true, ret, filter, filter_label);
if ((int)ret.size() >= (nCount + nFrom)) break;
}
}
Expand Down Expand Up @@ -642,7 +745,7 @@ RPCHelpMan listsinceblock()
const CWalletTx& tx = pairWtx.second;

if (depth == -1 || abs(wallet.GetTxDepthInMainChain(tx)) < depth) {
ListTransactions(wallet, tx, 0, true, transactions, filter, filter_label, include_change);
ListTransactions(wallet, tx, 0, 100000000, true, transactions, filter, filter_label, include_change);
}
}

Expand All @@ -659,7 +762,7 @@ RPCHelpMan listsinceblock()
if (it != wallet.mapWallet.end()) {
// We want all transactions regardless of confirmation count to appear here,
// even negative confirmation ones, hence the big negative.
ListTransactions(wallet, it->second, -100000000, true, removed, filter, filter_label, include_change);
ListTransactions(wallet, it->second, -100000000, 100000000, true, removed, filter, filter_label, include_change);
}
}
blockId = block.hashPrevBlock;
Expand Down Expand Up @@ -777,7 +880,7 @@ RPCHelpMan gettransaction()
WalletTxToJSON(*pwallet, wtx, entry);

UniValue details(UniValue::VARR);
ListTransactions(*pwallet, wtx, 0, false, details, filter, /*filter_label=*/std::nullopt);
ListTransactions(*pwallet, wtx, 0, 100000000, false, details, filter, /*filter_label=*/std::nullopt);
entry.pushKV("details", details);

entry.pushKV("hex", EncodeHexTx(*wtx.tx));
Expand Down
2 changes: 2 additions & 0 deletions src/wallet/rpc/wallet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,7 @@ RPCHelpMan signmessage();
RPCHelpMan listreceivedbyaddress();
RPCHelpMan listreceivedbylabel();
RPCHelpMan listtransactions();
RPCHelpMan listpendingtransactions();
RPCHelpMan listsinceblock();
RPCHelpMan gettransaction();
RPCHelpMan abandontransaction();
Expand Down Expand Up @@ -934,6 +935,7 @@ Span<const CRPCCommand> GetWalletRPCCommands()
{"wallet", &listsinceblock},
{"wallet", &liststakedcommitments},
{"wallet", &listtransactions},
{"wallet", &listpendingtransactions},
{"wallet", &listunspent},
{"wallet", &listwalletdir},
{"wallet", &listwallets},
Expand Down

0 comments on commit e3411ff

Please sign in to comment.