From 5b9087a9a7da2602485e85e0b163dc3cbd2daf31 Mon Sep 17 00:00:00 2001 From: glozow Date: Thu, 11 May 2023 17:54:39 +0100 Subject: [PATCH] [rpc] require package to be a tree in submitpackage --- src/rpc/mempool.cpp | 4 ++++ test/functional/rpc_packages.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp index 705608bd47..173127e014 100644 --- a/src/rpc/mempool.cpp +++ b/src/rpc/mempool.cpp @@ -820,6 +820,7 @@ static RPCHelpMan submitpackage() { return RPCHelpMan{"submitpackage", "Submit a package of raw transactions (serialized, hex-encoded) to local node (-regtest only).\n" + "The package must consist of a child with its parents, and none of the parents may depend on one another.\n" "The package will be validated according to consensus and mempool policy rules. If all transactions pass, they will be accepted to mempool.\n" "This RPC is experimental and the interface may be unstable. Refer to doc/policy/packages.md for documentation on package policies.\n" "Warning: until package relay is in use, successful submission does not mean the transaction will propagate to other nodes on the network.\n" @@ -881,6 +882,9 @@ static RPCHelpMan submitpackage() } txns.emplace_back(MakeTransactionRef(std::move(mtx))); } + if (!IsChildWithParentsTree(txns)) { + throw JSONRPCTransactionError(TransactionError::INVALID_PACKAGE, "package topology disallowed. not child-with-parents or parents depend on each other."); + } NodeContext& node = EnsureAnyNodeContext(request.context); CTxMemPool& mempool = EnsureMemPool(node); diff --git a/test/functional/rpc_packages.py b/test/functional/rpc_packages.py index 9c4960aa1e..5644a9f5a8 100755 --- a/test/functional/rpc_packages.py +++ b/test/functional/rpc_packages.py @@ -335,7 +335,7 @@ class RPCPackagesTest(BitcoinTestFramework): self.log.info("Submitpackage only allows packages of 1 child with its parents") # Chain of 3 transactions has too many generations chain_hex = [t["hex"] for t in self.wallet.create_self_transfer_chain(chain_length=25)] - assert_raises_rpc_error(-25, "not-child-with-parents", node.submitpackage, chain_hex) + assert_raises_rpc_error(-25, "package topology disallowed", node.submitpackage, chain_hex) if __name__ == "__main__":