Merge pull request #7 from daira/1454-deprecate-accounts
1454 deprecate accounts
This commit is contained in:
commit
29af81274e
|
@ -64,8 +64,8 @@ class ListTransactionsTest(BitcoinTestFramework):
|
||||||
# sendmany from node1: twice to self, twice to node2:
|
# sendmany from node1: twice to self, twice to node2:
|
||||||
send_to = { self.nodes[0].getnewaddress() : 0.11,
|
send_to = { self.nodes[0].getnewaddress() : 0.11,
|
||||||
self.nodes[1].getnewaddress() : 0.22,
|
self.nodes[1].getnewaddress() : 0.22,
|
||||||
self.nodes[0].getaccountaddress("from1") : 0.33,
|
self.nodes[0].getaccountaddress("") : 0.33,
|
||||||
self.nodes[1].getaccountaddress("toself") : 0.44 }
|
self.nodes[1].getaccountaddress("") : 0.44 }
|
||||||
txid = self.nodes[1].sendmany("", send_to)
|
txid = self.nodes[1].sendmany("", send_to)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
check_array_result(self.nodes[1].listtransactions(),
|
check_array_result(self.nodes[1].listtransactions(),
|
||||||
|
@ -85,13 +85,13 @@ class ListTransactionsTest(BitcoinTestFramework):
|
||||||
{"txid":txid} )
|
{"txid":txid} )
|
||||||
check_array_result(self.nodes[0].listtransactions(),
|
check_array_result(self.nodes[0].listtransactions(),
|
||||||
{"category":"receive","amount":Decimal("0.33")},
|
{"category":"receive","amount":Decimal("0.33")},
|
||||||
{"txid":txid, "account" : "from1"} )
|
{"txid":txid, "account" : ""} )
|
||||||
check_array_result(self.nodes[1].listtransactions(),
|
check_array_result(self.nodes[1].listtransactions(),
|
||||||
{"category":"send","amount":Decimal("-0.44")},
|
{"category":"send","amount":Decimal("-0.44")},
|
||||||
{"txid":txid, "account" : ""} )
|
{"txid":txid, "account" : ""} )
|
||||||
check_array_result(self.nodes[1].listtransactions(),
|
check_array_result(self.nodes[1].listtransactions(),
|
||||||
{"category":"receive","amount":Decimal("0.44")},
|
{"category":"receive","amount":Decimal("0.44")},
|
||||||
{"txid":txid, "account" : "toself"} )
|
{"txid":txid, "account" : ""} )
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
ListTransactionsTest().main()
|
ListTransactionsTest().main()
|
||||||
|
|
|
@ -30,19 +30,14 @@ class TxnMallTest(BitcoinTestFramework):
|
||||||
for i in range(4):
|
for i in range(4):
|
||||||
assert_equal(self.nodes[i].getbalance(), starting_balance)
|
assert_equal(self.nodes[i].getbalance(), starting_balance)
|
||||||
self.nodes[i].getnewaddress("") # bug workaround, coins generated assigned to first getnewaddress!
|
self.nodes[i].getnewaddress("") # bug workaround, coins generated assigned to first getnewaddress!
|
||||||
|
|
||||||
# Assign coins to foo and bar accounts:
|
|
||||||
self.nodes[0].move("", "foo", (starting_balance - (mining_reward - 5)))
|
|
||||||
self.nodes[0].move("", "bar", (mining_reward - 5))
|
|
||||||
assert_equal(self.nodes[0].getbalance(""), 0)
|
|
||||||
|
|
||||||
# Coins are sent to node1_address
|
# Coins are sent to node1_address
|
||||||
node1_address = self.nodes[1].getnewaddress("from0")
|
node1_address = self.nodes[1].getnewaddress("")
|
||||||
|
|
||||||
# First: use raw transaction API to send (starting_balance - (mining_reward - 2)) BTC to node1_address,
|
# First: use raw transaction API to send (starting_balance - (mining_reward - 2)) BTC to node1_address,
|
||||||
# but don't broadcast:
|
# but don't broadcast:
|
||||||
(total_in, inputs) = gather_inputs(self.nodes[0], (starting_balance - (mining_reward - 2)))
|
(total_in, inputs) = gather_inputs(self.nodes[0], (starting_balance - (mining_reward - 2)))
|
||||||
change_address = self.nodes[0].getnewaddress("foo")
|
change_address = self.nodes[0].getnewaddress("")
|
||||||
outputs = {}
|
outputs = {}
|
||||||
outputs[change_address] = (mining_reward - 2)
|
outputs[change_address] = (mining_reward - 2)
|
||||||
outputs[node1_address] = (starting_balance - (mining_reward - 2))
|
outputs[node1_address] = (starting_balance - (mining_reward - 2))
|
||||||
|
@ -53,9 +48,9 @@ class TxnMallTest(BitcoinTestFramework):
|
||||||
# Create two transaction from node[0] to node[1]; the
|
# Create two transaction from node[0] to node[1]; the
|
||||||
# second must spend change from the first because the first
|
# second must spend change from the first because the first
|
||||||
# spends all mature inputs:
|
# spends all mature inputs:
|
||||||
txid1 = self.nodes[0].sendfrom("foo", node1_address, (starting_balance - (mining_reward - 2)), 0)
|
txid1 = self.nodes[0].sendfrom("", node1_address, (starting_balance - (mining_reward - 2)), 0)
|
||||||
txid2 = self.nodes[0].sendfrom("bar", node1_address, 5, 0)
|
txid2 = self.nodes[0].sendfrom("", node1_address, 5, 0)
|
||||||
|
|
||||||
# Have node0 mine a block:
|
# Have node0 mine a block:
|
||||||
if (self.options.mine_block):
|
if (self.options.mine_block):
|
||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
|
@ -72,19 +67,15 @@ class TxnMallTest(BitcoinTestFramework):
|
||||||
expected += tx2["amount"] + tx2["fee"]
|
expected += tx2["amount"] + tx2["fee"]
|
||||||
assert_equal(self.nodes[0].getbalance(), expected)
|
assert_equal(self.nodes[0].getbalance(), expected)
|
||||||
|
|
||||||
# foo and bar accounts should be debited:
|
|
||||||
assert_equal(self.nodes[0].getbalance("foo"), (starting_balance - (mining_reward - 5))+tx1["amount"]+tx1["fee"])
|
|
||||||
assert_equal(self.nodes[0].getbalance("bar"), (mining_reward - 5)+tx2["amount"]+tx2["fee"])
|
|
||||||
|
|
||||||
if self.options.mine_block:
|
if self.options.mine_block:
|
||||||
assert_equal(tx1["confirmations"], 1)
|
assert_equal(tx1["confirmations"], 1)
|
||||||
assert_equal(tx2["confirmations"], 1)
|
assert_equal(tx2["confirmations"], 1)
|
||||||
# Node1's "from0" balance should be both transaction amounts:
|
# Node1's total balance should be its starting balance plus both transaction amounts:
|
||||||
assert_equal(self.nodes[1].getbalance("from0"), -(tx1["amount"]+tx2["amount"]))
|
assert_equal(self.nodes[1].getbalance(""), starting_balance - (tx1["amount"]+tx2["amount"]))
|
||||||
else:
|
else:
|
||||||
assert_equal(tx1["confirmations"], 0)
|
assert_equal(tx1["confirmations"], 0)
|
||||||
assert_equal(tx2["confirmations"], 0)
|
assert_equal(tx2["confirmations"], 0)
|
||||||
|
|
||||||
# Now give doublespend to miner:
|
# Now give doublespend to miner:
|
||||||
mutated_txid = self.nodes[2].sendrawtransaction(doublespend["hex"])
|
mutated_txid = self.nodes[2].sendrawtransaction(doublespend["hex"])
|
||||||
# ... mine a block...
|
# ... mine a block...
|
||||||
|
@ -98,23 +89,19 @@ class TxnMallTest(BitcoinTestFramework):
|
||||||
# Re-fetch transaction info:
|
# Re-fetch transaction info:
|
||||||
tx1 = self.nodes[0].gettransaction(txid1)
|
tx1 = self.nodes[0].gettransaction(txid1)
|
||||||
tx2 = self.nodes[0].gettransaction(txid2)
|
tx2 = self.nodes[0].gettransaction(txid2)
|
||||||
|
|
||||||
# Both transactions should be conflicted
|
# Both transactions should be conflicted
|
||||||
assert_equal(tx1["confirmations"], -1)
|
assert_equal(tx1["confirmations"], -1)
|
||||||
assert_equal(tx2["confirmations"], -1)
|
assert_equal(tx2["confirmations"], -1)
|
||||||
|
|
||||||
# Node0's total balance should be starting balance, plus 100BTC for
|
# Node0's total balance should be starting balance, plus (mining_reward * 2) for
|
||||||
# two more matured blocks, minus (starting_balance - (mining_reward - 2)) for the double-spend:
|
# two more matured blocks, minus (starting_balance - (mining_reward - 2)) for the double-spend:
|
||||||
expected = starting_balance + (mining_reward * 2) - (starting_balance - (mining_reward - 2))
|
expected = starting_balance + (mining_reward * 2) - (starting_balance - (mining_reward - 2))
|
||||||
assert_equal(self.nodes[0].getbalance(), expected)
|
assert_equal(self.nodes[0].getbalance(), expected)
|
||||||
assert_equal(self.nodes[0].getbalance("*"), expected)
|
assert_equal(self.nodes[0].getbalance("*"), expected)
|
||||||
|
|
||||||
# foo account should be debited, but bar account should not:
|
# Node1's total balance should be its starting balance plus the amount of the mutated send:
|
||||||
assert_equal(self.nodes[0].getbalance("foo"), (starting_balance - (mining_reward - 5))-(starting_balance - (mining_reward - 2)))
|
assert_equal(self.nodes[1].getbalance(""), starting_balance + (starting_balance - (mining_reward - 2)))
|
||||||
assert_equal(self.nodes[0].getbalance("bar"), (mining_reward - 5))
|
|
||||||
|
|
||||||
# Node1's "from" account balance should be just the mutated send:
|
|
||||||
assert_equal(self.nodes[1].getbalance("from0"), (starting_balance - (mining_reward - 2)))
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
TxnMallTest().main()
|
TxnMallTest().main()
|
||||||
|
|
|
@ -77,7 +77,7 @@ class WalletTest (BitcoinTestFramework):
|
||||||
inputs = []
|
inputs = []
|
||||||
outputs = {}
|
outputs = {}
|
||||||
inputs.append({ "txid" : utxo["txid"], "vout" : utxo["vout"]})
|
inputs.append({ "txid" : utxo["txid"], "vout" : utxo["vout"]})
|
||||||
outputs[self.nodes[2].getnewaddress("from1")] = utxo["amount"]
|
outputs[self.nodes[2].getnewaddress("")] = utxo["amount"]
|
||||||
raw_tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
raw_tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
txns_to_send.append(self.nodes[0].signrawtransaction(raw_tx))
|
txns_to_send.append(self.nodes[0].signrawtransaction(raw_tx))
|
||||||
|
|
||||||
|
@ -92,12 +92,11 @@ class WalletTest (BitcoinTestFramework):
|
||||||
|
|
||||||
assert_equal(self.nodes[0].getbalance(), 0)
|
assert_equal(self.nodes[0].getbalance(), 0)
|
||||||
assert_equal(self.nodes[2].getbalance(), 50)
|
assert_equal(self.nodes[2].getbalance(), 50)
|
||||||
assert_equal(self.nodes[2].getbalance("from1"), 50-21)
|
|
||||||
assert_equal(self.nodes[0].getbalance("*"), 0)
|
assert_equal(self.nodes[0].getbalance("*"), 0)
|
||||||
assert_equal(self.nodes[2].getbalance("*"), 50)
|
assert_equal(self.nodes[2].getbalance("*"), 50)
|
||||||
|
|
||||||
# Send 10 BTC normal
|
# Send 10 BTC normal
|
||||||
address = self.nodes[0].getnewaddress("test")
|
address = self.nodes[0].getnewaddress("")
|
||||||
self.nodes[2].settxfee(Decimal('0.001'))
|
self.nodes[2].settxfee(Decimal('0.001'))
|
||||||
txid = self.nodes[2].sendtoaddress(address, 10, "", "", False)
|
txid = self.nodes[2].sendtoaddress(address, 10, "", "", False)
|
||||||
self.nodes[2].generate(1)
|
self.nodes[2].generate(1)
|
||||||
|
@ -117,7 +116,7 @@ class WalletTest (BitcoinTestFramework):
|
||||||
assert_equal(self.nodes[0].getbalance("*"), Decimal('19.99900000'))
|
assert_equal(self.nodes[0].getbalance("*"), Decimal('19.99900000'))
|
||||||
|
|
||||||
# Sendmany 10 BTC
|
# Sendmany 10 BTC
|
||||||
txid = self.nodes[2].sendmany('from1', {address: 10}, 0, "", [])
|
txid = self.nodes[2].sendmany("", {address: 10}, 0, "", [])
|
||||||
self.nodes[2].generate(1)
|
self.nodes[2].generate(1)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
assert_equal(self.nodes[2].getbalance(), Decimal('19.99800000'))
|
assert_equal(self.nodes[2].getbalance(), Decimal('19.99800000'))
|
||||||
|
@ -126,7 +125,7 @@ class WalletTest (BitcoinTestFramework):
|
||||||
assert_equal(self.nodes[0].getbalance("*"), Decimal('29.99900000'))
|
assert_equal(self.nodes[0].getbalance("*"), Decimal('29.99900000'))
|
||||||
|
|
||||||
# Sendmany 10 BTC with subtract fee from amount
|
# Sendmany 10 BTC with subtract fee from amount
|
||||||
txid = self.nodes[2].sendmany('from1', {address: 10}, 0, "", [address])
|
txid = self.nodes[2].sendmany("", {address: 10}, 0, "", [address])
|
||||||
self.nodes[2].generate(1)
|
self.nodes[2].generate(1)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
assert_equal(self.nodes[2].getbalance(), Decimal('9.99800000'))
|
assert_equal(self.nodes[2].getbalance(), Decimal('9.99800000'))
|
||||||
|
@ -151,7 +150,7 @@ class WalletTest (BitcoinTestFramework):
|
||||||
sync_mempools(self.nodes)
|
sync_mempools(self.nodes)
|
||||||
|
|
||||||
assert(txid1 in self.nodes[3].getrawmempool())
|
assert(txid1 in self.nodes[3].getrawmempool())
|
||||||
|
|
||||||
#check if we can list zero value tx as available coins
|
#check if we can list zero value tx as available coins
|
||||||
#1. create rawtx
|
#1. create rawtx
|
||||||
#2. hex-changed one output to 0.0
|
#2. hex-changed one output to 0.0
|
||||||
|
@ -160,18 +159,18 @@ class WalletTest (BitcoinTestFramework):
|
||||||
usp = self.nodes[1].listunspent()
|
usp = self.nodes[1].listunspent()
|
||||||
inputs = [{"txid":usp[0]['txid'], "vout":usp[0]['vout']}]
|
inputs = [{"txid":usp[0]['txid'], "vout":usp[0]['vout']}]
|
||||||
outputs = {self.nodes[1].getnewaddress(): 9.998, self.nodes[0].getnewaddress(): 11.11}
|
outputs = {self.nodes[1].getnewaddress(): 9.998, self.nodes[0].getnewaddress(): 11.11}
|
||||||
|
|
||||||
rawTx = self.nodes[1].createrawtransaction(inputs, outputs).replace("c0833842", "00000000") #replace 11.11 with 0.0 (int32)
|
rawTx = self.nodes[1].createrawtransaction(inputs, outputs).replace("c0833842", "00000000") #replace 11.11 with 0.0 (int32)
|
||||||
decRawTx = self.nodes[1].decoderawtransaction(rawTx)
|
decRawTx = self.nodes[1].decoderawtransaction(rawTx)
|
||||||
signedRawTx = self.nodes[1].signrawtransaction(rawTx)
|
signedRawTx = self.nodes[1].signrawtransaction(rawTx)
|
||||||
decRawTx = self.nodes[1].decoderawtransaction(signedRawTx['hex'])
|
decRawTx = self.nodes[1].decoderawtransaction(signedRawTx['hex'])
|
||||||
zeroValueTxid= decRawTx['txid']
|
zeroValueTxid= decRawTx['txid']
|
||||||
sendResp = self.nodes[1].sendrawtransaction(signedRawTx['hex'])
|
sendResp = self.nodes[1].sendrawtransaction(signedRawTx['hex'])
|
||||||
|
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
self.nodes[1].generate(1) #mine a block
|
self.nodes[1].generate(1) #mine a block
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
|
||||||
unspentTxs = self.nodes[0].listunspent() #zero value tx must be in listunspents output
|
unspentTxs = self.nodes[0].listunspent() #zero value tx must be in listunspents output
|
||||||
found = False
|
found = False
|
||||||
for uTx in unspentTxs:
|
for uTx in unspentTxs:
|
||||||
|
@ -179,7 +178,7 @@ class WalletTest (BitcoinTestFramework):
|
||||||
found = True
|
found = True
|
||||||
assert_equal(uTx['amount'], Decimal('0.00000000'));
|
assert_equal(uTx['amount'], Decimal('0.00000000'));
|
||||||
assert(found)
|
assert(found)
|
||||||
|
|
||||||
#do some -walletbroadcast tests
|
#do some -walletbroadcast tests
|
||||||
stop_nodes(self.nodes)
|
stop_nodes(self.nodes)
|
||||||
wait_bitcoinds()
|
wait_bitcoinds()
|
||||||
|
@ -203,10 +202,10 @@ class WalletTest (BitcoinTestFramework):
|
||||||
txObjNotBroadcasted = self.nodes[0].gettransaction(txIdNotBroadcasted)
|
txObjNotBroadcasted = self.nodes[0].gettransaction(txIdNotBroadcasted)
|
||||||
assert_equal(self.nodes[2].getbalance(), Decimal('11.99800000')); #should not be
|
assert_equal(self.nodes[2].getbalance(), Decimal('11.99800000')); #should not be
|
||||||
assert_equal(self.nodes[2].getbalance("*"), Decimal('11.99800000')); #should not be
|
assert_equal(self.nodes[2].getbalance("*"), Decimal('11.99800000')); #should not be
|
||||||
|
|
||||||
#create another tx
|
#create another tx
|
||||||
txIdNotBroadcasted = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 2);
|
txIdNotBroadcasted = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 2);
|
||||||
|
|
||||||
#restart the nodes with -walletbroadcast=1
|
#restart the nodes with -walletbroadcast=1
|
||||||
stop_nodes(self.nodes)
|
stop_nodes(self.nodes)
|
||||||
wait_bitcoinds()
|
wait_bitcoinds()
|
||||||
|
@ -215,10 +214,10 @@ class WalletTest (BitcoinTestFramework):
|
||||||
connect_nodes_bi(self.nodes,1,2)
|
connect_nodes_bi(self.nodes,1,2)
|
||||||
connect_nodes_bi(self.nodes,0,2)
|
connect_nodes_bi(self.nodes,0,2)
|
||||||
sync_blocks(self.nodes)
|
sync_blocks(self.nodes)
|
||||||
|
|
||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
sync_blocks(self.nodes)
|
sync_blocks(self.nodes)
|
||||||
|
|
||||||
#tx should be added to balance because after restarting the nodes tx should be broadcastet
|
#tx should be added to balance because after restarting the nodes tx should be broadcastet
|
||||||
assert_equal(self.nodes[2].getbalance(), Decimal('13.99800000')); #should not be
|
assert_equal(self.nodes[2].getbalance(), Decimal('13.99800000')); #should not be
|
||||||
assert_equal(self.nodes[2].getbalance("*"), Decimal('13.99800000')); #should not be
|
assert_equal(self.nodes[2].getbalance("*"), Decimal('13.99800000')); #should not be
|
||||||
|
|
Loading…
Reference in New Issue