github
/
bitcoin
mirror of https://github.com/bitcoin/bitcoin
1
Fork 0
Code Releases Activity

Do not require -txindex for -txospenderindex 

This makes -txospenderindex compatible with pruning too.
This commit is contained in:
sstone 2022-12-02 14:32:23 +01:00 committed by sstone
parent 38d5ee5c79
commit eada8fcba0
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/index/txospenderindex.h
View File

@ -22,7 +22,7 @@ protected:
private:
const std::unique_ptr<DB> m_db;
bool AllowPrune() const override { return false; }
bool AllowPrune() const override { return true; }
protected:
bool CustomAppend(const interfaces::BlockInfo& block) override;

7
src/init.cpp
View File

@ -955,9 +955,6 @@ bool AppInitParameterInteraction(const ArgsManager& args)
if (args.GetIntArg("-prune", 0)) {
if (args.GetBoolArg("-txindex", DEFAULT_TXINDEX))
return InitError(_("Prune mode is incompatible with -txindex."));
if (args.GetBoolArg("-txospenderindex", DEFAULT_TXOSPENDERINDEX)) {
return InitError(_("Prune mode is incompatible with -txospenderindex."));
}
if (args.GetBoolArg("-reindex-chainstate", false)) {
return InitError(_("Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead."));
}
@ -1657,10 +1654,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
}
if (args.GetBoolArg("-txospenderindex", DEFAULT_TXOSPENDERINDEX)) {
if (!args.GetBoolArg("-txindex", DEFAULT_TXINDEX)) {
return InitError(_("-txospenderindex requires -txindex."));
}
g_txospenderindex = std::make_unique<TxoSpenderIndex>(interfaces::MakeChain(node), cache_sizes.txospender_index, false, fReindex);
node.indexes.emplace_back(g_txospenderindex.get());
}

19
test/functional/rpc_mempool_info.py
View File

@ -16,9 +16,9 @@ class RPCMempoolInfoTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 3
self.extra_args = [
["-txindex", "-txospenderindex", "-whitelist=noban@127.0.0.1"],
["-txindex", "-txospenderindex", "-whitelist=noban@127.0.0.1"],
["-txindex", "-whitelist=noban@127.0.0.1"],
["-txospenderindex", "-whitelist=noban@127.0.0.1"],
["-txospenderindex", "-whitelist=noban@127.0.0.1"],
["-whitelist=noban@127.0.0.1"],
]
def run_test(self):
@ -147,7 +147,7 @@ class RPCMempoolInfoTest(BitcoinTestFramework):
confirmed_utxo = self.wallet.get_utxo(mark_as_spent = False)
tx1 = create_tx(utxos_to_spend=[confirmed_utxo], num_outputs=1)
tx2 = create_tx(utxos_to_spend=[tx1["new_utxos"][0]], num_outputs=1)
# tx1 spends our utxo, tx2 spends
# tx1 spends our utxo, tx2 spends tx1
self.generate(self.wallet, 1)
# tx1 and tx2 are confirmed, and indexed in txospenderindex
result = self.nodes[0].gettxspendingprevout([ {'txid' : confirmed_utxo['txid'], 'vout' : 0} ])
@ -155,9 +155,10 @@ class RPCMempoolInfoTest(BitcoinTestFramework):
result = self.nodes[0].gettxspendingprevout([ {'txid' : tx1['txid'], 'vout' : 0} ])
assert_equal(result, [ {'txid' : tx1['txid'], 'vout' : 0, 'spendingtxid' : tx2["txid"]} ])
# replace tx1 with tx3
self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
self.nodes[1].invalidateblock(self.nodes[1].getbestblockhash())
self.nodes[2].invalidateblock(self.nodes[2].getbestblockhash())
blockhash= self.nodes[0].getbestblockhash()
self.nodes[0].invalidateblock(blockhash)
self.nodes[1].invalidateblock(blockhash)
self.nodes[2].invalidateblock(blockhash)
tx3 = create_tx(utxos_to_spend=[confirmed_utxo], num_outputs=2, fee_per_output=2000)
assert tx3["txid"] in self.nodes[0].getrawmempool()
assert not tx1["txid"] in self.nodes[0].getrawmempool()
@ -165,8 +166,10 @@ class RPCMempoolInfoTest(BitcoinTestFramework):
# tx2 is not in the mempool anymore, but still in txospender index which has not been rewound yet
result = self.nodes[0].gettxspendingprevout([ {'txid' : tx1['txid'], 'vout' : 0} ])
assert_equal(result, [ {'txid' : tx1['txid'], 'vout' : 0, 'spendingtxid' : tx2["txid"]} ])
txinfo = self.nodes[0].getrawtransaction(tx2["txid"], True)
txinfo = self.nodes[0].getrawtransaction(tx2["txid"], verbose = True, blockhash = blockhash)
assert_equal(txinfo["confirmations"], 0)
assert_equal(txinfo["in_active_chain"], False)
self.generate(self.wallet, 1)
# we check that the spending tx for tx1 is now tx3
result = self.nodes[0].gettxspendingprevout([ {'txid' : confirmed_utxo['txid'], 'vout' : 0} ])