Fix tx validation state (#13)

VeriBlock · Jan 27, 2020 · e4b6386 · e4b6386
1 parent 84b3ed3
commit e4b6386
Show file tree

Hide file tree

Showing 5 changed files with 193 additions and 137 deletions.
diff --git a/src/vbk/pop_service.hpp b/src/vbk/pop_service.hpp
@@ -29,6 +29,8 @@ using BlockBytes = std::vector<uint8_t>;
 struct PopService {
     virtual ~PopService() = default;
 
+    virtual void clearTemporaryPayloads() = 0;
+
     virtual void savePopTxToDatabase(const CBlock& block, const int& nHeight) = 0;
 
     virtual std::vector<BlockBytes> getLastKnownVBKBlocks(size_t blocks) = 0;
@@ -45,12 +47,12 @@ struct PopService {
 
     virtual void updateContext(const std::vector<std::vector<uint8_t>>& veriBlockBlocks, const std::vector<std::vector<uint8_t>>& bitcoinBlocks) = 0;
 
-    virtual bool parsePopTx(const CTransactionRef& tx, Publications* publications, Context* ctx, PopTxType* type) = 0;
+    virtual bool parsePopTx(const CTransactionRef& tx, ScriptError* serror, Publications* publications, Context* ctx, PopTxType* type) = 0;
 
-    virtual bool determineATVPlausibilityWithBTCRules(AltchainId altChainIdentifier, const CBlockHeader& popEndorsementHeader, const Consensus::Params& params) = 0;
+    virtual bool determineATVPlausibilityWithBTCRules(AltchainId altChainIdentifier, const CBlockHeader& popEndorsementHeader, const Consensus::Params& params, TxValidationState& state) = 0;
 
-    virtual void addPayloads(const CBlock& block, const int& nHeight, const Publications& publications) = 0;
-    virtual void removePayloads(const CBlock&, const int&) = 0;
+    virtual void addPayloads(std::string blockHash, const int& nHeight, const Publications& publications) = 0;
+    virtual void removePayloads(std::string blockHash, const int& blockHeight) = 0;
     virtual void setConfig() = 0;
 };
 } // namespace VeriBlock