Merge branch 'dwy_mitigation2' into fixgettransactioncrash

2018-11-03 21:13:11 +08:00
parent 969689713d 1a5c39bcfd
commit 7258003351
18 changed files with 246 additions and 61 deletions
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -263,7 +263,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
        addressRet = CScriptID(uint160(vSolutions[0]));
        return true;
    }
-    
+
    else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
    {
        addressRet = CKeyID(uint160(vSolutions[0]));