Sync extern.h (#101)

* update hook error codes

* reorder and remove unused externs

* add HOOK_STATE_DIR keylet

* Delete types.h

* move transaction types

hook/error.h

@@ -31,7 +31,7 @@
 #define MANTISSA_UNDERSIZED -27
 #define EXPONENT_OVERSIZED -28
 #define EXPONENT_UNDERSIZED -29
-#define OVERFLOW -30
+#define XFL_OVERFLOW -30
 #define NOT_IOU_AMOUNT -31
 #define NOT_AN_AMOUNT -32
 #define CANT_RETURN_NEGATIVE -33
@@ -42,5 +42,8 @@
 #define RESERVE_INSUFFICIENT -38
 #define COMPLEX_NOT_SUPPORTED -39
 #define DOES_NOT_MATCH -40
+#define INVALID_KEY -41
+#define NOT_A_STRING -42
+#define MEM_OVERLAP -43
 #define HOOK_ERROR_CODES
 #endif //HOOK_ERROR_CODES

hook/extern.h

@@ -9,257 +9,63 @@ _g(uint32_t guard_id, uint32_t maxiter);
 extern int64_t
 accept(uint32_t read_ptr, uint32_t read_len, int64_t error_code);
 
-extern int64_t
-emit(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-etxn_burden(void);
-
-extern int64_t
-etxn_details(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-etxn_fee_base(uint32_t read_ptr, uint32_t read_len);
-
-extern int64_t
-etxn_generation(void);
-
-extern int64_t
-etxn_nonce(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-etxn_reserve(uint32_t count);
-
-extern int64_t
-fee_base(void);
-
-extern int64_t
-float_compare(int64_t float1, int64_t float2, uint32_t mode);
-
-extern int64_t
-float_divide(int64_t float1, int64_t float2);
-
-extern int64_t
-float_exponent(int64_t float1);
-
-extern int64_t
-float_exponent_set(int64_t float1, int32_t exponent);
-
-extern int64_t
-float_int(int64_t float1, uint32_t decimal_places, uint32_t abs);
-
-extern int64_t
-float_invert(int64_t float1);
-
-extern int64_t
-float_log(int64_t float1);
-
-extern int64_t
-float_mantissa(int64_t float1);
-
-extern int64_t
-float_mantissa_set(int64_t float1, int64_t mantissa);
-
-extern int64_t
-float_mulratio(
-    int64_t float1,
-    uint32_t round_up,
-    uint32_t numerator,
-    uint32_t denominator);
-
-extern int64_t
-float_multiply(int64_t float1, int64_t float2);
-
-extern int64_t
-float_negate(int64_t float1);
-
-extern int64_t
-float_one(void);
-
-extern int64_t
-float_root(int64_t float1, uint32_t n);
-
-extern int64_t
-float_set(int32_t exponent, int64_t mantissa);
-
-extern int64_t
-float_sign(int64_t float1);
-
-extern int64_t
-float_sign_set(int64_t float1, uint32_t negative);
-
-extern int64_t
-float_sto(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t cread_ptr,
-    uint32_t cread_len,
-    uint32_t iread_ptr,
-    uint32_t iread_len,
-    int64_t float1,
-    uint32_t field_code);
-
-extern int64_t
-float_sto_set(uint32_t read_ptr, uint32_t read_len);
-
-extern int64_t
-float_sum(int64_t float1, int64_t float2);
-
-extern int64_t
-hook_account(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-hook_again(void);
-
-extern int64_t
-hook_hash(uint32_t write_ptr, uint32_t write_len, int32_t hook_no);
-
-extern int64_t
-hook_param(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-otxn_param(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-hook_param_set(
-    uint32_t read_ptr,
-    uint32_t read_len,
-    uint32_t kread_ptr,
-    uint32_t kread_len,
-    uint32_t hread_ptr,
-    uint32_t hread_len);
-
-extern int64_t
-hook_pos(void);
-
-extern int64_t
-hook_skip(uint32_t read_ptr, uint32_t read_len, uint32_t flags);
-
-extern int64_t
-ledger_keylet(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t lread_ptr,
-    uint32_t lread_len,
-    uint32_t hread_ptr,
-    uint32_t hread_len);
-
-extern int64_t
-ledger_last_hash(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-ledger_last_time(void);
-
-extern int64_t
-ledger_nonce(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-ledger_seq(void);
-
-extern int64_t
-meta_slot(uint32_t slot_no);
-
-extern int64_t
-otxn_burden(void);
-
-extern int64_t
-otxn_field(uint32_t write_ptr, uint32_t write_len, uint32_t field_id);
-
-extern int64_t
-otxn_field_txt(uint32_t write_ptr, uint32_t write_len, uint32_t field_id);
-
-extern int64_t
-otxn_generation(void);
-
-extern int64_t
-otxn_id(uint32_t write_ptr, uint32_t write_len, uint32_t flags);
-
-extern int64_t
-otxn_slot(uint32_t slot_no);
-
-extern int64_t
-otxn_type(void);
-
 extern int64_t
 rollback(uint32_t read_ptr, uint32_t read_len, int64_t error_code);
 
-extern int64_t
+// UTIL
-slot(uint32_t write_ptr, uint32_t write_len, uint32_t slot);
 
 extern int64_t
-slot_clear(uint32_t slot);
+util_raddr(
-
-extern int64_t
-slot_count(uint32_t slot);
-
-extern int64_t
-slot_float(uint32_t slot_no);
-
-extern int64_t
-slot_id(uint32_t write_ptr, uint32_t write_len, uint32_t slot);
-
-extern int64_t
-slot_set(uint32_t read_ptr, uint32_t read_len, uint32_t slot);
-
-extern int64_t
-slot_size(uint32_t slot);
-
-extern int64_t
-slot_subarray(uint32_t parent_slot, uint32_t array_id, uint32_t new_slot);
-
-extern int64_t
-slot_subfield(uint32_t parent_slot, uint32_t field_id, uint32_t new_slot);
-
-extern int64_t
-slot_type(uint32_t slot_no, uint32_t flags);
-
-extern int64_t
-state(
     uint32_t write_ptr,
     uint32_t write_len,
+    uint32_t read_ptr,
+    uint32_t read_len);
+
+extern int64_t
+util_accid(
+    uint32_t write_ptr,
+    uint32_t write_len,
+    uint32_t read_ptr,
+    uint32_t read_len);
+
+extern int64_t
+util_verify(
+    uint32_t dread_ptr,
+    uint32_t dread_len,
+    uint32_t sread_ptr,
+    uint32_t sread_len,
     uint32_t kread_ptr,
     uint32_t kread_len);
 
 extern int64_t
-state_foreign(
+util_sha512h(
     uint32_t write_ptr,
     uint32_t write_len,
-    uint32_t kread_ptr,
+    uint32_t read_ptr,
-    uint32_t kread_len,
+    uint32_t read_len);
-    uint32_t nread_ptr,
-    uint32_t nread_len,
-    uint32_t aread_ptr,
-    uint32_t aread_len);
 
 extern int64_t
-state_foreign_set(
+util_keylet(
-    uint32_t read_ptr,
+    uint32_t write_ptr,
-    uint32_t read_len,
+    uint32_t write_len,
-    uint32_t kread_ptr,
+    uint32_t keylet_type,
-    uint32_t kread_len,
+    uint32_t a,
-    uint32_t nread_ptr,
+    uint32_t b,
-    uint32_t nread_len,
+    uint32_t c,
-    uint32_t aread_ptr,
+    uint32_t d,
-    uint32_t aread_len);
+    uint32_t e,
+    uint32_t f);
+
+// STO
 
 extern int64_t
-state_set(
+sto_validate(uint32_t tread_ptr, uint32_t tread_len);
-    uint32_t read_ptr,
+
-    uint32_t read_len,
+extern int64_t
-    uint32_t kread_ptr,
+sto_subfield(uint32_t read_ptr, uint32_t read_len, uint32_t field_id);
-    uint32_t kread_len);
+
+extern int64_t
+sto_subarray(uint32_t read_ptr, uint32_t read_len, uint32_t array_id);
 
 extern int64_t
 sto_emplace(
@@ -279,14 +85,222 @@ sto_erase(
     uint32_t read_len,
     uint32_t field_id);
 
-extern int64_t
+// EMITTED TXN
-sto_subarray(uint32_t read_ptr, uint32_t read_len, uint32_t array_id);
 
 extern int64_t
-sto_subfield(uint32_t read_ptr, uint32_t read_len, uint32_t field_id);
+etxn_burden(void);
 
 extern int64_t
-sto_validate(uint32_t tread_ptr, uint32_t tread_len);
+etxn_details(uint32_t write_ptr, uint32_t write_len);
+
+extern int64_t
+etxn_fee_base(uint32_t read_ptr, uint32_t read_len);
+
+extern int64_t
+etxn_reserve(uint32_t count);
+
+extern int64_t
+etxn_generation(void);
+
+extern int64_t
+etxn_nonce(uint32_t write_ptr, uint32_t write_len);
+
+extern int64_t
+emit(
+    uint32_t write_ptr,
+    uint32_t write_len,
+    uint32_t read_ptr,
+    uint32_t read_len);
+
+// FLOAT
+
+extern int64_t
+float_set(int32_t exponent, int64_t mantissa);
+
+extern int64_t
+float_multiply(int64_t float1, int64_t float2);
+
+extern int64_t
+float_mulratio(
+    int64_t float1,
+    uint32_t round_up,
+    uint32_t numerator,
+    uint32_t denominator);
+
+extern int64_t
+float_negate(int64_t float1);
+
+extern int64_t
+float_compare(int64_t float1, int64_t float2, uint32_t mode);
+
+extern int64_t
+float_sum(int64_t float1, int64_t float2);
+
+extern int64_t
+float_sto(
+    uint32_t write_ptr,
+    uint32_t write_len,
+    uint32_t cread_ptr,
+    uint32_t cread_len,
+    uint32_t iread_ptr,
+    uint32_t iread_len,
+    int64_t float1,
+    uint32_t field_code);
+
+extern int64_t
+float_sto_set(uint32_t read_ptr, uint32_t read_len);
+
+extern int64_t
+float_invert(int64_t float1);
+
+extern int64_t
+float_divide(int64_t float1, int64_t float2);
+
+extern int64_t
+float_one(void);
+
+extern int64_t
+float_mantissa(int64_t float1);
+
+extern int64_t
+float_sign(int64_t float1);
+
+extern int64_t
+float_int(int64_t float1, uint32_t decimal_places, uint32_t abs);
+
+extern int64_t
+float_log(int64_t float1);
+
+extern int64_t
+float_root(int64_t float1, uint32_t n);
+
+// LEDGER
+
+extern int64_t
+fee_base(void);
+
+extern int64_t
+ledger_seq(void);
+
+extern int64_t
+ledger_last_time(void);
+
+extern int64_t
+ledger_last_hash(uint32_t write_ptr, uint32_t write_len);
+
+extern int64_t
+ledger_nonce(uint32_t write_ptr, uint32_t write_len);
+
+extern int64_t
+ledger_keylet(
+    uint32_t write_ptr,
+    uint32_t write_len,
+    uint32_t lread_ptr,
+    uint32_t lread_len,
+    uint32_t hread_ptr,
+    uint32_t hread_len);
+
+// HOOK
+
+extern int64_t
+hook_account(uint32_t write_ptr, uint32_t write_len);
+
+extern int64_t
+hook_hash(uint32_t write_ptr, uint32_t write_len, int32_t hook_no);
+
+extern int64_t
+hook_param_set(
+    uint32_t read_ptr,
+    uint32_t read_len,
+    uint32_t kread_ptr,
+    uint32_t kread_len,
+    uint32_t hread_ptr,
+    uint32_t hread_len);
+
+extern int64_t
+hook_param(
+    uint32_t write_ptr,
+    uint32_t write_len,
+    uint32_t read_ptr,
+    uint32_t read_len);
+
+extern int64_t
+hook_again(void);
+
+extern int64_t
+hook_skip(uint32_t read_ptr, uint32_t read_len, uint32_t flags);
+
+extern int64_t
+hook_pos(void);
+
+// SLOT
+
+extern int64_t
+slot(uint32_t write_ptr, uint32_t write_len, uint32_t slot);
+
+extern int64_t
+slot_clear(uint32_t slot);
+
+extern int64_t
+slot_count(uint32_t slot);
+
+extern int64_t
+slot_set(uint32_t read_ptr, uint32_t read_len, uint32_t slot);
+
+extern int64_t
+slot_size(uint32_t slot);
+
+extern int64_t
+slot_subarray(uint32_t parent_slot, uint32_t array_id, uint32_t new_slot);
+
+extern int64_t
+slot_subfield(uint32_t parent_slot, uint32_t field_id, uint32_t new_slot);
+
+extern int64_t
+slot_type(uint32_t slot_no, uint32_t flags);
+
+extern int64_t
+slot_float(uint32_t slot_no);
+
+// STATE
+
+extern int64_t
+state_set(
+    uint32_t read_ptr,
+    uint32_t read_len,
+    uint32_t kread_ptr,
+    uint32_t kread_len);
+
+extern int64_t
+state_foreign_set(
+    uint32_t read_ptr,
+    uint32_t read_len,
+    uint32_t kread_ptr,
+    uint32_t kread_len,
+    uint32_t nread_ptr,
+    uint32_t nread_len,
+    uint32_t aread_ptr,
+    uint32_t aread_len);
+
+extern int64_t
+state(
+    uint32_t write_ptr,
+    uint32_t write_len,
+    uint32_t kread_ptr,
+    uint32_t kread_len);
+
+extern int64_t
+state_foreign(
+    uint32_t write_ptr,
+    uint32_t write_len,
+    uint32_t kread_ptr,
+    uint32_t kread_len,
+    uint32_t nread_ptr,
+    uint32_t nread_len,
+    uint32_t aread_ptr,
+    uint32_t aread_len);
+
+// TRACE
 
 extern int64_t
 trace(
@@ -296,57 +310,45 @@ trace(
     uint32_t dread_len,
     uint32_t as_hex);
 
-extern int64_t
-trace_float(uint32_t read_ptr, uint32_t read_len, int64_t float1);
-
 extern int64_t
 trace_num(uint32_t read_ptr, uint32_t read_len, int64_t number);
 
 extern int64_t
-trace_slot(uint32_t read_ptr, uint32_t read_len, uint32_t slot);
+trace_float(uint32_t read_ptr, uint32_t read_len, int64_t float1);
+
+// OTXN
 
 extern int64_t
-util_accid(
+otxn_burden(void);
+
+extern int64_t
+otxn_field(uint32_t write_ptr, uint32_t write_len, uint32_t field_id);
+
+extern int64_t
+otxn_generation(void);
+
+extern int64_t
+otxn_id(uint32_t write_ptr, uint32_t write_len, uint32_t flags);
+
+extern int64_t
+otxn_type(void);
+
+extern int64_t
+otxn_slot(uint32_t slot_no);
+
+extern int64_t
+otxn_param(
     uint32_t write_ptr,
     uint32_t write_len,
     uint32_t read_ptr,
     uint32_t read_len);
 
 extern int64_t
-util_keylet(
+meta_slot(uint32_t slot_no);
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t keylet_type,
-    uint32_t a,
-    uint32_t b,
-    uint32_t c,
-    uint32_t d,
-    uint32_t e,
-    uint32_t f);
 
-extern int64_t
+// featureHooks1
-util_raddr(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-util_sha512h(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-util_verify(
-    uint32_t dread_ptr,
-    uint32_t dread_len,
-    uint32_t sread_ptr,
-    uint32_t sread_len,
-    uint32_t kread_ptr,
-    uint32_t kread_len);
 
 extern int64_t xpop_slot(uint32_t, uint32_t);
+
 #define HOOK_EXTERN
 #endif  // HOOK_EXTERN

hook/hookapi.h

@@ -36,6 +36,7 @@
 #define KEYLET_EMITTED 22
 #define KEYLET_NFT_OFFER 23
 #define KEYLET_HOOK_DEFINITION 24
+#define KEYLET_HOOK_STATE_DIR 25
 
 #define COMPARE_EQUAL 1U
 #define COMPARE_LESS 2U
@@ -45,6 +46,6 @@
 #include "extern.h"
 #include "sfcodes.h"
 #include "macro.h"
-#include "types.h"
+#include "tts.h"
 
 #endif

hook/macro.h

@@ -261,42 +261,6 @@ int out_len = 0;\
     if (i < 0) buf[0] |= 0x80U;\
 }
 
-#define ttPAYMENT 0
-#define ttESCROW_CREATE 1
-#define ttESCROW_FINISH 2
-#define ttACCOUNT_SET 3
-#define ttESCROW_CANCEL 4
-#define ttREGULAR_KEY_SET 5
-#define ttOFFER_CREATE 7
-#define ttOFFER_CANCEL 8
-#define ttTICKET_CREATE 10
-#define ttSIGNER_LIST_SET 12
-#define ttPAYCHAN_CREATE 13
-#define ttPAYCHAN_FUND 14
-#define ttPAYCHAN_CLAIM 15
-#define ttCHECK_CREATE 16
-#define ttCHECK_CASH 17
-#define ttCHECK_CANCEL 18
-#define ttDEPOSIT_PREAUTH 19
-#define ttTRUST_SET 20
-#define ttACCOUNT_DELETE 21
-#define ttHOOK_SET 22
-#define ttNFTOKEN_MINT 25
-#define ttNFTOKEN_BURN 26
-#define ttNFTOKEN_CREATE_OFFER 27
-#define ttNFTOKEN_CANCEL_OFFER 28
-#define ttNFTOKEN_ACCEPT_OFFER 29
-#define ttURITOKEN_MINT 45
-#define ttURITOKEN_BURN 46
-#define ttURITOKEN_BUY 47
-#define ttURITOKEN_CREATE_SELL_OFFER 48
-#define ttURITOKEN_CANCEL_SELL_OFFER 49
-#define ttCLAIM_REWARD 98
-#define ttINVOKE 99
-#define ttAMENDMENT 100
-#define ttFEE 101
-#define ttUNL_MODIFY 102
-#define ttEMIT_FAILURE 103
 #define tfCANONICAL 0x80000000UL
 
 #define atACCOUNT 1U

hook/tts.h

@@ -0,0 +1,42 @@
+// For documentation please see: https://xrpl-hooks.readme.io/reference/
+#define ttPAYMENT 0
+#define ttESCROW_CREATE 1
+#define ttESCROW_FINISH 2
+#define ttACCOUNT_SET 3
+#define ttESCROW_CANCEL 4
+#define ttREGULAR_KEY_SET 5
+// #define ttNICKNAME_SET 6 // deprecated
+#define ttOFFER_CREATE 7
+#define ttOFFER_CANCEL 8
+#define ttTICKET_CREATE 10
+// #define ttSPINAL_TAP 11 // deprecated
+#define ttSIGNER_LIST_SET 12
+#define ttPAYCHAN_CREATE 13
+#define ttPAYCHAN_FUND 14
+#define ttPAYCHAN_CLAIM 15
+#define ttCHECK_CREATE 16
+#define ttCHECK_CASH 17
+#define ttCHECK_CANCEL 18
+#define ttDEPOSIT_PREAUTH 19
+#define ttTRUST_SET 20
+#define ttACCOUNT_DELETE 21
+#define ttHOOK_SET 22
+#define ttNFTOKEN_MINT 25
+#define ttNFTOKEN_BURN 26
+#define ttNFTOKEN_CREATE_OFFER 27
+#define ttNFTOKEN_CANCEL_OFFER 28
+#define ttNFTOKEN_ACCEPT_OFFER 29
+#define ttURITOKEN_MINT 45
+#define ttURITOKEN_BURN 46
+#define ttURITOKEN_BUY 47
+#define ttURITOKEN_CREATE_SELL_OFFER 48
+#define ttURITOKEN_CANCEL_SELL_OFFER 49
+#define ttGENESIS_MINT 96
+#define ttIMPORT 97
+#define ttCLAIM_REWARD 98
+#define ttINVOKE 99
+#define ttAMENDMENT 100
+#define ttFEE 101
+#define ttUNL_MODIFY 102
+#define ttEMIT_FAILURE 103
+#define ttUNL_REPORT 104

hook/types.h

@@ -1,239 +0,0 @@
-#include <stdint.h>
-
-// 8 byte-int = 1 bytes
-#define SFL_CLOSERESOLUTION 1
-#define SFL_METHOD 1
-#define SFL_TRANSACTIONRESULT 1
-#define SFL_TICKSIZE 1
-#define SFL_UNLMODIFYDISABLING 1
-#define SFL_HOOKRESULT 1
-// 16 byte-int = 2 bytes
-#define SFL_LEDGERENTRYTYPE 2
-#define SFL_TRANSACTIONTYPE 2
-#define SFL_SIGNERWEIGHT 2
-#define SFL_TRANSFERFEE 2
-#define SFL_VERSION 2
-#define SFL_HOOKSTATECHANGECOUNT 2
-#define SFL_HOOKEMITCOUNT 2
-#define SFL_HOOKEXECUTIONINDEX 2
-#define SFL_HOOKAPIVERSION 2
-// 32 byte-int = 4 bytes
-#define SFL_NETWORKID 4
-#define SFL_FLAGS 4
-#define SFL_SOURCETAG 4
-#define SFL_SEQUENCE 4
-#define SFL_PREVIOUSTXNLGRSEQ 4
-#define SFL_LEDGERSEQUENCE 4
-#define SFL_CLOSETIME 4
-#define SFL_PARENTCLOSETIME 4
-#define SFL_SIGNINGTIME 4
-#define SFL_EXPIRATION 4
-#define SFL_TRANSFERRATE 4
-#define SFL_WALLETSIZE 4
-#define SFL_OWNERCOUNT 4
-#define SFL_DESTINATIONTAG 4
-#define SFL_HIGHQUALITYIN 4
-#define SFL_HIGHQUALITYOUT 4
-#define SFL_LOWQUALITYIN 4
-#define SFL_LOWQUALITYOUT 4
-#define SFL_QUALITYIN 4
-#define SFL_QUALITYOUT 4
-#define SFL_STAMPESCROW 4
-#define SFL_BONDAMOUNT 4
-#define SFL_LOADFEE 4
-#define SFL_OFFERSEQUENCE 4
-#define SFL_FIRSTLEDGERSEQUENCE 4
-#define SFL_LASTLEDGERSEQUENCE 4
-#define SFL_TRANSACTIONINDEX 4
-#define SFL_OPERATIONLIMIT 4
-#define SFL_REFERENCEFEEUNITS 4
-#define SFL_RESERVEBASE 4
-#define SFL_RESERVEINCREMENT 4
-#define SFL_SETFLAG 4
-#define SFL_CLEARFLAG 4
-#define SFL_SIGNERQUORUM 4
-#define SFL_CANCELAFTER 4
-#define SFL_FINISHAFTER 4
-#define SFL_SIGNERLISTID 4
-#define SFL_SETTLEDELAY 4
-#define SFL_TICKETCOUNT 4
-#define SFL_TICKETSEQUENCE 4
-#define SFL_NFTOKENTAXON 4
-#define SFL_MINTEDNFTOKENS 4
-#define SFL_BURNEDNFTOKENS 4
-#define SFL_HOOKSTATECOUNT 4
-#define SFL_EMITGENERATION 4
-#define SFL_LOCKCOUNT 4
-#define SFL_REWARDTIME 4
-#define SFL_REWARDLGRFIRST 4
-#define SFL_REWARDLGRLAST 4
-#define SFL_FIRSTNFTOKENSEQUENCE 4
-// 64 byte-int = 8 bytes
-#define SFL_INDEX_NEXT 8
-#define SFL_INDEX_PREVIOUS 8
-#define SFL_BOOK_NODE 8
-#define SFL_OWNER_NODE 8
-#define SFL_BASE_FEE 8
-#define SFL_EXCHANGE_RATE 8
-#define SFL_LOW_NODE 8
-#define SFL_HIGH_NODE 8
-#define SFL_DESTINATION_NODE 8
-#define SFL_COOKIE 8
-#define SFL_SERVER_VERSION 8
-#define SFL_EMIT_BURDEN 8
-#define SFL_NFTOKEN_OFFER_NODE 8
-#define SFL_HOOK_INSTRUCTION_COUNT 8
-#define SFL_HOOK_RETURN_CODE 8
-#define SFL_REFERENCE_COUNT 8
-#define SFL_REWARD_ACCUMULATOR 8
-// 128 byte-int = 4 bytes
-#define SFL_EMAIL_HASH 128
-// 160 byte-int = 4 bytes
-#define SFL_TAKER_PAYS_CURRENCY 160
-#define SFL_TAKER_PAYS_ISSUER 160
-#define SFL_TAKER_GETS_CURRENCY 160
-#define SFL_TAKER_GETS_ISSUER 160
-// 256 byte-int = ??? bytes
-#define SFL_LEDGER_HASH 256
-#define SFL_PARENT_HASH 256
-#define SFL_TRANSACTION_HASH 256
-#define SFL_ACCOUNT_HASH 256
-#define SFL_HOOK_ON 256
-#define SFL_PREVIOUS_TXN_ID 256
-#define SFL_LEDGER_INDEX 256
-#define SFL_WALLET_LOCATOR 256
-#define SFL_ROOT_INDEX 256
-#define SFL_ACCOUNT_TXN_ID 256
-#define SFL_NFTOKEN_ID 256
-#define SFL_EMIT_PARENT_TXN_ID 256
-#define SFL_EMIT_NONCE 256
-#define SFL_EMIT_HOOK_HASH 256
-// 256 byte-int = ??? bytes
-#define SFL_BOOK_DIRECTORY 256
-#define SFL_INVOICE_ID 256
-#define SFL_NICKNAME 256
-#define SFL_AMENDMENT 256
-#define SFL_DIGEST 256
-#define SFL_CHANNEL 256
-#define SFL_CONSENSUS_HASH 256
-#define SFL_CHECK_ID 256
-#define SFL_VALIDATED_HASH 256
-#define SFL_PREVIOUS_PAGE_MIN 256
-#define SFL_NEXT_PAGE_MIN 256
-#define SFL_NFTOKEN_BUY_OFFER 256
-#define SFL_NFTOKEN_SELL_OFFER 256
-#define SFL_HOOK_STATE_KEY 256
-#define SFL_HOOK_HASH 256
-#define SFL_HOOK_NAMESPACE 256
-#define SFL_HOOK_SET_TXN_ID 256
-#define SFL_OFFER_ID 256
-#define SFL_ESCROW_ID 256
-#define SFL_URITOKEN_ID 256
-// 20 bytes
-#define SFL_AMOUNT 20
-#define SFL_BALANCE 20
-#define SFL_LIMIT_AMOUNT 20
-#define SFL_TAKER_PAYS 20
-#define SFL_TAKER_GETS 20
-#define SFL_LOW_LIMIT 20
-#define SFL_HIGH_LIMIT 20
-#define SFL_FEE 20
-#define SFL_SEND_MAX 20
-#define SFL_DELIVER_MIN 20
-#define SFL_LOCKED_BALANCE 20
-// Unimplemented
-#define SFL_AMOUNT_MINIMUM_OFFER 8
-#define SFL_AMOUNT_RIPPLE_ESCROW 8
-#define SFL_AMOUNT_DELIVERED_AMOUNT 8
-#define SFL_AMOUNT_NFTOKEN_BROKER_FEE 8
-#define SFL_AMOUNT_HOOK_CALLBACK_FEE 8
-#define SFL_AMOUNT_BASE_FEE_DROPS 8
-#define SFL_AMOUNT_RESERVE_BASE_DROPS 8
-#define SFL_AMOUNT_RESERVE_INCREMENT_DROPS 8
-// Unimplemented
-#define SFL_VL_PUBLIC_KEY 64
-#define SFL_VL_MESSAGE_KEY 64
-#define SFL_VL_SIGNING_PUB_KEY 64
-// Unimplemented
-#define SFL_VL_TXN_SIGNATURE 96
-// Unimplemented
-#define SFL_VL_URI 256
-// Unimplemented
-#define SFL_VL_SIGNATURE 96
-// Unimplemented
-#define SFL_VL_DOMAIN 256
-#define SFL_VL_FUND_CODE 256
-#define SFL_VL_REMOVE_CODE 256
-#define SFL_VL_EXPIRE_CODE 256
-#define SFL_VL_CREATE_CODE 256
-#define SFL_VL_MEMO_TYPE 256
-#define SFL_VL_MEMO_DATA 256
-#define SFL_VL_MEMO_FORMAT 256
-#define SFL_VL_FULFILLMENT 256
-#define SFL_VL_CONDITION 256
-// Unimplemented
-#define SFL_VL_MASTER_SIGNATURE 96
-// Unimplemented
-#define SFL_VL_UNL_MODIFY_VALIDATOR 256
-#define SFL_VL_VALIDATOR_TO_DISABLE 256
-#define SFL_VL_VALIDATOR_TO_RE_ENABLE 256
-#define SFL_VL_HOOK_STATE_DATA 256
-#define SFL_VL_HOOK_RETURN_STRING 256
-#define SFL_VL_HOOK_PARAMETER_NAME 256
-#define SFL_VL_HOOK_PARAMETER_VALUE 256
-#define SFL_VL_BLOB 256
-// 20 bytes
-#define SFL_ACCOUNT 20
-#define SFL_OWNER 20
-#define SFL_DESTINATION 20
-#define SFL_ISSUER 20
-#define SFL_AUTHORIZE 20
-#define SFL_UNAUTHORIZE 20
-#define SFL_REGULAR_KEY 20
-#define SFL_NFTOKEN_MINTER 20
-#define SFL_EMIT_CALLBACK 20
-#define SFL_HOOK_ACCOUNT 20
-#define SFL_NFTOKEN_MINTER 20
-// Unimplemented
-#define SFL_PATHS 1
-// Unimplemented
-#define SFL_VECTOR256_INDEXES 32
-#define SFL_VECTOR256_HASHES 32
-#define SFL_VECTOR256_AMENDMENTS 32
-#define SFL_VECTOR256_NFTOKEN_OFFERS 32
-#define SFL_VECTOR256_HOOK_NAMESPACES 32
-// Unimplemented
-#define SFL_TRANSACTION_META_DATA 1
-#define SFL_CREATED_NODE 1
-#define SFL_DELETED_NODE 1
-#define SFL_MODIFIED_NODE 1
-#define SFL_PREVIOUS_FIELDS 1
-#define SFL_FINAL_FIELDS 1
-#define SFL_NEW_FIELDS 1
-#define SFL_TEMPLATE_ENTRY 1
-#define SFL_MEMO 1
-#define SFL_SIGNER_ENTRY 1
-#define SFL_NFTOKEN 1
-#define SFL_EMIT_DETAILS 1
-#define SFL_HOOK 1
-#define SFL_SIGNER 1
-#define SFL_MAJORITY 1
-#define SFL_DISABLED_VALIDATOR 1
-#define SFL_EMITTED_TXN 1
-#define SFL_HOOK_EXECUTION 1
-#define SFL_HOOK_DEFINITION 1
-#define SFL_HOOK_PARAMETER 1
-#define SFL_HOOK_GRANT 1
-#define SFL_SIGNERS 1
-#define SFL_SIGNER_ENTRIES 1
-#define SFL_TEMPLATE 1
-#define SFL_NECESSARY 1
-#define SFL_SUFFICIENT 1
-#define SFL_AFFECTED_NODES 1
-#define SFL_MEMOS 1
-#define SFL_NFTOKENS 1
-#define SFL_HOOKS 1
-#define SFL_MAJORITIES 1
-#define SFL_DISABLED_VALIDATORS 1
-#define SFL_HOOK_EXECUTIONS 1
-#define SFL_HOOK_EXECUTION 1

src/ripple/app/hook/Enum.h

@@ -258,13 +258,13 @@ namespace hook_api
         {"util_raddr",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU}},
         {"util_accid",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU}},
         {"util_verify",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU}},
+        {"util_sha512h",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU}},
+        {"util_keylet",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU}},
         {"sto_validate",{0x7EU,0x7FU,0x7FU}},
         {"sto_subfield",{0x7EU,0x7FU,0x7FU,0x7FU}},
         {"sto_subarray",{0x7EU,0x7FU,0x7FU,0x7FU}},
         {"sto_emplace",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU}},
         {"sto_erase",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU}},
-        {"util_sha512h",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU}},
-        {"util_keylet",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU}},
         {"etxn_burden",{0x7EU}},
         {"etxn_details",{0x7EU,0x7FU,0x7FU}},
         {"etxn_fee_base",{0x7EU,0x7FU,0x7FU}},
@@ -288,14 +288,14 @@ namespace hook_api
         {"float_int",{0x7EU,0x7EU,0x7FU,0x7FU}},
         {"float_log",{0x7EU,0x7EU}},
         {"float_root",{0x7EU,0x7EU,0x7FU}},
-        {"hook_account",{0x7EU,0x7FU,0x7FU}},
-        {"hook_hash",{0x7EU,0x7FU,0x7FU,0x7FU}},
         {"fee_base",{0x7EU}},
         {"ledger_seq",{0x7EU}},
         {"ledger_last_time",{0x7EU}},
         {"ledger_last_hash",{0x7EU,0x7FU,0x7FU}},
         {"ledger_nonce",{0x7EU,0x7FU,0x7FU}},
         {"ledger_keylet",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU}},
+        {"hook_account",{0x7EU,0x7FU,0x7FU}},
+        {"hook_hash",{0x7EU,0x7FU,0x7FU,0x7FU}},
         {"hook_param_set",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU,0x7FU}},
         {"hook_param",{0x7EU,0x7FU,0x7FU,0x7FU,0x7FU}},
         {"hook_again",{0x7EU}},