Merge branch 'transia-hooks' into denis-uritoken

revert transactors

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",

packages/ripple-binary-codec/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transia/ripple-binary-codec",
-  "version": "1.4.6-alpha.5",
+  "version": "1.4.6-alpha.1",
   "description": "XRP Ledger binary codec",
   "files": [
     "dist/*",

packages/ripple-binary-codec/src/binary.ts

@@ -15,7 +15,6 @@ import { STObject } from './types/st-object'
 import { JsonObject } from './types/serialized-type'
 import { Buffer } from 'buffer/'
 import bigInt = require('big-integer')
-import { AmountObject } from './types/amount'
 
 /**
  * Construct a BinaryParser
@@ -123,7 +122,7 @@ function signingData(
  */
 interface ClaimObject extends JsonObject {
   channel: string
-  amount: AmountObject
+  amount: string | number
 }
 
 /**
@@ -134,19 +133,16 @@ interface ClaimObject extends JsonObject {
  * @returns the serialized object with appropriate prefix
  */
 function signingClaimData(claim: ClaimObject): Buffer {
+  const num = bigInt(String(claim.amount))
   const prefix = HashPrefix.paymentChannelClaim
   const channel = coreTypes.Hash256.from(claim.channel).toBytes()
+  const amount = coreTypes.UInt64.from(num).toBytes()
+
   const bytesList = new BytesList()
+
   bytesList.put(prefix)
   bytesList.put(channel)
-  if (typeof claim.amount === 'string') {
+  bytesList.put(amount)
-    const num = bigInt(String(claim.amount))
-    const amount = coreTypes.UInt64.from(num).toBytes()
-    bytesList.put(amount)
-  } else {
-    const amount = coreTypes.Amount.from(claim.amount).toBytes()
-    bytesList.put(amount)
-  }
   return bytesList.toBytes()
 }
 

packages/ripple-binary-codec/src/enums/definitions.json

@@ -37,7 +37,6 @@
     "LedgerHashes": 104,
     "Amendments": 102,
     "FeeSettings": 115,
-    "ImportVlseq": 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": {
@@ -2581,7 +2399,6 @@
     "tefNO_TICKET": -180,
     "tefNFTOKEN_IS_NOT_TRANSFERABLE": -179,
     "tefPAST_IMPORT_SEQ": -178,
-    "tefPAST_IMPORT_VL_SEQ": -177,
 
     "terRETRY": -99,
     "terFUNDS_SPENT": -98,
@@ -2709,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,
+    "EmitFailure": 103
-    "UNLReport": 104
   }
 }

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 {

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',

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)
 })

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,

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
         }
     ]

packages/ripple-binary-codec/test/fixtures/unl-report-binary.json

@@ -1 +0,0 @@
-"120068240000000026006D2E00684000000000000000730081140000000000000000000000000000000000000000E05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655E1"

packages/ripple-binary-codec/test/fixtures/unl-report-meta-binary.json

@@ -1 +0,0 @@
-"201C00000000F8E51100525661E32E7A24A238F1C619D5F9DDCC41A94B33B66C0163F7EFCC8A19C9FD6F28DCE6F05FE05F7121ED3ABC6740983BFB13FFD9728EBCC365A2877877D368FC28990819522300C92A698114A53F8465478D79DC0C764F0FB2B67AE92465FD5EE1E05F7121ED49F82B2FFD537F224A1E0A10DEEFC3C25CE3882979E6B327C9F18603D21F0A2281142BF2A77E25382EC1DEF521D81D24BC0FDD35BC9BE1E05F7121ED79EB0F6A9F01A039235E536D19F812B55ACF540C9E22CF62C271E0D42BFF51748114C45147960400DB6B763110CBCE8D641E9365F24EE1E05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655811408BCFB092DEE1BF0F2662AECE4DCC62C4AECCB8AE1E05F7121ED96F581FED430E8CBE1F08B37408857001D4118D49FBB594B0BE007C2DBFFD3678114A4EF485B50A7D91DF45450A680FAC31C53367B2DE1E05F7121EDCF31B8F683345E1C49B4A1D85BF2731E55E7D6781F3D4BF45EE7ADF2D2FB340281144D854497B48F1A41EF04E09DB656A11AAD01A703E1E05F7121EDDF197FC59A7FAA09EB1AD60A4638BA6201DD51497B5C08A1745115098E229E0E811446550CBD2B655081662AE3159B0488DE27EC0592E1F1E1E72200000000F05EE05E7121ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860811478339DD5880A994A5CB6E56CB7ED13FEEF201928E1F1F05FE05F7121ED93B2BE467CAD2F9F56FB3A82BDFF17F84B09E34232DDE8FAF2FC72382F142655811408BCFB092DEE1BF0F2662AECE4DCC62C4AECCB8AE1F1E1E1F1031000"

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"
-  }
-}

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'

packages/ripple-binary-codec/test/signing-data-encoding.test.js

@@ -170,7 +170,59 @@ describe('Signing data', function () {
       ].join(''),
     )
   })
-  test('can create native claim blob', function () {
+
+  test('can create multi signing blobs with custom definitions', function () {
+    const customPaymentDefinitions = JSON.parse(
+      JSON.stringify(normalDefinitions),
+    )
+    customPaymentDefinitions.TRANSACTION_TYPES.Payment = 31
+
+    const newDefs = new XrplDefinitions(customPaymentDefinitions)
+    const signingAccount = 'rJZdUusLDtY9NEsGea7ijqhVrXv98rYBYN'
+    const signingJson = { ...tx_json, SigningPubKey: '' }
+    const actual = encodeForMultisigning(signingJson, signingAccount, newDefs)
+    expect(actual).toBe(
+      [
+        '534D5400', // signingPrefix
+        // TransactionType
+        '12',
+        '001F',
+        // Flags
+        '22',
+        '80000000',
+        // Sequence
+        '24',
+        '00000001',
+        // Amount
+        '61',
+        // native amount
+        '40000000000003E8',
+        // Fee
+        '68',
+        // native amount
+        '400000000000000A',
+        // SigningPubKey
+        '73',
+        // VLLength
+        '00',
+        // '',
+        // Account
+        '81',
+        // VLLength
+        '14',
+        '5B812C9D57731E27A2DA8B1830195F88EF32A3B6',
+        // Destination
+        '83',
+        // VLLength
+        '14',
+        'B5F762798A53D543A014CAF8B297CFF8F2F937E8',
+        // signingAccount suffix
+        'C0A5ABEF242802EFED4B041E8F2D4A8CC86AE3D1',
+      ].join(''),
+    )
+  })
+
+  test('can create claim blob', function () {
     const channel =
       '43904CBFCDCEC530B4037871F86EE90BF799DF8D2E0EA564BC8A3F332E4F5FB1'
     const amount = '1000'
@@ -187,27 +239,4 @@ describe('Signing data', function () {
       ].join(''),
     )
   })
-  test('can create ic claim blob', function () {
-    const channel =
-      '43904CBFCDCEC530B4037871F86EE90BF799DF8D2E0EA564BC8A3F332E4F5FB1'
-    const amount = {
-      issuer: 'rJZdUusLDtY9NEsGea7ijqhVrXv98rYBYN',
-      currency: 'USD',
-      value: '10',
-    }
-    const json = { channel, amount }
-    const actual = encodeForSigningClaim(json)
-    expect(actual).toBe(
-      [
-        // hash prefix
-        '434C4D00',
-        // channel ID
-        '43904CBFCDCEC530B4037871F86EE90BF799DF8D2E0EA564BC8A3F332E4F5FB1',
-        // amount as a uint64
-        'D4C38D7EA4C680000000000000000000000000005553440000000000C0A5ABEF',
-        // amount as a uint64
-        '242802EFED4B041E8F2D4A8CC86AE3D1',
-      ].join(''),
-    )
-  })
 })

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',

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)

packages/xrpl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transia/xrpl",
-  "version": "2.7.3-alpha.18",
+  "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.5",
+    "@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"
 }

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,

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)
   }

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
-}

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
 }
 
 /**

packages/xrpl/src/models/ledger/Escrow.ts

@@ -1,9 +1,7 @@
-import { Amount } from '../common'
-
 import BaseLedgerEntry from './BaseLedgerEntry'
 
 /**
- * The Escrow object type represents a held payment waiting to be
+ * The Escrow object type represents a held payment of XRP waiting to be
  * executed or canceled.
  *
  * @category Ledger Entries
@@ -12,17 +10,17 @@ export default interface Escrow extends BaseLedgerEntry {
   LedgerEntryType: 'Escrow'
   /**
    * The address of the owner (sender) of this held payment. This is the
-   * account that provided the amounts, and gets it back if the held payment is
+   * account that provided the XRP, and gets it back if the held payment is
    * canceled.
    */
   Account: string
   /**
-   * The destination address where the amounts are paid if the held payment is
+   * The destination address where the XRP is paid if the held payment is
    * successful.
    */
   Destination: string
-  /** The amount to be delivered by the held payment. */
+  /** The amount of XRP, in drops, to be delivered by the held payment. */
-  Amount: Amount
+  Amount: string
   /**
    * A PREIMAGE-SHA-256 crypto-condition, as hexadecimal. If present, the
    * EscrowFinish transaction must contain a fulfillment that satisfies this
@@ -73,9 +71,4 @@ export default interface Escrow extends BaseLedgerEntry {
    * modified this object.
    */
   PreviousTxnLgrSeq: number
-  /**
-   * The fee to charge when users finish an escrow, initially set on the
-   * creation of an escrow contract, and updated on subsequent finish transactions
-   */
-  TransferRate?: number
 }

packages/xrpl/src/models/ledger/FeeSettings.ts

@@ -24,6 +24,4 @@ export default interface FeeSettings extends BaseLedgerEntry {
    * type.
    */
   Flags: number
-  XahauActivationLgrSeq?: number
-  AccountCount?: number
 }

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
-}

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

packages/xrpl/src/models/ledger/PayChannel.ts

@@ -1,11 +1,9 @@
-import { Amount } from '../common'
-
 import BaseLedgerEntry from './BaseLedgerEntry'
 
 /**
  * The PayChannel object type represents a payment channel. Payment channels
- * enable small, rapid off-ledger payments that can be later reconciled
+ * enable small, rapid off-ledger payments of XRP that can be later reconciled
- * with the consensus ledger. A payment channel holds a balance that can
+ * with the consensus ledger. A payment channel holds a balance of XRP that can
  * only be paid out to a specific destination address until the channel is
  * closed.
  *
@@ -20,37 +18,37 @@ export default interface PayChannel extends BaseLedgerEntry {
   Account: string
   /**
    * The destination address for this payment channel. While the payment
-   * channel is open, this address is the only one that can receive amounts from the
+   * channel is open, this address is the only one that can receive XRP from the
    * channel. This comes from the Destination field of the transaction that
    * created the channel.
    */
   Destination: string
   /**
-   * Total amount that has been allocated to this channel. This includes amounts
+   * Total XRP, in drops, that has been allocated to this channel. This
-   * that have been paid to the destination address. This is initially set by the
+   * includes XRP that has been paid to the destination address. This is
-   * transaction that created the channel and can be increased if the source
+   * initially set by the transaction that created the channel and can be
-   * address sends a PaymentChannelFund transaction.
+   * increased if the source address sends a PaymentChannelFund transaction.
    */
-  Amount: Amount
+  Amount: string
   /**
-   * Total amount already paid out by the channel. The difference between this value
+   * Total XRP, in drops, already paid out by the channel. The difference
-   * and the Amount field is how much can still be paid to the destination address
+   * between this value and the Amount field is how much XRP can still be paid
-   * with PaymentChannelClaim transactions. If the channel closes, the remaining
+   * to the destination address with PaymentChannelClaim transactions. If the
-   * difference is returned to the source address.
+   * channel closes, the remaining difference is returned to the source address.
    */
-  Balance: Amount
+  Balance: string
   /**
    * Public key, in hexadecimal, of the key pair that can be used to sign
    * claims against this channel. This can be any valid secp256k1 or Ed25519
    * public key. This is set by the transaction that created the channel and
    * must match the public key used in claims against the channel. The channel
-   * source address can also send amounts from this channel to the destination
+   * source address can also send XRP from this channel to the destination
    * without signed claims.
    */
   PublicKey: string
   /**
    * Number of seconds the source address must wait to close the channel if
-   * it still has any amount in it. Smaller values mean that the destination
+   * it still has any XRP in it. Smaller values mean that the destination
    * address has less time to redeem any outstanding claims after the source
    * address requests to close the channel. Can be any value that fits in a
    * 32-bit unsigned integer (0 to 2^32-1). This is set by the transaction that
@@ -106,10 +104,4 @@ export default interface PayChannel extends BaseLedgerEntry {
    * this object, in case the directory consists of multiple pages.
    */
   DestinationNode?: string
-  /**
-   * The fee to charge when users make claims on a payment channel, initially
-   * set on the creation of a payment channel and updated on subsequent funding
-   * or claim transactions.
-   */
-  TransferRate?: number
 }

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
-}

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
-}

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,
 }

packages/xrpl/src/models/methods/accountChannels.ts

@@ -1,10 +1,10 @@
-import { Amount, LedgerIndex } from '../common'
+import { LedgerIndex } from '../common'
 
 import { BaseRequest, BaseResponse } from './baseMethod'
 
 interface Channel {
   account: string
-  amount: Amount
+  amount: string
   balance: string
   channel_id: string
   destination_account: string
@@ -15,7 +15,6 @@ interface Channel {
   cancel_after?: number
   source_tab?: number
   destination_tag?: number
-  transfer_rate?: number
 }
 
 /**

packages/xrpl/src/models/methods/accountLines.ts

@@ -1,4 +1,4 @@
-import { Amount, LedgerIndex } from '../common'
+import { LedgerIndex } from '../common'
 
 import { BaseRequest, BaseResponse } from './baseMethod'
 
@@ -64,14 +64,6 @@ export interface Trustline {
    * false.
    */
   freeze_peer?: boolean
-  /**
-   * The total amount of FT, in drops/Amount locked in payment channels or escrow.
-   */
-  locked_balance?: Amount
-  /**
-   * The total number of lock balances on a RippleState ledger object.
-   */
-  lock_count?: number
 }
 
 /**

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}.

packages/xrpl/src/models/methods/channelVerify.ts

@@ -9,7 +9,7 @@ import { BaseRequest, BaseResponse } from './baseMethod'
  */
 export interface ChannelVerifyRequest extends BaseRequest {
   command: 'channel_verify'
-  /** The amount the provided signature authorizes. */
+  /** The amount of XRP, in drops, the provided signature authorizes. */
   amount: string
   /**
    * The Channel ID of the channel that provides the XRP. This is a

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
+   * The hash of the Hook object to retrieve.
-   * URIToken, as hexadecimal. If an object, the `issuer` and `uri`
-   * sub-fields are required to uniquely specify the URIToken entry.
    */
-  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. */
+        /** The account of the Hook object. */
-        issuer: string
+        account: string
-        /** The URIToken uri string (ascii). */
-        uri: 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
+  }
 }
 
 /**

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 */

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')
-  }
-}

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
 }
 
 /**

packages/xrpl/src/models/transactions/escrowCancel.ts

@@ -3,7 +3,7 @@ import { ValidationError } from '../../errors'
 import { BaseTransaction, validateBaseTransaction } from './common'
 
 /**
- * Return escrowed amount to the sender.
+ * Return escrowed XRP to the sender.
  *
  * @category Transaction Models
  */

packages/xrpl/src/models/transactions/escrowCreate.ts

@@ -1,23 +1,22 @@
 /* eslint-disable complexity -- Necessary for validateEscrowCreate */
 import { ValidationError } from '../../errors'
-import { Amount } from '../common'
 
-import { BaseTransaction, isAmount, validateBaseTransaction } from './common'
+import { BaseTransaction, validateBaseTransaction } from './common'
 
 /**
- * Sequester amount until the escrow process either finishes or is canceled.
+ * Sequester XRP until the escrow process either finishes or is canceled.
  *
  * @category Transaction Models
  */
 export interface EscrowCreate extends BaseTransaction {
   TransactionType: 'EscrowCreate'
   /**
-   * Amount to deduct from the sender's balance and escrow. Once escrowed, the
+   * Amount of XRP, in drops, to deduct from the sender's balance and escrow.
-   * amount can either go to the Destination address (after the FinishAfter time)
+   * Once escrowed, the XRP can either go to the Destination address (after the.
-   * or returned to the sender (after the CancelAfter time).
+   * FinishAfter time) or returned to the sender (after the CancelAfter time).
    */
-  Amount: Amount
+  Amount: string
-  /** Address to receive escrowed amount. */
+  /** Address to receive escrowed XRP. */
   Destination: string
   /**
    * The time, in seconds since the Ripple Epoch, when this escrow expires.
@@ -26,7 +25,7 @@ export interface EscrowCreate extends BaseTransaction {
    */
   CancelAfter?: number
   /**
-   * The time, in seconds since the Ripple Epoch, when the escrowed amount can be
+   * The time, in seconds since the Ripple Epoch, when the escrowed XRP can be
    * released to the recipient. This value is immutable; the funds cannot move.
    * until this time is reached.
    */
@@ -56,8 +55,8 @@ export function validateEscrowCreate(tx: Record<string, unknown>): void {
     throw new ValidationError('EscrowCreate: missing field Amount')
   }
 
-  if (typeof tx.Amount !== 'string' && !isAmount(tx.Amount)) {
+  if (typeof tx.Amount !== 'string') {
-    throw new ValidationError('EscrowCreate: Amount must be an Amount')
+    throw new ValidationError('EscrowCreate: Amount must be a string')
   }
 
   if (tx.Destination === undefined) {

packages/xrpl/src/models/transactions/escrowFinish.ts

@@ -3,7 +3,7 @@ import { ValidationError } from '../../errors'
 import { BaseTransaction, validateBaseTransaction } from './common'
 
 /**
- * Deliver amount from a held payment to the recipient.
+ * Deliver XRP from a held payment to the recipient.
  *
  * @category Transaction Models
  */

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')
-  }
 }

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'

packages/xrpl/src/models/transactions/metadata.ts

@@ -8,7 +8,7 @@ export interface HookExecution {
     HookHash: string
     HookInstructionCount: string
     HookResult: number
-    HookReturnCode: string
+    HookReturnCode: number
     HookReturnString: string
     HookStateChangeCount: number
   }

packages/xrpl/src/models/transactions/paymentChannelClaim.ts

@@ -1,13 +1,7 @@
 /* eslint-disable complexity -- Necessary for validatePaymentChannelClaim */
 import { ValidationError } from '../../errors'
-import { Amount } from '../common'
 
-import {
+import { BaseTransaction, GlobalFlags, validateBaseTransaction } from './common'
-  BaseTransaction,
-  GlobalFlags,
-  validateBaseTransaction,
-  isAmount,
-} from './common'
 
 /**
  * Enum representing values for PaymentChannelClaim transaction flags.
@@ -24,15 +18,15 @@ export enum PaymentChannelClaimFlags {
   /**
    * Request to close the channel. Only the channel source and destination
    * addresses can use this flag. This flag closes the channel immediately if it
-   * has no more funds allocated to it after processing the current claim, or if
+   * has no more XRP allocated to it after processing the current claim, or if
    * the destination address uses it. If the source address uses this flag when
-   * the channel still holds an amount, this schedules the channel to close after
+   * the channel still holds XRP, this schedules the channel to close after
    * SettleDelay seconds have passed. (Specifically, this sets the Expiration of
    * the channel to the close time of the previous ledger plus the channel's
    * SettleDelay time, unless the channel already has an earlier Expiration
    * time.) If the destination address uses this flag when the channel still
-   * holds an amount, any amount that remains after processing the claim is
+   * holds XRP, any XRP that remains after processing the claim is returned to
-   * returned to the source address.
+   * the source address.
    */
   tfClose = 0x00020000,
 }
@@ -84,21 +78,21 @@ export interface PaymentChannelClaimFlagsInterface extends GlobalFlags {
   /**
    * Request to close the channel. Only the channel source and destination
    * addresses can use this flag. This flag closes the channel immediately if it
-   * has no more funds allocated to it after processing the current claim, or if
+   * has no more XRP allocated to it after processing the current claim, or if
    * the destination address uses it. If the source address uses this flag when
-   * the channel still holds an amount, this schedules the channel to close after
+   * the channel still holds XRP, this schedules the channel to close after
    * SettleDelay seconds have passed. (Specifically, this sets the Expiration of
    * the channel to the close time of the previous ledger plus the channel's
    * SettleDelay time, unless the channel already has an earlier Expiration
    * time.) If the destination address uses this flag when the channel still
-   * holds an amount, any amount that remains after processing the claim is
+   * holds XRP, any XRP that remains after processing the claim is returned to
-   * returned to the source address.
+   * the source address.
    */
   tfClose?: boolean
 }
 
 /**
- * Claim amount from a payment channel, adjust the payment channel's expiration,
+ * Claim XRP from a payment channel, adjust the payment channel's expiration,
  * or both.
  *
  * @category Transaction Models
@@ -109,18 +103,18 @@ export interface PaymentChannelClaim extends BaseTransaction {
   /** The unique ID of the channel as a 64-character hexadecimal string. */
   Channel: string
   /**
-   * Total amount delivered by this channel after processing this claim. Required
+   * Total amount of XRP, in drops, delivered by this channel after processing
-   * to deliver amount. Must be more than the total amount delivered by the channel
+   * this claim. Required to deliver XRP. Must be more than the total amount
-   * so far, but not greater than the Amount of the signed claim. Must be provided
+   * delivered by the channel so far, but not greater than the Amount of the
-   * except when closing the channel.
+   * signed claim. Must be provided except when closing the channel.
    */
-  Balance?: Amount
+  Balance?: string
   /**
-   * The amount authorized by the Signature. This must match the amount in the
+   * The amount of XRP, in drops, authorized by the Signature. This must match
-   * signed message. This is the cumulative amount that can be dispensed by the
+   * the amount in the signed message. This is the cumulative amount of XRP that
-   * channel, including amounts previously redeemed. Required unless closing the channel.
+   * can be dispensed by the channel, including XRP previously redeemed.
    */
-  Amount?: Amount
+  Amount?: string
   /**
    * The signature of this claim, as hexadecimal. The signed message contains
    * the channel ID and the amount of the claim. Required unless the sender of
@@ -153,12 +147,12 @@ export function validatePaymentChannelClaim(tx: Record<string, unknown>): void {
     throw new ValidationError('PaymentChannelClaim: Channel must be a string')
   }
 
-  if (tx.Balance !== undefined && !isAmount(tx.Balance)) {
+  if (tx.Balance !== undefined && typeof tx.Balance !== 'string') {
-    throw new ValidationError('PaymentChannelClaim: Balance must be an Amount')
+    throw new ValidationError('PaymentChannelClaim: Balance must be a string')
   }
 
-  if (tx.Amount !== undefined && !isAmount(tx.Amount)) {
+  if (tx.Amount !== undefined && typeof tx.Amount !== 'string') {
-    throw new ValidationError('PaymentChannelClaim: Amount must be an Amount')
+    throw new ValidationError('PaymentChannelClaim: Amount must be a string')
   }
 
   if (tx.Signature !== undefined && typeof tx.Signature !== 'string') {

packages/xrpl/src/models/transactions/paymentChannelCreate.ts

@@ -1,11 +1,10 @@
 /* eslint-disable complexity -- Necessary for validatePaymentChannelCreate */
 import { ValidationError } from '../../errors'
-import { Amount } from '../common'
 
-import { BaseTransaction, validateBaseTransaction, isAmount } from './common'
+import { BaseTransaction, validateBaseTransaction } from './common'
 
 /**
- * Create a unidirectional channel and fund it. The address sending
+ * Create a unidirectional channel and fund it with XRP. The address sending
  * this transaction becomes the "source address" of the payment channel.
  *
  * @category Transaction Models
@@ -13,20 +12,20 @@ import { BaseTransaction, validateBaseTransaction, isAmount } from './common'
 export interface PaymentChannelCreate extends BaseTransaction {
   TransactionType: 'PaymentChannelCreate'
   /**
-   * Amount to deduct from the sender's balance and set aside in this channel.
+   * Amount of XRP, in drops, to deduct from the sender's balance and set aside
-   * While the channel is open, the amount can only go to the Destination
+   * in this channel. While the channel is open, the XRP can only go to the
-   * address. When the channel closes, any unclaimed amount is returned to
+   * Destination address. When the channel closes, any unclaimed XRP is returned
-   * the source address's balance.
+   * to the source address's balance.
    */
-  Amount: Amount
+  Amount: string
   /**
-   * Address to receive claims against this channel. This is also known as
+   * Address to receive XRP claims against this channel. This is also known as
    * the "destination address" for the channel.
    */
   Destination: string
   /**
    * Amount of time the source address must wait before closing the channel if
-   * it has unclaimed amount.
+   * it has unclaimed XRP.
    */
   SettleDelay: number
   /**
@@ -66,8 +65,8 @@ export function validatePaymentChannelCreate(
     throw new ValidationError('PaymentChannelCreate: missing Amount')
   }
 
-  if (typeof tx.Amount !== 'string' && !isAmount(tx.Amount)) {
+  if (typeof tx.Amount !== 'string') {
-    throw new ValidationError('PaymentChannelCreate: Amount must be an Amount')
+    throw new ValidationError('PaymentChannelCreate: Amount must be a string')
   }
 
   if (tx.Destination === undefined) {

packages/xrpl/src/models/transactions/paymentChannelFund.ts

@@ -1,10 +1,9 @@
 import { ValidationError } from '../../errors'
-import { Amount } from '../common'
 
-import { BaseTransaction, validateBaseTransaction, isAmount } from './common'
+import { BaseTransaction, validateBaseTransaction } from './common'
 
 /**
- * Add additional amount to an open payment channel, and optionally update the
+ * Add additional XRP to an open payment channel, and optionally update the
  * expiration time of the channel. Only the source address of the channel can
  * use this transaction.
  *
@@ -18,15 +17,16 @@ export interface PaymentChannelFund extends BaseTransaction {
    */
   Channel: string
   /**
-   * Amount to add to the channel. Must be a positive amount
+   * Amount of XRP in drops to add to the channel. Must be a positive amount
+   * of XRP.
    */
-  Amount: Amount
+  Amount: string
   /**
    * New Expiration time to set for the channel in seconds since the Ripple
    * Epoch. This must be later than either the current time plus the SettleDelay
    * of the channel, or the existing Expiration of the channel. After the
    * Expiration time, any transaction that would access the channel closes the
-   * channel without taking its normal action. Any unspent amount is returned to
+   * channel without taking its normal action. Any unspent XRP is returned to
    * the source address when the channel closes. (Expiration is separate from
    * the channel's immutable CancelAfter time.) For more information, see the
    * PayChannel ledger object type.
@@ -55,8 +55,8 @@ export function validatePaymentChannelFund(tx: Record<string, unknown>): void {
     throw new ValidationError('PaymentChannelFund: missing Amount')
   }
 
-  if (typeof tx.Amount !== 'string' && !isAmount(tx.Amount)) {
+  if (typeof tx.Amount !== 'string') {
-    throw new ValidationError('PaymentChannelFund: Amount must be an Amount')
+    throw new ValidationError('PaymentChannelFund: Amount must be a string')
   }
 
   if (tx.Expiration !== undefined && typeof tx.Expiration !== 'number') {

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
 
 /**

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')
   }

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'
@@ -72,7 +71,6 @@ export type Transaction =
   | CheckCancel
   | CheckCash
   | CheckCreate
-  | ClaimReward
   | DepositPreauth
   | EscrowCancel
   | EscrowCreate
@@ -148,10 +146,6 @@ export function validate(transaction: Record<string, unknown>): void {
       validateCheckCreate(tx)
       break
 
-    case 'ClaimReward':
-      validateClaimReward(tx)
-      break
-
     case 'DepositPreauth':
       validateDepositPreauth(tx)
       break

packages/xrpl/src/models/transactions/uriTokenMint.ts

@@ -1,5 +1,4 @@
 import { ValidationError } from '../../errors'
-import { Amount } from '../common'
 import { isHex } from '../utils'
 
 import { BaseTransaction, GlobalFlags, validateBaseTransaction } from './common'
@@ -75,23 +74,6 @@ export interface URITokenMint extends BaseTransaction {
    */
   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
 }
 

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)
     },

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(),
     },
   }

packages/xrpl/src/utils/hashes/hashLedger.ts

@@ -83,11 +83,7 @@ export function hashSignedTx(tx: Transaction | string): string {
     txObject = tx
   }
 
-  if (
+  if (txObject.TxnSignature === undefined && txObject.Signers === undefined) {
-    !txObject.EmitDetails &&
-    txObject.TxnSignature === undefined &&
-    txObject.Signers === undefined
-  ) {
     throw new ValidationError('The transaction must be signed to hash it.')
   }
 

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 }

packages/xrpl/src/utils/hashes/ledgerSpaces.ts

@@ -28,7 +28,6 @@ const ledgerSpaces = {
   signerList: 'S',
   paychan: 'x',
   check: 'C',
-  uriToken: 'U',
   depositPreauth: 'p',
 }
 

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 {

packages/xrpl/test/fixtures/requests/getOrderbookWithXrp.json

@@ -4,6 +4,6 @@
     "issuer": "rp8rJYTpodf8qbSCHVTNacf8nSW8mRakFw"
   },
   "takerGets": {
-    "currency": "XAH"
+    "currency": "XRP"
   }
 }

packages/xrpl/test/fixtures/responses/getBalances.json

@@ -1,7 +1,7 @@
 [
   {
     "value": "922.913243",
-    "currency": "XAH"
+    "currency": "XRP"
   },
   {
     "value": "0",

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',

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,
-  )
 })

packages/xrpl/test/models/escrowCreate.test.ts

@@ -82,12 +82,12 @@ describe('EscrowCreate', function () {
     assert.throws(
       () => validateEscrowCreate(escrow),
       ValidationError,
-      'EscrowCreate: Amount must be an Amount',
+      'EscrowCreate: Amount must be a string',
     )
     assert.throws(
       () => validate(escrow),
       ValidationError,
-      'EscrowCreate: Amount must be an Amount',
+      'EscrowCreate: Amount must be a string',
     )
   })
 

packages/xrpl/test/models/paymentChannelClaim.test.ts

@@ -77,12 +77,12 @@ describe('PaymentChannelClaim', function () {
     assert.throws(
       () => validatePaymentChannelClaim(channel),
       ValidationError,
-      'PaymentChannelClaim: Balance must be an Amount',
+      'PaymentChannelClaim: Balance must be a string',
     )
     assert.throws(
       () => validate(channel),
       ValidationError,
-      'PaymentChannelClaim: Balance must be an Amount',
+      'PaymentChannelClaim: Balance must be a string',
     )
   })
 
@@ -92,12 +92,12 @@ describe('PaymentChannelClaim', function () {
     assert.throws(
       () => validatePaymentChannelClaim(channel),
       ValidationError,
-      'PaymentChannelClaim: Amount must be an Amount',
+      'PaymentChannelClaim: Amount must be a string',
     )
     assert.throws(
       () => validate(channel),
       ValidationError,
-      'PaymentChannelClaim: Amount must be an Amount',
+      'PaymentChannelClaim: Amount must be a string',
     )
   })
 

packages/xrpl/test/models/paymentChannelCreate.test.ts

@@ -106,12 +106,12 @@ describe('PaymentChannelCreate', function () {
     assert.throws(
       () => validatePaymentChannelCreate(channel),
       ValidationError,
-      'PaymentChannelCreate: Amount must be an Amount',
+      'PaymentChannelCreate: Amount must be a string',
     )
     assert.throws(
       () => validate(channel),
       ValidationError,
-      'PaymentChannelCreate: Amount must be an Amount',
+      'PaymentChannelCreate: Amount must be a string',
     )
   })
 

packages/xrpl/test/models/paymentChannelFund.test.ts

@@ -70,12 +70,12 @@ describe('PaymentChannelFund', function () {
     assert.throws(
       () => validatePaymentChannelFund(channel),
       ValidationError,
-      'PaymentChannelFund: Amount must be an Amount',
+      'PaymentChannelFund: Amount must be a string',
     )
     assert.throws(
       () => validate(channel),
       ValidationError,
-      'PaymentChannelFund: Amount must be an Amount',
+      'PaymentChannelFund: Amount must be a string',
     )
   })
 

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,

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',
       },

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',
         },

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',
           },
           {

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'

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 () {