Merge branch 'transia-hooks' into iouescrow-tmp

2025-12-06 17:27:59 +00:00 · 2023-06-14 23:09:43 +00:00 · 2023-06-14 23:01:48 +00:00 · 2023-06-14 22:57:05 +00:00 · 2023-06-14 22:41:22 +00:00 · 2023-06-14 19:46:05 +00:00
67 changed files with 168 additions and 1262 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -29,7 +29,7 @@
        "enable": true
    },
    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "explicit"
+        "source.fixAll.eslint": true
    },
    "files.insertFinalNewline": true,
    "files.trimFinalNewlines": true,
--- a/README.md
+++ b/README.md
@@ -32,19 +32,19 @@ All of which works in Node.js (tested for v14+) & web browsers (tested for Chrom
 In an existing project (with package.json), install xrpl.js with:

 ```
-$ npm install --save @transia/xrpl
+$ npm install --save xrpl
 ```

 Or with `yarn`:

 ```
-$ yarn add @transia/xrpl
+$ yarn add xrpl
 ```

 Example usage:

 ```js
-const xrpl = require("@transia/xrpl");
+const xrpl = require("xrpl");
 async function main() {
  const client = new xrpl.Client("wss://s.altnet.rippletest.net:51233");
  await client.connect();
--- a/package-lock.json
+++ b/package-lock.json
@@ -17148,7 +17148,7 @@
    },
    "packages/ripple-binary-codec": {
      "name": "@transia/ripple-binary-codec",
-      "version": "1.4.6-alpha.2",
+      "version": "1.4.6-alpha.1",
      "license": "ISC",
      "dependencies": {
        "@transia/ripple-address-codec": "^4.2.8-alpha.0",
@@ -17188,11 +17188,11 @@
    },
    "packages/xrpl": {
      "name": "@transia/xrpl",
-      "version": "2.7.3-alpha.5",
+      "version": "2.7.3-alpha.1",
      "license": "ISC",
      "dependencies": {
        "@transia/ripple-address-codec": "^4.2.8-alpha.0",
-        "@transia/ripple-binary-codec": "^1.4.6-alpha.2",
+        "@transia/ripple-binary-codec": "^1.4.6-alpha.1",
        "@transia/ripple-keypairs": "^1.1.8-alpha.0",
        "bignumber.js": "^9.0.0",
        "bip32": "^2.0.6",
@@ -19388,7 +19388,7 @@
      "requires": {
        "@geut/browser-node-core": "^2.0.13",
        "@transia/ripple-address-codec": "^4.2.8-alpha.0",
-        "@transia/ripple-binary-codec": "^1.4.6-alpha.2",
+        "@transia/ripple-binary-codec": "^1.4.6-alpha.1",
        "@transia/ripple-keypairs": "^1.1.8-alpha.0",
        "@types/node": "^14.18.36",
        "assert-browserify": "^2.0.0",
--- a/packages/ripple-binary-codec/package.json
+++ b/packages/ripple-binary-codec/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@transia/ripple-binary-codec",
-  "version": "1.4.6-alpha.8",
+  "version": "1.4.6-alpha.1",
  "description": "XRP Ledger binary codec",
  "files": [
    "dist/*",
--- a/packages/ripple-binary-codec/src/enums/definitions.json
+++ b/packages/ripple-binary-codec/src/enums/definitions.json
@@ -37,7 +37,6 @@
    "LedgerHashes": 104,
    "Amendments": 102,
    "FeeSettings": 115,
-    "ImportVLSequence": 73,
    "Escrow": 117,
    "PayChannel": 120,
    "Check": 67,
@@ -46,7 +45,6 @@
    "NFTokenPage": 80,
    "NFTokenOffer": 55,
    "URIToken": 85,
-    "UNLReport": 82,
    "Any": -3,
    "Child": -2,
    "Nickname": 110,
@@ -798,16 +796,6 @@
        "type": "UInt32"
      }
    ],
-    [
-      "XahauActivationLgrSeq",
-      {
-        "nth": 96,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt32"
-      }
-    ],
    [
      "ImportSequence",
      {
@@ -818,36 +806,6 @@
        "type": "UInt32"
      }
    ],
-    [
-      "RewardTime",
-      {
-        "nth": 98,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt32"
-      }
-    ],
-    [
-      "RewardLgrFirst",
-      {
-        "nth": 99,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt32"
-      }
-    ],
-    [
-      "RewardLgrLast",
-      {
-        "nth": 100,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt32"
-      }
-    ],
    [
      "IndexNext",
      {
@@ -1008,36 +966,6 @@
        "type": "UInt64"
      }
    ],
-    [
-      "AccountIndex",
-      {
-        "nth": 98,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt64"
-      }
-    ],
-    [
-      "AccountCount",
-      {
-        "nth": 99,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt64"
-      }
-    ],
-    [
-      "RewardAccumulator",
-      {
-        "nth": 100,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt64"
-      }
-    ],
    [
      "EmailHash",
      {
@@ -1428,36 +1356,6 @@
        "type": "Hash256"
      }
    ],
-    [
-      "GovernanceFlags",
-      {
-        "nth": 99,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "Hash256"
-      }
-    ],
-    [
-      "GovernanceMarks",
-      {
-        "nth": 98,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "Hash256"
-      }
-    ],
-    [
-      "EmittedTxnID",
-      {
-        "nth": 97,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "Hash256"
-      }
-    ],
    [
      "Amount",
      {
@@ -2268,46 +2166,6 @@
        "type": "STObject"
      }
    ],
-    [
-      "GenesisMint",
-      {
-        "nth": 96,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STObject"
-      }
-    ],
-    [
-      "ActiveValidator",
-      {
-        "nth": 95,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STObject"
-      }
-    ],
-    [
-      "ImportVLKey",
-      {
-        "nth": 94,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STObject"
-      }
-    ],
-    [
-      "HookEmission",
-      {
-        "nth": 93,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STObject"
-      }
-    ],
    [
      "Signers",
      {
@@ -2447,46 +2305,6 @@
        "isSigningField": true,
        "type": "STArray"
      }
-    ],
-    [
-      "GenesisMints",
-      {
-        "nth": 96,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STArray"
-      }
-    ],
-    [
-      "ActiveValidators",
-      {
-        "nth": 95,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STArray"
-      }
-    ],
-    [
-      "ImportVLKeys",
-      {
-        "nth": 94,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STArray"
-      }
-    ],
-    [
-      "HookEmissions",
-      {
-        "nth": 93,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STArray"
-      }
    ]
  ],
  "TRANSACTION_RESULTS": {
@@ -2521,11 +2339,11 @@
    "temBAD_PATH": -291,
    "temBAD_PATH_LOOP": -290,
    "temBAD_REGKEY": -289,
-    "temBAD_SEND_NATIVE_LIMIT": -288,
-    "temBAD_SEND_NATIVE_MAX": -287,
-    "temBAD_SEND_NATIVE_NO_DIRECT": -286,
-    "temBAD_SEND_NATIVE_PARTIAL": -285,
-    "temBAD_SEND_NATIVE_PATHS": -284,
+    "temBAD_SEND_XRP_LIMIT": -288,
+    "temBAD_SEND_XRP_MAX": -287,
+    "temBAD_SEND_XRP_NO_DIRECT": -286,
+    "temBAD_SEND_XRP_PARTIAL": -285,
+    "temBAD_SEND_XRP_PATHS": -284,
    "temBAD_SEQUENCE": -283,
    "temBAD_SIGNATURE": -282,
    "temBAD_SRC_ACCOUNT": -281,
@@ -2557,6 +2375,7 @@
    "temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT": -255,
    "temXCHAIN_TOO_MANY_ATTESTATIONS": -254,
    "temHOOK_DATA_TOO_LARGE": -253,
+    "temHOOK_REJECTED": -252,

    "tefFAILURE": -199,
    "tefALREADY": -198,
@@ -2580,8 +2399,6 @@
    "tefNO_TICKET": -180,
    "tefNFTOKEN_IS_NOT_TRANSFERABLE": -179,
    "tefPAST_IMPORT_SEQ": -178,
-    "tefPAST_IMPORT_VL_SEQ": -177,
-    "tefNONDIR_EMIT": -176,

    "terRETRY": -99,
    "terFUNDS_SPENT": -98,
@@ -2610,7 +2427,7 @@
    "tecINSUF_RESERVE_LINE": 122,
    "tecINSUF_RESERVE_OFFER": 123,
    "tecNO_DST": 124,
-    "tecNO_DST_INSUF_NATIVE": 125,
+    "tecNO_DST_INSUF_XRP": 125,
    "tecNO_LINE_INSUF_RESERVE": 126,
    "tecNO_LINE_REDUNDANT": 127,
    "tecPATH_DRY": 128,
@@ -2672,7 +2489,6 @@
    "tecXCHAIN_PAYMENT_FAILED": 184,
    "tecXCHAIN_SELF_COMMIT": 185,
    "tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR": 186,
-    "tecINSUF_RESERVE_SELLER": 187,
    "tecLAST_POSSIBLE_ENTRY": 255
  },
  "TRANSACTION_TYPES": {
@@ -2710,14 +2526,11 @@
    "URITokenBuy": 47,
    "URITokenCreateSellOffer": 48,
    "URITokenCancelSellOffer": 49,
-    "GenesisMint": 96,
    "Import": 97,
-    "ClaimReward": 98,
    "Invoke": 99,
    "EnableAmendment": 100,
    "SetFee": 101,
    "UNLModify": 102,
-    "EmitFailure": 103,
-    "UNLReport": 104
+    "EmitFailure": 103
  }
 }
--- a/packages/ripple-binary-codec/src/types/currency.ts
+++ b/packages/ripple-binary-codec/src/types/currency.ts
@@ -12,7 +12,7 @@ const STANDARD_FORMAT_HEX_REGEX = /^0{24}[\x00-\x7F]{6}0{10}$/
 */
 function isoToBytes(iso: string): Buffer {
  const bytes = Buffer.alloc(20)
-  if (iso !== 'XAH') {
+  if (iso !== 'XRP') {
    const isoBytes = iso.split('').map((c) => c.charCodeAt(0))
    bytes.set(isoBytes, 12)
  }
@@ -28,7 +28,7 @@ function isIsoCode(iso: string): boolean {

 function isoCodeFromHex(code: Buffer): string | null {
  const iso = code.toString()
-  if (iso === 'XAH') {
+  if (iso === 'XRP') {
    return null
  }
  if (isIsoCode(iso)) {
@@ -89,7 +89,7 @@ class Currency extends Hash160 {
    const hex = this.bytes.toString('hex')

    if (XRP_HEX_REGEX.test(hex)) {
-      this._iso = 'XAH'
+      this._iso = 'XRP'
    } else if (STANDARD_FORMAT_HEX_REGEX.test(hex)) {
      this._iso = isoCodeFromHex(this.bytes.slice(12, 15))
    } else {
--- a/packages/ripple-binary-codec/test/binary-parser.test.js
+++ b/packages/ripple-binary-codec/test/binary-parser.test.js
@@ -369,7 +369,7 @@ function pathSetBinaryTests() {
        currency: 'BTC',
        issuer: 'r3AWbdp2jQLXLywJypdoNwVSvr81xs3uhn',
      },
-      { currency: 'XAH' },
+      { currency: 'XRP' },
      {
        currency: 'USD',
        issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
--- a/packages/ripple-binary-codec/test/binary-serializer.test.js
+++ b/packages/ripple-binary-codec/test/binary-serializer.test.js
@@ -105,11 +105,6 @@ let json_omitted = {
 }

 const NegativeUNL = require('./fixtures/negative-unl.json')
-const UNLReport = {
-  tx: require('./fixtures/unl-report.json'),
-  binary: require('./fixtures/unl-report-binary.json'),
-  meta: require('./fixtures/unl-report-meta-binary.json'),
-}

 function bytesListTest() {
  const list = new BytesList()
@@ -234,18 +229,6 @@ function NegativeUNLTest() {
  })
 }

-function UNLReportTest() {
-  test('can serialize UNLReport', () => {
-    expect(encode(UNLReport.tx)).toEqual(UNLReport.binary)
-  })
-  test('can serialize UNLReport metadata', () => {
-    expect(encode(UNLReport.tx.meta)).toEqual(UNLReport.meta)
-  })
-  test('can deserialize UNLReport metadata', () => {
-    expect(decode(UNLReport.meta)).toEqual(UNLReport.tx.meta)
-  })
-}
-
 function omitUndefinedTest() {
  test('omits fields with undefined value', () => {
    let encodedOmitted = encode(json_omitted)
@@ -303,5 +286,4 @@ describe('Binary Serialization', function () {
  describe('OmitUndefined', omitUndefinedTest)
  describe('TicketTest', ticketTest)
  describe('NFToken', nfTokenTest)
-  describe('UNLReport', UNLReportTest)
 })
--- a/packages/ripple-binary-codec/test/definitions.test.js
+++ b/packages/ripple-binary-codec/test/definitions.test.js
@@ -44,7 +44,7 @@ describe('encode and decode using new types as a parameter', function () {
    definitions.FIELDS.push([
      'NewFieldDefinition',
      {
-        nth: 101,
+        nth: 100,
        isVLEncoded: false,
        isSerialized: true,
        isSigningField: true,
--- a/packages/ripple-binary-codec/test/fixtures/data-driven-tests.json
+++ b/packages/ripple-binary-codec/test/fixtures/data-driven-tests.json
@@ -2904,7 +2904,7 @@
            "type_id": 6,
            "is_native": true,
            "type": "Amount",
-            "error": "1000000000000 absolute XAH is bigger than max native value 100000000000.0",
+            "error": "1000000000000 absolute XRP is bigger than max native value 100000000000.0",
            "is_negative": false
        },
        {
@@ -2912,7 +2912,7 @@
            "type_id": 6,
            "is_native": true,
            "type": "Amount",
-            "error": "10000000000000000000 absolute XAH is bigger than max native value 100000000000.0",
+            "error": "10000000000000000000 absolute XRP is bigger than max native value 100000000000.0",
            "is_negative": true
        }
    ]
--- a/packages/ripple-binary-codec/test/fixtures/unl-report-binary.json
+++ b/packages/ripple-binary-codec/test/fixtures/unl-report-binary.json
@@ -1 +0,0 @@
-"120068240000000026006D2E00684000000000000000730081140000000000000000000000000000000000000000E05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655E1"
--- a/packages/ripple-binary-codec/test/fixtures/unl-report-meta-binary.json
+++ b/packages/ripple-binary-codec/test/fixtures/unl-report-meta-binary.json
@@ -1 +0,0 @@
-"201C00000000F8E51100525661E32E7A24A238F1C619D5F9DDCC41A94B33B66C0163F7EFCC8A19C9FD6F28DCE6F05FE05F7121ED3ABC6740983BFB13FFD9728EBCC365A2877877D368FC28990819522300C92A698114A53F8465478D79DC0C764F0FB2B67AE92465FD5EE1E05F7121ED49F82B2FFD537F224A1E0A10DEEFC3C25CE3882979E6B327C9F18603D21F0A2281142BF2A77E25382EC1DEF521D81D24BC0FDD35BC9BE1E05F7121ED79EB0F6A9F01A039235E536D19F812B55ACF540C9E22CF62C271E0D42BFF51748114C45147960400DB6B763110CBCE8D641E9365F24EE1E05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655811408BCFB092DEE1BF0F2662AECE4DCC62C4AECCB8AE1E05F7121ED96F581FED430E8CBE1F08B37408857001D4118D49FBB594B0BE007C2DBFFD3678114A4EF485B50A7D91DF45450A680FAC31C53367B2DE1E05F7121EDCF31B8F683345E1C49B4A1D85BF2731E55E7D6781F3D4BF45EE7ADF2D2FB340281144D854497B48F1A41EF04E09DB656A11AAD01A703E1E05F7121EDDF197FC59A7FAA09EB1AD60A4638BA6201DD51497B5C08A1745115098E229E0E811446550CBD2B655081662AE3159B0488DE27EC0592E1F1E1E72200000000F05EE05E7121ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860811478339DD5880A994A5CB6E56CB7ED13FEEF201928E1F1F05FE05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655811408BCFB092DEE1BF0F2662AECE4DCC62C4AECCB8AE1F1E1E1F1031000"
--- a/packages/ripple-binary-codec/test/fixtures/unl-report.json
+++ b/packages/ripple-binary-codec/test/fixtures/unl-report.json
@@ -1,89 +0,0 @@
-{
-  "Account": "",
-  "ActiveValidator": {
-    "PublicKey": "ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655"
-  },
-  "Fee": "0",
-  "LedgerSequence": 7155200,
-  "Sequence": 0,
-  "SigningPubKey": "",
-  "TransactionType": "UNLReport",
-  "hash": "0878863F758F74A5CBD35691CDAB625A3BCD35B21B440E20545C4757DDB0CA43",
-  "meta": {
-    "AffectedNodes": [
-      {
-        "ModifiedNode": {
-          "FinalFields": {
-            "ActiveValidators": [
-              {
-                "ActiveValidator": {
-                  "Account": "roUo3ygV92bdhfE1v9LGpPETXvJv2kQv5",
-                  "PublicKey": "ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655"
-                }
-              }
-            ],
-            "Flags": 0,
-            "ImportVLKeys": [
-              {
-                "ImportVLKey": {
-                  "Account": "rBxZvQBY551DJ21g9AC1Qc9ASQowqcskbF",
-                  "PublicKey": "ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860"
-                }
-              }
-            ]
-          },
-          "LedgerEntryType": "UNLReport",
-          "LedgerIndex": "61E32E7A24A238F1C619D5F9DDCC41A94B33B66C0163F7EFCC8A19C9FD6F28DC",
-          "PreviousFields": {
-            "ActiveValidators": [
-              {
-                "ActiveValidator": {
-                  "Account": "rGhk2uLd8ShzX2Zrcgn8sQk1LWBG4jjEwf",
-                  "PublicKey": "ED3ABC6740983BFB13FFD9728EBCC365A2877877D368FC28990819522300C92A69"
-                }
-              },
-              {
-                "ActiveValidator": {
-                  "Account": "rnr4kwS1VkJhvjVRuq2fbWZtEdN2HbpVVu",
-                  "PublicKey": "ED49F82B2FFD537F224A1E0A10DEEFC3C25CE3882979E6B327C9F18603D21F0A22"
-                }
-              },
-              {
-                "ActiveValidator": {
-                  "Account": "rJupFrPPYgUNFBdoSqhMEJ22hiHKiZSHXQ",
-                  "PublicKey": "ED79EB0F6A9F01A039235E536D19F812B55ACF540C9E22CF62C271E0D42BFF5174"
-                }
-              },
-              {
-                "ActiveValidator": {
-                  "Account": "roUo3ygV92bdhfE1v9LGpPETXvJv2kQv5",
-                  "PublicKey": "ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655"
-                }
-              },
-              {
-                "ActiveValidator": {
-                  "Account": "rGsa7f4arJ8JE9ok9LCht6jCu5xBKUKVMq",
-                  "PublicKey": "ED96F581FED430E8CBE1F08B37408857001D4118D49FBB594B0BE007C2DBFFD367"
-                }
-              },
-              {
-                "ActiveValidator": {
-                  "Account": "r3htgPchiR2r8kMGzPK3Wfv3WTrpaRKjtU",
-                  "PublicKey": "EDCF31B8F683345E1C49B4A1D85BF2731E55E7D6781F3D4BF45EE7ADF2D2FB3402"
-                }
-              },
-              {
-                "ActiveValidator": {
-                  "Account": "rfQtB8m51sdbWgcmddRX2mMjMpSxzX1AGr",
-                  "PublicKey": "EDDF197FC59A7FAA09EB1AD60A4638BA6201DD51497B5C08A1745115098E229E0E"
-                }
-              }
-            ]
-          }
-        }
-      }
-    ],
-    "TransactionIndex": 0,
-    "TransactionResult": "tesSUCCESS"
-  }
-}
--- a/packages/ripple-binary-codec/test/hash.test.js
+++ b/packages/ripple-binary-codec/test/hash.test.js
@@ -77,7 +77,7 @@ describe('Hash256', function () {

 describe('Currency', function () {
  test('Decoding allows dodgy XRP without throwing', function () {
-    const currencyCode = '0000000000000000000000005841480000000000'
+    const currencyCode = '0000000000000000000000005852500000000000'
    expect(Currency.from(currencyCode).toJSON()).toBe(currencyCode)
  })
  test('Currency code with lowercase letters decodes to ISO code', () => {
@@ -113,7 +113,7 @@ describe('Currency', function () {

  test('can be constructed from a Buffer', function () {
    const xrp = new Currency(Buffer.alloc(20))
-    expect(xrp.iso()).toBe('XAH')
+    expect(xrp.iso()).toBe('XRP')
  })
  test('Can handle non-standard currency codes', () => {
    const currency = '015841551A748AD2C1F76FF6ECB0CCCD00000000'
--- a/packages/ripple-binary-codec/test/tx-encode-decode.test.js
+++ b/packages/ripple-binary-codec/test/tx-encode-decode.test.js
@@ -58,7 +58,7 @@ describe('encoding and decoding tx_json', function () {
      Sequence: 19,
      LimitAmount: {
        value: '200',
-        currency: '0000000000000000000000005841480000000000',
+        currency: '0000000000000000000000005852500000000000',
        issuer: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K',
      },
      Fee: '10',
--- a/packages/xrpl/HISTORY.md
+++ b/packages/xrpl/HISTORY.md
@@ -1698,7 +1698,7 @@ __OTHER CHANGES__
        parseBinary: false
      }
    ```
-+ Added full currency name support, e.g. `Currency.from_json('XAH').to_human({full_name:'Ripples'})` will return `XAH - Ripples`
+ Added full currency name support, e.g. `Currency.from_json('XRP').to_human({full_name:'Ripples'})` will return `XRP - Ripples`
 + Improved interest bearing currency support, e.g. `Currency.from_human('USD - US Dollar (2.5%pa)')`
 + Improve test coverage
 + Added blob vault client.  The vault client facilitates interaction with ripple's namespace and blob vault or 3rd party blob vaults using ripple's blob vault software (https://github.com/ripple/ripple-blobvault). A list of the available functions can be found at [docs/VAULTCLIENT.md](docs/VAULTCLIENT.md)
--- a/packages/xrpl/package.json
+++ b/packages/xrpl/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@transia/xrpl",
-  "version": "2.7.3-alpha.25",
+  "version": "2.7.3-alpha.1",
  "license": "ISC",
  "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
  "files": [
@@ -23,7 +23,7 @@
  },
  "dependencies": {
    "@transia/ripple-address-codec": "^4.2.8-alpha.0",
-    "@transia/ripple-binary-codec": "^1.4.6-alpha.8",
+    "@transia/ripple-binary-codec": "^1.4.6-alpha.1",
    "@transia/ripple-keypairs": "^1.1.8-alpha.0",
    "bignumber.js": "^9.0.0",
    "bip32": "^2.0.6",
@@ -80,6 +80,5 @@
  "readmeFilename": "README.md",
  "engines": {
    "node": ">=10.13.0"
-  },
-  "gitHead": "3b234ec8ec1c677e0f3f534fd2985c985871c87e"
+  }
 }
--- a/packages/xrpl/snippets/src/paths.ts
+++ b/packages/xrpl/snippets/src/paths.ts
@@ -18,7 +18,7 @@ async function createTxWithPaths(): Promise<void> {
    source_account: wallet.classicAddress,
    source_currencies: [
      {
-        currency: 'XAH',
+        currency: 'XRP',
      },
    ],
    destination_account,
--- a/packages/xrpl/src/Wallet/index.ts
+++ b/packages/xrpl/src/Wallet/index.ts
@@ -485,10 +485,10 @@ class Wallet {

        if (
          txCurrency.length === standard_currency_code_len &&
-          txCurrency.toUpperCase() === 'XAH'
+          txCurrency.toUpperCase() === 'XRP'
        ) {
          throw new XrplError(
-            `Trying to sign an issued currency with a similar standard code to XAH (received '${txCurrency}'). XAH is not an issued currency.`,
+            `Trying to sign an issued currency with a similar standard code to XRP (received '${txCurrency}'). XRP is not an issued currency.`,
          )
        }

@@ -575,7 +575,7 @@ function removeTrailingZeros(tx: Transaction): void {
 /* eslint-disable @typescript-eslint/no-magic-numbers -- Magic numbers are from rippleds of currency code encoding */
 function isoToHex(iso: string): string {
  const bytes = Buffer.alloc(20)
-  if (iso !== 'XAH') {
+  if (iso !== 'XRP') {
    const isoBytes = iso.split('').map((chr) => chr.charCodeAt(0))
    bytes.set(isoBytes, 12)
  }
--- a/packages/xrpl/src/models/common/index.ts
+++ b/packages/xrpl/src/models/common/index.ts
@@ -1,7 +1,7 @@
 export type LedgerIndex = number | ('validated' | 'closed' | 'current')

 interface XRP {
-  currency: 'XAH'
+  currency: 'XRP'
 }

 interface IssuedCurrency {
@@ -195,13 +195,3 @@ export interface NFTOffer {
  destination?: string
  expiration?: number
 }
-
-/**
- * This information is added to emitted Transactions.
- */
-export interface EmitDetails {
-  EmitBurden: number
-  EmitGeneration: number
-  EmitHookHash: string
-  EmitParentTxnID: string
-}
--- a/packages/xrpl/src/models/ledger/AccountRoot.ts
+++ b/packages/xrpl/src/models/ledger/AccountRoot.ts
@@ -72,10 +72,6 @@ export default interface AccountRoot extends BaseLedgerEntry {
   * account to each other.
   */
  TransferRate?: number
-  ImportSequence?: string
-  GovernanceFlags?: string
-  GovernanceMarks?: string
-  AccountIndex?: number
 }

 /**
--- a/packages/xrpl/src/models/ledger/FeeSettings.ts
+++ b/packages/xrpl/src/models/ledger/FeeSettings.ts
@@ -24,6 +24,4 @@ export default interface FeeSettings extends BaseLedgerEntry {
   * type.
   */
  Flags: number
-  XahauActivationLgrSeq?: number
-  AccountCount?: number
 }
--- a/packages/xrpl/src/models/ledger/ImportVLSequence.ts
+++ b/packages/xrpl/src/models/ledger/ImportVLSequence.ts
@@ -1,19 +0,0 @@
-import BaseLedgerEntry from './BaseLedgerEntry'
-
-/**
- *
- *
- *
- * @category Ledger Entries
- */
-export default interface ImportVLSequence extends BaseLedgerEntry {
-  LedgerEntryType: 'ImportVLSequence'
-  /**
-   *
-   */
-  PublicKey: string
-  /**
-   *
-   */
-  ImportSequence: string
-}
--- a/packages/xrpl/src/models/ledger/LedgerEntry.ts
+++ b/packages/xrpl/src/models/ledger/LedgerEntry.ts
@@ -9,7 +9,6 @@ import FeeSettings from './FeeSettings'
 import Hook from './Hook'
 import HookDefinition from './HookDefinition'
 import HookState from './HookState'
-import ImportVLSequence from './ImportVLSequence'
 import LedgerHashes from './LedgerHashes'
 import NegativeUNL from './NegativeUNL'
 import Offer from './Offer'
@@ -17,8 +16,6 @@ import PayChannel from './PayChannel'
 import RippleState from './RippleState'
 import SignerList from './SignerList'
 import Ticket from './Ticket'
-import UNLReport from './UNLReport'
-import URIToken from './URIToken'

 type LedgerEntry =
  | AccountRoot
@@ -32,7 +29,6 @@ type LedgerEntry =
  | Hook
  | HookDefinition
  | HookState
-  | ImportVLSequence
  | LedgerHashes
  | NegativeUNL
  | Offer
@@ -40,7 +36,5 @@ type LedgerEntry =
  | RippleState
  | SignerList
  | Ticket
-  | UNLReport
-  | URIToken

 export default LedgerEntry
--- a/packages/xrpl/src/models/ledger/UNLReport.ts
+++ b/packages/xrpl/src/models/ledger/UNLReport.ts
@@ -1,42 +0,0 @@
-import BaseLedgerEntry from './BaseLedgerEntry'
-
-interface ImportVLKey {
-  ImportVLKey: {
-    PublicKey: string
-    Account?: string
-  }
-}
-interface ActiveValidator {
-  ActiveValidator: {
-    PublicKey: string
-    Account?: string
-  }
-}
-
-/**
- *
- *
- *
- * @category Ledger Entries
- */
-export default interface UNLReport extends BaseLedgerEntry {
-  LedgerEntryType: 'UNLReport'
-  /**
-   *
-   */
-  ImportVLKeys?: ImportVLKey[]
-  /**
-   *
-   */
-  ActiveValidators?: ActiveValidator[]
-  /**
-   * The identifying hash of the transaction that most recently modified this
-   * object.
-   */
-  PreviousTxnID: string
-  /**
-   * The index of the ledger that contains the transaction that most recently
-   * modified this object.
-   */
-  PreviousTxnLgrSeq: number
-}
--- a/packages/xrpl/src/models/ledger/URIToken.ts
+++ b/packages/xrpl/src/models/ledger/URIToken.ts
@@ -1,53 +0,0 @@
-import { Amount } from '../common'
-
-import BaseLedgerEntry from './BaseLedgerEntry'
-
-/**
- * The URIToken object type contains the
- *
- * @category Ledger Entries
- */
-export default interface URIToken extends BaseLedgerEntry {
-  LedgerEntryType: 'URIToken'
-
-  /**
-   */
-  Owner: string
-
-  /**
-   * A hint indicating which page of the sender's owner directory links to this
-   * object, in case the directory consists of multiple pages.
-   */
-  OwnerNode: string
-
-  /**
-   */
-  Issuer: string
-
-  /**
-   */
-  URI: string
-
-  /**
-   */
-  Digest: string
-
-  /**
-   */
-  Amount: Amount
-
-  /**
-   */
-  Destination: string
-
-  /**
-   * The identifying hash of the transaction that most recently modified this
-   * object.
-   */
-  PreviousTxnID: string
-  /**
-   * The index of the ledger that contains the transaction that most recently
-   * modified this object.
-   */
-  PreviousTxnLgrSeq: number
-}
--- a/packages/xrpl/src/models/ledger/index.ts
+++ b/packages/xrpl/src/models/ledger/index.ts
@@ -12,7 +12,6 @@ import FeeSettings from './FeeSettings'
 import Hook from './Hook'
 import HookDefinition from './HookDefinition'
 import HookState from './HookState'
-import ImportVLSequence from './ImportVLSequence'
 import Ledger from './Ledger'
 import LedgerEntry from './LedgerEntry'
 import LedgerHashes from './LedgerHashes'
@@ -22,8 +21,6 @@ import PayChannel from './PayChannel'
 import RippleState, { RippleStateFlags } from './RippleState'
 import SignerList, { SignerListFlags } from './SignerList'
 import Ticket from './Ticket'
-import UNLReport from './UNLReport'
-import URIToken from './URIToken'

 export {
  AccountRoot,
@@ -39,7 +36,6 @@ export {
  Hook,
  HookDefinition,
  HookState,
-  ImportVLSequence,
  Ledger,
  LedgerEntry,
  LedgerHashes,
@@ -52,6 +48,4 @@ export {
  SignerList,
  SignerListFlags,
  Ticket,
-  UNLReport,
-  URIToken,
 }
--- a/packages/xrpl/src/models/methods/accountNamespace.ts
+++ b/packages/xrpl/src/models/methods/accountNamespace.ts
@@ -1,46 +0,0 @@
-import { HookState } from '../ledger'
-
-import { BaseRequest, BaseResponse } from './baseMethod'
-
-/**
- * The `account_namespace` command retrieves the account namespace. All information retrieved is relative to a
- * particular version of the ledger. Returns an {@link AccountNamespaceResponse}.
- *
- * @category Requests
- */
-export interface AccountNamespaceRequest extends BaseRequest {
-  command: 'account_namespace'
-  /** A unique identifier for the account, most commonly the account's address. */
-  account: string
-  /** The hex namespace. */
-  namespace_id?: string
-}
-
-/**
- * Response expected from an {@link AccountNamespaceRequest}.
- *
- * @category Responses
- */
-export interface AccountNamespaceResponse extends BaseResponse {
-  result: {
-    /**
-     * The account requested.
-     */
-    account: string
-    /**
-     * The namespace_id requested.
-     */
-    namespace_id: string
-    /**
-     * A list of HookStates for the specified account namespace_id.
-     */
-    namespace_entries: HookState[]
-    /**
-     * The ledger index of the current open ledger, which was used when
-     * retrieving this information.
-     */
-    ledger_current_index: number
-    /** If true, this data comes from a validated ledger. */
-    validated: boolean
-  }
-}
--- a/packages/xrpl/src/models/methods/accountObjects.ts
+++ b/packages/xrpl/src/models/methods/accountObjects.ts
@@ -3,13 +3,11 @@ import {
  Check,
  DepositPreauth,
  Escrow,
-  Hook,
  Offer,
  PayChannel,
  RippleState,
  SignerList,
  Ticket,
-  URIToken,
 } from '../ledger'

 import { BaseRequest, BaseResponse } from './baseMethod'
@@ -18,14 +16,12 @@ type AccountObjectType =
  | 'check'
  | 'deposit_preauth'
  | 'escrow'
-  | 'hook'
  | 'nft_offer'
  | 'offer'
  | 'payment_channel'
  | 'signer_list'
  | 'state'
  | 'ticket'
-  | 'uritoken'

 /**
 * The account_objects command returns the raw ledger format for all objects
@@ -77,13 +73,11 @@ type AccountObject =
  | Check
  | DepositPreauth
  | Escrow
-  | Hook
  | Offer
  | PayChannel
  | SignerList
  | RippleState
  | Ticket
-  | URIToken

 /**
 * Response expected from an {@link AccountObjectsRequest}.
--- a/packages/xrpl/src/models/methods/index.ts
+++ b/packages/xrpl/src/models/methods/index.ts
@@ -8,10 +8,6 @@ import {
 } from './accountCurrencies'
 import { AccountInfoRequest, AccountInfoResponse } from './accountInfo'
 import { AccountLinesRequest, AccountLinesResponse } from './accountLines'
-import {
-  AccountNamespaceRequest,
-  AccountNamespaceResponse,
-} from './accountNamespace'
 import { AccountNFTsRequest, AccountNFTsResponse } from './accountNFTs'
 import { AccountObjectsRequest, AccountObjectsResponse } from './accountObjects'
 import {
@@ -87,7 +83,6 @@ type Request =
  | AccountCurrenciesRequest
  | AccountInfoRequest
  | AccountLinesRequest
-  | AccountNamespaceRequest
  | AccountNFTsRequest
  | AccountObjectsRequest
  | AccountOffersRequest
@@ -138,7 +133,6 @@ type Response =
  | AccountCurrenciesResponse
  | AccountInfoResponse
  | AccountLinesResponse
-  | AccountNamespaceResponse
  | AccountNFTsResponse
  | AccountObjectsResponse
  | AccountOffersResponse
--- a/packages/xrpl/src/models/methods/ledgerEntry.ts
+++ b/packages/xrpl/src/models/methods/ledgerEntry.ts
@@ -79,11 +79,6 @@ export interface LedgerEntryRequest extends BaseRequest {
      }
    | string

-  /**
-   * The object ID of a transaction emitted by the ledger entry.
-   */
-  emitted_txn?: string
-
  /**
   * The Escrow object to retrieve. If a string, must be the object ID of the
   * escrow, as hexadecimal. If an object, requires owner and seq sub-fields.
@@ -97,47 +92,6 @@ export interface LedgerEntryRequest extends BaseRequest {
      }
    | string

-  /**
-   * The hash of the Hook object to retrieve.
-   */
-  hook_definition?: string
-
-  /**
-   * The Hook object to retrieve. If a string, must be the object ID of the Hook.
-   * If an object, requires `account` sub-field.
-   */
-  hook?:
-    | {
-        /** The account of the Hook object. */
-        account: string
-      }
-    | string
-
-  /**
-   * Object specifying the HookState object to retrieve. Requires the sub-fields
-   * `account`, `key`, and `namespace_id` to uniquely specify the HookState entry
-   * to retrieve.
-   */
-  hook_state?: {
-    /** The account of the Hook object. */
-    account: string
-    /** The key of the state. */
-    key: string
-    /** The namespace of the state. */
-    namespace_id: string
-  }
-
-  /**
-   * The Import VL Sequence object to retrieve. If a string, must be the object ID of the VLSequence.
-   * If an object, requires `public_key` sub-field.
-   */
-  import_vlseq?:
-    | {
-        /** The public_key of the Import VL Sequence object. */
-        public_key: string
-      }
-    | string
-
  /**
   * The Offer object to retrieve. If a string, interpret as the unique object
   * ID to the Offer. If an object, requires the sub-fields `account` and `seq`
@@ -183,20 +137,40 @@ export interface LedgerEntryRequest extends BaseRequest {
        ticket_sequence: number
      }
    | string
+  /**
+   * The object ID of a transaction emitted by the ledger entry.
+   */
+  emitted_txn?: string

  /**
-   * The URIToken object to retrieve. If a string, must be the object ID of the
-   * URIToken, as hexadecimal. If an object, the `issuer` and `uri`
-   * sub-fields are required to uniquely specify the URIToken entry.
+   * The hash of the Hook object to retrieve.
   */
-  uri_token?:
+  hook_definition?: string
+
+  /**
+   * The Hook object to retrieve. If a string, must be the object ID of the Hook.
+   * If an object, requires `account` sub-field.
+   */
+  hook?:
    | {
-        /** The issuer of the URIToken object. */
-        issuer: string
-        /** The URIToken uri string (ascii). */
-        uri: string
+        /** The account of the Hook object. */
+        account: string
      }
    | string
+
+  /**
+   * Object specifying the HookState object to retrieve. Requires the sub-fields
+   * `account`, `key`, and `namespace_id` to uniquely specify the HookState entry
+   * to retrieve.
+   */
+  hook_state?: {
+    /** The account of the Hook object. */
+    account: string
+    /** The key of the state. */
+    key: string
+    /** The namespace of the state. */
+    namespace_id: string
+  }
 }

 /**
--- a/packages/xrpl/src/models/transactions/accountSet.ts
+++ b/packages/xrpl/src/models/transactions/accountSet.ts
@@ -48,7 +48,6 @@ export enum AccountSetAsfFlags {
   */
  asfAuthorizedNFTokenMinter = 10,
  /** asf 11 is reserved for Hooks amendment */
-  asfTshCollect = 11,
  /** Disallow other accounts from creating incoming NFTOffers */
  asfDisallowIncomingNFTokenOffer = 12,
  /** Disallow other accounts from creating incoming Checks */
--- a/packages/xrpl/src/models/transactions/claimReward.ts
+++ b/packages/xrpl/src/models/transactions/claimReward.ts
@@ -1,28 +0,0 @@
-import { ValidationError } from '../../errors'
-
-import { BaseTransaction, validateBaseTransaction } from './common'
-
-/**
- * ClaimReward is a transaction model that allows an account to claim rewards.
- *
- * @category Transaction Models
- */
-export interface ClaimReward extends BaseTransaction {
-  TransactionType: 'ClaimReward'
-  /** The unique address of the issuer where the reward.c hook is installed. */
-  Issuer?: string
-}
-
-/**
- * Verify the form and type of an ClaimReward at runtime.
- *
- * @param tx - An ClaimReward Transaction.
- * @throws When the ClaimReward is Malformed.
- */
-export function validateClaimReward(tx: Record<string, unknown>): void {
-  validateBaseTransaction(tx)
-
-  if (tx.Issuer !== undefined && typeof tx.Issuer !== 'string') {
-    throw new ValidationError('ClaimReward: invalid Issuer')
-  }
-}
--- a/packages/xrpl/src/models/transactions/common.ts
+++ b/packages/xrpl/src/models/transactions/common.ts
@@ -10,7 +10,6 @@ import {
  IssuedCurrencyAmount,
  Memo,
  Signer,
-  EmitDetails,
 } from '../common'
 import { onlyHasFields } from '../utils'

@@ -174,10 +173,6 @@ export interface BaseTransaction {
   * The hook parameters of the transaction.
   */
  HookParameters?: HookParameter[]
-  /**
-   * The hook parameters of the transaction.
-   */
-  EmitDetails?: EmitDetails
 }

 /**
--- a/packages/xrpl/src/models/transactions/escrowCancel.ts
+++ b/packages/xrpl/src/models/transactions/escrowCancel.ts
@@ -15,12 +15,7 @@ export interface EscrowCancel extends BaseTransaction {
   * Transaction sequence (or Ticket  number) of EscrowCreate transaction that.
   * created the escrow to cancel.
   */
-  OfferSequence?: number
-  /**
-   * The ID of the Escrow ledger object to cancel as a 64-character hexadecimal
-   * string.
-   */
-  EscrowID?: string
+  OfferSequence: number
 }

 /**
@@ -40,17 +35,11 @@ export function validateEscrowCancel(tx: Record<string, unknown>): void {
    throw new ValidationError('EscrowCancel: Owner must be a string')
  }

-  if (tx.OfferSequence === undefined && tx.EscrowID === undefined) {
-    throw new ValidationError(
-      'EscrowCancel: must include OfferSequence or EscrowID',
-    )
+  if (tx.OfferSequence === undefined) {
+    throw new ValidationError('EscrowCancel: missing OfferSequence')
  }

-  if (tx.OfferSequence !== undefined && typeof tx.OfferSequence !== 'number') {
-    throw new ValidationError('EscrowCancel: invalid OfferSequence')
-  }
-
-  if (tx.EscrowID !== undefined && typeof tx.EscrowID !== 'string') {
-    throw new ValidationError('EscrowCancel: invalid EscrowID')
+  if (typeof tx.OfferSequence !== 'number') {
+    throw new ValidationError('EscrowCancel: OfferSequence must be a number')
  }
 }
--- a/packages/xrpl/src/models/transactions/import.ts
+++ b/packages/xrpl/src/models/transactions/import.ts
@@ -1,5 +1,3 @@
-import { ValidationError } from '../../errors'
-
 import { BaseTransaction, validateBaseTransaction } from './common'

 /**
@@ -9,10 +7,6 @@ import { BaseTransaction, validateBaseTransaction } from './common'
 */
 export interface Import extends BaseTransaction {
  TransactionType: 'Import'
-  /**
-   *
-   */
-  Issuer?: string
  /**
   * Hex value representing a VL Blob.
   */
@@ -27,12 +21,4 @@ export interface Import extends BaseTransaction {
 */
 export function validateImport(tx: Record<string, unknown>): void {
  validateBaseTransaction(tx)
-
-  if (tx.Issuer !== undefined && typeof tx.Issuer !== 'string') {
-    throw new ValidationError('Import: Issuer must be a string')
-  }
-
-  if (tx.Account === tx.Issuer) {
-    throw new ValidationError('Import: Issuer and Account must not be equal')
-  }
 }
--- a/packages/xrpl/src/models/transactions/index.ts
+++ b/packages/xrpl/src/models/transactions/index.ts
@@ -10,7 +10,6 @@ export { AccountDelete } from './accountDelete'
 export { CheckCancel } from './checkCancel'
 export { CheckCash } from './checkCash'
 export { CheckCreate } from './checkCreate'
-export { ClaimReward } from './claimReward'
 export { DepositPreauth } from './depositPreauth'
 export { EscrowCancel } from './escrowCancel'
 export { EscrowCreate } from './escrowCreate'
@@ -49,12 +48,3 @@ export { SetHookFlagsInterface, SetHookFlags, SetHook } from './setHook'
 export { SignerListSet } from './signerListSet'
 export { TicketCreate } from './ticketCreate'
 export { TrustSetFlagsInterface, TrustSetFlags, TrustSet } from './trustSet'
-export {
-  URITokenMintFlagsInterface,
-  URITokenMintFlags,
-  URITokenMint,
-} from './uriTokenMint'
-export { URITokenBurn } from './uriTokenBurn'
-export { URITokenCreateSellOffer } from './uriTokenCreateSellOffer'
-export { URITokenBuy } from './uriTokenBuy'
-export { URITokenCancelSellOffer } from './uriTokenCancelSellOffer'
--- a/packages/xrpl/src/models/transactions/metadata.ts
+++ b/packages/xrpl/src/models/transactions/metadata.ts
@@ -8,19 +8,9 @@ export interface HookExecution {
    HookHash: string
    HookInstructionCount: string
    HookResult: number
-    HookReturnCode: string
+    HookReturnCode: number
    HookReturnString: string
    HookStateChangeCount: number
-    Flags: number
-  }
-}
-
-export interface HookEmission {
-  HookEmission: {
-    EmittedTxnID: string
-    HookAccount: string
-    HookHash: string
-    EmitNonce: string
  }
 }

@@ -85,7 +75,6 @@ export function isDeletedNode(node: Node): node is DeletedNode {

 export interface TransactionMetadata {
  HookExecutions?: HookExecution[]
-  HookEmissions?: HookEmission[]
  AffectedNodes: Node[]
  DeliveredAmount?: Amount
  // "unavailable" possible for transactions before 2014-01-20
--- a/packages/xrpl/src/models/transactions/offerCancel.ts
+++ b/packages/xrpl/src/models/transactions/offerCancel.ts
@@ -15,12 +15,7 @@ export interface OfferCancel extends BaseTransaction {
   * created by that transaction. It is not considered an error if the offer.
   * specified does not exist.
   */
-  OfferSequence?: number
-  /**
-   * The ID of the Escrow ledger object to cancel as a 64-character hexadecimal
-   * string.
-   */
-  OfferID?: string
+  OfferSequence: number
 }

 /**
@@ -32,17 +27,11 @@ export interface OfferCancel extends BaseTransaction {
 export function validateOfferCancel(tx: Record<string, unknown>): void {
  validateBaseTransaction(tx)

-  if (tx.OfferSequence === undefined && tx.OfferID === undefined) {
-    throw new ValidationError(
-      'OfferCancel: must include OfferSequence or OfferID',
-    )
+  if (tx.OfferSequence === undefined) {
+    throw new ValidationError('OfferCancel: missing field OfferSequence')
  }

-  if (tx.OfferSequence !== undefined && typeof tx.OfferSequence !== 'number') {
-    throw new ValidationError('OfferCancel: invalid OfferSequence')
-  }
-
-  if (tx.OfferID !== undefined && typeof tx.OfferID !== 'string') {
-    throw new ValidationError('OfferCancel: invalid OfferID')
+  if (typeof tx.OfferSequence !== 'number') {
+    throw new ValidationError('OfferCancel: OfferSequence must be a number')
  }
 }
--- a/packages/xrpl/src/models/transactions/offerCreate.ts
+++ b/packages/xrpl/src/models/transactions/offerCreate.ts
@@ -103,11 +103,6 @@ export interface OfferCreate extends BaseTransaction {
  Expiration?: number
  /** An offer to delete first, specified in the same way as OfferCancel. */
  OfferSequence?: number
-  /**
-   * The ID of the Offer ledger object to cancel as a 64-character hexadecimal
-   * string.
-   */
-  OfferID?: string
  /** The amount and type of currency being provided by the offer creator. */
  TakerGets: Amount
  /** The amount and type of currency being requested by the offer creator. */
@@ -146,8 +141,4 @@ export function validateOfferCreate(tx: Record<string, unknown>): void {
  if (tx.OfferSequence !== undefined && typeof tx.OfferSequence !== 'number') {
    throw new ValidationError('OfferCreate: invalid OfferSequence')
  }
-
-  if (tx.OfferID !== undefined && typeof tx.OfferID !== 'string') {
-    throw new ValidationError('OfferCreate: invalid OfferID')
-  }
 }
--- a/packages/xrpl/src/models/transactions/setHook.ts
+++ b/packages/xrpl/src/models/transactions/setHook.ts
@@ -14,10 +14,10 @@ export enum SetHookFlags {
  hsfOverride = 0x00000001,
  /**
   */
-  hsfNSDelete = 0x0000002,
+  hsfNSDelete = 0x00000010,
  /**
   */
-  hsfCollect = 0x00000004,
+  hsfCollect = 0x00000100,
 }

 export interface SetHookFlagsInterface extends GlobalFlags {
@@ -41,7 +41,7 @@ export interface SetHook extends BaseTransaction {
  Flags?: number | SetHookFlagsInterface
 }

-const MAX_HOOKS = 10
+const MAX_HOOKS = 4
 const HEX_REGEX = /^[0-9A-Fa-f]{64}$/u

 /**
--- a/packages/xrpl/src/models/transactions/signerListSet.ts
+++ b/packages/xrpl/src/models/transactions/signerListSet.ts
@@ -23,7 +23,7 @@ export interface SignerListSet extends BaseTransaction {
   * more than 32 members. No address may appear more than once in the list, nor
   * may the Account submitting the transaction appear in the list.
   */
-  SignerEntries?: SignerEntry[]
+  SignerEntries: SignerEntry[]
 }

 const MAX_SIGNERS = 32
@@ -36,7 +36,6 @@ const HEX_WALLET_LOCATOR_REGEX = /^[0-9A-Fa-f]{64}$/u
 * @param tx - An SignerListSet Transaction.
 * @throws When the SignerListSet is Malformed.
 */
-// eslint-disable-next-line complexity -- validation can be complex
 export function validateSignerListSet(tx: Record<string, unknown>): void {
  validateBaseTransaction(tx)

@@ -48,10 +47,6 @@ export function validateSignerListSet(tx: Record<string, unknown>): void {
    throw new ValidationError('SignerListSet: invalid SignerQuorum')
  }

-  if (tx.SignerQuorum === 0) {
-    return
-  }
-
  if (tx.SignerEntries === undefined) {
    throw new ValidationError('SignerListSet: missing field SignerEntries')
  }
--- a/packages/xrpl/src/models/transactions/transaction.ts
+++ b/packages/xrpl/src/models/transactions/transaction.ts
@@ -9,7 +9,6 @@ import { AccountSet, validateAccountSet } from './accountSet'
 import { CheckCancel, validateCheckCancel } from './checkCancel'
 import { CheckCash, validateCheckCash } from './checkCash'
 import { CheckCreate, validateCheckCreate } from './checkCreate'
-import { ClaimReward, validateClaimReward } from './claimReward'
 import { DepositPreauth, validateDepositPreauth } from './depositPreauth'
 import { EscrowCancel, validateEscrowCancel } from './escrowCancel'
 import { EscrowCreate, validateEscrowCreate } from './escrowCreate'
@@ -51,17 +50,6 @@ import { SetRegularKey, validateSetRegularKey } from './setRegularKey'
 import { SignerListSet, validateSignerListSet } from './signerListSet'
 import { TicketCreate, validateTicketCreate } from './ticketCreate'
 import { TrustSet, validateTrustSet } from './trustSet'
-import { URITokenBurn, validateURITokenBurn } from './uriTokenBurn'
-import { URITokenBuy, validateURITokenBuy } from './uriTokenBuy'
-import {
-  URITokenCancelSellOffer,
-  validateURITokenCancelSellOffer,
-} from './uriTokenCancelSellOffer'
-import {
-  URITokenCreateSellOffer,
-  validateURITokenCreateSellOffer,
-} from './uriTokenCreateSellOffer'
-import { URITokenMint, validateURITokenMint } from './uriTokenMint'

 /**
 * @category Transaction Models
@@ -72,7 +60,6 @@ export type Transaction =
  | CheckCancel
  | CheckCash
  | CheckCreate
-  | ClaimReward
  | DepositPreauth
  | EscrowCancel
  | EscrowCreate
@@ -95,11 +82,6 @@ export type Transaction =
  | SignerListSet
  | TicketCreate
  | TrustSet
-  | URITokenBurn
-  | URITokenBuy
-  | URITokenCancelSellOffer
-  | URITokenMint
-  | URITokenCreateSellOffer

 /**
 * @category Transaction Models
@@ -148,10 +130,6 @@ export function validate(transaction: Record<string, unknown>): void {
      validateCheckCreate(tx)
      break

-    case 'ClaimReward':
-      validateClaimReward(tx)
-      break
-
    case 'DepositPreauth':
      validateDepositPreauth(tx)
      break
@@ -240,26 +218,6 @@ export function validate(transaction: Record<string, unknown>): void {
      validateTrustSet(tx)
      break

-    case 'URITokenMint':
-      validateURITokenMint(tx)
-      break
-
-    case 'URITokenBurn':
-      validateURITokenBurn(tx)
-      break
-
-    case 'URITokenCreateSellOffer':
-      validateURITokenCreateSellOffer(tx)
-      break
-
-    case 'URITokenBuy':
-      validateURITokenBuy(tx)
-      break
-
-    case 'URITokenCancelSellOffer':
-      validateURITokenCancelSellOffer(tx)
-      break
-
    default:
      throw new ValidationError(
        `Invalid field TransactionType: ${tx.TransactionType}`,
--- a/packages/xrpl/src/models/transactions/uriTokenBurn.ts
+++ b/packages/xrpl/src/models/transactions/uriTokenBurn.ts
@@ -1,60 +0,0 @@
-import { ValidationError } from '../../errors'
-
-import { BaseTransaction, validateBaseTransaction } from './common'
-
-/**
- * Map of flags to boolean values representing {@link URITokenBurn} transaction
- * flags.
- *
- * @category Transaction Flags
- *
- * @example
- * ```typescript
- * const tx: URITokenBurn = {
- * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
- * TransactionType: 'URITokenBurn',
- * }
- *
- * // Autofill the tx to see how flags actually look compared to the interface usage.
- * const autofilledTx = await client.autofill(tx)
- * console.log(autofilledTx)
- * // {
- * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * // URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
- * // TransactionType: 'URITokenBurn',
- * // Sequence: 21970384,
- * // Fee: '12',
- * // LastLedgerSequence: 21970404
- * // }
- * ```
- */
-
-/**
- * An URITokenBurn transaction is effectively a limit order . It defines an
- * intent to exchange currencies, and creates an Offer object if not completely.
- * Fulfilled when placed. Offers can be partially fulfilled.
- *
- * @category Transaction Models
- */
-export interface URITokenBurn extends BaseTransaction {
-  TransactionType: 'URITokenBurn'
-  /**
-   * Identifies the URIToken object to be removed by the transaction.
-   */
-  URITokenID: string
-}
-
-/**
- * Verify the form and type of an URITokenBurn at runtime.
- *
- * @param tx - An URITokenBurn Transaction.
- * @throws When the URITokenBurn is Malformed.
- */
-export function validateURITokenBurn(tx: Record<string, unknown>): void {
-  validateBaseTransaction(tx)
-
-  if (tx.URITokenID == null) {
-    throw new ValidationError('NFTokenBurn: missing field URITokenID')
-  }
-}
--- a/packages/xrpl/src/models/transactions/uriTokenBuy.ts
+++ b/packages/xrpl/src/models/transactions/uriTokenBuy.ts
@@ -1,83 +0,0 @@
-import { ValidationError } from '../../errors'
-import { Amount } from '../common'
-
-import { BaseTransaction, isAmount, validateBaseTransaction } from './common'
-
-/**
- * Map of flags to boolean values representing {@link URITokenBuy} transaction
- * flags.
- *
- * @category Transaction Flags
- *
- * @example
- * ```typescript
- * const tx: URITokenBuy = {
- * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
- * Amount: '1000000',
- * TransactionType: 'URITokenBuy',
- * }
- *
- * // Autofill the tx to see how flags actually look compared to the interface usage.
- * const autofilledTx = await client.autofill(tx)
- * console.log(autofilledTx)
- * // {
- * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * // URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
- * // Amount: '1000000',
- * // TransactionType: 'URITokenBuy',
- * // Sequence: 21970384,
- * // Fee: '12',
- * // LastLedgerSequence: 21970404
- * // }
- * ```
- */
-
-/**
- * An URITokenBuy transaction is effectively a limit order . It defines an
- * intent to exchange currencies, and creates an Offer object if not completely.
- * Fulfilled when placed. Offers can be partially fulfilled.
- *
- * @category Transaction Models
- */
-export interface URITokenBuy extends BaseTransaction {
-  TransactionType: 'URITokenBuy'
-  /**
-   * Identifies the URITokenID of the NFToken object that the
-   * offer references.
-   */
-  URITokenID: string
-  /**
-   * Indicates the amount expected or offered for the Token.
-   *
-   * The amount must be non-zero, except when this is a sell
-   * offer and the asset is XRP. This would indicate that the current
-   * owner of the token is giving it away free, either to anyone at all,
-   * or to the account identified by the Destination field.
-   */
-  Amount: Amount
-}
-
-/**
- * Verify the form and type of an URITokenBuy at runtime.
- *
- * @param tx - An URITokenBuy Transaction.
- * @throws When the URITokenBuy is Malformed.
- */
-export function validateURITokenBuy(tx: Record<string, unknown>): void {
-  validateBaseTransaction(tx)
-
-  if (tx.Account === tx.Destination) {
-    throw new ValidationError(
-      'URITokenBuy: Destination and Account must not be equal',
-    )
-  }
-
-  if (tx.URITokenID == null) {
-    throw new ValidationError('URITokenBuy: missing field URITokenID')
-  }
-
-  if (!isAmount(tx.Amount)) {
-    throw new ValidationError('URITokenBuy: invalid Amount')
-  }
-}
--- a/packages/xrpl/src/models/transactions/uriTokenCancelSellOffer.ts
+++ b/packages/xrpl/src/models/transactions/uriTokenCancelSellOffer.ts
@@ -1,65 +0,0 @@
-import { ValidationError } from '../../errors'
-
-import { BaseTransaction, validateBaseTransaction } from './common'
-
-/**
- * Map of flags to boolean values representing {@link URITokenCancelSellOffer} transaction
- * flags.
- *
- * @category Transaction Flags
- *
- * @example
- * ```typescript
- * const tx: URITokenCancelSellOffer = {
- * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
- * TransactionType: 'URITokenCancelSellOffer',
- * }
- *
- * // Autofill the tx to see how flags actually look compared to the interface usage.
- * const autofilledTx = await client.autofill(tx)
- * console.log(autofilledTx)
- * // {
- * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * // URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
- * // TransactionType: 'URITokenCancelSellOffer',
- * // Sequence: 21970384,
- * // Fee: '12',
- * // LastLedgerSequence: 21970404
- * // }
- * ```
- */
-
-/**
- * An URITokenCancelSellOffer transaction is effectively a limit order . It defines an
- * intent to exchange currencies, and creates an Offer object if not completely.
- * Fulfilled when placed. Offers can be partially fulfilled.
- *
- * @category Transaction Models
- */
-export interface URITokenCancelSellOffer extends BaseTransaction {
-  TransactionType: 'URITokenCancelSellOffer'
-  /**
-   * Identifies the URITokenID of the NFToken object that the
-   * offer references.
-   */
-  URITokenID: string
-}
-
-/**
- * Verify the form and type of an URITokenCancelSellOffer at runtime.
- *
- * @param tx - An URITokenCancelSellOffer Transaction.
- * @throws When the URITokenCancelSellOffer is Malformed.
- */
-export function validateURITokenCancelSellOffer(
-  tx: Record<string, unknown>,
-): void {
-  validateBaseTransaction(tx)
-
-  if (tx.URITokenID == null) {
-    throw new ValidationError(
-      'URITokenCancelSellOffer: missing field URITokenID',
-    )
-  }
-}
--- a/packages/xrpl/src/models/transactions/uriTokenCreateSellOffer.ts
+++ b/packages/xrpl/src/models/transactions/uriTokenCreateSellOffer.ts
@@ -1,93 +0,0 @@
-import { ValidationError } from '../../errors'
-import { Amount } from '../common'
-
-import { BaseTransaction, isAmount, validateBaseTransaction } from './common'
-
-/**
- * Map of flags to boolean values representing {@link URITokenCreateSellOffer} transaction
- * flags.
- *
- * @category Transaction Flags
- *
- * @example
- * ```typescript
- * const tx: URITokenCreateSellOffer = {
- * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
- * Amount: '1000000',
- * TransactionType: 'URITokenCreateSellOffer',
- * }
- *
- * // Autofill the tx to see how flags actually look compared to the interface usage.
- * const autofilledTx = await client.autofill(tx)
- * console.log(autofilledTx)
- * // {
- * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * // URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
- * // Amount: '1000000',
- * // TransactionType: 'URITokenCreateSellOffer',
- * // Sequence: 21970384,
- * // Fee: '12',
- * // LastLedgerSequence: 21970404
- * // }
- * ```
- */
-
-/**
- * An URITokenCreateSellOffer transaction is effectively a limit order . It defines an
- * intent to exchange currencies, and creates an Offer object if not completely.
- * Fulfilled when placed. Offers can be partially fulfilled.
- *
- * @category Transaction Models
- */
-export interface URITokenCreateSellOffer extends BaseTransaction {
-  TransactionType: 'URITokenCreateSellOffer'
-  /**
-   * Identifies the URITokenID of the NFToken object that the
-   * offer references.
-   */
-  URITokenID: string
-  /**
-   * Indicates the amount expected or offered for the Token.
-   *
-   * The amount must be non-zero, except when this is a sell
-   * offer and the asset is XRP. This would indicate that the current
-   * owner of the token is giving it away free, either to anyone at all,
-   * or to the account identified by the Destination field.
-   */
-  Amount: Amount
-  /**
-   * If present, indicates that this offer may only be
-   * accepted by the specified account. Attempts by other
-   * accounts to accept this offer MUST fail.
-   */
-  Destination?: string
-}
-
-/**
- * Verify the form and type of an URITokenCreateSellOffer at runtime.
- *
- * @param tx - An URITokenCreateSellOffer Transaction.
- * @throws When the URITokenCreateSellOffer is Malformed.
- */
-export function validateURITokenCreateSellOffer(
-  tx: Record<string, unknown>,
-): void {
-  validateBaseTransaction(tx)
-
-  if (tx.Account === tx.Destination) {
-    throw new ValidationError(
-      'URITokenCreateSellOffer: Destination and Account must not be equal',
-    )
-  }
-
-  if (tx.URITokenID == null) {
-    throw new ValidationError(
-      'URITokenCreateSellOffer: missing field URITokenID',
-    )
-  }
-
-  if (!isAmount(tx.Amount)) {
-    throw new ValidationError('URITokenCreateSellOffer: invalid Amount')
-  }
-}
--- a/packages/xrpl/src/models/transactions/uriTokenMint.ts
+++ b/packages/xrpl/src/models/transactions/uriTokenMint.ts
@@ -1,110 +0,0 @@
-import { ValidationError } from '../../errors'
-import { Amount } from '../common'
-import { isHex } from '../utils'
-
-import { BaseTransaction, GlobalFlags, validateBaseTransaction } from './common'
-
-/**
- * Transaction Flags for an URITokenMint Transaction.
- *
- * @category Transaction Flags
- */
-export enum URITokenMintFlags {
-  /**
-   * If set, indicates that the minted token may be burned by the issuer even
-   * if the issuer does not currently hold the token. The current holder of
-   * the token may always burn it.
-   */
-  tfBurnable = 0x00000001,
-}
-
-/**
- * Map of flags to boolean values representing {@link URITokenMint} transaction
- * flags.
- *
- * @category Transaction Flags
- *
- * @example
- * ```typescript
- * const tx: URITokenMint = {
- * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * URI: '697066733A2F2F434944',
- * TransactionType: 'URITokenMint',
- * Flags: {
- *   tfBurnable: true,
- *  },
- * }
- *
- * // Autofill the tx to see how flags actually look compared to the interface usage.
- * const autofilledTx = await client.autofill(tx)
- * console.log(autofilledTx)
- * // {
- * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
- * // URI: '697066733A2F2F434944',
- * // TransactionType: 'URITokenMint',
- * // Flags: 0,
- * // Sequence: 21970384,
- * // Fee: '12',
- * // LastLedgerSequence: 21970404
- * // }
- * ```
- */
-export interface URITokenMintFlagsInterface extends GlobalFlags {
-  tfBurnable?: boolean
-}
-
-/**
- * An URITokenMint transaction is effectively a limit order . It defines an
- * intent to exchange currencies, and creates an Offer object if not completely.
- * Fulfilled when placed. Offers can be partially fulfilled.
- *
- * @category Transaction Models
- */
-export interface URITokenMint extends BaseTransaction {
-  TransactionType: 'URITokenMint'
-  Flags?: number | URITokenMintFlagsInterface
-  /**
-   * URI that points to the data and/or metadata associated with the NFT.
-   * This field need not be an HTTP or HTTPS URL; it could be an IPFS URI, a
-   * magnet link, immediate data encoded as an RFC2379 "data" URL, or even an
-   * opaque issuer-specific encoding. The URI is NOT checked for validity, but
-   * the field is limited to a maximum length of 256 bytes.
-   *
-   * This field must be hex-encoded. You can use `convertStringToHex` to
-   * convert this field to the proper encoding.
-   */
-  URI: string
-
-  /**
-   * Indicates the amount expected or offered for the Token.
-   *
-   * The amount must be non-zero, except when this is a sell
-   * offer and the asset is XRP. This would indicate that the current
-   * owner of the token is giving it away free, either to anyone at all,
-   * or to the account identified by the Destination field.
-   */
-  Amount?: Amount
-
-  /**
-   * If present, indicates that this offer may only be
-   * accepted by the specified account. Attempts by other
-   * accounts to accept this offer MUST fail.
-   */
-  Destination?: string
-
-  Digest?: string
-}
-
-/**
- * Verify the form and type of an URITokenMint at runtime.
- *
- * @param tx - An URITokenMint Transaction.
- * @throws When the URITokenMint is Malformed.
- */
-export function validateURITokenMint(tx: Record<string, unknown>): void {
-  validateBaseTransaction(tx)
-
-  if (typeof tx.URI === 'string' && !isHex(tx.URI)) {
-    throw new ValidationError('URITokenMint: URI must be in hex format')
-  }
-}
--- a/packages/xrpl/src/sugar/autofill.ts
+++ b/packages/xrpl/src/sugar/autofill.ts
@@ -2,15 +2,16 @@ import {
  xAddressToClassicAddress,
  isValidXAddress,
 } from '@transia/ripple-address-codec'
-import { encode } from '@transia/ripple-binary-codec'
+import BigNumber from 'bignumber.js'

 import type { Client } from '..'
 import { ValidationError, XrplError } from '../errors'
 import { AccountInfoRequest, AccountObjectsRequest } from '../models/methods'
 import { Transaction } from '../models/transactions'
 import { setTransactionFlagsToNumber } from '../models/utils/flags'
+import { xrpToDrops } from '../utils'

-import { getFeeEstimateXrp } from './getFeeXrp'
+import { getFeeXrp } from './getFeeXrp'

 // Expire unconfirmed transactions after 20 ledger versions, approximately 1 minute, by default
 const LEDGER_OFFSET = 20
@@ -49,18 +50,17 @@ async function autofill<T extends Transaction>(
  if (tx.Sequence == null) {
    promises.push(setNextValidSequenceNumber(this, tx))
  }
+  if (tx.Fee == null) {
+    promises.push(calculateFeePerTransactionType(this, tx, signersCount))
+  }
  if (tx.LastLedgerSequence == null) {
    promises.push(setLatestValidatedLedgerSequence(this, tx))
  }
  if (tx.TransactionType === 'AccountDelete') {
    promises.push(checkAccountDeleteBlockers(this, tx))
  }
-  await Promise.all(promises).then(() => tx)

-  if (tx.Fee == null) {
-    await calculateFeePerTransactionType(this, tx, signersCount)
-  }
-  return tx
+  return Promise.all(promises).then(() => tx)
 }

 function setValidAddresses(tx: Transaction): void {
@@ -146,17 +146,64 @@ async function setNextValidSequenceNumber(
  tx.Sequence = data.result.account_data.Sequence
 }

+async function fetchAccountDeleteFee(client: Client): Promise<BigNumber> {
+  const response = await client.request({ command: 'server_state' })
+  const fee = response.result.state.validated_ledger?.reserve_inc
+
+  if (fee == null) {
+    return Promise.reject(new Error('Could not fetch Owner Reserve.'))
+  }
+
+  return new BigNumber(fee)
+}
+
 async function calculateFeePerTransactionType(
  client: Client,
  tx: Transaction,
  signersCount = 0,
 ): Promise<void> {
-  const copyTx = { ...tx }
-  copyTx.SigningPubKey = ``
-  copyTx.Fee = `0`
-  const tx_blob = encode(copyTx)
-  // eslint-disable-next-line require-atomic-updates, no-param-reassign -- ignore
-  tx.Fee = await getFeeEstimateXrp(client, tx_blob, signersCount)
+  // netFee is usually 0.00001 XRP (10 drops)
+  const netFeeXRP = await getFeeXrp(client)
+  const netFeeDrops = xrpToDrops(netFeeXRP)
+  let baseFee = new BigNumber(netFeeDrops)
+
+  // EscrowFinish Transaction with Fulfillment
+  if (tx.TransactionType === 'EscrowFinish' && tx.Fulfillment != null) {
+    const fulfillmentBytesSize: number = Math.ceil(tx.Fulfillment.length / 2)
+    // 10 drops × (33 + (Fulfillment size in bytes / 16))
+    const product = new BigNumber(
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers -- expected use of magic numbers
+      scaleValue(netFeeDrops, 33 + fulfillmentBytesSize / 16),
+    )
+    baseFee = product.dp(0, BigNumber.ROUND_CEIL)
+  }
+
+  // AccountDelete Transaction
+  if (tx.TransactionType === 'AccountDelete') {
+    baseFee = await fetchAccountDeleteFee(client)
+  }
+
+  /*
+   * Multi-signed Transaction
+   * 10 drops × (1 + Number of Signatures Provided)
+   */
+  if (signersCount > 0) {
+    baseFee = BigNumber.sum(baseFee, scaleValue(netFeeDrops, 1 + signersCount))
+  }
+
+  const maxFeeDrops = xrpToDrops(client.maxFeeXRP)
+  const totalFee =
+    tx.TransactionType === 'AccountDelete'
+      ? baseFee
+      : BigNumber.min(baseFee, maxFeeDrops)
+
+  // Round up baseFee and return it as a string
+  // eslint-disable-next-line no-param-reassign, @typescript-eslint/no-magic-numbers -- param reassign is safe, base 10 magic num
+  tx.Fee = totalFee.dp(0, BigNumber.ROUND_CEIL).toString(10)
+}
+
+function scaleValue(value, multiplier): string {
+  return new BigNumber(value).times(multiplier).toString()
 }

 async function setLatestValidatedLedgerSequence(
--- a/packages/xrpl/src/sugar/balances.ts
+++ b/packages/xrpl/src/sugar/balances.ts
@@ -115,7 +115,7 @@ async function getBalances(
        formatBalances(response.result.lines),
      )
      if (xrpBalance !== '') {
-        balances.push({ currency: 'XAH', value: xrpBalance })
+        balances.push({ currency: 'XRP', value: xrpBalance })
      }
      balances.push(...accountLinesBalance)
    },
--- a/packages/xrpl/src/sugar/getFeeXrp.ts
+++ b/packages/xrpl/src/sugar/getFeeXrp.ts
@@ -50,20 +50,15 @@ export async function getFeeXrp(
 *
 * @param client - The Client used to connect to the ledger.
 * @param txBlob - The encoded transaction to estimate the fee for.
- * @param signersCount - The number of multisigners.
 * @returns The transaction fee.
 */
 export async function getFeeEstimateXrp(
  client: Client,
  txBlob: string,
-  signersCount = 0,
 ): Promise<string> {
  const response = await client.request({
    command: 'fee',
    tx_blob: txBlob,
  })
-  const openLedgerFee = response.result.drops.open_ledger_fee
-  const baseFee = new BigNumber(response.result.drops.base_fee)
-  const totalFee = BigNumber.sum(openLedgerFee, Number(baseFee) * signersCount)
-  return new BigNumber(totalFee.toFixed(NUM_DECIMAL_PLACES)).toString(BASE_10)
+  return response.result.drops.base_fee
 }
--- a/packages/xrpl/src/utils/getBalanceChanges.ts
+++ b/packages/xrpl/src/utils/getBalanceChanges.ts
@@ -105,7 +105,7 @@ function getXRPQuantity(
    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- okay here
    account: (node.FinalFields?.Account ?? node.NewFields?.Account) as string,
    balance: {
-      currency: 'XAH',
+      currency: 'XRP',
      value: dropsToXrp(value).toString(),
    },
  }
--- a/packages/xrpl/src/utils/hashes/hashLedger.ts
+++ b/packages/xrpl/src/utils/hashes/hashLedger.ts
@@ -83,11 +83,7 @@ export function hashSignedTx(tx: Transaction | string): string {
    txObject = tx
  }

-  if (
-    !txObject.EmitDetails &&
-    txObject.TxnSignature === undefined &&
-    txObject.Signers === undefined
-  ) {
+  if (txObject.TxnSignature === undefined && txObject.Signers === undefined) {
    throw new ValidationError('The transaction must be signed to hash it.')
  }

--- a/packages/xrpl/src/utils/hashes/index.ts
+++ b/packages/xrpl/src/utils/hashes/index.ts
@@ -6,8 +6,6 @@
 import { decodeAccountID } from '@transia/ripple-address-codec'
 import BigNumber from 'bignumber.js'

-import { convertStringToHex } from '../stringConversion'
-
 import hashLedger, {
  hashLedgerHeader,
  hashSignedTx,
@@ -186,18 +184,4 @@ export function hashPaymentChannel(
  )
 }

-/**
- * Compute the Hash of an URIToken LedgerEntry.
- *
- * @param issuer - Address of the issuer of the URIToken.
- * @param uri - string uri of the URIToken (not the hex).
- * @returns The hash of the URIToken LedgerEntry.
- * @category Utilities
- */
-export function hashURIToken(issuer: string, uri: string): string {
-  return sha512Half(
-    ledgerSpaceHex('uriToken') + addressToHex(issuer) + convertStringToHex(uri),
-  )
-}
-
 export { hashLedgerHeader, hashSignedTx, hashLedger, hashStateTree, hashTxTree }
--- a/packages/xrpl/src/utils/hashes/ledgerSpaces.ts
+++ b/packages/xrpl/src/utils/hashes/ledgerSpaces.ts
@@ -28,7 +28,6 @@ const ledgerSpaces = {
  signerList: 'S',
  paychan: 'x',
  check: 'C',
-  uriToken: 'U',
  depositPreauth: 'p',
 }

--- a/packages/xrpl/src/utils/index.ts
+++ b/packages/xrpl/src/utils/index.ts
@@ -39,7 +39,6 @@ import {
  hashLedgerHeader,
  hashEscrow,
  hashPaymentChannel,
-  hashURIToken,
 } from './hashes'
 import { calculateHookOn, hexHookParameters, TTS } from './hooks'
 import parseNFTokenID from './parseNFTokenID'
@@ -174,7 +173,6 @@ const hashes = {
  hashLedgerHeader,
  hashEscrow,
  hashPaymentChannel,
-  hashURIToken,
 }

 export {
--- a/packages/xrpl/test/fixtures/requests/getOrderbookWithXrp.json
+++ b/packages/xrpl/test/fixtures/requests/getOrderbookWithXrp.json
@@ -4,6 +4,6 @@
    "issuer": "rp8rJYTpodf8qbSCHVTNacf8nSW8mRakFw"
  },
  "takerGets": {
-    "currency": "XAH"
+    "currency": "XRP"
  }
 }
--- a/packages/xrpl/test/fixtures/responses/getBalances.json
+++ b/packages/xrpl/test/fixtures/responses/getBalances.json
@@ -1,7 +1,7 @@
 [
  {
    "value": "922.913243",
-    "currency": "XAH"
+    "currency": "XRP"
  },
  {
    "value": "0",
--- a/packages/xrpl/test/fixtures/rippled/ledgerFull7501326.json
+++ b/packages/xrpl/test/fixtures/rippled/ledgerFull7501326.json
--- a/packages/xrpl/test/integration/requests/bookOffers.test.ts
+++ b/packages/xrpl/test/integration/requests/bookOffers.test.ts
@@ -25,7 +25,7 @@ describe('book_offers', function () {
      const bookOffer: BookOffersRequest = {
        command: 'book_offers',
        taker_gets: {
-          currency: 'XAH',
+          currency: 'XRP',
        },
        taker_pays: {
          currency: 'USD',
--- a/packages/xrpl/test/integration/transactions/signerListSet.test.ts
+++ b/packages/xrpl/test/integration/transactions/signerListSet.test.ts
@@ -18,9 +18,8 @@ describe('SignerListSet', function () {
  })
  afterEach(async () => teardownClient(testContext))

-  // Add signerlist
  it(
-    'add',
+    'base',
    async () => {
      const tx: SignerListSet = {
        TransactionType: 'SignerListSet',
@@ -45,18 +44,4 @@ describe('SignerListSet', function () {
    },
    TIMEOUT,
  )
-
-  // Remove signerlist
-  it(
-    'remove',
-    async () => {
-      const tx: SignerListSet = {
-        TransactionType: 'SignerListSet',
-        Account: testContext.wallet.classicAddress,
-        SignerQuorum: 0,
-      }
-      await testTransaction(testContext.client, tx, testContext.wallet)
-    },
-    TIMEOUT,
-  )
 })
--- a/packages/xrpl/test/models/setHook.test.ts
+++ b/packages/xrpl/test/models/setHook.test.ts
@@ -69,7 +69,7 @@ describe('SetHook', function () {
    )
  })

-  it(`throws w/ maximum of 10 members allowed in Hooks`, function () {
+  it(`throws w/ maximum of 4 members allowed in Hooks`, function () {
    setHookTx.Hooks = []
    const hook = {
      Hook: {
@@ -88,14 +88,8 @@ describe('SetHook', function () {
    setHookTx.Hooks.push(hook)
    setHookTx.Hooks.push(hook)
    setHookTx.Hooks.push(hook)
-    setHookTx.Hooks.push(hook)
-    setHookTx.Hooks.push(hook)
-    setHookTx.Hooks.push(hook)
-    setHookTx.Hooks.push(hook)
-    setHookTx.Hooks.push(hook)
-    setHookTx.Hooks.push(hook)

-    const errorMessage = 'SetHook: maximum of 10 hooks allowed in Hooks'
+    const errorMessage = 'SetHook: maximum of 4 hooks allowed in Hooks'
    assert.throws(
      () => validateSetHook(setHookTx),
      ValidationError,
--- a/packages/xrpl/test/models/trustSet.test.ts
+++ b/packages/xrpl/test/models/trustSet.test.ts
@@ -16,7 +16,7 @@ describe('TrustSet', function () {
      TransactionType: 'TrustSet',
      Account: 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo',
      LimitAmount: {
-        currency: 'XAH',
+        currency: 'XRP',
        issuer: 'rcXY84C4g14iFp6taFXjjQGVeHqSCh9RX',
        value: '4329.23',
      },
--- a/packages/xrpl/test/models/utils.test.ts
+++ b/packages/xrpl/test/models/utils.test.ts
@@ -118,7 +118,7 @@ describe('Models Utils', function () {
        TransactionType: 'TrustSet',
        Account: 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo',
        LimitAmount: {
-          currency: 'XAH',
+          currency: 'XRP',
          issuer: 'rcXY84C4g14iFp6taFXjjQGVeHqSCh9RX',
          value: '4329.23',
        },
--- a/packages/xrpl/test/utils/getBalanceChanges.test.ts
+++ b/packages/xrpl/test/utils/getBalanceChanges.test.ts
@@ -15,16 +15,16 @@ import trustlineSetLimit2 from '../fixtures/utils/trustlineSetLimit2.json'
 import trustlineSetLimitZero from '../fixtures/utils/trustlineSetLimitZero.json'

 describe('getBalanceChanges', function () {
-  it('XAH create account', function () {
+  it('XRP create account', function () {
    const result = getBalanceChanges(paymentXrpCreateAccount.metadata)
    const expected = [
      {
        account: 'rLDYrujdKUfVx28T9vRDAbyJ7G2WVXKo4K',
-        balances: [{ currency: 'XAH', value: '100' }],
+        balances: [{ currency: 'XRP', value: '100' }],
      },
      {
        account: 'rKmBGxocj9Abgy25J51Mk1iqFzW9aVF9Tc',
-        balances: [{ currency: 'XAH', value: '-100.012' }],
+        balances: [{ currency: 'XRP', value: '-100.012' }],
      },
    ]
    assert.deepStrictEqual(result, expected)
@@ -43,7 +43,7 @@ describe('getBalanceChanges', function () {
          },
          {
            value: '-0.012',
-            currency: 'XAH',
+            currency: 'XRP',
          },
        ],
      },
@@ -114,7 +114,7 @@ describe('getBalanceChanges', function () {
          },
          {
            value: '-0.012',
-            currency: 'XAH',
+            currency: 'XRP',
          },
        ],
      },
@@ -136,7 +136,7 @@ describe('getBalanceChanges', function () {
          },
          {
            value: '-0.012',
-            currency: 'XAH',
+            currency: 'XRP',
          },
        ],
      },
@@ -177,7 +177,7 @@ describe('getBalanceChanges', function () {
        balances: [
          {
            value: '-0.012',
-            currency: 'XAH',
+            currency: 'XRP',
          },
        ],
      },
@@ -197,7 +197,7 @@ describe('getBalanceChanges', function () {
            value: '10',
          },
          {
-            currency: 'XAH',
+            currency: 'XRP',
            value: '-0.012',
          },
        ],
@@ -224,7 +224,7 @@ describe('getBalanceChanges', function () {
        balances: [
          {
            value: '-0.012',
-            currency: 'XAH',
+            currency: 'XRP',
          },
        ],
      },
@@ -239,7 +239,7 @@ describe('getBalanceChanges', function () {
        account: 'rsApBGKJmMfExxZBrGnzxEXyq7TMhMRg4e',
        balances: [
          {
-            currency: 'XAH',
+            currency: 'XRP',
            value: '-0.00001',
          },
        ],
@@ -286,7 +286,7 @@ describe('getBalanceChanges', function () {
          },
          {
            value: '-0.012',
-            currency: 'XAH',
+            currency: 'XRP',
          },
        ],
      },
@@ -316,7 +316,7 @@ describe('getBalanceChanges', function () {
            value: '-100',
          },
          {
-            currency: 'XAH',
+            currency: 'XRP',
            value: '-0.00001',
          },
        ],
@@ -347,7 +347,7 @@ describe('getBalanceChanges', function () {
            value: '-200',
          },
          {
-            currency: 'XAH',
+            currency: 'XRP',
            value: '-0.00001',
          },
        ],
@@ -383,7 +383,7 @@ describe('getBalanceChanges', function () {
            value: '-100',
          },
          {
-            currency: 'XAH',
+            currency: 'XRP',
            value: '-0.00001',
          },
          {
--- a/packages/xrpl/test/utils/hashes.test.ts
+++ b/packages/xrpl/test/utils/hashes.test.ts
@@ -15,7 +15,6 @@ import {
  hashAccountRoot,
  hashOfferId,
  hashSignerListId,
-  hashURIToken,
 } from '../../src/utils/hashes'
 import fixtures from '../fixtures/rippled'
 import { assertResultMatch } from '../testUtils'
@@ -144,16 +143,6 @@ describe('Hashes', function () {
    assert.equal(actualEntryHash, expectedEntryHash)
  })

-  it('calcURITokenEntryHash', function () {
-    const issuer = 'rDx69ebzbowuqztksVDmZXjizTd12BVr4x'
-    const uri = 'ipfs://cid'
-    const expectedEntryHash =
-      'AFC4233E5C4094952DEF5483DC41488C8744D1268F897C0CB25DE66399591399'
-    const actualEntryHash = hashURIToken(issuer, uri)
-
-    assert.equal(actualEntryHash, expectedEntryHash)
-  })
-
  it('Hash a signed transaction correctly', function () {
    const expected_hash =
      '458101D51051230B1D56E9ACAFAA34451BF65FA000F95DF6F0FF5B3A62D83FC2'
--- a/packages/xrpl/test/wallet/index.test.ts
+++ b/packages/xrpl/test/wallet/index.test.ts
@@ -757,13 +757,13 @@ describe('Wallet', function () {
    it('sign throws when a payment contains an issued currency like XRP', async function () {
      const payment: Payment = { ...issuedCurrencyPayment }
      payment.Amount = {
-        currency: 'xah',
+        currency: 'xrp',
        issuer: 'rnURbz5HLbvqEq69b1B4TX6cUTNMmcrBqi',
        value: '123.40',
      }
      assert.throws(() => {
        wallet.sign(payment)
-      }, /^Trying to sign an issued currency with a similar standard code to XAH \(received 'xah'\)\. XAH is not an issued currency\./u)
+      }, /^Trying to sign an issued currency with a similar standard code to XRP \(received 'xrp'\)\. XRP is not an issued currency\./u)
    })

    it('sign does NOT throw when a payment contains an issued currency like xrp in hex string format', async function () {
Author	SHA1	Message	Date
Denis Angell	2698f5f645	Merge branch 'transia-hooks' into iouescrow-tmp	2023-06-14 23:09:43 +00:00
Denis Angell	41f694b137	Merge branch 'transia-hooks' into iouescrow-tmp	2023-06-14 23:01:48 +00:00
Denis Angell	a4c64c8b26	Merge branch 'transia-hooks' into iouescrow-tmp	2023-06-14 22:57:05 +00:00
Denis Angell	ccde41b949	Merge branch 'transia-hooks' into iouescrow-tmp	2023-06-14 22:41:22 +00:00
Denis Angell	145940c010	Merge branch 'transia-hooks' into iouescrow-tmp	2023-06-14 19:46:05 +00:00
Denis Angell	b8b6e91a96	sync definitions w/ hooks	2023-06-14 19:44:01 +00:00
Denis Angell	fa599162d2	fixup! reorder definitions	2023-06-14 19:40:28 +00:00
Denis Angell	0a0f5afb66	fixup! prepare for nth clash in definitions.json	2023-06-14 19:39:49 +00:00
Denis Angell	424a2533bc	fixup: definitions `tecPRECISION_LOSS`	2023-06-14 19:39:38 +00:00
Denis Angell	c7018d6dad	fixup! update Amount & Balance	2023-06-14 19:38:26 +00:00
Denis Angell	9b4a202c78	docstring: replace XRP with amounts	2023-06-14 19:38:14 +00:00
Denis Angell	6f4984acd6	fixup! remove faucet	2023-06-14 19:38:03 +00:00
Denis Angell	94cf02dbb7	reverse else order	2023-06-14 19:37:50 +00:00
Denis Angell	ca773ae876	update validation error response	2023-06-14 19:37:33 +00:00
Denis Angell	e5a2323d7c	faucet wallet integration test	2023-06-14 19:37:17 +00:00
Denis Angell	cbac35ab43	update docstrings	2023-06-14 19:37:03 +00:00
Denis Angell	1ef14433b7	fix `ClaimObject`	2023-06-14 19:36:49 +00:00
Denis Angell	0d1eea1667	add faucet test	2023-02-14 19:42:29 -05:00
Denis Angell	c9852eb1a3	update faucet	2023-02-14 19:42:21 -05:00
Denis Angell	147f7be7f6	remove `XRP` references to amount	2023-02-14 19:40:18 -05:00
Denis Angell	3b19974634	fix docstring errors	2023-02-09 11:19:50 -05:00
Denis Angell	b7283c5841	refactor `signingClaimData`	2023-02-09 11:19:36 -05:00
Denis Angell	c8d24d65f5	Merge branch 'main' into iouescrow	2023-02-06 10:56:50 -05:00
Denis Angell	e712d8fd8c	remove integration testing	2023-02-06 10:48:27 -05:00
Denis Angell	8fbcb20129	remove redundant check	2023-02-06 10:30:18 -05:00
Denis Angell	a679128f02	rename IC to Token	2023-02-06 10:19:01 -05:00
Denis Angell	9f15deed15	update fund wallet url	2023-02-06 10:18:09 -05:00
Denis Angell	9b540c89f0	update docstrings	2023-02-06 10:17:47 -05:00
dangell7	5541632b7f	amendment-xls34d add transfer rate Update definitions.json update test error text update validation error fix undefined validation switch claim signing order, update claim object update workflow docker tests (paychan + escrow) add ic gateway (test) add faucet update sdk fixup git-workflow	2023-02-06 09:19:49 -05:00
				`@@ -1 +0,0 @@`
				`"120068240000000026006D2E00684000000000000000730081140000000000000000000000000000000000000000E05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655E1"`
				`@@ -1 +0,0 @@`
				"201C00000000F8E51100525661E32E7A24A238F1C619D5F9DDCC41A94B33B66C0163F7EFCC8A19C9FD6F28DCE6F05FE05F7121ED3ABC6740983BFB13FFD9728EBCC365A2877877D368FC28990819522300C92A698114A53F8465478D79DC0C764F0FB2B67AE92465FD5EE1E05F7121ED49F82B2FFD537F224A1E0A10DEEFC3C25CE3882979E6B327C9F18603D21F0A2281142BF2A77E25382EC1DEF521D81D24BC0FDD35BC9BE1E05F7121ED79EB0F6A9F01A039235E536D19F812B55ACF540C9E22CF62C271E0D42BFF51748114C45147960400DB6B763110CBCE8D641E9365F24EE1E05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655811408BCFB092DEE1BF0F2662AECE4DCC62C4AECCB8AE1E05F7121ED96F581FED430E8CBE1F08B37408857001D4118D49FBB594B0BE007C2DBFFD3678114A4EF485B50A7D91DF45450A680FAC31C53367B2DE1E05F7121EDCF31B8F683345E1C49B4A1D85BF2731E55E7D6781F3D4BF45EE7ADF2D2FB340281144D854497B48F1A41EF04E09DB656A11AAD01A703E1E05F7121EDDF197FC59A7FAA09EB1AD60A4638BA6201DD51497B5C08A1745115098E229E0E811446550CBD2B655081662AE3159B0488DE27EC0592E1F1E1E72200000000F05EE05E7121ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860811478339DD5880A994A5CB6E56CB7ED13FEEF201928E1F1F05FE05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655811408BCFB092DEE1BF0F2662AECE4DCC62C4AECCB8AE1F1E1E1F1031000"