sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

llmq/rpc: Adjust verify islock, don't err when transaction isn't known locally (#4106)

Browse Source 
* llmq/rpc: Adjust verify islock, don't err when transaction isn't known locally

* combine two ifs

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

* tests: Verify islocks for unknown txes

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
This commit is contained in:
PastaPastaPasta 2021-04-16 11:03:41 -04:00 committed by pasta
parent 6badaaafab
commit bc4e6fc538
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rpc/rpcquorums.cpp
View File

@ -684,13 +684,7 @@ UniValue verifyislock(const JSONRPCRequest& request)
LOCK(cs_main); LOCK(cs_main);
CTransactionRef tx; CTransactionRef tx;
uint256 hash_block; uint256 hash_block;
if (!GetTransaction(txid, tx, Params().GetConsensus(), hash_block, true)) { if (GetTransaction(txid, tx, Params().GetConsensus(), hash_block, true) && !hash_block.IsNull()) {
std::string errmsg = fTxIndex
? "No such mempool or blockchain transaction"
: "No such mempool transaction. Use -txindex to enable blockchain transaction queries";
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, errmsg);
}
if (!hash_block.IsNull()) {
pindexMined = LookupBlockIndex(hash_block); pindexMined = LookupBlockIndex(hash_block);
} }
} }

11
test/functional/rpc_verifyislock.py
View File

@ -5,7 +5,7 @@
from test_framework.messages import CTransaction, FromHex, hash256, ser_compact_size, ser_string from test_framework.messages import CTransaction, FromHex, hash256, ser_compact_size, ser_string
from test_framework.test_framework import DashTestFramework from test_framework.test_framework import DashTestFramework
from test_framework.util import bytes_to_hex_str, satoshi_round, wait_until from test_framework.util import assert_raises_rpc_error, bytes_to_hex_str, satoshi_round, wait_until
''' '''
rpc_verifyislock.py rpc_verifyislock.py
@ -83,9 +83,14 @@ class RPCVerifyISLockTest(DashTestFramework):
assert selected_hash == oldest_quorum_hash assert selected_hash == oldest_quorum_hash
# Create the ISLOCK, then mine a quorum to move the signing quorum out of the active set # Create the ISLOCK, then mine a quorum to move the signing quorum out of the active set
islock = self.create_islock(rawtx) islock = self.create_islock(rawtx)
# Mine one block to trigger the "signHeight + dkgInterval" verification for the ISLOCK
self.mine_quorum() self.mine_quorum()
# Send the tx and verify the ISLOCK. This triggers the "signHeight + dkgInterval" verification # Verify the ISLOCK for a transaction that is not yet known by the node
rawtx_txid = node.sendrawtransaction(rawtx) rawtx_txid = node.decoderawtransaction(rawtx)["txid"]
assert_raises_rpc_error(-5, "No such mempool or blockchain transaction", node.getrawtransaction, rawtx_txid)
assert node.verifyislock(request_id, rawtx_txid, bytes_to_hex_str(islock.sig), node.getblockcount())
# Send the tx and verify the ISLOCK for a now known transaction
assert rawtx_txid == node.sendrawtransaction(rawtx)
assert node.verifyislock(request_id, rawtx_txid, bytes_to_hex_str(islock.sig), node.getblockcount()) assert node.verifyislock(request_id, rawtx_txid, bytes_to_hex_str(islock.sig), node.getblockcount())