ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorder log codes

Browse Source
This commit is contained in:
Richard Holland
2022-04-19 08:24:13 +00:00
parent bc2ad5bd8c
commit d59c1cac7f
2 changed files with 91 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
src/ripple/app/tx/applyHook.h
View File

@@ -63,12 +63,9 @@ namespace hook
{ttACCOUNT_SET, tshNONE }, {ttACCOUNT_SET, tshNONE },
{ttESCROW_CANCEL, tshCOLLECT }, {ttESCROW_CANCEL, tshCOLLECT },
{ttREGULAR_KEY_SET, tshNONE }, {ttREGULAR_KEY_SET, tshNONE },
// {ttNICKNAME_SET, tshNONE },
{ttOFFER_CREATE, tshCOLLECT }, {ttOFFER_CREATE, tshCOLLECT },
{ttOFFER_CANCEL, tshNONE }, {ttOFFER_CANCEL, tshNONE },
// {ttCONTRACT, tshNONE },
{ttTICKET_CREATE, tshNONE }, {ttTICKET_CREATE, tshNONE },
// {ttSPINAL_TAP, tshNONE },
{ttSIGNER_LIST_SET, tshROLLBACK }, {ttSIGNER_LIST_SET, tshROLLBACK },
{ttPAYCHAN_CREATE, tshROLLBACK }, {ttPAYCHAN_CREATE, tshROLLBACK },
{ttPAYCHAN_FUND, tshCOLLECT }, {ttPAYCHAN_FUND, tshCOLLECT },
@@ -99,93 +96,88 @@ namespace hook
enum hook_log_code : uint16_t enum hook_log_code : uint16_t
{ {
/* HookSet log-codes */ /* HookSet log-codes */
SHORT_HOOK = 0, // web assembly byte code ended abruptly AMENDMENT_DISABLED = 1, // attempt to HookSet when amendment is not yet enabled.
CALL_ILLEGAL = 1, // wasm tries to call a non-whitelisted function API_ILLEGAL = 2, // HookSet object contained HookApiVersion for existing HookDefinition
GUARD_PARAMETERS = 2, // guard called but did not use constant expressions for params API_INVALID = 3, // HookSet object contained HookApiVersion for unrecognised hook API
CALL_INDIRECT = 3, // wasm used call indirect instruction which is disallowed API_MISSING = 4, // HookSet object did not contain HookApiVersion but should have
GUARD_MISSING = 4, // guard call missing at top of loop BLOCK_ILLEGAL = 5, // a block end instruction moves execution below depth 0 {{}}`}` <= like this
MEMORY_GROW = 5, // memory.grow instruction is present but disallowed CALL_ILLEGAL = 6, // wasm tries to call a non-whitelisted function
BLOCK_ILLEGAL = 6, // a block end instruction moves execution below depth 0 {{}}`}` <= like this CALL_INDIRECT = 7, // wasm used call indirect instruction which is disallowed
INSTRUCTION_COUNT = 7, // worst case execution instruction count as computed by HookSet CREATE_FLAG = 8, // create operation requires hsfOVERRIDE flag
INSTRUCTION_EXCESS = 8, // worst case execution instruction count was too large DELETE_FIELD = 9, //
PARAMETERS_ILLEGAL = 9, // HookParameters contained something other than a HookParameter DELETE_FLAG = 10, // delete operation requires hsfOVERRIDE flag
PARAMETERS_FIELD = 10, // HookParameters contained a HookParameter with an invalid key in it DELETE_NOTHING = 11, // delete operation would delete nothing
PARAMETERS_NAME = 11, // HookParameters contained a HookParameter which lacked ParameterName field EXPORTS_MISSING = 12, // hook did not export *any* functions (should be cbak, hook)
HASH_OR_CODE = 12, // HookSet object can contain only one of CreateCode and HookHash EXPORT_CBAK_FUNC = 13, // hook did not export correct func def int64_t cbak(uint32_t)
GRANTS_EMPTY = 13, // HookSet object contained an empty grants array (you should remove it) EXPORT_HOOK_FUNC = 14, // hook did not export correct func def int64_t hook(uint32_t)
GRANTS_EXCESS = 14, // HookSet object cotnained a grants array with too many grants EXPORT_MISSING = 15, // distinct from export*S*_missing, either hook or cbak is missing
GRANTS_ILLEGAL = 15, // Hookset object contained grants array which contained a non Grant object FLAGS_INVALID = 16, // HookSet flags were invalid for specified operation
GRANTS_FIELD = 16, // HookSet object contained a grant without Authorize or HookHash FUNCS_MISSING = 17, // hook did not include function code for any functions
API_ILLEGAL = 17, // HookSet object contained HookApiVersion for existing HookDefinition FUNC_PARAM_INVALID = 18, // parameter types may only be i32 i64 u32 u64
NAMESPACE_MISSING = 18, // HookSet object lacked HookNamespace FUNC_RETURN_COUNT = 19, // a function type is defined in the wasm which returns > 1 return value
API_MISSING = 19, // HookSet object did not contain HookApiVersion but should have FUNC_RETURN_INVALID = 20, // a function type does not return i32 i64 u32 or u64
API_INVALID = 20, // HookSet object contained HookApiVersion for unrecognised hook API FUNC_TYPELESS = 21, // hook defined hook/cbak but their type is not defined in wasm
HOOKON_MISSING = 21, // HookSet object did not contain HookOn but should have FUNC_TYPE_INVALID = 22, // malformed and illegal wasm in the func type section
DELETE_FIELD = 22, // GRANTS_EMPTY = 23, // HookSet object contained an empty grants array (you should remove it)
OVERRIDE_MISSING = 23, // HookSet object was trying to update or delete a hook but lacked hsfOVERRIDE GRANTS_EXCESS = 24, // HookSet object cotnained a grants array with too many grants
FLAGS_INVALID = 24, // HookSet flags were invalid for specified operation GRANTS_FIELD = 25, // HookSet object contained a grant without Authorize or HookHash
NSDELETE_FIELD = 25, GRANTS_ILLEGAL = 26, // Hookset object contained grants array which contained a non Grant object
NSDELETE_FLAGS = 26, GUARD_IMPORT = 27, // guard import is missing
WASM_TOO_SMALL = 27, GUARD_MISSING = 28, // guard call missing at top of loop
WASM_BAD_MAGIC = 28, // wasm magic number missing or not wasm GUARD_PARAMETERS = 29, // guard called but did not use constant expressions for params
WASM_PARSE_LOOP = 29, // wasm section parsing resulted in an infinite loop HASH_OR_CODE = 30, // HookSet object can contain only one of CreateCode and HookHash
IMPORTS_MISSING = 30, // hook must import guard, and accept/rollback HOOKON_MISSING = 31, // HookSet object did not contain HookOn but should have
IMPORT_MODULE_BAD = 31, // hook attempted to specify no or a bad import module HOOKS_ARRAY_BAD = 32, // attempt to HookSet with a Hooks array containing a non-Hook obj
IMPORT_MODULE_ENV = 32, // hook attempted to specify import module not named env HOOKS_ARRAY_BLANK = 33, // all hook set objs were blank
IMPORT_NAME_BAD = 33, // import name was too short or too long HOOKS_ARRAY_EMPTY = 34, // attempt to HookSet with an empty Hooks array
IMPORT_ILLEGAL = 34, // attempted import of a non-whitelisted function HOOKS_ARRAY_MISSING = 35, // attempt to HookSet without a Hooks array
GUARD_IMPORT = 35, // guard import is missing HOOKS_ARRAY_TOO_BIG = 36, // attempt to HookSet with a Hooks array beyond the chain size limit
EXPORTS_MISSING = 36, // hook did not export *any* functions (should be cbak, hook) HOOK_ADD = 37, // Informational: adding ltHook to directory
EXPORT_HOOK_FUNC = 37, // hook did not export correct func def int64_t hook(uint32_t) HOOK_DEF_MISSING = 38, // attempt to reference a hook definition (by hash) that is not on ledger
EXPORT_CBAK_FUNC = 38, // hook did not export correct func def int64_t cbak(uint32_t) HOOK_DELETE = 39, // unable to delete ltHook from owner
EXPORT_MISSING = 39, // distinct from export*S*_missing, either hook or cbak is missing HOOK_INVALID_FIELD = 40, // HookSetObj contained an illegal/unexpected field
FUNCS_MISSING = 40, // hook did not include function code for any functions HOOK_PARAMS_COUNT = 41, // hookset obj would create too many hook parameters
FUNC_TYPELESS = 41, // hook defined hook/cbak but their type is not defined in wasm HOOK_PARAM_SIZE = 42, // hookset obj sets a parameter or value that exceeds max allowable size
FUNC_TYPE_INVALID = 42, // malformed and illegal wasm in the func type section IMPORTS_MISSING = 43, // hook must import guard, and accept/rollback
FUNC_PARAM_INVALID = 43, // parameter types may only be i32 i64 u32 u64 IMPORT_ILLEGAL = 44, // attempted import of a non-whitelisted function
PARAM_HOOK_CBAK = 44, // hook and cbak must take exactly one u32 parameter IMPORT_MODULE_BAD = 45, // hook attempted to specify no or a bad import module
FUNC_RETURN_COUNT = 45, // a function type is defined in the wasm which returns > 1 return value IMPORT_MODULE_ENV = 46, // hook attempted to specify import module not named env
FUNC_RETURN_INVALID = 46, // a function type does not return i32 i64 u32 or u64 IMPORT_NAME_BAD = 47, // import name was too short or too long
RETURN_HOOK_CBAK = 47, // hook and cbak must retunr i64 INSTALL_FLAG = 48, // install operation requires hsoOVERRIDE
TYPE_INVALID = 48, // malformed and illegal wasm specifying an illegal local var type INSTALL_MISSING = 49, // install operation specifies hookhash which doesn't exist on the ledger
WASM_SMOKE_TEST = 49, // Informational: first attempt to load wasm into wasm runtime INSTRUCTION_COUNT = 50, // worst case execution instruction count as computed by HookSet
WASM_TEST_FAILURE = 50, // the smoke test failed INSTRUCTION_EXCESS = 51, // worst case execution instruction count was too large
HOOK_DEF_MISSING = 51, // attempt to reference a hook definition (by hash) that is not on ledger MEMORY_GROW = 52, // memory.grow instruction is present but disallowed
AMENDMENT_DISABLED = 52, // attempt to HookSet when amendment is not yet enabled. NAMESPACE_MISSING = 53, // HookSet object lacked HookNamespace
HOOKS_ARRAY_MISSING = 53, // attempt to HookSet without a Hooks array NSDELETE = 54, // Informational: a namespace is being deleted
HOOKS_ARRAY_EMPTY = 54, // attempt to HookSet with an empty Hooks array NSDELETE_ACCOUNT = 55, // nsdelete tried to delete ns from a non-existing account
HOOKS_ARRAY_TOO_BIG = 55, // attempt to HookSet with a Hooks array beyond the chain size limit NSDELETE_COUNT = 56, // namespace state count less than 0 / overflow
HOOKS_ARRAY_BAD = 56, // attempt to HookSet with a Hooks array containing a non-Hook obj NSDELETE_DIR = 57, // could not delete directory node in ledger
HOOK_INVALID_FIELD = 57, // HookSetObj contained an illegal/unexpected field NSDELETE_DIRECTORY = 58, // nsdelete operation failed to delete ns directory
WASM_VALIDATION = 58, // a generic error while parsing wasm, usually leb128 overflow NSDELETE_DIR_ENTRY = 59, // nsdelete operation failed due to bad entry in ns directory
HOOKS_ARRAY_BLANK = 59, // all hook set objs were blank NSDELETE_ENTRY = 60, // nsdelete operation failed due to missing hook state entry
NSDELETE = 60, // Informational: a namespace is being deleted NSDELETE_FIELD = 61,
NSDELETE_ACCOUNT = 61, // nsdelete tried to delete ns from a non-existing account NSDELETE_FLAGS = 62,
NSDELETE_DIRECTORY = 62, // nsdelete operation failed to delete ns directory NSDELETE_NONSTATE = 63, // nsdelete operation failed due to the presence of a non-hookstate obj
NSDELETE_DIR_ENTRY = 63, // nsdelete operation failed due to bad entry in ns directory NSDELETE_NOTHING = 64, // hsfNSDELETE provided but nothing to delete
NSDELETE_NONSTATE = 64, // nsdelete operation failed due to the presence of a non-hookstate obj OPERATION_INVALID = 65, // could not deduce an operation from the provided hookset obj
NSDELETE_ENTRY = 65, // nsdelete operation failed due to missing hook state entry OVERRIDE_MISSING = 66, // HookSet object was trying to update or delete a hook but lacked hsfOVERRIDE
NSDELETE_DIR = 66, // could not delete directory node in ledger PARAMETERS_FIELD = 67, // HookParameters contained a HookParameter with an invalid key in it
NSDELETE_COUNT = 67, // namespace state count less than 0 / overflow PARAMETERS_ILLEGAL = 68, // HookParameters contained something other than a HookParameter
HOOK_PARAMS_COUNT = 68, // hookset obj would create too many hook parameters PARAMETERS_NAME = 69, // HookParameters contained a HookParameter which lacked ParameterName field
HOOK_PARAM_SIZE = 69, // hookset obj sets a parameter or value that exceeds max allowable size PARAM_HOOK_CBAK = 70, // hook and cbak must take exactly one u32 parameter
NSDELETE_NOTHING = 70, // hsfNSDELETE provided but nothing to delete RETURN_HOOK_CBAK = 71, // hook and cbak must retunr i64
DELETE_FLAG = 71, // delete operation requires hsfOVERRIDE flag SHORT_HOOK = 72, // web assembly byte code ended abruptly
DELETE_NOTHING = 72, // delete operation would delete nothing TYPE_INVALID = 73, // malformed and illegal wasm specifying an illegal local var type
CREATE_FLAG = 73, // create operation requires hsfOVERRIDE flag WASM_BAD_MAGIC = 74, // wasm magic number missing or not wasm
WASM_TOO_BIG = 74, // set hook would exceed maximum hook size
WASM_INVALID = 75, // set hook operation would set invalid wasm WASM_INVALID = 75, // set hook operation would set invalid wasm
INSTALL_FLAG = 76, // install operation requires hsoOVERRIDE WASM_PARSE_LOOP = 76, // wasm section parsing resulted in an infinite loop
INSTALL_MISSING = 77, // install operation specifies hookhash which doesn't exist on the ledger WASM_SMOKE_TEST = 77, // Informational: first attempt to load wasm into wasm runtime
OPERATION_INVALID = 78 // could not deduce an operation from the provided hookset obj WASM_TEST_FAILURE = 78, // the smoke test failed
WASM_TOO_BIG = 79, // set hook would exceed maximum hook size
WASM_TOO_SMALL = 80,
WASM_VALIDATION = 81, // a generic error while parsing wasm, usually leb128 overflow
// RH NOTE: only HookSet msgs got log codes, possibly all Hook log lines should get a code?
//RH UPTO
}; };
}; };

10
src/ripple/app/tx/impl/SetHook.cpp
View File

@@ -1359,7 +1359,7 @@ SetHook::preflight(PreflightContext const& ctx)
if (!ctx.rules.enabled(featureHooks)) if (!ctx.rules.enabled(featureHooks))
{ {
JLOG(ctx.j.warn()) JLOG(ctx.j.warn())
<< "HookSet[(" << hook::log::AMENDMENT_DISABLED << ")" << "HookSet(" << hook::log::AMENDMENT_DISABLED << ")["
<< HS_ACC() << "]: Hooks Amendment not enabled!"; << HS_ACC() << "]: Hooks Amendment not enabled!";
return temDISABLED; return temDISABLED;
} }
@@ -2218,7 +2218,9 @@ SetHook::setHook()
keylet::ownerDir(account_), keylet::ownerDir(account_),
hint, hookKeylet.key, false)) hint, hookKeylet.key, false))
{ {
JLOG(j_.fatal()) << "Unable to delete ltHOOK from owner."; JLOG(j_.fatal())
<< "HookSet(" << hook::log::HOOK_DELETE << ")[" << HS_ACC()
<< "]: Unable to delete ltHOOK from owner";
return tefBAD_LEDGER; return tefBAD_LEDGER;
} }
@@ -2242,7 +2244,9 @@ SetHook::setHook()
hookKeylet, hookKeylet,
describeOwnerDir(account_)); describeOwnerDir(account_));
JLOG(j_.trace()) << "Adding ltHook to account directory " JLOG(j_.trace())
<< "HookSet(" << hook::log::HOOK_ADD << ")[" << HS_ACC()
<< "]: Adding ltHook to account directory "
<< to_string(hookKeylet.key) << ": " << to_string(hookKeylet.key) << ": "
<< (page ? "success" : "failure"); << (page ? "success" : "failure");