Major updates integration from all upstreams

2018-09-18 14:33:53 -07:00
parent 0c8fa56a02 0e0f5e4ea7
commit 9feb4b9e08
396 changed files with 25517 additions and 6854 deletions
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -89,9 +89,11 @@ enum
    SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9),
 };

+bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
+
 struct PrecomputedTransactionData
 {
-    uint256 hashPrevouts, hashSequence, hashOutputs, hashJoinSplits;
+    uint256 hashPrevouts, hashSequence, hashOutputs, hashJoinSplits, hashShieldedSpends, hashShieldedOutputs;

    PrecomputedTransactionData(const CTransaction& tx);
 };
@@ -100,6 +102,7 @@ enum SigVersion
 {
    SIGVERSION_SPROUT = 0,
    SIGVERSION_OVERWINTER = 1,
+    SIGVERSION_SAPLING = 2,
 };

 uint256 SignatureHash(