From 8d3091bbcbe0c5fe8e8237bab9a90a4fd8d54c26 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 31 May 2019 11:31:02 -0400
Subject: [PATCH] Deserialize merkle proofs without witness, which matters for
 dynafed

---
 src/pegins.cpp | 2 +-
 src/pegins.h   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pegins.cpp b/src/pegins.cpp
index 356e519ade..79fe24d5dc 100644
--- a/src/pegins.cpp
+++ b/src/pegins.cpp
@@ -188,7 +188,7 @@ static bool GetBlockAndTxFromMerkleBlock(uint256& block_hash, uint256& tx_hash,
     try {
         std::vector<uint256> tx_hashes;
         std::vector<unsigned int> tx_indices;
-        CDataStream merkle_block_stream(merkle_block_raw, SER_NETWORK, PROTOCOL_VERSION);
+        CDataStream merkle_block_stream(merkle_block_raw, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
         merkle_block_stream >> merkle_block;
         block_hash = merkle_block.header.GetHash();
 
diff --git a/src/pegins.h b/src/pegins.h
index aa3f4fbe43..6e6c1b05b2 100644
--- a/src/pegins.h
+++ b/src/pegins.h
@@ -10,6 +10,7 @@
 #include <primitives/bitcoin/transaction.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
+#include <chain.h>
 
 /** Calculates script necessary for p2ch peg-in transactions */
 CScript calculate_contract(const CScript& federationRedeemScript, const CScript& witnessProgram);
@@ -31,4 +32,9 @@ CTxOut GetPeginOutputFromWitness(const CScriptWitness& pegin_witness);
  */
 bool MatchLiquidWatchman(const CScript& script);
 
+/** Get full fedpegscripts from two previous epoch starts based on given index
+ * nextblock_validation is false when doing block validation, true for mempool
+ * or "lookahead" purposes. Newest epochs first. */
+std::vector<CScript> GetValidFedpegScripts(const CBlockIndex* pblockindex, const Consensus::Params& params, bool nextblock_validation);
+
 #endif // BITCOIN_PEGINS_H