From 296aaa87c69eb99cac3c2f88426eafa844cdab5a Mon Sep 17 00:00:00 2001
From: David Burkett <davidburkett38@gmail.com>
Date: Mon, 13 Mar 2023 12:49:24 -0400
Subject: [PATCH] Don't return MWEB-only transactions when rpcserialversion <=
 1

---
 src/rpc/blockchain.cpp          |  5 +++
 test/functional/mweb_mempool.py | 60 +++++++++++++++++++++++++++++++++
 test/functional/test_runner.py  |  1 +
 3 files changed, 66 insertions(+)
 create mode 100644 test/functional/mweb_mempool.py

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 1ba0e3f429..48e7cbdf93 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -921,6 +921,11 @@ static RPCHelpMan getmempoolentry()
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction not in mempool");
     }
 
+    if (RPCSerializationFlags() & SERIALIZE_NO_MWEB && it->GetTx().IsMWEBOnly()) {
+        // Don't return MWEB-only transactions to clients that don't support them.
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "MWEB-only transaction not serializable for rpcserialversion<2");
+    }
+
     const CTxMemPoolEntry &e = *it;
     UniValue info(UniValue::VOBJ);
     entryToJSON(mempool, info, e);
diff --git a/test/functional/mweb_mempool.py b/test/functional/mweb_mempool.py
new file mode 100644
index 0000000000..120976f9a3
--- /dev/null
+++ b/test/functional/mweb_mempool.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+# Copyright (c) 2020 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""
+Tests mempool functionality for MWEB transactions
+"""
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.ltc_util import setup_mweb_chain
+from test_framework.util import assert_equal, assert_raises_rpc_error
+
+class MWEBMempoolTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.setup_clean_chain = True
+        self.num_nodes = 3
+        self.extra_args = [
+            [
+                "-rpcserialversion=0",
+                '-whitelist=noban@127.0.0.1'
+            ],
+            [
+                "-rpcserialversion=1",
+                '-whitelist=noban@127.0.0.1'
+            ],
+            [
+                '-whitelist=noban@127.0.0.1'
+            ],
+        ]
+
+    def run_test(self):
+        node0 = self.nodes[0]
+        node1 = self.nodes[1]
+        node2 = self.nodes[2]
+
+        self.log.info("Setup MWEB chain")
+        setup_mweb_chain(node0)
+        
+        self.log.info("Pegin some coins")
+        node0.sendtoaddress(node0.getnewaddress(address_type='mweb'), 10)
+        node0.generate(1)
+        
+        self.log.info("Create an MWEB-to-MWEB transaction")
+        txid = node0.sendtoaddress(node0.getnewaddress(address_type='mweb'), 2)
+        self.sync_all()
+
+        self.log.info("Assert txid is returned in getrawmempool but tx not returned from getmempoolentry for rpcserialversion=0")
+        assert_equal([txid], node0.getrawmempool())
+        assert_raises_rpc_error(-22, "MWEB-only transaction not serializable for rpcserialversion<2", node0.getmempoolentry, txid)
+
+        self.log.info("Assert txid is returned in getrawmempool but tx not returned from getmempoolentry for rpcserialversion=1")
+        assert_equal([txid], node1.getrawmempool())
+        assert_raises_rpc_error(-22, "MWEB-only transaction not serializable for rpcserialversion<2", node1.getmempoolentry, txid)
+
+        self.log.info("Assert txid is returned in getrawmempool and tx is returned for getmempoolentry for rpcserialversion=2")
+        assert_equal([txid], node2.getrawmempool())
+        assert node2.getmempoolentry(txid) is not None
+
+if __name__ == '__main__':
+    MWEBMempoolTest().main()
\ No newline at end of file
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index c43ebb33b9..7c3830e3e2 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -246,6 +246,7 @@ BASE_SCRIPTS = [
     'feature_dersig.py',
     'feature_cltv.py',
     'mweb_basic.py',
+    'mweb_mempool.py',
     'mweb_mining.py',
     'mweb_reorg.py',
     'mweb_pegout_all.py',