Sync with latest Komodo changes

2018-08-06 12:52:22 -07:00
parent 55135eed8a cbd0560df3
commit 5034d1c134
150 changed files with 10076 additions and 2162 deletions
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -569,9 +569,11 @@ public:
    unsigned int GetSigOpCount(const CScript& scriptSig) const;

    bool IsPayToPublicKeyHash() const;
+    bool IsPayToPublicKey() const;

    bool IsPayToScriptHash() const;
    bool IsPayToCryptoCondition() const;
+    bool IsCoinImport() const;
    bool MayAcceptCryptoCondition() const;

    /** Called by IsStandardTx and P2SH/BIP62 VerifyScript (which makes it consensus-critical). */