Merge df8e57296c into merged_master (Elements PR ElementsProject/elements#1286)

This commit is contained in:
James Dorfman 2024-05-24 06:48:04 +00:00
commit dbbde2d123

View file

@ -82,8 +82,6 @@ typedef enum ScriptError_t
SCRIPT_ERR_OP_CODESEPARATOR,
SCRIPT_ERR_SIG_FINDANDDELETE,
SCRIPT_ERR_ERROR_COUNT,
// ELEMENTS:
SCRIPT_ERR_RANGEPROOF,
SCRIPT_ERR_PEDERSEN_TALLY,
@ -96,10 +94,13 @@ typedef enum ScriptError_t
SCRIPT_ERR_INTROSPECT_INDEX_OUT_OF_BOUNDS,
SCRIPT_ERR_EXPECTED_8BYTES,
SCRIPT_ERR_ARITHMETIC64,
SCRIPT_ERR_ECMULTVERIFYFAIL
SCRIPT_ERR_ECMULTVERIFYFAIL,
/* Must go last */
SCRIPT_ERR_ERROR_COUNT
} ScriptError;
#define SCRIPT_ERR_LAST SCRIPT_ERR_ECMULTVERIFYFAIL
#define SCRIPT_ERR_LAST SCRIPT_ERR_ERROR_COUNT
std::string ScriptErrorString(const ScriptError error);