diff --git a/content/transactions.json b/content/transactions.json
index e2f1d8e..7dbf0a7 100644
--- a/content/transactions.json
+++ b/content/transactions.json
@@ -79,25 +79,40 @@
     "Condition": "A0258020E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855810100",
     "Fulfillment": "A0028000"
   },
+  {
+    "TransactionType": "NFTokenMint",
+    "Account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
+    "Fee": "10",
+    "NFTokenTaxon": 0,
+    "URI": "697066733A2F2F516D614374444B5A4656767666756676626479346573745A626851483744586831364354707631686F776D424779"
+  },
   {
     "TransactionType": "NFTokenBurn",
     "Account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
     "Fee": "10",
-    "TokenID": "000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65"
+    "NFTokenID": "000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65"
   },
   {
     "TransactionType": "NFTokenAcceptOffer",
-    "Fee": "10"
+    "Account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
+    "Fee": "10",
+    "NFTokenSellOffer": "A2FA1A9911FE2AEF83DAB05F437768E26A301EF899BD31EB85E704B3D528FF18",
+    "NFTokenBuyOffer": "4AAAEEA76E3C8148473CB3840CE637676E561FB02BD4CA22CA59729EA815B862",
+    "NFTokenBrokerFee": "10"
   },
   {
     "TransactionType": "NFTokenCancelOffer",
     "Account": "ra5nK24KXen9AHvsdFTKHSANinZseWnPcX",
-    "TokenIDs": "000100001E962F495F07A990F4ED55ACCFEEF365DBAA76B6A048C0A200000007"
+    "Fee": "10",
+    "NFTokenOffers": {
+      "$type": "json",
+      "$value":  ["4AAAEEA76E3C8148473CB3840CE637676E561FB02BD4CA22CA59729EA815B862"]
+    }
   },
   {
     "TransactionType": "NFTokenCreateOffer",
     "Account": "rs8jBmmfpwgmrSPgwMsh7CvKRmRt1JTVSX",
-    "TokenID": "000100001E962F495F07A990F4ED55ACCFEEF365DBAA76B6A048C0A200000007",
+    "NFTokenID": "000100001E962F495F07A990F4ED55ACCFEEF365DBAA76B6A048C0A200000007",
     "Amount": {
       "$value": "100",
       "$type": "xrp"
diff --git a/package.json b/package.json
index 400539f..0cd5eac 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "vscode-languageserver": "^7.0.0",
     "vscode-uri": "^3.0.2",
     "wabt": "1.0.16",
-    "xrpl-accountlib": "^1.3.2",
+    "xrpl-accountlib": "^1.5.2",
     "xrpl-client": "^1.9.4"
   },
   "devDependencies": {
diff --git a/patches/ripple-binary-codec+1.3.2.patch b/patches/ripple-binary-codec+1.4.2.patch
similarity index 79%
rename from patches/ripple-binary-codec+1.3.2.patch
rename to patches/ripple-binary-codec+1.4.2.patch
index 03429dd..7c77bb6 100644
--- a/patches/ripple-binary-codec+1.3.2.patch
+++ b/patches/ripple-binary-codec+1.4.2.patch
@@ -1,176 +1,54 @@
 diff --git a/node_modules/ripple-binary-codec/dist/enums/definitions.json b/node_modules/ripple-binary-codec/dist/enums/definitions.json
-index cfe1902..1fbe906 100644
+index 6a82327..273b78d 100644
 --- a/node_modules/ripple-binary-codec/dist/enums/definitions.json
 +++ b/node_modules/ripple-binary-codec/dist/enums/definitions.json
-@@ -1,29 +1,33 @@
-+
- {
-   "TYPES": {
--    "Validation": 10003,
-     "Done": -1,
-+    "Unknown": -2,
-+    "NotPresent": 0,
-+    "UInt16": 1,
-+    "UInt32": 2,
-+    "UInt64": 3,
-     "Hash128": 4,
-+    "Hash256": 5,
-+    "Amount": 6,
-     "Blob": 7,
-     "AccountID": 8,
--    "Amount": 6,
--    "Hash256": 5,
--    "UInt8": 16,
--    "Vector256": 19,
-     "STObject": 14,
--    "Unknown": -2,
--    "Transaction": 10001,
-+    "STArray": 15,
-+    "UInt8": 16,
-     "Hash160": 17,
-     "PathSet": 18,
-+    "Vector256": 19,
-+    "UInt96": 20,
-+    "UInt192": 21,
-+    "UInt384": 22,
-+    "UInt512": 23,
-+    "Transaction": 10001,
-     "LedgerEntry": 10002,
--    "UInt16": 1,
--    "NotPresent": 0,
--    "UInt64": 3,
--    "UInt32": 2,
--    "STArray": 15
-+    "Validation": 10003,
-+    "Metadata": 10004
-   },
-   "LEDGER_ENTRY_TYPES": {
--    "Any": -3,
--    "Child": -2,
-     "Invalid": -1,
-     "AccountRoot": 97,
-     "DirectoryNode": 100,
-@@ -36,13 +40,14 @@
-     "FeeSettings": 115,
-     "Escrow": 117,
-     "PayChannel": 120,
--    "DepositPreauth": 112,
-     "Check": 67,
-+    "DepositPreauth": 112,
-+    "NegativeUnl": 78,
-+    "Any": 0,
-+    "Child": 7378,
-     "Nickname": 110,
-     "Contract": 99,
--    "NFTokenPage": 80,
--    "NFTokenOffer": 55,
--    "NegativeUNL": 78
-+    "GeneratorMap": 103
+@@ -46,23 +46,103 @@
    },
    "FIELDS": [
      [
-@@ -65,6 +70,166 @@
-         "type": "Unknown"
+-      "Generic",
++      "LedgerEntry",
+       {
+-        "nth": 0,
++        "nth": 1,
+         "isVLEncoded": false,
+         "isSerialized": false,
+         "isSigningField": false,
+-        "type": "Unknown"
++        "type": "LedgerEntry"
        }
      ],
-+    [
-+      "ObjectEndMarker",
-+      {
-+        "nth": 1,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
-+        "type": "STObject"
-+      }
-+    ],
-+    [
-+      "ArrayEndMarker",
-+      {
-+        "nth": 1,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
-+        "type": "STArray"
-+      }
-+    ],
-+    [
-+      "hash",
-+      {
-+        "nth": 257,
-+        "isVLEncoded": false,
-+        "isSerialized": false,
-+        "isSigningField": false,
-+        "type": "Hash256"
-+      }
-+    ],
-+    [
-+      "index",
-+      {
-+        "nth": 258,
-+        "isVLEncoded": false,
-+        "isSerialized": false,
-+        "isSigningField": false,
-+        "type": "Hash256"
-+      }
-+    ],
-+    [
-+      "taker_gets_funded",
-+      {
-+        "nth": 258,
-+        "isVLEncoded": false,
-+        "isSerialized": false,
-+        "isSigningField": false,
-+        "type": "Amount"
-+      }
-+    ],
-+    [
-+      "taker_pays_funded",
-+      {
-+        "nth": 259,
-+        "isVLEncoded": false,
-+        "isSerialized": false,
-+        "isSigningField": false,
-+        "type": "Amount"
-+      }
-+    ],
-+    [
-+      "LedgerEntry",
-+      {
-+        "nth": 257,
-+        "isVLEncoded": false,
-+        "isSerialized": false,
-+        "isSigningField": true,
-+        "type": "LedgerEntry"
-+      }
-+    ],
-+    [
+     [
+-      "Invalid",
 +      "Transaction",
-+      {
-+        "nth": 257,
-+        "isVLEncoded": false,
-+        "isSerialized": false,
-+        "isSigningField": true,
+       {
+-        "nth": -1,
++        "nth": 1,
+         "isVLEncoded": false,
+         "isSerialized": false,
+         "isSigningField": false,
+-        "type": "Unknown"
 +        "type": "Transaction"
 +      }
 +    ],
 +    [
 +      "Validation",
 +      {
-+        "nth": 257,
++        "nth": 1,
 +        "isVLEncoded": false,
 +        "isSerialized": false,
-+        "isSigningField": true,
++        "isSigningField": false,
 +        "type": "Validation"
 +      }
 +    ],
 +    [
 +      "Metadata",
 +      {
-+        "nth": 257,
++        "nth": 1,
 +        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
-+        "type": "Metadata"
++        "isSerialized": false,
++        "isSigningField": false,
++        "type": "Validation"
 +      }
 +    ],
 +    [
@@ -231,12 +109,10 @@ index cfe1902..1fbe906 100644
 +        "isSerialized": true,
 +        "isSigningField": true,
 +        "type": "UInt8"
-+      }
-+    ],
+       }
+     ],
      [
-       "LedgerEntryType",
-       {
-@@ -105,6 +270,56 @@
+@@ -105,6 +185,56 @@
          "type": "UInt16"
        }
      ],
@@ -293,7 +169,7 @@ index cfe1902..1fbe906 100644
      [
        "Flags",
        {
-@@ -456,53 +671,143 @@
+@@ -456,272 +586,612 @@
        }
      ],
      [
@@ -350,7 +226,7 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "BaseFee",
-+      "TokenTaxon",
++      "NFTokenTaxon",
        {
 -        "nth": 5,
 +        "nth": 42,
@@ -359,180 +235,255 @@ index cfe1902..1fbe906 100644
          "isSigningField": true,
 -        "type": "UInt64"
 +        "type": "UInt32"
-+      }
-+    ],
-+    [
-+      "MintedTokens",
-+      {
+       }
+     ],
+     [
+-      "ExchangeRate",
++      "MintedNFTokens",
+       {
+-        "nth": 6,
 +        "nth": 43,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "UInt64"
 +        "type": "UInt32"
-+      }
-+    ],
-+    [
-+      "BurnedTokens",
-+      {
+       }
+     ],
+     [
+-      "LowNode",
++      "BurnedNFTokens",
+       {
+-        "nth": 7,
 +        "nth": 44,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "UInt64"
 +        "type": "UInt32"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "HighNode",
 +      "HookStateCount",
-+      {
+       {
+-        "nth": 8,
 +        "nth": 45,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "UInt64"
 +        "type": "UInt32"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "EmailHash",
 +      "EmitGeneration",
-+      {
+       {
+-        "nth": 1,
 +        "nth": 46,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash128"
 +        "type": "UInt32"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "LedgerHash",
 +      "IndexNext",
-+      {
-+        "nth": 1,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
-+        "type": "UInt64"
-+      }
-+    ],
-+    [
-+      "IndexPrevious",
-+      {
-+        "nth": 2,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
-+        "type": "UInt64"
-+      }
-+    ],
-+    [
-+      "BookNode",
-+      {
-+        "nth": 3,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
-+        "type": "UInt64"
-+      }
-+    ],
-+    [
-+      "OwnerNode",
-+      {
-+        "nth": 4,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
-+        "type": "UInt64"
-+      }
-+    ],
-+    [
-+      "BaseFee",
-+      {
-+        "nth": 5,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+       {
+         "nth": 1,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
        }
      ],
      [
-@@ -535,6 +840,96 @@
-         "type": "UInt64"
+-      "ParentHash",
++      "IndexPrevious",
+       {
+         "nth": 2,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
++        "type": "UInt64"
        }
      ],
-+    [
+     [
+-      "TransactionHash",
++      "BookNode",
+       {
+         "nth": 3,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
++        "type": "UInt64"
+       }
+     ],
+     [
+-      "AccountHash",
++      "OwnerNode",
+       {
+         "nth": 4,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
++        "type": "UInt64"
+       }
+     ],
+     [
+-      "PreviousTxnID",
++      "BaseFee",
+       {
+         "nth": 5,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
++        "type": "UInt64"
+       }
+     ],
+     [
+-      "LedgerIndex",
++      "ExchangeRate",
+       {
+         "nth": 6,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
++        "type": "UInt64"
+       }
+     ],
+     [
+-      "WalletLocator",
++      "LowNode",
+       {
+         "nth": 7,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
++        "type": "UInt64"
+       }
+     ],
+     [
+-      "RootIndex",
++      "HighNode",
+       {
+         "nth": 8,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
++        "type": "UInt64"
+       }
+     ],
+     [
+-      "AccountTxnID",
 +      "DestinationNode",
-+      {
-+        "nth": 9,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+       {
+         "nth": 9,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "NFTokenID",
 +      "Cookie",
-+      {
-+        "nth": 10,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+       {
+         "nth": 10,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "BookDirectory",
 +      "ServerVersion",
-+      {
+       {
+-        "nth": 16,
 +        "nth": 11,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
-+      }
-+    ],
-+    [
-+      "OfferNode",
-+      {
+       }
+     ],
+     [
+-      "InvoiceID",
++      "NFTokenOfferNode",
+       {
+-        "nth": 17,
 +        "nth": 12,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "Nickname",
 +      "EmitBurden",
-+      {
+       {
+-        "nth": 18,
 +        "nth": 13,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "Amendment",
 +      "HookOn",
-+      {
+       {
+-        "nth": 19,
 +        "nth": 16,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "TicketID",
 +      "HookInstructionCount",
-+      {
+       {
+-        "nth": 20,
 +        "nth": 17,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "Digest",
 +      "HookReturnCode",
-+      {
-+        "nth": 18,
-+        "isVLEncoded": false,
-+        "isSerialized": true,
-+        "isSigningField": true,
+       {
+-        "nth": 21,
++        "nth": 19,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "Hash256"
 +        "type": "UInt64"
 +      }
 +    ],
@@ -546,13 +497,16 @@ index cfe1902..1fbe906 100644
 +        "type": "UInt64"
 +      }
 +    ],
-     [
-       "EmailHash",
-       {
-@@ -545,6 +940,46 @@
-         "type": "Hash128"
-       }
-     ],
++    [
++      "EmailHash",
++      {
++        "nth": 1,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash128"
++      }
++    ],
 +    [
 +      "TakerPaysCurrency",
 +      {
@@ -593,13 +547,106 @@ index cfe1902..1fbe906 100644
 +        "type": "Hash160"
 +      }
 +    ],
-     [
-       "LedgerHash",
-       {
-@@ -645,6 +1080,36 @@
-         "type": "Hash256"
-       }
-     ],
++    [
++      "LedgerHash",
++      {
++        "nth": 1,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "ParentHash",
++      {
++        "nth": 2,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "TransactionHash",
++      {
++        "nth": 3,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "AccountHash",
++      {
++        "nth": 4,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "PreviousTxnID",
++      {
++        "nth": 5,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "LedgerIndex",
++      {
++        "nth": 6,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "WalletLocator",
++      {
++        "nth": 7,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "RootIndex",
++      {
++        "nth": 8,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "AccountTxnID",
++      {
++        "nth": 9,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "NFTokenID",
++      {
++        "nth": 10,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
 +    [
 +      "EmitParentTxnID",
 +      {
@@ -630,59 +677,81 @@ index cfe1902..1fbe906 100644
 +        "type": "Hash256"
 +      }
 +    ],
-     [
-       "BookDirectory",
-       {
-@@ -686,9 +1151,9 @@
-       }
-     ],
-     [
--      "TicketID",
-+      "Digest",
-       {
--        "nth": 20,
-+        "nth": 21,
-         "isVLEncoded": false,
-         "isSerialized": true,
-         "isSigningField": true,
-@@ -696,9 +1161,9 @@
-       }
-     ],
-     [
--      "Digest",
-+      "Channel",
-       {
--        "nth": 21,
-+        "nth": 22,
-         "isVLEncoded": false,
-         "isSerialized": true,
-         "isSigningField": true,
-@@ -706,22 +1171,112 @@
-       }
-     ],
-     [
--      "hash",
-+      "ConsensusHash",
-       {
--        "nth": 257,
-+        "nth": 23,
-         "isVLEncoded": false,
--        "isSerialized": false,
--        "isSigningField": false,
++    [
++      "BookDirectory",
++      {
++        "nth": 16,
++        "isVLEncoded": false,
 +        "isSerialized": true,
 +        "isSigningField": true,
-         "type": "Hash256"
-       }
-     ],
-     [
--      "index",
++        "type": "Hash256"
++      }
++    ],
++    [
++      "InvoiceID",
++      {
++        "nth": 17,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "Nickname",
++      {
++        "nth": 18,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "Amendment",
++      {
++        "nth": 19,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "Digest",
++      {
++        "nth": 21,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "Channel",
++      {
++        "nth": 22,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
++      "ConsensusHash",
++      {
++        "nth": 23,
++        "isVLEncoded": false,
++        "isSerialized": true,
++        "isSigningField": true,
++        "type": "Hash256"
++      }
++    ],
++    [
 +      "CheckID",
-       {
--        "nth": 258,
++      {
 +        "nth": 24,
-         "isVLEncoded": false,
--        "isSerialized": false,
--        "isSigningField": false,
++        "isVLEncoded": false,
 +        "isSerialized": true,
 +        "isSigningField": true,
 +        "type": "Hash256"
@@ -719,7 +788,7 @@ index cfe1902..1fbe906 100644
 +      }
 +    ],
 +    [
-+      "BuyOffer",
++      "NFTokenBuyOffer",
 +      {
 +        "nth": 28,
 +        "isVLEncoded": false,
@@ -729,7 +798,7 @@ index cfe1902..1fbe906 100644
 +      }
 +    ],
 +    [
-+      "SellOffer",
++      "NFTokenSellOffer",
 +      {
 +        "nth": 29,
 +        "isVLEncoded": false,
@@ -746,23 +815,31 @@ index cfe1902..1fbe906 100644
 +        "isSerialized": true,
 +        "isSigningField": true,
 +        "type": "Hash256"
-+      }
-+    ],
-+    [
+       }
+     ],
+     [
+-      "hash",
 +      "HookHash",
-+      {
+       {
+-        "nth": 257,
 +        "nth": 31,
-+        "isVLEncoded": false,
+         "isVLEncoded": false,
+-        "isSerialized": false,
+-        "isSigningField": false,
 +        "isSerialized": true,
 +        "isSigningField": true,
-+        "type": "Hash256"
-+      }
-+    ],
-+    [
+         "type": "Hash256"
+       }
+     ],
+     [
+-      "index",
 +      "HookNamespace",
-+      {
+       {
+-        "nth": 258,
 +        "nth": 32,
-+        "isVLEncoded": false,
+         "isVLEncoded": false,
+-        "isSerialized": false,
+-        "isSigningField": false,
 +        "isSerialized": true,
 +        "isSigningField": true,
 +        "type": "Hash256"
@@ -778,11 +855,10 @@ index cfe1902..1fbe906 100644
          "type": "Hash256"
        }
      ],
-@@ -865,26 +1420,6 @@
-         "type": "Amount"
+@@ -866,22 +1336,12 @@
        }
      ],
--    [
+     [
 -      "taker_gets_funded",
 -      {
 -        "nth": 258,
@@ -794,18 +870,19 @@ index cfe1902..1fbe906 100644
 -    ],
 -    [
 -      "taker_pays_funded",
--      {
++      "HookCallbackFee",
+       {
 -        "nth": 259,
--        "isVLEncoded": false,
++        "nth": 20,
+         "isVLEncoded": false,
 -        "isSerialized": false,
 -        "isSigningField": false,
--        "type": "Amount"
--      }
--    ],
-     [
-       "PublicKey",
-       {
-@@ -1086,49 +1621,49 @@
++        "isSerialized": true,
++        "isSigningField": true,
+         "type": "Amount"
+       }
+     ],
+@@ -1086,49 +1546,49 @@
        }
      ],
      [
@@ -869,7 +946,7 @@ index cfe1902..1fbe906 100644
          "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
-@@ -1136,9 +1671,9 @@
+@@ -1136,9 +1596,9 @@
        }
      ],
      [
@@ -881,7 +958,7 @@ index cfe1902..1fbe906 100644
          "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
-@@ -1146,9 +1681,9 @@
+@@ -1146,9 +1606,9 @@
        }
      ],
      [
@@ -893,7 +970,7 @@ index cfe1902..1fbe906 100644
          "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
-@@ -1156,9 +1691,9 @@
+@@ -1156,9 +1616,9 @@
        }
      ],
      [
@@ -905,11 +982,11 @@ index cfe1902..1fbe906 100644
          "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
-@@ -1166,9 +1701,9 @@
+@@ -1166,9 +1626,9 @@
        }
      ],
      [
--      "Minter",
+-      "NFTokenMinter",
 +      "Authorize",
        {
 -        "nth": 9,
@@ -917,7 +994,7 @@ index cfe1902..1fbe906 100644
          "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
-@@ -1176,623 +1711,453 @@
+@@ -1176,139 +1636,119 @@
        }
      ],
      [
@@ -942,50 +1019,67 @@ index cfe1902..1fbe906 100644
 -    ],
 -    [
 -      "CreatedNode",
--      {
--        "nth": 3,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STObject"
--      }
--    ],
--    [
--      "DeletedNode",
--      {
--        "nth": 4,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STObject"
--      }
--    ],
--    [
--      "ModifiedNode",
--      {
--        "nth": 5,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STObject"
--      }
--    ],
--    [
--      "PreviousFields",
 +      "Unauthorize",
        {
-         "nth": 6,
+-        "nth": 3,
 -        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
++        "nth": 6,
++        "isVLEncoded": true,
+         "isSerialized": true,
+         "isSigningField": true,
 -        "type": "STObject"
--      }
--    ],
--    [
++        "type": "AccountID"
+       }
+     ],
+     [
+-      "DeletedNode",
++      "RegularKey",
+       {
+-        "nth": 4,
+-        "isVLEncoded": false,
++        "nth": 8,
++        "isVLEncoded": true,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STObject"
++        "type": "AccountID"
+       }
+     ],
+     [
+-      "ModifiedNode",
++      "NFTokenMinter",
+       {
+-        "nth": 5,
+-        "isVLEncoded": false,
++        "nth": 9,
++        "isVLEncoded": true,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STObject"
++        "type": "AccountID"
+       }
+     ],
+     [
+-      "PreviousFields",
++      "EmitCallback",
+       {
+-        "nth": 6,
+-        "isVLEncoded": false,
++        "nth": 10,
++        "isVLEncoded": true,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STObject"
++        "type": "AccountID"
+       }
+     ],
+     [
 -      "FinalFields",
--      {
++      "HookAccount",
+       {
 -        "nth": 7,
 -        "isVLEncoded": false,
++        "nth": 16,
 +        "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
@@ -995,95 +1089,112 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "NewFields",
-+      "RegularKey",
++      "Indexes",
        {
-         "nth": 8,
+-        "nth": 8,
 -        "isVLEncoded": false,
++        "nth": 1,
 +        "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "STObject"
-+        "type": "AccountID"
++        "type": "Vector256"
        }
      ],
      [
 -      "TemplateEntry",
-+      "Minter",
++      "Hashes",
        {
-         "nth": 9,
+-        "nth": 9,
 -        "isVLEncoded": false,
++        "nth": 2,
 +        "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "STObject"
-+        "type": "AccountID"
++        "type": "Vector256"
        }
      ],
      [
 -      "Memo",
-+      "EmitCallback",
++      "Amendments",
        {
-         "nth": 10,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STObject"
--      }
--    ],
--    [
--      "SignerEntry",
--      {
--        "nth": 11,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STObject"
--      }
--    ],
--    [
--      "NonFungibleToken",
--      {
--        "nth": 12,
+-        "nth": 10,
 -        "isVLEncoded": false,
++        "nth": 3,
 +        "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "STObject"
-+        "type": "AccountID"
++        "type": "Vector256"
+       }
+     ],
+     [
+-      "SignerEntry",
++      "NFTokenOffers",
+       {
+-        "nth": 11,
+-        "isVLEncoded": false,
++        "nth": 4,
++        "isVLEncoded": true,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STObject"
++        "type": "Vector256"
+       }
+     ],
+     [
+-      "NFToken",
++      "HookNamespaces",
+       {
+-        "nth": 12,
+-        "isVLEncoded": false,
++        "nth": 5,
++        "isVLEncoded": true,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STObject"
++        "type": "Vector256"
        }
      ],
      [
 -      "Signer",
-+      "HookAccount",
++      "Paths",
        {
-         "nth": 16,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
+-        "nth": 16,
++        "nth": 1,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
 -        "type": "STObject"
--      }
--    ],
--    [
++        "type": "PathSet"
+       }
+     ],
+     [
 -      "Majority",
--      {
++      "TransactionMetaData",
+       {
 -        "nth": 18,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STObject"
--      }
--    ],
--    [
++        "nth": 2,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+@@ -1316,9 +1756,9 @@
+       }
+     ],
+     [
 -      "DisabledValidator",
--      {
++      "CreatedNode",
+       {
 -        "nth": 19,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STObject"
--      }
--    ],
--    [
++        "nth": 3,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+@@ -1326,399 +1766,359 @@
+       }
+     ],
+     [
 -      "ArrayEndMarker",
 -      {
 -        "nth": 1,
@@ -1105,129 +1216,129 @@ index cfe1902..1fbe906 100644
 -    ],
 -    [
 -      "SignerEntries",
--      {
--        "nth": 4,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STArray"
--      }
--    ],
--    [
--      "Template",
--      {
--        "nth": 5,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STArray"
--      }
--    ],
--    [
--      "Necessary",
--      {
--        "nth": 6,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STArray"
--      }
--    ],
--    [
--      "Sufficient",
--      {
--        "nth": 7,
--        "isVLEncoded": false,
--        "isSerialized": true,
--        "isSigningField": true,
--        "type": "STArray"
--      }
--    ],
--    [
--      "AffectedNodes",
--      {
--        "nth": 8,
--        "isVLEncoded": false,
-+        "isVLEncoded": true,
++      "DeletedNode",
+       {
+         "nth": 4,
+         "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "STArray"
-+        "type": "AccountID"
++        "type": "STObject"
        }
      ],
      [
--      "Memos",
-+      "Indexes",
+-      "Template",
++      "ModifiedNode",
        {
+         "nth": 5,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STArray"
++        "type": "STObject"
+       }
+     ],
+     [
+-      "Necessary",
++      "PreviousFields",
+       {
+         "nth": 6,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STArray"
++        "type": "STObject"
+       }
+     ],
+     [
+-      "Sufficient",
++      "FinalFields",
+       {
+         "nth": 7,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STArray"
++        "type": "STObject"
+       }
+     ],
+     [
+-      "AffectedNodes",
++      "NewFields",
+       {
+         "nth": 8,
+         "isVLEncoded": false,
+         "isSerialized": true,
+         "isSigningField": true,
+-        "type": "STArray"
+-      }
+-    ],
+-    [
+-      "Memos",
+-      {
 -        "nth": 9,
 -        "isVLEncoded": false,
-+        "nth": 1,
-+        "isVLEncoded": true,
-         "isSerialized": true,
-         "isSigningField": true,
+-        "isSerialized": true,
+-        "isSigningField": true,
 -        "type": "STArray"
-+        "type": "Vector256"
-       }
-     ],
-     [
--      "NonFungibleTokens",
-+      "Hashes",
-       {
+-      }
+-    ],
+-    [
+-      "NFTokens",
+-      {
 -        "nth": 10,
 -        "isVLEncoded": false,
-+        "nth": 2,
-+        "isVLEncoded": true,
-         "isSerialized": true,
-         "isSigningField": true,
+-        "isSerialized": true,
+-        "isSigningField": true,
 -        "type": "STArray"
-+        "type": "Vector256"
++        "type": "STObject"
        }
      ],
      [
 -      "Majorities",
-+      "Amendments",
++      "TemplateEntry",
        {
 -        "nth": 16,
--        "isVLEncoded": false,
-+        "nth": 3,
-+        "isVLEncoded": true,
++        "nth": 9,
+         "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "STArray"
-+        "type": "Vector256"
++        "type": "STObject"
        }
      ],
      [
 -      "DisabledValidators",
-+      "TokenOffers",
++      "Memo",
        {
 -        "nth": 17,
--        "isVLEncoded": false,
-+        "nth": 4,
-+        "isVLEncoded": true,
++        "nth": 10,
+         "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "STArray"
-+        "type": "Vector256"
++        "type": "STObject"
        }
      ],
      [
 -      "CloseResolution",
-+      "Paths",
++      "SignerEntry",
        {
-         "nth": 1,
+-        "nth": 1,
++        "nth": 11,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt8"
-+        "type": "PathSet"
++        "type": "STObject"
        }
      ],
      [
 -      "Method",
-+      "TransactionMetaData",
++      "NFToken",
        {
-         "nth": 2,
+-        "nth": 2,
++        "nth": 12,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1237,9 +1348,10 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "TransactionResult",
-+      "CreatedNode",
++      "EmitDetails",
        {
-         "nth": 3,
+-        "nth": 3,
++        "nth": 13,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1249,10 +1361,10 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "TakerPaysCurrency",
-+      "DeletedNode",
++      "Hook",
        {
 -        "nth": 1,
-+        "nth": 4,
++        "nth": 14,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1262,10 +1374,10 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "TakerPaysIssuer",
-+      "ModifiedNode",
++      "Signer",
        {
 -        "nth": 2,
-+        "nth": 5,
++        "nth": 16,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1275,10 +1387,10 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "TakerGetsCurrency",
-+      "PreviousFields",
++      "Majority",
        {
 -        "nth": 3,
-+        "nth": 6,
++        "nth": 18,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1288,10 +1400,10 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "TakerGetsIssuer",
-+      "FinalFields",
++      "DisabledValidator",
        {
 -        "nth": 4,
-+        "nth": 7,
++        "nth": 19,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1301,10 +1413,10 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "Paths",
-+      "NewFields",
++      "EmittedTxn",
        {
 -        "nth": 1,
-+        "nth": 8,
++        "nth": 20,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1314,11 +1426,11 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "Indexes",
-+      "TemplateEntry",
++      "HookExecution",
        {
 -        "nth": 1,
 -        "isVLEncoded": true,
-+        "nth": 9,
++        "nth": 21,
 +        "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1328,11 +1440,11 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "Hashes",
-+      "Memo",
++      "HookDefinition",
        {
 -        "nth": 2,
 -        "isVLEncoded": true,
-+        "nth": 10,
++        "nth": 22,
 +        "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1342,11 +1454,11 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "Amendments",
-+      "SignerEntry",
++      "HookParameter",
        {
 -        "nth": 3,
 -        "isVLEncoded": true,
-+        "nth": 11,
++        "nth": 23,
 +        "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1355,12 +1467,12 @@ index cfe1902..1fbe906 100644
        }
      ],
      [
--      "TokenOffers",
-+      "NonFungibleToken",
+-      "NFTokenOffers",
++      "HookGrant",
        {
 -        "nth": 4,
 -        "isVLEncoded": true,
-+        "nth": 12,
++        "nth": 24,
 +        "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1370,160 +1482,158 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "Transaction",
-+      "EmitDetails",
++      "Signers",
        {
 -        "nth": 1,
-+        "nth": 13,
++        "nth": 3,
          "isVLEncoded": false,
 -        "isSerialized": false,
--        "isSigningField": false,
--        "type": "Transaction"
 +        "isSerialized": true,
-+        "isSigningField": true,
-+        "type": "STObject"
+         "isSigningField": false,
+-        "type": "Transaction"
++        "type": "STArray"
        }
      ],
      [
 -      "LedgerEntry",
-+      "Hook",
++      "SignerEntries",
        {
 -        "nth": 1,
-+        "nth": 14,
++        "nth": 4,
          "isVLEncoded": false,
 -        "isSerialized": false,
 -        "isSigningField": false,
 -        "type": "LedgerEntry"
 +        "isSerialized": true,
 +        "isSigningField": true,
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
 -      "Validation",
-+      "Signer",
++      "Template",
        {
 -        "nth": 1,
-+        "nth": 16,
++        "nth": 5,
          "isVLEncoded": false,
 -        "isSerialized": false,
 -        "isSigningField": false,
 -        "type": "Validation"
 +        "isSerialized": true,
 +        "isSigningField": true,
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
 -      "SignerListID",
-+      "Majority",
++      "Necessary",
        {
 -        "nth": 38,
-+        "nth": 18,
++        "nth": 6,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt32"
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
 -      "SettleDelay",
-+      "DisabledValidator",
++      "Sufficient",
        {
 -        "nth": 39,
-+        "nth": 19,
++        "nth": 7,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt32"
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
 -      "TicketCount",
-+      "EmittedTxn",
++      "AffectedNodes",
        {
 -        "nth": 40,
-+        "nth": 20,
++        "nth": 8,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt32"
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
 -      "TicketSequence",
-+      "HookExecution",
++      "Memos",
        {
 -        "nth": 41,
-+        "nth": 21,
++        "nth": 9,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt32"
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
--      "TokenTaxon",
-+      "HookDefinition",
+-      "NFTokenTaxon",
++      "NFTokens",
        {
 -        "nth": 42,
-+        "nth": 22,
++        "nth": 10,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt32"
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
--      "MintedTokens",
-+      "HookParameter",
+-      "MintedNFTokens",
++      "Hooks",
        {
 -        "nth": 43,
-+        "nth": 23,
++        "nth": 11,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt32"
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
--      "BurnedTokens",
-+      "HookGrant",
+-      "BurnedNFTokens",
++      "Majorities",
        {
 -        "nth": 44,
-+        "nth": 24,
++        "nth": 16,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt32"
-+        "type": "STObject"
++        "type": "STArray"
        }
      ],
      [
 -      "Channel",
-+      "Signers",
++      "DisabledValidators",
        {
 -        "nth": 22,
-+        "nth": 3,
++        "nth": 17,
          "isVLEncoded": false,
          "isSerialized": true,
--        "isSigningField": true,
+         "isSigningField": true,
 -        "type": "Hash256"
-+        "isSigningField": false,
 +        "type": "STArray"
        }
      ],
      [
 -      "ConsensusHash",
-+      "SignerEntries",
++      "HookExecutions",
        {
 -        "nth": 23,
-+        "nth": 4,
++        "nth": 18,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1533,10 +1643,10 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "CheckID",
-+      "Template",
++      "HookParameters",
        {
 -        "nth": 24,
-+        "nth": 5,
++        "nth": 19,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1546,10 +1656,10 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "ValidatedHash",
-+      "Necessary",
++      "HookGrants",
        {
 -        "nth": 25,
-+        "nth": 6,
++        "nth": 20,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1559,127 +1669,138 @@ index cfe1902..1fbe906 100644
      ],
      [
 -      "PreviousPageMin",
-+      "Sufficient",
++      "Generic",
        {
 -        "nth": 26,
-+        "nth": 7,
++        "nth": 0,
          "isVLEncoded": false,
-         "isSerialized": true,
-         "isSigningField": true,
+-        "isSerialized": true,
+-        "isSigningField": true,
 -        "type": "Hash256"
-+        "type": "STArray"
++        "isSerialized": false,
++        "isSigningField": false,
++        "type": "Unknown"
        }
      ],
      [
 -      "NextPageMin",
-+      "AffectedNodes",
++      "Invalid",
        {
 -        "nth": 27,
-+        "nth": 8,
++        "nth": -1,
          "isVLEncoded": false,
-         "isSerialized": true,
-         "isSigningField": true,
+-        "isSerialized": true,
+-        "isSigningField": true,
 -        "type": "Hash256"
-+        "type": "STArray"
++        "isSerialized": false,
++        "isSigningField": false,
++        "type": "Unknown"
        }
      ],
      [
--      "BuyOffer",
-+      "Memos",
+-      "NFTokenBuyOffer",
++      "TicketID",
        {
 -        "nth": 28,
-+        "nth": 9,
++        "nth": 20,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
--        "type": "Hash256"
-+        "type": "STArray"
+@@ -1726,73 +2126,73 @@
        }
      ],
      [
--      "SellOffer",
-+      "NonFungibleTokens",
+-      "NFTokenSellOffer",
++      "hash",
        {
 -        "nth": 29,
-+        "nth": 10,
++        "nth": 257,
          "isVLEncoded": false,
-         "isSerialized": true,
-         "isSigningField": true,
--        "type": "Hash256"
-+        "type": "STArray"
+-        "isSerialized": true,
+-        "isSigningField": true,
++        "isSerialized": false,
++        "isSigningField": false,
+         "type": "Hash256"
        }
      ],
      [
 -      "TickSize",
-+      "Hooks",
++      "index",
        {
 -        "nth": 16,
-+        "nth": 11,
++        "nth": 258,
          "isVLEncoded": false,
-         "isSerialized": true,
-         "isSigningField": true,
+-        "isSerialized": true,
+-        "isSigningField": true,
 -        "type": "UInt8"
-+        "type": "STArray"
++        "isSerialized": false,
++        "isSigningField": false,
++        "type": "Hash256"
        }
      ],
      [
 -      "UNLModifyDisabling",
-+      "Majorities",
++      "taker_gets_funded",
        {
 -        "nth": 17,
-+        "nth": 16,
++        "nth": 258,
          "isVLEncoded": false,
-         "isSerialized": true,
-         "isSigningField": true,
+-        "isSerialized": true,
+-        "isSigningField": true,
 -        "type": "UInt8"
-+        "type": "STArray"
++        "isSerialized": false,
++        "isSigningField": false,
++        "type": "Amount"
        }
      ],
      [
 -      "DestinationNode",
-+      "DisabledValidators",
++      "taker_pays_funded",
        {
 -        "nth": 9,
-+        "nth": 17,
++        "nth": 259,
          "isVLEncoded": false,
-         "isSerialized": true,
-         "isSigningField": true,
+-        "isSerialized": true,
+-        "isSigningField": true,
 -        "type": "UInt64"
-+        "type": "STArray"
++        "isSerialized": false,
++        "isSigningField": false,
++        "type": "Amount"
        }
      ],
      [
 -      "Cookie",
-+      "HookExecutions",
++      "Target",
        {
 -        "nth": 10,
-+        "nth": 18,
-         "isVLEncoded": false,
+-        "isVLEncoded": false,
++        "nth": 7,
++        "isVLEncoded": true,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt64"
-+        "type": "STArray"
++        "type": "AccountID"
        }
      ],
      [
 -      "ServerVersion",
-+      "HookParameters",
++      "ObjectEndMarker",
        {
 -        "nth": 11,
-+        "nth": 19,
++        "nth": 1,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
 -        "type": "UInt64"
-+        "type": "STArray"
++        "type": "STObject"
        }
      ],
      [
--      "OfferNode",
-+      "HookGrants",
+-      "NFTokenOfferNode",
++      "ArrayEndMarker",
        {
 -        "nth": 12,
-+        "nth": 20,
++        "nth": 1,
          "isVLEncoded": false,
          "isSerialized": true,
          "isSigningField": true,
@@ -1688,51 +1809,7 @@ index cfe1902..1fbe906 100644
        }
      ]
    ],
-@@ -1844,8 +2209,10 @@
-     "temBAD_TICK_SIZE": -269,
-     "temINVALID_ACCOUNT_ID": -268,
-     "temCANNOT_PREAUTH_SELF": -267,
--    "temUNCERTAIN": -266,
--    "temUNKNOWN": -265,
-+    "temINVALID_COUNT": -266,
-+    "temUNCERTAIN": -265,
-+    "temUNKNOWN": -264,
-+    "temSEQ_AND_TICKET": -263,
- 
-     "tefFAILURE": -199,
-     "tefALREADY": -198,
-@@ -1867,7 +2234,6 @@
-     "tefINVARIANT_FAILED": -182,
-     "tefTOO_BIG": -181,
-     "tefNO_TICKET": -180,
--    "tefTOKEN_IS_NOT_TRANSFERABLE": -179,
- 
-     "terRETRY": -99,
-     "terFUNDS_SPENT": -98,
-@@ -1880,6 +2246,7 @@
-     "terLAST": -91,
-     "terNO_RIPPLE": -90,
-     "terQUEUED": -89,
-+    "terPRE_TICKET": -88,
- 
-     "tesSUCCESS": 0,
- 
-@@ -1921,21 +2288,10 @@
-     "tecKILLED": 150,
-     "tecHAS_OBLIGATIONS": 151,
-     "tecTOO_SOON": 152,
--
--    "tecMAX_SEQUENCE_REACHED": 154,
--    "tecNO_SUITABLE_PAGE": 155,
--    "tecBUY_SELL_MISMATCH": 156,
--    "tecOFFER_TYPE_MISMATCH": 157,
--    "tecCANT_ACCEPT_OWN_OFFER": 158,
--    "tecINSUFFICIENT_FUNDS": 159,
--    "tecOBJECT_NOT_FOUND": 160,
--    "tecINSUFFICIENT_PAYMENT": 161,
--    "tecINCORRECT_ASSET": 162,
--    "tecTOO_MANY": 163
-+    "tecHOOK_ERROR": 153
+@@ -1938,7 +2338,6 @@
    },
    "TRANSACTION_TYPES": {
      "Invalid": -1,
@@ -1740,16 +1817,11 @@ index cfe1902..1fbe906 100644
      "Payment": 0,
      "EscrowCreate": 1,
      "EscrowFinish": 2,
-@@ -1958,11 +2314,7 @@
+@@ -1961,6 +2360,7 @@
      "DepositPreauth": 19,
      "TrustSet": 20,
      "AccountDelete": 21,
--    "NFTokenMint": 25,
--    "NFTokenBurn": 26,
--    "NFTokenCreateOffer": 27,
--    "NFTokenCancelOffer": 28,
--    "NFTokenAcceptOffer": 29,
 +    "SetHook": 22,
-     "EnableAmendment": 100,
-     "SetFee": 101,
-     "UNLModify": 102
+     "NFTokenMint": 25,
+     "NFTokenBurn": 26,
+     "NFTokenCreateOffer": 27,
diff --git a/state/actions/sendTransaction.ts b/state/actions/sendTransaction.ts
index 9b01022..54ea1b6 100644
--- a/state/actions/sendTransaction.ts
+++ b/state/actions/sendTransaction.ts
@@ -24,7 +24,6 @@ export const sendTransaction = async (account: IAccount, txOptions: TransactionO
         Fee,  // TODO auto-fillable default
         ...opts
     };
-
     const { logPrefix = '' } = options || {}
     try {
         const signedAccount = derive.familySeed(account.secret);
diff --git a/state/transactions.ts b/state/transactions.ts
index 84e24f7..ce38492 100644
--- a/state/transactions.ts
+++ b/state/transactions.ts
@@ -118,7 +118,7 @@ export const prepareTransaction = (data: any) => {
         // handle type: `json`
         if (_value && typeof _value === "object" && _value.$type === "json") {
             if (typeof _value.$value === "object") {
-                options[field] = { ..._value.$value } as any;
+                options[field] = _value.$value;
             } else {
                 try {
                     options[field] = JSON.parse(_value.$value);
diff --git a/utils/hookOnCalculator.ts b/utils/hookOnCalculator.ts
index 5c40b71..e33d02c 100644
--- a/utils/hookOnCalculator.ts
+++ b/utils/hookOnCalculator.ts
@@ -18,13 +18,18 @@ export const tts = {
   ttDEPOSIT_PREAUTH: 19,
   ttTRUST_SET: 20,
   ttACCOUNT_DELETE: 21,
-  ttHOOK_SET: 22
+  ttHOOK_SET: 22,
+  ttNFTOKEN_MINT: 25,
+  ttNFTOKEN_BURN: 26,
+  ttNFTOKEN_CREATE_OFFER: 27,
+  ttNFTOKEN_CANCEL_OFFER: 28,
+  ttNFTOKEN_ACCEPT_OFFER: 29
 };
 
 export type TTS = typeof tts;
 
 const calculateHookOn = (arr: (keyof TTS)[]) => {
-  let start = '0x00000000003ff5bf';
+  let start = '0x000000003e3ff5bf';
   arr.forEach(n => {
     let v = BigInt(start);
     v ^= (BigInt(1) << BigInt(tts[n as keyof TTS]));
diff --git a/yarn.lock b/yarn.lock
index 51d6e8f..4eaad7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1280,14 +1280,6 @@ babel-plugin-macros@^2.6.1:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
@@ -1552,11 +1544,6 @@ core-js-pure@^3.20.2:
   resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz"
   integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==
 
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
@@ -3545,11 +3532,6 @@ reconnecting-websocket@^4.4.0:
   resolved "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz"
   integrity sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
 regenerator-runtime@^0.13.4:
   version "0.13.9"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"
@@ -3648,20 +3630,15 @@ ripple-address-codec@^4.1.0, ripple-address-codec@^4.1.1, ripple-address-codec@^
     base-x "3.0.9"
     create-hash "^1.1.2"
 
-ripple-binary-codec@^0.2.4:
-  version "0.2.7"
-  resolved "https://registry.npmjs.org/ripple-binary-codec/-/ripple-binary-codec-0.2.7.tgz"
-  integrity sha512-VD+sHgZK76q3kmO765klFHPDCEveS5SUeg/bUNVpNrj7w2alyDNkbF17XNbAjFv+kSYhfsUudQanoaSs2Y6uzw==
+ripple-address-codec@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/ripple-address-codec/-/ripple-address-codec-4.2.4.tgz#a56c2168c8bb81269ea4d15ed96d6824c5a866f8"
+  integrity sha512-roAOjKz94+FboTItey1XRh5qynwt4xvfBLvbbcx+FiR94Yw2x3LrKLF2GVCMCSAh5I6PkcpADg6AbYsUbGN3nA==
   dependencies:
-    babel-runtime "^6.26.0"
-    bn.js "^5.1.1"
-    create-hash "^1.2.0"
-    decimal.js "^10.2.0"
-    inherits "^2.0.4"
-    lodash "^4.17.15"
-    ripple-address-codec "^4.1.0"
+    base-x "3.0.9"
+    create-hash "^1.1.2"
 
-ripple-binary-codec@^1.1.3, ripple-binary-codec@^1.3.0:
+ripple-binary-codec@^1.1.3:
   version "1.3.2"
   resolved "https://registry.npmjs.org/ripple-binary-codec/-/ripple-binary-codec-1.3.2.tgz"
   integrity sha512-8VG1vfb3EM1J7ZdPXo9E57Zv2hF4cxT64gP6rGSQzODVgMjiBCWozhN3729qNTGtHItz0e82Oix8v95vWYBQ3A==
@@ -3673,6 +3650,18 @@ ripple-binary-codec@^1.1.3, ripple-binary-codec@^1.3.0:
     decimal.js "^10.2.0"
     ripple-address-codec "^4.2.3"
 
+ripple-binary-codec@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/ripple-binary-codec/-/ripple-binary-codec-1.4.2.tgz#cdc35353e4bc7c3a704719247c82b4c4d0b57dd3"
+  integrity sha512-EDKIyZMa/6Ay/oNgCwjD9b9CJv0zmBreeHVQeG4BYwy+9GPnIQjNeT5e/aB6OjAnhcmpgbPeBmzwmNVwzxlt0w==
+  dependencies:
+    assert "^2.0.0"
+    big-integer "^1.6.48"
+    buffer "5.6.0"
+    create-hash "^1.2.0"
+    decimal.js "^10.2.0"
+    ripple-address-codec "^4.2.4"
+
 ripple-bs58@^4.0.0:
   version "4.0.1"
   resolved "https://registry.npmjs.org/ripple-bs58/-/ripple-bs58-4.0.1.tgz"
@@ -3696,7 +3685,7 @@ ripple-hashes@^0.3.4, ripple-hashes@latest:
     bignumber.js "^4.1.0"
     create-hash "^1.1.2"
     ripple-address-codec "^3.0.4"
-    ripple-binary-codec "^0.2.4"
+    ripple-binary-codec "^1.4.2"
 
 ripple-keypairs@^1.0.3, ripple-keypairs@latest:
   version "1.1.3"
@@ -4328,10 +4317,10 @@ ws@^7.2.0:
   resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
-xrpl-accountlib@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/xrpl-accountlib/-/xrpl-accountlib-1.3.2.tgz"
-  integrity sha512-mXwoumGp0xUiZ7Ty/1o4FHVRK4uLnqngxdYmikZs50drMjlgCUP6GXun2Vf4Uus1fnVnxhXIw+E7peH5OjiOJA==
+xrpl-accountlib@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/xrpl-accountlib/-/xrpl-accountlib-1.5.2.tgz#8f16abe449fd60ba9ed75597f6ce3f0c45dfff43"
+  integrity sha512-lieY2/5G9DySqdtgQ0AD/aMMG5Sy/MLAmbIsmsCaF06scM5DpR8s4SsEzgHni7dOG68Wjnb2Uz6tf5aV+l4/Kg==
   dependencies:
     assert "^2.0.0"
     bip32 "^2.0.5"
@@ -4340,13 +4329,13 @@ xrpl-accountlib@^1.3.2:
     elliptic "6.5.4"
     hash.js "^1.1.7"
     ripple-address-codec "^4.1.0"
-    ripple-binary-codec "^1.3.0"
+    ripple-binary-codec "^1.4.2"
     ripple-hashes "^0.3.4"
     ripple-keypairs "^1.0.3"
     ripple-lib "^1.6.4"
     ripple-secret-codec "^1.0.2"
     xrpl-secret-numbers "^0.3.3"
-    xrpl-sign-keypairs "^2.0.1"
+    xrpl-sign-keypairs "^2.1.1"
 
 xrpl-client@^1.9.4:
   version "1.9.4"
@@ -4365,13 +4354,13 @@ xrpl-secret-numbers@^0.3.3:
     brorand "^1.1.0"
     ripple-keypairs "^1.0.3"
 
-xrpl-sign-keypairs@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/xrpl-sign-keypairs/-/xrpl-sign-keypairs-2.0.1.tgz"
-  integrity sha512-84QbE3trxetaw0hqDADCWMx0HH1VAWnTJp0TGoKTGRf1jzTqjI7eNNNw5lmcay2MH8bW/waNzJIF8vSAJSkVrQ==
+xrpl-sign-keypairs@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/xrpl-sign-keypairs/-/xrpl-sign-keypairs-2.1.1.tgz#2f7f2855799c5d4ba091007963825eef1db21a4e"
+  integrity sha512-rKQmUCx+x7gjjJ5zv/Z7bOYR+8I36JwUCFlpuD9UzYD4w2msGQDG0rmxVENyZSfThDBVQ1kEArVn6SMDMe9LUQ==
   dependencies:
     big-integer latest
-    ripple-binary-codec "^1.3.0"
+    ripple-binary-codec "^1.4.2"
     ripple-bs58check latest
     ripple-hashes latest
     ripple-keypairs latest