Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.18 backport] Index the genesis block with txindex #839

Merged
merged 2 commits into from
Mar 24, 2020
Merged

[0.18 backport] Index the genesis block with txindex #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ad748
Index the genesis block with txindex
stevenroose Mar 23, 2020
b23efb2
Improve coinbase and issuance tx testing for txindex
stevenroose Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/index/txindex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ bool TxIndex::Init()
bool TxIndex::WriteBlock(const CBlock& block, const CBlockIndex* pindex)
{
// Exclude genesis block transaction because outputs are not spendable.
if (pindex->nHeight == 0) return true;
//ELEMENTS: we do index the genesis block
//if (pindex->nHeight == 0) return true;

CDiskTxPos pos(pindex->GetBlockPos(), GetSizeOfCompactSize(block.vtx.size()));
std::vector<std::pair<uint256, CDiskTxPos>> vPos;
Expand Down
3 changes: 2 additions & 1 deletion src/test/txindex_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)
}

// Check that txindex excludes genesis block transactions.
//ELEMENTS: we do include them
const CBlock& genesis_block = Params().GenesisBlock();
for (const auto& txn : genesis_block.vtx) {
BOOST_CHECK(!txindex.FindTx(txn->GetHash(), block_hash, tx_disk));
BOOST_CHECK(txindex.FindTx(txn->GetHash(), block_hash, tx_disk));
}

// Check that txindex has all txs that were in the chain before it started.
Expand Down
21 changes: 14 additions & 7 deletions test/functional/feature_connect_genesis_outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def set_test_params(self):
self.num_nodes = 2
self.setup_clean_chain = True
# First node doesn't connect coinbase output to db, second does
self.extra_args = [["-con_connect_genesis_outputs=0", "-initialfreecoins={}".format(NUM_INITIAL_COINS * COIN)],
self.extra_args = [["-con_connect_genesis_outputs=0", "-initialfreecoins={}".format(NUM_INITIAL_COINS * COIN), '-txindex=1'],
["-con_connect_genesis_outputs=1", "-initialfreecoins={}".format(NUM_INITIAL_COINS * COIN), '-anyonecanspendaremine=1']]

def skip_test_if_missing_module(self):
Expand Down Expand Up @@ -49,15 +49,22 @@ def run_test(self):
assert_equal(unspent[0]["amount"], NUM_INITIAL_COINS)
assert_equal(unspent[0]["confirmations"], 1)

# Test rpc getraw functionality
# Test rpc getraw functionality.

# Coinbase transaction is provably unspendable (OP_RETURN), so even AddCoin won't add it
assert_raises_rpc_error(-5, "No such mempool transaction. Use -txindex to enable blockchain transaction queries. Use gettransaction for wallet transactions.", self.nodes[0].getrawtransaction, coinbase_tx)
assert_raises_rpc_error(-5, "No such mempool transaction. Use -txindex to enable blockchain transaction queries. Use gettransaction for wallet transactions.", self.nodes[1].getrawtransaction, coinbase_tx)
# Node 0 has txindex.
self.nodes[0].getrawtransaction(coinbase_tx, False)
self.nodes[0].getrawtransaction(issuance_tx, False)

# Issuance transaction is an OP_TRUE, so will be available to second node
assert_raises_rpc_error(-5, "No such mempool transaction. Use -txindex to enable blockchain transaction queries. Use gettransaction for wallet transactions.", self.nodes[0].getrawtransaction, issuance_tx)
# Node 1 doesn't.
assert_raises_rpc_error(-5, "No such mempool transaction. Use -txindex to enable blockchain transaction queries. Use gettransaction for wallet transactions.", self.nodes[1].getrawtransaction, coinbase_tx)
assert_raises_rpc_error(-5, "No such mempool transaction. Use -txindex to enable blockchain transaction queries. Use gettransaction for wallet transactions.", self.nodes[1].getrawtransaction, issuance_tx)
# But it can still access them by providing the genesis block hash.
self.nodes[1].getrawtransaction(coinbase_tx, False, self.nodes[0].getblockhash(0))
self.nodes[1].getrawtransaction(issuance_tx, False, self.nodes[0].getblockhash(0))

# Because the issuance tx is OP_TRUE, node 1 (with anyonecanspendaremine) has them in the wallet.
assert_raises_rpc_error(-5, "Invalid or non-wallet transaction id", self.nodes[0].gettransaction, issuance_tx)
self.nodes[1].gettransaction(issuance_tx)

if __name__ == '__main__':
ConnectGenesisTest().main()