Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/src/script/script_error.h
+++ b/src/script/script_error.h
@@ -52,7 +52,11 @@ typedef enum ScriptError_t
    /* softfork safeness */
    SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS,

-    SCRIPT_ERR_ERROR_COUNT
+    SCRIPT_ERR_ERROR_COUNT,
+
+    /* crypto-condition script errors */
+    SCRIPT_ERR_CRYPTOCONDITION_VERIFY,
+    SCRIPT_ERR_CRYPTOCONDITION_INVALID_FULFILLMENT
 } ScriptError;

 #define SCRIPT_ERR_LAST SCRIPT_ERR_ERROR_COUNT