wip

src/cc/eval.cpp

@@ -1,9 +1,11 @@
 #include <assert.h>
 #include <cryptoconditions.h>
 
+#include "primitives/block.h"
 #include "primitives/transaction.h"
 #include "script/cc.h"
 #include "cc/eval.h"
+#include "cc/utils.h"
 #include "main.h"
 #include "chain.h"
 #include "core_io.h"
@@ -14,9 +16,7 @@ Eval* EVAL_TEST = 0;
 
 bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
 {
-    Eval eval_;
-    Eval *eval = EVAL_TEST;
-    if (!eval) eval = &eval_;
+    EvalRef eval;
 
     bool out = eval->Dispatch(cond, tx, nIn);
     assert(eval->state.IsValid() == out);
@@ -162,8 +162,7 @@ bool Eval::GetNotarisationData(const uint256 notaryHash, NotarisationData &data)
     CBlockIndex block;
     if (!GetTxConfirmed(notaryHash, notarisationTx, block)) return false;
     if (!CheckNotaryInputs(notarisationTx, block.nHeight, block.nTime)) return false;
-    if (notarisationTx.vout.size() < 2) return false;
-    if (!data.Parse(notarisationTx.vout[1].scriptPubKey)) return false;
+    if (!ParseNotarisationOpReturn(notarisationTx, data)) return false;
     return true;
 }
 
@@ -176,34 +175,13 @@ bool Eval::GetNotarisationData(int notarisationHeight, NotarisationData &data, b
 /*
  * Notarisation data, ie, OP_RETURN payload in notarisation transactions
  */
-extern char ASSETCHAINS_SYMBOL[16];
-
-bool NotarisationData::Parse(const CScript scriptPK)
+bool ParseNotarisationOpReturn(const CTransaction &tx, NotarisationData &data)
 {
-    *this = NotarisationData();
-
+    if (tx.vout.size() < 2) return false;
     std::vector<unsigned char> vdata;
-    if (!GetOpReturnData(scriptPK, vdata)) return false;
-
-    CDataStream ss(vdata, SER_NETWORK, PROTOCOL_VERSION);
-
-    try {
-        ss >> blockHash;
-        ss >> height;
-        if (ASSETCHAINS_SYMBOL[0])
-            ss >> txHash;
-
-        char *nullPos = (char*) memchr(&ss[0], 0, ss.size());
-        if (!nullPos) return false;
-        ss.read(symbol, nullPos-&ss[0]+1);
-
-        if (ss.size() < 36) return false;
-        ss >> MoM;
-        ss >> MoMDepth;
-    } catch (...) {
-        return false;
-    }
-    return true;
+    if (!GetOpReturnData(tx.vout[1].scriptPubKey, vdata)) return false;
+    bool out = E_UNMARSHAL(vdata, ss >> data);
+    return out;
 }
 
 
@@ -240,3 +218,11 @@ uint256 SafeCheckMerkleBranch(uint256 hash, const std::vector<uint256>& vMerkleB
     }
     return hash;
 }
+
+
+uint256 GetMerkleRoot(const std::vector<uint256>& vLeaves)
+{
+    bool fMutated;
+    std::vector<uint256> vMerkleTree;
+    return BuildMerkleTree(&fMutated, vLeaves, vMerkleTree);
+}