Skip to content

Commit ad727f4

Browse files
committed
[rpc] sendrawtransaction no longer bypasses minRelayTxFee
The prioritisetransaction API can always be used if a transaction needs to be submitted that bypasses minRelayTxFee.
1 parent fe282ac commit ad727f4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

qa/rpc-tests/nulldummy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ def run_test(self):
7474
self.block_submit(self.nodes[0], test1txs, False, True)
7575

7676
print ("Test 2: Non-NULLDUMMY base multisig transaction should not be accepted to mempool before activation")
77-
test2tx = self.create_transaction(self.nodes[0], txid2, self.ms_address, 48)
77+
test2tx = self.create_transaction(self.nodes[0], txid2, self.ms_address, 47)
7878
trueDummy(test2tx)
7979
txid4 = self.tx_submit(self.nodes[0], test2tx, NULLDUMMY_ERROR)
8080

8181
print ("Test 3: Non-NULLDUMMY base transactions should be accepted in a block before activation [431]")
8282
self.block_submit(self.nodes[0], [test2tx], False, True)
8383

8484
print ("Test 4: Non-NULLDUMMY base multisig transaction is invalid after activation")
85-
test4tx = self.create_transaction(self.nodes[0], txid4, self.address, 47)
85+
test4tx = self.create_transaction(self.nodes[0], txid4, self.address, 46)
8686
test6txs=[CTransaction(test4tx)]
8787
trueDummy(test4tx)
8888
self.tx_submit(self.nodes[0], test4tx, NULLDUMMY_ERROR)

src/rpc/rawtransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
891891
CTransactionRef tx(MakeTransactionRef(std::move(mtx)));
892892
const uint256& hashTx = tx->GetHash();
893893

894-
bool fLimitFree = false;
894+
bool fLimitFree = true;
895895
CAmount nMaxRawTxFee = maxTxFee;
896896
if (request.params.size() > 1 && request.params[1].get_bool())
897897
nMaxRawTxFee = 0;

0 commit comments

Comments
 (0)