merge jl777/dev; zcash upgrade, CC to fix

2018-03-26 20:07:32 -03:00
parent 51aad18733 1e0e14dea7
commit 9e74de25fc
617 changed files with 56209 additions and 10078 deletions
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -142,7 +142,7 @@ const char* GetOpName(opcodetype opcode)
    case OP_CHECKCRYPTOCONDITIONVERIFY
                                   : return "OP_CHECKCRYPTOCONDITIONVERIFY";

-    // expanson
+    // expansion
    case OP_NOP1                   : return "OP_NOP1";
    case OP_NOP2                   : return "OP_NOP2";
    case OP_NOP3                   : return "OP_NOP3";