diff --git a/test/functional/bip65-cltv-p2p.py b/test/functional/bip65-cltv-p2p.py
--- a/test/functional/bip65-cltv-p2p.py
+++ b/test/functional/bip65-cltv-p2p.py
@@ -43,8 +43,7 @@
tx.nLockTime = height
# Need to re-sign, since nSequence and nLockTime changed
- signed_result = node.signrawtransaction(
- ToHex(tx), None, None, "ALL|FORKID")
+ signed_result = node.signrawtransaction(ToHex(tx))
new_tx = CTransaction()
new_tx.deserialize(BytesIO(hex_str_to_bytes(signed_result['hex'])))
@@ -58,7 +57,7 @@
inputs = [{"txid": from_txid, "vout": 0}]
outputs = {to_address: amount}
rawtx = node.createrawtransaction(inputs, outputs)
- signresult = node.signrawtransaction(rawtx, None, None, "ALL|FORKID")
+ signresult = node.signrawtransaction(rawtx)
tx = CTransaction()
tx.deserialize(BytesIO(hex_str_to_bytes(signresult['hex'])))
return tx
diff --git a/test/functional/bip68-sequence.py b/test/functional/bip68-sequence.py
--- a/test/functional/bip68-sequence.py
+++ b/test/functional/bip68-sequence.py
@@ -81,8 +81,7 @@
CTxIn(COutPoint(int(utxo["txid"], 16), utxo["vout"]), nSequence=sequence_value)]
tx1.vout = [CTxOut(value, CScript([b'a']))]
- tx1_signed = self.nodes[0].signrawtransaction(
- ToHex(tx1), None, None, "ALL|FORKID")["hex"]
+ tx1_signed = self.nodes[0].signrawtransaction(ToHex(tx1))["hex"]
tx1_id = self.nodes[0].sendrawtransaction(tx1_signed)
tx1_id = int(tx1_id, 16)
@@ -201,8 +200,7 @@
tx_size = len(ToHex(tx)) // 2 + 120 * num_inputs + 50
tx.vout.append(
CTxOut(int(value - self.relayfee * tx_size * COIN / 1000), CScript([b'a'])))
- rawtx = self.nodes[0].signrawtransaction(
- ToHex(tx), None, None, "ALL|FORKID")["hex"]
+ rawtx = self.nodes[0].signrawtransaction(ToHex(tx))["hex"]
if (using_sequence_locks and not should_pass):
# This transaction should be rejected
@@ -233,8 +231,7 @@
tx2.vin = [CTxIn(COutPoint(tx1.sha256, 0), nSequence=0)]
tx2.vout = [
CTxOut(int(tx1.vout[0].nValue - self.relayfee * COIN), CScript([b'a']))]
- tx2_raw = self.nodes[0].signrawtransaction(
- ToHex(tx2), None, None, "ALL|FORKID")["hex"]
+ tx2_raw = self.nodes[0].signrawtransaction(ToHex(tx2))["hex"]
tx2 = FromHex(tx2, tx2_raw)
tx2.rehash()
@@ -320,8 +317,7 @@
tx5.vin.append(
CTxIn(COutPoint(int(utxos[0]["txid"], 16), utxos[0]["vout"]), nSequence=1))
tx5.vout[0].nValue += int(utxos[0]["amount"] * COIN)
- raw_tx5 = self.nodes[0].signrawtransaction(
- ToHex(tx5), None, None, "ALL|FORKID")["hex"]
+ raw_tx5 = self.nodes[0].signrawtransaction(ToHex(tx5))["hex"]
assert_raises_rpc_error(-26, NOT_FINAL_ERROR,
self.nodes[0].sendrawtransaction, raw_tx5)
@@ -385,8 +381,7 @@
CTxOut(int(tx1.vout[0].nValue - self.relayfee * COIN), CScript([b'a']))]
# sign tx2
- tx2_raw = self.nodes[0].signrawtransaction(
- ToHex(tx2), None, None, "ALL|FORKID")["hex"]
+ tx2_raw = self.nodes[0].signrawtransaction(ToHex(tx2))["hex"]
tx2 = FromHex(tx2, tx2_raw)
tx2.rehash()
@@ -439,8 +434,7 @@
rawtxfund = self.nodes[1].fundrawtransaction(rawtx)['hex']
tx = FromHex(CTransaction(), rawtxfund)
tx.nVersion = 2
- tx_signed = self.nodes[1].signrawtransaction(
- ToHex(tx), None, None, "ALL|FORKID")["hex"]
+ tx_signed = self.nodes[1].signrawtransaction(ToHex(tx))["hex"]
try:
tx_id = self.nodes[1].sendrawtransaction(tx_signed)
assert(before_activation == False)
diff --git a/test/functional/bip9-softforks.py b/test/functional/bip9-softforks.py
--- a/test/functional/bip9-softforks.py
+++ b/test/functional/bip9-softforks.py
@@ -53,8 +53,7 @@
return tx
def sign_transaction(self, node, tx):
- signresult = node.signrawtransaction(
- bytes_to_hex_str(tx.serialize()), None, None, "ALL|FORKID")
+ signresult = node.signrawtransaction(bytes_to_hex_str(tx.serialize()))
tx = CTransaction()
f = BytesIO(hex_str_to_bytes(signresult['hex']))
tx.deserialize(f)
diff --git a/test/functional/bipdersig-p2p.py b/test/functional/bipdersig-p2p.py
--- a/test/functional/bipdersig-p2p.py
+++ b/test/functional/bipdersig-p2p.py
@@ -45,7 +45,7 @@
inputs = [{"txid": from_txid, "vout": 0}]
outputs = {to_address: amount}
rawtx = node.createrawtransaction(inputs, outputs)
- signresult = node.signrawtransaction(rawtx, None, None, "ALL|FORKID")
+ signresult = node.signrawtransaction(rawtx)
tx = CTransaction()
tx.deserialize(BytesIO(hex_str_to_bytes(signresult['hex'])))
return tx
diff --git a/test/functional/fundrawtransaction.py b/test/functional/fundrawtransaction.py
--- a/test/functional/fundrawtransaction.py
+++ b/test/functional/fundrawtransaction.py
@@ -444,8 +444,7 @@
rawTx = self.nodes[2].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[2].fundrawtransaction(rawTx)
- signedTx = self.nodes[2].signrawtransaction(
- fundedTx['hex'], None, None, "ALL|FORKID")
+ signedTx = self.nodes[2].signrawtransaction(fundedTx['hex'])
txId = self.nodes[2].sendrawtransaction(signedTx['hex'])
self.sync_all()
self.nodes[1].generate(1)
@@ -503,8 +502,7 @@
# now we need to unlock
self.nodes[1].walletpassphrase("test", 600)
- signedTx = self.nodes[1].signrawtransaction(
- fundedTx['hex'], None, None, "ALL|FORKID")
+ signedTx = self.nodes[1].signrawtransaction(fundedTx['hex'])
txId = self.nodes[1].sendrawtransaction(signedTx['hex'])
self.nodes[1].generate(1)
self.sync_all()
@@ -568,8 +566,7 @@
self.nodes[0].getnewaddress(): 0.15, self.nodes[0].getnewaddress(): 0.04}
rawTx = self.nodes[1].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[1].fundrawtransaction(rawTx)
- fundedAndSignedTx = self.nodes[1].signrawtransaction(
- fundedTx['hex'], None, None, "ALL|FORKID")
+ fundedAndSignedTx = self.nodes[1].signrawtransaction(fundedTx['hex'])
txId = self.nodes[1].sendrawtransaction(fundedAndSignedTx['hex'])
self.sync_all()
self.nodes[0].generate(1)
@@ -630,11 +627,9 @@
assert_equal(result["fee"] + res_dec["vout"][
result["changepos"]]["value"], watchonly_amount / 10)
- signedtx = self.nodes[3].signrawtransaction(
- result["hex"], None, None, "ALL|FORKID")
+ signedtx = self.nodes[3].signrawtransaction(result["hex"])
assert(not signedtx["complete"])
- signedtx = self.nodes[0].signrawtransaction(
- signedtx["hex"], None, None, "ALL|FORKID")
+ signedtx = self.nodes[0].signrawtransaction(signedtx["hex"])
assert(signedtx["complete"])
self.nodes[0].sendrawtransaction(signedtx["hex"])
self.nodes[0].generate(1)
diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py
--- a/test/functional/mempool_limit.py
+++ b/test/functional/mempool_limit.py
@@ -33,8 +33,7 @@
txF = self.nodes[0].fundrawtransaction(tx)
# return to automatic fee selection
self.nodes[0].settxfee(0)
- txFS = self.nodes[0].signrawtransaction(
- txF['hex'], None, None, "ALL|FORKID")
+ txFS = self.nodes[0].signrawtransaction(txF['hex'])
txid = self.nodes[0].sendrawtransaction(txFS['hex'])
relayfee = self.nodes[0].getnetworkinfo()['relayfee']
diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py
--- a/test/functional/mempool_packages.py
+++ b/test/functional/mempool_packages.py
@@ -27,7 +27,7 @@
for i in range(num_outputs):
outputs[node.getnewaddress()] = send_value
rawtx = node.createrawtransaction(inputs, outputs)
- signedtx = node.signrawtransaction(rawtx, None, None, "ALL|FORKID")
+ signedtx = node.signrawtransaction(rawtx)
txid = node.sendrawtransaction(signedtx['hex'])
fulltx = node.getrawtransaction(txid, 1)
# make sure we didn't generate a change output
@@ -222,8 +222,7 @@
for i in range(2):
outputs[self.nodes[0].getnewaddress()] = send_value
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
- signedtx = self.nodes[0].signrawtransaction(
- rawtx, None, None, "ALL|FORKID")
+ signedtx = self.nodes[0].signrawtransaction(rawtx)
txid = self.nodes[0].sendrawtransaction(signedtx['hex'])
tx0_id = txid
value = send_value
@@ -249,8 +248,7 @@
inputs = [{'txid': tx1_id, 'vout': 0}, {'txid': txid, 'vout': 0}]
outputs = {self.nodes[0].getnewaddress(): send_value + value - 4 * fee}
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
- signedtx = self.nodes[0].signrawtransaction(
- rawtx, None, None, "ALL|FORKID")
+ signedtx = self.nodes[0].signrawtransaction(rawtx)
txid = self.nodes[0].sendrawtransaction(signedtx['hex'])
sync_mempools(self.nodes)
diff --git a/test/functional/mempool_reorg.py b/test/functional/mempool_reorg.py
--- a/test/functional/mempool_reorg.py
+++ b/test/functional/mempool_reorg.py
@@ -55,8 +55,7 @@
timelock_tx = timelock_tx.replace("ffffffff", "11111191", 1)
timelock_tx = timelock_tx[:-8] + \
hex(self.nodes[0].getblockcount() + 2)[2:] + "000000"
- timelock_tx = self.nodes[0].signrawtransaction(
- timelock_tx, None, None, "ALL|FORKID")["hex"]
+ timelock_tx = self.nodes[0].signrawtransaction(timelock_tx)["hex"]
# This will raise an exception because the timelock transaction is too immature to spend
assert_raises_rpc_error(-26, "bad-txns-nonfinal",
self.nodes[0].sendrawtransaction, timelock_tx)
diff --git a/test/functional/merkle_blocks.py b/test/functional/merkle_blocks.py
--- a/test/functional/merkle_blocks.py
+++ b/test/functional/merkle_blocks.py
@@ -40,11 +40,11 @@
tx1 = self.nodes[0].createrawtransaction(
[node0utxos.pop()], {self.nodes[1].getnewaddress(): 49.99})
txid1 = self.nodes[0].sendrawtransaction(
- self.nodes[0].signrawtransaction(tx1, None, None, "ALL|FORKID")["hex"])
+ self.nodes[0].signrawtransaction(tx1)["hex"])
tx2 = self.nodes[0].createrawtransaction(
[node0utxos.pop()], {self.nodes[1].getnewaddress(): 49.99})
txid2 = self.nodes[0].sendrawtransaction(
- self.nodes[0].signrawtransaction(tx2, None, None, "ALL|FORKID")["hex"])
+ self.nodes[0].signrawtransaction(tx2)["hex"])
# This will raise an exception because the transaction is not yet in a block
assert_raises_rpc_error(-5, "Transaction not yet in block",
self.nodes[0].gettxoutproof, [txid1])
@@ -69,7 +69,7 @@
tx3 = self.nodes[1].createrawtransaction(
[txin_spent], {self.nodes[0].getnewaddress(): 49.98})
txid3 = self.nodes[0].sendrawtransaction(
- self.nodes[1].signrawtransaction(tx3, None, None, "ALL|FORKID")["hex"])
+ self.nodes[1].signrawtransaction(tx3)["hex"])
self.nodes[0].generate(1)
self.sync_all()
diff --git a/test/functional/nulldummy.py b/test/functional/nulldummy.py
--- a/test/functional/nulldummy.py
+++ b/test/functional/nulldummy.py
@@ -89,7 +89,7 @@
inputs = [{"txid": txid, "vout": 0}]
outputs = {to_address: amount}
rawtx = node.createrawtransaction(inputs, outputs)
- signresult = node.signrawtransaction(rawtx, None, None, "ALL|FORKID")
+ signresult = node.signrawtransaction(rawtx)
tx = CTransaction()
f = BytesIO(hex_str_to_bytes(signresult['hex']))
tx.deserialize(f)
diff --git a/test/functional/prioritise_transaction.py b/test/functional/prioritise_transaction.py
--- a/test/functional/prioritise_transaction.py
+++ b/test/functional/prioritise_transaction.py
@@ -112,8 +112,7 @@
inputs.append({"txid": utxo["txid"], "vout": utxo["vout"]})
outputs[self.nodes[0].getnewaddress()] = utxo["amount"] - self.relayfee
raw_tx = self.nodes[0].createrawtransaction(inputs, outputs)
- tx_hex = self.nodes[0].signrawtransaction(
- raw_tx, None, None, "ALL|FORKID")["hex"]
+ tx_hex = self.nodes[0].signrawtransaction(raw_tx)["hex"]
txid = self.nodes[0].sendrawtransaction(tx_hex)
# A tx that spends an in-mempool tx has 0 priority, so we can use it to
@@ -124,8 +123,7 @@
outputs = {}
outputs[self.nodes[0].getnewaddress()] = utxo["amount"] - self.relayfee
raw_tx2 = self.nodes[0].createrawtransaction(inputs, outputs)
- tx2_hex = self.nodes[0].signrawtransaction(
- raw_tx2, None, None, "ALL|FORKID")["hex"]
+ tx2_hex = self.nodes[0].signrawtransaction(raw_tx2)["hex"]
tx2_id = self.nodes[0].decoderawtransaction(tx2_hex)["txid"]
# This will raise an exception due to min relay fee not being met
diff --git a/test/functional/rawtransactions.py b/test/functional/rawtransactions.py
--- a/test/functional/rawtransactions.py
+++ b/test/functional/rawtransactions.py
@@ -48,8 +48,7 @@
# won't exists
outputs = {self.nodes[0].getnewaddress(): 4.998}
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
- rawtx = self.nodes[2].signrawtransaction(
- rawtx, None, None, "ALL|FORKID")
+ rawtx = self.nodes[2].signrawtransaction(rawtx)
# This will raise an exception since there are missing inputs
assert_raises_rpc_error(
@@ -127,13 +126,11 @@
}]
outputs = {self.nodes[0].getnewaddress(): 2.19}
rawTx = self.nodes[2].createrawtransaction(inputs, outputs)
- rawTxPartialSigned = self.nodes[
- 1].signrawtransaction(rawTx, inputs, None, "ALL|FORKID")
+ rawTxPartialSigned = self.nodes[1].signrawtransaction(rawTx, inputs)
# node1 only has one key, can't comp. sign the tx
assert_equal(rawTxPartialSigned['complete'], False)
- rawTxSigned = self.nodes[2].signrawtransaction(
- rawTx, inputs, None, "ALL|FORKID")
+ rawTxSigned = self.nodes[2].signrawtransaction(rawTx, inputs)
# node2 can sign the tx compl., own two of three keys
assert_equal(rawTxSigned['complete'], True)
self.nodes[2].sendrawtransaction(rawTxSigned['hex'])
diff --git a/test/functional/smartfees.py b/test/functional/smartfees.py
--- a/test/functional/smartfees.py
+++ b/test/functional/smartfees.py
@@ -94,8 +94,7 @@
# If this is the initial split we actually need to sign the transaction
# Otherwise we just need to insert the property ScriptSig
if (initial_split):
- completetx = from_node.signrawtransaction(
- rawtx, None, None, "ALL|FORKID")["hex"]
+ completetx = from_node.signrawtransaction(rawtx)["hex"]
else:
completetx = rawtx[0:82] + SCRIPT_SIG[prevtxout["vout"]] + rawtx[84:]
txid = from_node.sendrawtransaction(completetx, True)