rpc: include satoshis in verbose raw transaction
This commit is contained in:
parent
1c022b9fc2
commit
87dfd13694
73
qa/rpc-tests/txindex.py
Executable file
73
qa/rpc-tests/txindex.py
Executable file
@ -0,0 +1,73 @@
|
|||||||
|
#!/usr/bin/env python2
|
||||||
|
# Copyright (c) 2014-2015 The Bitcoin Core developers
|
||||||
|
# Distributed under the MIT software license, see the accompanying
|
||||||
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#
|
||||||
|
# Test txindex generation and fetching
|
||||||
|
#
|
||||||
|
|
||||||
|
import time
|
||||||
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
|
from test_framework.util import *
|
||||||
|
from test_framework.script import *
|
||||||
|
from test_framework.mininode import *
|
||||||
|
import binascii
|
||||||
|
|
||||||
|
class TxIndexTest(BitcoinTestFramework):
|
||||||
|
|
||||||
|
def setup_chain(self):
|
||||||
|
print("Initializing test directory "+self.options.tmpdir)
|
||||||
|
initialize_chain_clean(self.options.tmpdir, 4)
|
||||||
|
|
||||||
|
def setup_network(self):
|
||||||
|
self.nodes = []
|
||||||
|
# Nodes 0/1 are "wallet" nodes
|
||||||
|
self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
|
||||||
|
self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-txindex"]))
|
||||||
|
# Nodes 2/3 are used for testing
|
||||||
|
self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-txindex"]))
|
||||||
|
self.nodes.append(start_node(3, self.options.tmpdir, ["-debug", "-txindex"]))
|
||||||
|
connect_nodes(self.nodes[0], 1)
|
||||||
|
connect_nodes(self.nodes[0], 2)
|
||||||
|
connect_nodes(self.nodes[0], 3)
|
||||||
|
|
||||||
|
self.is_network_split = False
|
||||||
|
self.sync_all()
|
||||||
|
|
||||||
|
def run_test(self):
|
||||||
|
print "Mining blocks..."
|
||||||
|
self.nodes[0].generate(105)
|
||||||
|
self.sync_all()
|
||||||
|
|
||||||
|
chain_height = self.nodes[1].getblockcount()
|
||||||
|
assert_equal(chain_height, 105)
|
||||||
|
|
||||||
|
print "Testing transaction index..."
|
||||||
|
|
||||||
|
privkey = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
|
||||||
|
address = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
|
||||||
|
addressHash = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
|
||||||
|
scriptPubKey = CScript([OP_DUP, OP_HASH160, addressHash, OP_EQUALVERIFY, OP_CHECKSIG])
|
||||||
|
unspent = self.nodes[0].listunspent()
|
||||||
|
tx = CTransaction()
|
||||||
|
amount = unspent[0]["amount"] * 100000000
|
||||||
|
tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
|
||||||
|
tx.vout = [CTxOut(amount, scriptPubKey)]
|
||||||
|
tx.rehash()
|
||||||
|
|
||||||
|
signed_tx = self.nodes[0].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
|
||||||
|
txid = self.nodes[0].sendrawtransaction(signed_tx["hex"], True)
|
||||||
|
self.nodes[0].generate(1)
|
||||||
|
self.sync_all()
|
||||||
|
|
||||||
|
# Check verbose raw transaction results
|
||||||
|
verbose = self.nodes[3].getrawtransaction(unspent[0]["txid"], 1)
|
||||||
|
assert_equal(verbose["vout"][0]["valueSat"], 5000000000);
|
||||||
|
assert_equal(verbose["vout"][0]["value"], 50);
|
||||||
|
|
||||||
|
print "Passed\n"
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
TxIndexTest().main()
|
@ -88,6 +88,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
|
|||||||
const CTxOut& txout = tx.vout[i];
|
const CTxOut& txout = tx.vout[i];
|
||||||
UniValue out(UniValue::VOBJ);
|
UniValue out(UniValue::VOBJ);
|
||||||
out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
|
out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
|
||||||
|
out.push_back(Pair("valueSat", txout.nValue));
|
||||||
out.push_back(Pair("n", (int64_t)i));
|
out.push_back(Pair("n", (int64_t)i));
|
||||||
UniValue o(UniValue::VOBJ);
|
UniValue o(UniValue::VOBJ);
|
||||||
ScriptPubKeyToJSON(txout.scriptPubKey, o, true);
|
ScriptPubKeyToJSON(txout.scriptPubKey, o, true);
|
||||||
|
Loading…
Reference in New Issue
Block a user