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/wallet/wallet_ismine.cpp
+++ b/src/wallet/wallet_ismine.cpp
@@ -42,7 +42,7 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& _scriptPubKey)

    if (scriptPubKey.IsCheckLockTimeVerify())
    {
-        uint8_t pushOp = scriptPubKey.data()[0];
+        uint8_t pushOp = scriptPubKey[0];
        uint32_t scriptStart = pushOp + 3;

        // continue with post CLTV script