Publish

- @transia/ripple-binary-codec@1.4.4-alpha.3
 - @transia/ripple-keypairs@1.1.6-alpha.3
 - @transia/xrpl@2.7.1-alpha.6

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

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

packages/ripple-address-codec/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ripple-address-codec",
-  "version": "4.2.8-alpha.0",
+  "version": "4.2.6-alpha.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ripple-address-codec",
-      "version": "4.2.8-alpha.0",
+      "version": "4.2.6-alpha.0",
       "license": "ISC",
       "dependencies": {
         "base-x": "^3.0.9",

packages/ripple-address-codec/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@transia/ripple-address-codec",
-  "version": "4.2.8-alpha.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "version": "4.2.6-alpha.0",
   "description": "encodes/decodes base58 encoded XRP Ledger identifiers",
   "files": [
     "dist/*",

packages/ripple-binary-codec/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@transia/ripple-binary-codec",
-  "version": "1.4.6-alpha.10",
+  "publishConfig": {
+    "access": "public"
+  },
+  "version": "1.4.4-alpha.3",
   "description": "XRP Ledger binary codec",
   "files": [
     "dist/*",
@@ -12,7 +15,7 @@
     "test": "test"
   },
   "dependencies": {
-    "@transia/ripple-address-codec": "^4.2.8-alpha.0",
+    "@transia/ripple-address-codec": "^4.2.6-alpha.0",
     "assert": "^2.0.0",
     "big-integer": "^1.6.48",
     "buffer": "5.6.0",
@@ -39,5 +42,6 @@
   "prettier": "@xrplf/prettier-config",
   "engines": {
     "node": ">= 10"
-  }
+  },
+  "gitHead": "943142cb73821de7a4662cc660c5693a3ec2ff81"
 }

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,
-    "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,
@@ -141,40 +139,40 @@
     [
       "LedgerEntry",
       {
-        "nth": 257,
+        "nth": 1,
         "isVLEncoded": false,
         "isSerialized": false,
-        "isSigningField": false,
+        "isSigningField": true,
         "type": "LedgerEntry"
       }
     ],
     [
       "Transaction",
       {
-        "nth": 257,
+        "nth": 1,
         "isVLEncoded": false,
         "isSerialized": false,
-        "isSigningField": false,
+        "isSigningField": true,
         "type": "Transaction"
       }
     ],
     [
       "Validation",
       {
-        "nth": 257,
+        "nth": 1,
         "isVLEncoded": false,
         "isSerialized": false,
-        "isSigningField": false,
+        "isSigningField": true,
         "type": "Validation"
       }
     ],
     [
       "Metadata",
       {
-        "nth": 257,
+        "nth": 1,
         "isVLEncoded": false,
-        "isSerialized": false,
+        "isSerialized": true,
-        "isSigningField": false,
+        "isSigningField": true,
         "type": "Metadata"
       }
     ],
@@ -788,66 +786,6 @@
         "type": "UInt32"
       }
     ],
-    [
-      "FirstNFTokenSequence",
-      {
-        "nth": 50,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt32"
-      }
-    ],
-    [
-      "XahauActivationLgrSeq",
-      {
-        "nth": 96,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "UInt32"
-      }
-    ],
-    [
-      "ImportSequence",
-      {
-        "nth": 97,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "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 +946,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 +1336,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",
       {
@@ -1618,36 +1496,6 @@
         "type": "Amount"
       }
     ],
-    [
-      "BaseFeeDrops",
-      {
-        "nth": 22,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "Amount"
-      }
-    ],
-    [
-      "ReserveBaseDrops",
-      {
-        "nth": 23,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "Amount"
-      }
-    ],
-    [
-      "ReserveIncrementDrops",
-      {
-        "nth": 24,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "Amount"
-      }
-    ],
     [
       "PublicKey",
       {
@@ -1998,16 +1846,6 @@
         "type": "AccountID"
       }
     ],
-    [
-      "Inform",
-      {
-        "nth": 99,
-        "isVLEncoded": true,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "AccountID"
-      }
-    ],
     [
       "Indexes",
       {
@@ -2058,16 +1896,6 @@
         "type": "Vector256"
       }
     ],
-    [
-      "URITokenIDs",
-      {
-        "nth": 99,
-        "isVLEncoded": true,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "Vector256"
-      }
-    ],
     [
       "Paths",
       {
@@ -2288,66 +2116,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"
-      }
-    ],
-    [
-      "MintURIToken",
-      {
-        "nth": 92,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STObject"
-      }
-    ],
-    [
-      "AmountEntry",
-      {
-        "nth": 91,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STObject"
-      }
-    ],
     [
       "Signers",
       {
@@ -2487,56 +2255,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"
-      }
-    ],
-    [
-      "Amounts",
-      {
-        "nth": 92,
-        "isVLEncoded": false,
-        "isSerialized": true,
-        "isSigningField": true,
-        "type": "STArray"
-      }
     ]
   ],
   "TRANSACTION_RESULTS": {
@@ -2557,8 +2275,6 @@
     "telREQUIRES_NETWORK_ID": -385,
     "telNETWORK_ID_MAKES_TX_NON_CANONICAL": -384,
     "telNON_LOCAL_EMITTED_TXN": -383,
-    "telIMPORT_VL_KEY_NOT_RECOGNISED": -382,
-    "telCAN_NOT_QUEUE_IMPORT": -381,
 
     "temMALFORMED": -299,
     "temBAD_AMOUNT": -298,
@@ -2571,11 +2287,11 @@
     "temBAD_PATH": -291,
     "temBAD_PATH_LOOP": -290,
     "temBAD_REGKEY": -289,
-    "temBAD_SEND_NATIVE_LIMIT": -288,
+    "temBAD_SEND_XRP_LIMIT": -288,
-    "temBAD_SEND_NATIVE_MAX": -287,
+    "temBAD_SEND_XRP_MAX": -287,
-    "temBAD_SEND_NATIVE_NO_DIRECT": -286,
+    "temBAD_SEND_XRP_NO_DIRECT": -286,
-    "temBAD_SEND_NATIVE_PARTIAL": -285,
+    "temBAD_SEND_XRP_PARTIAL": -285,
-    "temBAD_SEND_NATIVE_PATHS": -284,
+    "temBAD_SEND_XRP_PATHS": -284,
     "temBAD_SEQUENCE": -283,
     "temBAD_SIGNATURE": -282,
     "temBAD_SRC_ACCOUNT": -281,
@@ -2607,6 +2323,7 @@
     "temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT": -255,
     "temXCHAIN_TOO_MANY_ATTESTATIONS": -254,
     "temHOOK_DATA_TOO_LARGE": -253,
+    "temHOOK_REJECTED": -252,
 
     "tefFAILURE": -199,
     "tefALREADY": -198,
@@ -2629,9 +2346,6 @@
     "tefTOO_BIG": -181,
     "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,
@@ -2649,7 +2363,6 @@
     "terNO_HOOK": -86,
 
     "tesSUCCESS": 0,
-    "tesPARTIAL": 1,
 
     "tecCLAIM": 100,
     "tecPATH_PARTIAL": 101,
@@ -2661,7 +2374,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,
@@ -2722,9 +2435,7 @@
     "tecXCHAIN_ACCOUNT_CREATE_TOO_MANY": 183,
     "tecXCHAIN_PAYMENT_FAILED": 184,
     "tecXCHAIN_SELF_COMMIT": 185,
-    "tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR": 186,
+    "tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR": 186
-    "tecINSUF_RESERVE_SELLER": 187,
-    "tecLAST_POSSIBLE_ENTRY": 255
   },
   "TRANSACTION_TYPES": {
     "Invalid": -1,
@@ -2761,15 +2472,10 @@
     "URITokenBuy": 47,
     "URITokenCreateSellOffer": 48,
     "URITokenCancelSellOffer": 49,
-    "Remit": 95,
-    "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,16 +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'),
-}
-
-const Remit = {
-  tx: require('./fixtures/remit-tx.json'),
-  binary: require('./fixtures/remit-binary.json'),
-}
 
 function bytesListTest() {
   const list = new BytesList()
@@ -239,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)
@@ -296,12 +274,6 @@ function nfTokenTest() {
   }
 }
 
-function RemitTest() {
-  test('can serialize Remit', () => {
-    expect(encode(Remit.tx)).toEqual(Remit.binary)
-  })
-}
-
 describe('Binary Serialization', function () {
   describe('nestedObjectTests', nestedObjectTests)
   describe('BytesList', bytesListTest)
@@ -314,6 +286,4 @@ describe('Binary Serialization', function () {
   describe('OmitUndefined', omitUndefinedTest)
   describe('TicketTest', ticketTest)
   describe('NFToken', nfTokenTest)
-  describe('UNLReport', UNLReportTest)
-  describe('Remit', RemitTest)
 })

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/remit-binary.json

@@ -1 +0,0 @@
-"12005F22000000002403EDEB4A2E00000001201B03EE5D3150116F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B68400000000000000C732102F9E33F16DF9507705EC954E3F94EB5F10D1FC4A354606DBE6297DBB1096FE65474473045022100E3FAE0EDEC3D6A8FF6D81BC9CF8288A61B7EEDE8071E90FF9314CB4621058D10022043545CF631706D700CEE65A1DB83EFDD185413808292D9D90F14D87D3DC2D8CB701A04DEADBEEF81147990EC5D1D8DF69E070A968D4B186986FDF06ED0831449FF0C73CA6AF9733DA805F76CA2C37776B7C46B806314757C4A9ED08284D61F3D8807280795F858BAB61DE05C220000000150156F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B7504DEADBEEFE1F05CE05B6140000000000003E8E1E05B61D4838D7EA4C68000000000000000000000000000555344000000000006B80F0F1D98AEDA846ED981F741C398FB2C4FD1E1F100136320AED08CC1F50DD5F23A1948AF86153A3F3B7593E5EC77D65A02BB1B29E05AB6AE"

packages/ripple-binary-codec/test/fixtures/remit-tx.json

@@ -1,39 +0,0 @@
-{
-  "TransactionType": "Remit",
-  "Account": "rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo",
-  "Destination": "rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy",
-  "DestinationTag": 1,
-  "Fee": "12",
-  "Flags": 0,
-  "LastLedgerSequence": 65953073,
-  "Sequence": 65923914,
-  "SigningPubKey": "02F9E33F16DF9507705EC954E3F94EB5F10D1FC4A354606DBE6297DBB1096FE654",
-  "TxnSignature": "3045022100E3FAE0EDEC3D6A8FF6D81BC9CF8288A61B7EEDE8071E90FF9314CB4621058D10022043545CF631706D700CEE65A1DB83EFDD185413808292D9D90F14D87D3DC2D8CB",
-  "Amounts": [
-    {
-      "AmountEntry": {
-        "Amount": "1000"
-      }
-    },
-    {
-      "AmountEntry": {
-        "Amount": {
-          "currency": "USD",
-          "issuer": "rcXY84C4g14iFp6taFXjjQGVeHqSCh9RX",
-          "value": "1"
-        }
-      }
-    }
-  ],
-  "MintURIToken": {
-    "URI": "DEADBEEF",
-    "Digest": "6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B",
-    "Flags": 1
-  },
-  "URITokenIDs": [
-    "AED08CC1F50DD5F23A1948AF86153A3F3B7593E5EC77D65A02BB1B29E05AB6AE"
-  ],
-  "InvoiceID": "6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B",
-  "Blob": "DEADBEEF",
-  "Inform": "rB5Ux4Lv2nRx6eeoAAsZmtctnBQ2LiACnk"
-}

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/ripple-keypairs/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@transia/ripple-keypairs",
-  "version": "1.1.8-alpha.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "version": "1.1.6-alpha.3",
   "description": "Cryptographic key pairs for the XRP Ledger",
   "scripts": {
     "build": "tsc -b",
@@ -17,7 +20,7 @@
     "test": "test"
   },
   "dependencies": {
-    "@transia/ripple-address-codec": "^4.2.8-alpha.0",
+    "@transia/ripple-address-codec": "^4.2.6-alpha.0",
     "bn.js": "^5.1.1",
     "brorand": "^1.0.5",
     "elliptic": "^6.5.4",
@@ -31,5 +34,6 @@
   "prettier": "@xrplf/prettier-config",
   "engines": {
     "node": ">= 10"
-  }
+  },
+  "gitHead": "943142cb73821de7a4662cc660c5693a3ec2ff81"
 }

packages/xrpl-models/package.json

@@ -1,25 +0,0 @@
-{
-  "name": "@transia/xahau-models",
-  "version": "2.7.3-alpha.29",
-  "description": "",
-  "private": false,
-  "main": "dist/models/index.js",
-  "files": [
-    "dist/**/*"
-  ],
-  "author": {
-    "name": "Denis Angell",
-    "url": "https://github.com/dangell7"
-  },
-  "license": "MIT",
-  "scripts": {},
-  "dependencies": {
-    "@types/node": "^20.4.2",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
-  },
-  "engines": {
-    "node": ">=12.0.0",
-    "npm": ">=7.0.0"
-  }
-}

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,9 @@
 {
   "name": "@transia/xrpl",
-  "version": "2.7.3-alpha.28",
+  "publishConfig": {
+    "access": "public"
+  },
+  "version": "2.7.1-alpha.6",
   "license": "ISC",
   "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
   "files": [
@@ -22,9 +25,9 @@
     "https-proxy-agent": false
   },
   "dependencies": {
-    "@transia/ripple-address-codec": "^4.2.8-alpha.0",
+    "@transia/ripple-address-codec": "^4.2.6-alpha.0",
-    "@transia/ripple-binary-codec": "^1.4.6-alpha.10",
+    "@transia/ripple-binary-codec": "^1.4.4-alpha.3",
-    "@transia/ripple-keypairs": "^1.1.8-alpha.0",
+    "@transia/ripple-keypairs": "^1.1.6-alpha.3",
     "bignumber.js": "^9.0.0",
     "bip32": "^2.0.6",
     "bip39": "^3.0.4",
@@ -54,7 +57,6 @@
     "build": "run-s build:lib build:snippets build:web",
     "build:snippets": "tsc --build ./snippets/tsconfig.json",
     "build:lib": "tsc --build tsconfig.build.json",
-    "build:models": "tsc --build tsconfig.models.json",
     "build:web": "webpack",
     "build:browserTests": "webpack --config ./test/webpack.config.js",
     "analyze": "run-s build:web --analyze",
@@ -82,5 +84,5 @@
   "engines": {
     "node": ">=10.13.0"
   },
-  "gitHead": "3b234ec8ec1c677e0f3f534fd2985c985871c87e"
+  "gitHead": "943142cb73821de7a4662cc660c5693a3ec2ff81"
 }

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

@@ -1,10 +1,4 @@
 /* eslint-disable max-lines -- There are lots of equivalent constructors which make sense to have here. */
-import {
-  classicAddressToXAddress,
-  isValidXAddress,
-  xAddressToClassicAddress,
-  encodeSeed,
-} from '@transia/ripple-address-codec'
 import {
   decode,
   encodeForSigning,
@@ -23,6 +17,12 @@ import { fromSeed } from 'bip32'
 import { mnemonicToSeedSync, validateMnemonic } from 'bip39'
 import isEqual from 'lodash/isEqual'
 import omitBy from 'lodash/omitBy'
+import {
+  classicAddressToXAddress,
+  isValidXAddress,
+  xAddressToClassicAddress,
+  encodeSeed,
+} from '@transia/ripple-address-codec'
 
 import ECDSA from '../ECDSA'
 import { ValidationError, XrplError } from '../errors'
@@ -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/Wallet/signer.ts

@@ -1,4 +1,3 @@
-import { decodeAccountID } from '@transia/ripple-address-codec'
 import {
   decode,
   encode,
@@ -8,6 +7,7 @@ import {
 import { sign as signWithKeypair, verify } from '@transia/ripple-keypairs'
 import { BigNumber } from 'bignumber.js'
 import { flatMap } from 'lodash'
+import { decodeAccountID } from '@transia/ripple-address-codec'
 
 import { ValidationError } from '../errors'
 import { Signer } from '../models/common'

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 {
@@ -17,8 +17,6 @@ export interface IssuedCurrencyAmount extends IssuedCurrency {
 
 export type Amount = IssuedCurrencyAmount | string
 
-export type AmountEntry = Amount
-
 export interface Signer {
   Signer: {
     Account: string
@@ -99,15 +97,14 @@ export interface Hook {
    * The object that describes the hook in Hooks.
    */
   Hook: {
-    HookHash?: string
     /**
      * The code that is executed when the hook is triggered.
      */
-    CreateCode?: string
+    CreateCode: string
     /**
      * The flags that are set on the hook.
      */
-    Flags?: number
+    Flags: number
     /**
      * The transactions that triggers the hook. Represented as a 256Hash
      */
@@ -197,31 +194,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
-}
-
-/**
- * The object that describes the uritoken in MintURIToken.
- */
-export interface MintURIToken {
-  /**
-   *
-   */
-  URI: string
-  /**
-   *
-   */
-  Digest?: string
-  /**
-   * The flags that are set on the uritoken.
-   */
-  Flags?: number
-}

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

@@ -72,20 +72,6 @@ export default interface AccountRoot extends BaseLedgerEntry {
    * account to each other.
    */
   TransferRate?: number
-  NFTokenMinter?: string
-  MintedNFTokens?: number
-  BurnedNFTokens?: number
-  HookStateCount?: number
-  HookNamespaces?: string[]
-  RewardLgrFirst?: number
-  RewardLgrLast?: number
-  RewardTime?: number
-  RewardAccumulator?: number
-  FirstNFTokenSequence?: number
-  ImportSequence?: string
-  GovernanceFlags?: string
-  GovernanceMarks?: string
-  AccountIndex?: number
 }
 
 /**
@@ -146,10 +132,6 @@ export interface AccountRootFlagsInterface {
    * Disallow incoming Trustlines from other accounts.
    */
   lsfDisallowIncomingTrustline?: boolean
-  /**
-   * Disallow incoming Trustlines from other accounts.
-   */
-  lsfDisallowIncomingRemit?: boolean
 }
 
 export enum AccountRootFlags {
@@ -206,12 +188,4 @@ export enum AccountRootFlags {
    * Disallow incoming Trustlines from other accounts.
    */
   lsfDisallowIncomingTrustline = 0x20000000,
-  /**
-   * The account has issued a URIToken.
-   */
-  lsfURITokenIssuer = 0x40000000,
-  /**
-   * Disallow incoming Remits from other accounts.
-   */
-  lsfDisallowIncomingRemit = 0x80000000,
 }

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

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

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 */
@@ -57,8 +56,6 @@ export enum AccountSetAsfFlags {
   asfDisallowIncomingPayChan = 14,
   /** Disallow other accounts from creating incoming Trustlines */
   asfDisallowIncomingTrustline = 15,
-  /** Disallow other accounts from sending incoming Remits */
-  asfDisallowIncomingRemit = 16,
 }
 
 /**

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

@@ -1,40 +0,0 @@
-import { ValidationError } from '../../errors'
-
-import { BaseTransaction, validateBaseTransaction } from './common'
-/**
- * Transaction Flags for an ClaimReward Transaction.
- *
- * @category Transaction Flags
- */
-export enum ClaimRewardFlags {
-  /**
-   * If set, indicates that the user would like to opt out of rewards.
-   */
-  tfOptOut = 0x00000001,
-}
-
-/**
- * ClaimReward is a transaction model that allows an account to claim rewards.
- *
- * @category Transaction Models
- */
-export interface ClaimReward extends BaseTransaction {
-  TransactionType: 'ClaimReward'
-  Flags?: number | ClaimRewardFlags
-  /** 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

@@ -4,14 +4,7 @@
 import { TRANSACTION_TYPES } from '@transia/ripple-binary-codec'
 
 import { ValidationError } from '../../errors'
-import {
+import { Amount, IssuedCurrencyAmount, Memo, Signer } from '../common'
-  Amount,
-  HookParameter,
-  IssuedCurrencyAmount,
-  Memo,
-  Signer,
-  EmitDetails,
-} from '../common'
 import { onlyHasFields } from '../utils'
 
 const MEMO_SIZE = 3
@@ -170,18 +163,6 @@ export interface BaseTransaction {
    * The network id of the transaction.
    */
   NetworkID?: number
-  /**
-   *
-   */
-  FirstLedgerSequence?: number
-  /**
-   * 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
  */
@@ -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
+  OfferSequence: number
-  /**
-   * The ID of the Escrow ledger object to cancel as a 64-character hexadecimal
-   * string.
-   */
-  EscrowID?: string
 }
 
 /**
@@ -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) {
+  if (tx.OfferSequence === undefined) {
-    throw new ValidationError(
+    throw new ValidationError('EscrowCancel: missing OfferSequence')
-      'EscrowCancel: must include OfferSequence or EscrowID',
-    )
   }
 
-  if (tx.OfferSequence !== undefined && typeof tx.OfferSequence !== 'number') {
+  if (typeof tx.OfferSequence !== 'number') {
-    throw new ValidationError('EscrowCancel: invalid OfferSequence')
+    throw new ValidationError('EscrowCancel: OfferSequence must be a number')
-  }
-
-  if (tx.EscrowID !== undefined && typeof tx.EscrowID !== 'string') {
-    throw new ValidationError('EscrowCancel: invalid EscrowID')
   }
 }

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,38 +0,0 @@
-import { ValidationError } from '../../errors'
-
-import { BaseTransaction, validateBaseTransaction } from './common'
-
-/**
- *
- *
- * @category Transaction Models
- */
-export interface Import extends BaseTransaction {
-  TransactionType: 'Import'
-  /**
-   *
-   */
-  Issuer?: string
-  /**
-   * Hex value representing a VL Blob.
-   */
-  Blob?: string
-}
-
-/**
- * Verify the form and type of an Import at runtime.
- *
- * @param tx - An Import Transaction.
- * @throws When the Import is Malformed.
- */
-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,12 +10,10 @@ 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'
 export { EscrowFinish } from './escrowFinish'
-export { Import } from './import'
 export { Invoke } from './invoke'
 export { NFTokenAcceptOffer } from './NFTokenAcceptOffer'
 export { NFTokenBurn } from './NFTokenBurn'
@@ -44,9 +42,8 @@ export {
 } from './paymentChannelClaim'
 export { PaymentChannelCreate } from './paymentChannelCreate'
 export { PaymentChannelFund } from './paymentChannelFund'
-export { Remit } from './remit'
-export { SetHookFlagsInterface, SetHookFlags, SetHook } from './setHook'
 export { SetRegularKey } from './setRegularKey'
+export { SetHook } from './setHook'
 export { SignerListSet } from './signerListSet'
 export { TicketCreate } from './ticketCreate'
 export { TrustSetFlagsInterface, TrustSetFlags, TrustSet } from './trustSet'

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

@@ -13,10 +13,6 @@ export interface Invoke extends BaseTransaction {
    * If present, invokes the Hook on the Destination account.
    */
   Destination?: string
-  /**
-   * Hex value representing a VL Blob.
-   */
-  Blob?: string
 }
 
 /**

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

@@ -1,29 +1,5 @@
 import { Amount } from '../common'
 
-export interface HookExecution {
-  HookExecution: {
-    HookAccount: string
-    HookEmitCount: number
-    HookExecutionIndex: number
-    HookHash: string
-    HookInstructionCount: string
-    HookResult: number
-    HookReturnCode: string
-    HookReturnString: string
-    HookStateChangeCount: number
-    Flags: number
-  }
-}
-
-export interface HookEmission {
-  HookEmission: {
-    EmittedTxnID: string
-    HookAccount: string
-    HookHash: string
-    EmitNonce: string
-  }
-}
-
 export interface CreatedNode {
   CreatedNode: {
     LedgerEntryType: string
@@ -84,8 +60,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

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
+  OfferSequence: number
-  /**
-   * The ID of the Escrow ledger object to cancel as a 64-character hexadecimal
-   * string.
-   */
-  OfferID?: string
 }
 
 /**
@@ -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) {
+  if (tx.OfferSequence === undefined) {
-    throw new ValidationError(
+    throw new ValidationError('OfferCancel: missing field OfferSequence')
-      'OfferCancel: must include OfferSequence or OfferID',
-    )
   }
 
-  if (tx.OfferSequence !== undefined && typeof tx.OfferSequence !== 'number') {
+  if (typeof tx.OfferSequence !== 'number') {
-    throw new ValidationError('OfferCancel: invalid OfferSequence')
+    throw new ValidationError('OfferCancel: OfferSequence must be a number')
-  }
-
-  if (tx.OfferID !== undefined && typeof tx.OfferID !== 'string') {
-    throw new ValidationError('OfferCancel: invalid OfferID')
   }
 }

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

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/remit.ts

@@ -1,204 +0,0 @@
-import { ValidationError } from '../../errors'
-import { AmountEntry, MintURIToken } from '../common'
-import { isHex } from '../utils'
-
-import { BaseTransaction, validateBaseTransaction } from './common'
-
-const MAX_URI_LENGTH = 512
-const DIGEST_LENGTH = 64
-const MAX_ARRAY_LENGTH = 32
-const MAX_BLOB_LENGTH = 1024
-
-/**
- * A Remit transaction represents a transfer of value from one account to
- * another.
- *
- * @category Transaction Models
- */
-export interface Remit extends BaseTransaction {
-  TransactionType: 'Remit'
-  /** The unique address of the account receiving the payment. */
-  Destination: string
-  /**
-   * Arbitrary tag that identifies the reason for the payment to the
-   * destination, or a hosted recipient to pay.
-   */
-  DestinationTag?: number
-  /**
-   *
-   */
-  Amounts?: AmountEntry[]
-  /**
-   *
-   */
-  MintURIToken?: MintURIToken
-  /**
-   *
-   */
-  URITokenIDs?: string[]
-  /**
-   * Arbitrary 256-bit hash representing a specific reason or identifier for
-   * this payment.
-   */
-  InvoiceID?: string
-  /**
-   * Hex value representing a VL Blob.
-   */
-  Blob?: string
-  /** The unique address of the account to inform */
-  Inform?: string
-}
-
-/**
- * Verify the form and type of a Remit at runtime.
- *
- * @param tx - A Remit Transaction.
- * @throws When the Remit is malformed.
- */
-// eslint-disable-next-line complexity -- ignore
-export function validateRemit(tx: Record<string, unknown>): void {
-  validateBaseTransaction(tx)
-
-  if (tx.Amounts !== undefined) {
-    checkAmounts(tx)
-  }
-  if (tx.URITokenIDs !== undefined) {
-    checkURITokenIDs(tx)
-  }
-  if (tx.Destination === tx.Account) {
-    throw new ValidationError(
-      'Remit: Destination must not be equal to the account',
-    )
-  }
-  if (tx.DestinationTag != null && typeof tx.DestinationTag !== 'number') {
-    throw new ValidationError('Remit: DestinationTag must be a number')
-  }
-  if (tx.Inform === tx.Account || tx.Inform === tx.Destination) {
-    throw new ValidationError(
-      'Remit: Inform must not be equal to the account or destination',
-    )
-  }
-
-  if (tx.MintURIToken !== undefined) {
-    checkMintURIToken(tx)
-  }
-
-  if (tx.Blob !== undefined && typeof tx.Blob !== 'string') {
-    throw new ValidationError('Remit: Blob must be a string')
-  }
-
-  if (tx.Blob !== undefined && typeof tx.Blob === 'string') {
-    if (!isHex(tx.Blob)) {
-      throw new ValidationError('Remit: Blob must be a hex string')
-    }
-    if (tx.Blob.length > MAX_BLOB_LENGTH) {
-      throw new ValidationError('Remit: max size Blob')
-    }
-  }
-}
-
-function checkAmounts(tx: Record<string, unknown>): void {
-  if (!Array.isArray(tx.Amounts)) {
-    throw new ValidationError('Remit: Amounts must be an array')
-  }
-  if (tx.Amounts.length < 1) {
-    throw new ValidationError('Remit: empty field Amounts')
-  }
-  if (tx.Amounts.length > MAX_ARRAY_LENGTH) {
-    throw new ValidationError('Remit: max field Amounts')
-  }
-  const seen = new Set<string>()
-  let seenXrp = false
-  for (const amount of tx.Amounts) {
-    if (
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access -- ignore
-      amount.AmountEntry === undefined ||
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access -- ignore
-      typeof amount.AmountEntry !== 'object'
-    ) {
-      throw new ValidationError('Remit: invalid Amounts.AmountEntry')
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access -- ignore
-    if (typeof amount.AmountEntry.Amount === 'string') {
-      // eslint-disable-next-line max-depth -- ignore
-      if (seenXrp) {
-        throw new ValidationError(
-          'Remit: Duplicate Native amounts are not allowed',
-        )
-      }
-      seenXrp = true
-    } else {
-      // eslint-disable-next-line max-len -- ignore
-      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access -- ignore
-      const amountKey = `${amount.AmountEntry.Amount.currency}:${amount.AmountEntry.Amount.issuer}`
-      // eslint-disable-next-line max-depth -- ingore
-      if (seen.has(amountKey)) {
-        throw new ValidationError('Remit: Duplicate amounts are not allowed')
-      }
-      seen.add(amountKey)
-    }
-  }
-}
-
-function checkURITokenIDs(tx: Record<string, unknown>): void {
-  if (!Array.isArray(tx.URITokenIDs)) {
-    throw new ValidationError('Remit: invalid field URITokenIDs')
-  }
-  if (tx.URITokenIDs.length < 1) {
-    throw new ValidationError('Remit: empty field URITokenIDs')
-  }
-  if (tx.URITokenIDs.length > MAX_ARRAY_LENGTH) {
-    throw new ValidationError('Remit: max field URITokenIDs')
-  }
-  const seen = new Set<string>()
-  for (const token of tx.URITokenIDs) {
-    if (typeof token !== 'string' || !isHex(token)) {
-      throw new ValidationError('Remit: URITokenID must be a hex string')
-    }
-    if (token.length !== DIGEST_LENGTH) {
-      throw new ValidationError(
-        `Remit: URITokenID must be exactly ${DIGEST_LENGTH} characters`,
-      )
-    }
-    if (seen.has(token)) {
-      throw new ValidationError('Remit: Duplicate URITokens are not allowed')
-    }
-    seen.add(token)
-  }
-}
-
-// eslint-disable-next-line complexity -- ignore
-function checkMintURIToken(tx: Record<string, unknown>): void {
-  function isRecord(value: unknown): value is Record<string, unknown> {
-    return value !== null && typeof value === 'object'
-  }
-  if (!isRecord(tx.MintURIToken)) {
-    throw new ValidationError('Remit: invalid MintURIToken')
-  }
-  if (tx.MintURIToken.URI === undefined) {
-    throw new ValidationError('Remit: missing field MintURIToken.URI')
-  }
-  if (typeof tx.MintURIToken.URI !== 'string' || !isHex(tx.MintURIToken.URI)) {
-    throw new ValidationError('Remit: MintURIToken.URI must be a hex string')
-  }
-  if (tx.MintURIToken.URI.length > MAX_URI_LENGTH) {
-    throw new ValidationError(
-      `Remit: URI must be less than ${MAX_URI_LENGTH} characters`,
-    )
-  }
-  if (
-    tx.MintURIToken.Digest !== undefined &&
-    typeof tx.MintURIToken.Digest !== 'string'
-  ) {
-    throw new ValidationError(`Remit: MintURIToken.Digest must be a string`)
-  }
-  if (
-    tx.MintURIToken.Digest !== undefined &&
-    !isHex(tx.MintURIToken.Digest) &&
-    tx.MintURIToken.Digest.length !== DIGEST_LENGTH
-  ) {
-    throw new ValidationError(
-      `Remit: Digest must be exactly ${DIGEST_LENGTH} characters`,
-    )
-  }
-}

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

@@ -1,30 +1,7 @@
 import { ValidationError } from '../../errors'
 import { Hook } from '../common'
 
-import { BaseTransaction, GlobalFlags, validateBaseTransaction } from './common'
+import { BaseTransaction, validateBaseTransaction } from './common'
-
-/**
- * Enum representing values for Set Hook Transaction Flags.
- *
- * @category Transaction Flags
- */
-export enum SetHookFlags {
-  /**
-   */
-  hsfOverride = 0x00000001,
-  /**
-   */
-  hsfNSDelete = 0x0000002,
-  /**
-   */
-  hsfCollect = 0x00000004,
-}
-
-export interface SetHookFlagsInterface extends GlobalFlags {
-  hsfOverride?: boolean
-  hsfNSDelete?: boolean
-  hsfCollect?: boolean
-}
 
 /**
  *
@@ -37,11 +14,9 @@ export interface SetHook extends BaseTransaction {
    *
    */
   Hooks: Hook[]
-
-  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,13 +9,10 @@ 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'
 import { EscrowFinish, validateEscrowFinish } from './escrowFinish'
-import { Import, validateImport } from './import'
-import { Invoke, validateInvoke } from './invoke'
 import { TransactionMetadata } from './metadata'
 import {
   NFTokenAcceptOffer,
@@ -46,7 +43,6 @@ import {
   PaymentChannelFund,
   validatePaymentChannelFund,
 } from './paymentChannelFund'
-import { Remit, validateRemit } from './remit'
 import { SetHook, validateSetHook } from './setHook'
 import { SetRegularKey, validateSetRegularKey } from './setRegularKey'
 import { SignerListSet, validateSignerListSet } from './signerListSet'
@@ -73,13 +69,10 @@ export type Transaction =
   | CheckCancel
   | CheckCash
   | CheckCreate
-  | ClaimReward
   | DepositPreauth
   | EscrowCancel
   | EscrowCreate
   | EscrowFinish
-  | Import
-  | Invoke
   | NFTokenAcceptOffer
   | NFTokenBurn
   | NFTokenCancelOffer
@@ -91,7 +84,6 @@ export type Transaction =
   | PaymentChannelClaim
   | PaymentChannelCreate
   | PaymentChannelFund
-  | Remit
   | SetHook
   | SetRegularKey
   | SignerListSet
@@ -150,10 +142,6 @@ export function validate(transaction: Record<string, unknown>): void {
       validateCheckCreate(tx)
       break
 
-    case 'ClaimReward':
-      validateClaimReward(tx)
-      break
-
     case 'DepositPreauth':
       validateDepositPreauth(tx)
       break
@@ -170,14 +158,6 @@ export function validate(transaction: Record<string, unknown>): void {
       validateEscrowFinish(tx)
       break
 
-    case 'Import':
-      validateImport(tx)
-      break
-
-    case 'Invoke':
-      validateInvoke(tx)
-      break
-
     case 'NFTokenAcceptOffer':
       validateNFTokenAcceptOffer(tx)
       break
@@ -222,18 +202,14 @@ export function validate(transaction: Record<string, unknown>): void {
       validatePaymentChannelFund(tx)
       break
 
-    case 'Remit':
+    case 'SetRegularKey':
-      validateRemit(tx)
+      validateSetRegularKey(tx)
       break
 
     case 'SetHook':
       validateSetHook(tx)
       break
 
-    case 'SetRegularKey':
-      validateSetRegularKey(tx)
-      break
-
     case 'SignerListSet':
       validateSignerListSet(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/models/utils/flags.ts

@@ -2,7 +2,6 @@
 /* eslint-disable no-bitwise -- flags require bitwise operations */
 
 import { ValidationError } from '../../errors'
-import { Hook } from '../common'
 import {
   AccountRootFlagsInterface,
   AccountRootFlags,
@@ -21,7 +20,6 @@ import {
   PaymentChannelClaimFlagsInterface,
   PaymentChannelClaimFlags,
 } from '../transactions/paymentChannelClaim'
-import { SetHookFlagsInterface, SetHookFlags } from '../transactions/setHook'
 import type { Transaction } from '../transactions/transaction'
 import { TrustSetFlagsInterface, TrustSetFlags } from '../transactions/trustSet'
 
@@ -77,15 +75,6 @@ export function setTransactionFlagsToNumber(tx: Transaction): void {
     case 'TrustSet':
       tx.Flags = convertTrustSetFlagsToNumber(tx.Flags)
       return
-    case 'SetHook':
-      tx.Flags = convertSetHookFlagsToNumber(tx.Flags)
-      tx.Hooks.forEach((hook: Hook) => {
-        hook.Hook.Flags = convertSetHookFlagsToNumber(
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- idk
-          hook.Hook.Flags as SetHookFlagsInterface,
-        )
-      })
-      return
     default:
       tx.Flags = 0
   }
@@ -119,10 +108,6 @@ function convertTrustSetFlagsToNumber(flags: TrustSetFlagsInterface): number {
   return reduceFlags(flags, TrustSetFlags)
 }
 
-function convertSetHookFlagsToNumber(flags: SetHookFlagsInterface): number {
-  return reduceFlags(flags, SetHookFlags)
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- added ValidationError check for flagEnum
 function reduceFlags(flags: GlobalFlags, flagEnum: any): number {
   return Object.keys(flags).reduce((resultFlags, flag) => {

packages/xrpl/src/sugar/autofill.ts

@@ -1,16 +1,17 @@
+import BigNumber from 'bignumber.js'
 import {
   xAddressToClassicAddress,
   isValidXAddress,
 } from '@transia/ripple-address-codec'
-import { encode } from '@transia/ripple-binary-codec'
 
 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) {
+  return Promise.all(promises).then(() => tx)
-    await calculateFeePerTransactionType(this, tx, signersCount)
-  }
-  return 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 }
+  // netFee is usually 0.00001 XRP (10 drops)
-  copyTx.SigningPubKey = ``
+  const netFeeXRP = await getFeeXrp(client)
-  copyTx.Fee = `0`
+  const netFeeDrops = xrpToDrops(netFeeXRP)
-  const tx_blob = encode(copyTx)
+  let baseFee = new BigNumber(netFeeDrops)
-  // eslint-disable-next-line require-atomic-updates, no-param-reassign -- ignore
+
-  tx.Fee = await getFeeEstimateXrp(client, tx_blob, signersCount)
+  // 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(

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/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
+  return response.result.drops.base_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)
 }

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

@@ -3,10 +3,8 @@
 /* eslint-disable no-bitwise  -- this file mimics behavior in rippled. It uses
    bitwise operators for and-ing numbers with a mask and bit shifting. */
 
-import { decodeAccountID } from '@transia/ripple-address-codec'
 import BigNumber from 'bignumber.js'
-
+import { decodeAccountID } from '@transia/ripple-address-codec'
-import { convertStringToHex } from '../stringConversion'
 
 import hashLedger, {
   hashLedgerHeader,
@@ -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/hooks.ts

@@ -8,7 +8,7 @@ import {
   TRANSACTION_TYPES,
   TRANSACTION_TYPE_MAP,
 } from '@transia/ripple-binary-codec'
-// import createHash = require('create-hash')
+import createHash = require('create-hash')
 
 import { XrplError } from '../errors'
 import { HookParameter } from '../models/common'
@@ -58,12 +58,32 @@ export function calculateHookOn(arr: Array<keyof TTS>): string {
   return hash.toUpperCase()
 }
 
-function isHex(value: string): boolean {
+/**
-  return /^[0-9A-F]+$/iu.test(value)
+ * Calculate the sha256 of a string
+ *
+ * @param string - the string to calculate the sha256
+ * @returns the sha256
+ */
+export async function sha256(string: string): Promise<string> {
+  const hash = createHash('sha256')
+  hash.update(string)
+  const hashBuffer = hash.digest()
+  const hashArray = Array.from(new Uint8Array(hashBuffer))
+  const hashHex = hashArray
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers -- Required
+    .map((bytes) => bytes.toString(16).padStart(2, '0'))
+    .join('')
+  return hashHex
 }
 
-function hexValue(value: string): string {
+/**
-  return Buffer.from(value, 'utf8').toString('hex').toUpperCase()
+ * Calculate the hex of a namespace
+ *
+ * @param namespace - the namespace to calculate the hex
+ * @returns the hex
+ */
+export async function hexNamespace(namespace: string): Promise<string> {
+  return (await sha256(namespace)).toUpperCase()
 }
 
 /**
@@ -75,21 +95,20 @@ function hexValue(value: string): string {
 export function hexHookParameters(data: HookParameter[]): HookParameter[] {
   const hookParameters: HookParameter[] = []
   for (const parameter of data) {
-    let hookPName = parameter.HookParameter.HookParameterName
-    let hookPValue = parameter.HookParameter.HookParameterValue
-
-    if (!isHex(hookPName)) {
-      hookPName = hexValue(hookPName)
-    }
-
-    if (!isHex(hookPValue)) {
-      hookPValue = hexValue(hookPValue)
-    }
-
     hookParameters.push({
       HookParameter: {
-        HookParameterName: hookPName,
+        HookParameterName: Buffer.from(
-        HookParameterValue: hookPValue,
+          parameter.HookParameter.HookParameterName,
+          'utf8',
+        )
+          .toString('hex')
+          .toUpperCase(),
+        HookParameterValue: Buffer.from(
+          parameter.HookParameter.HookParameterValue,
+          'utf8',
+        )
+          .toString('hex')
+          .toUpperCase(),
       },
     })
   }

packages/xrpl/src/utils/index.ts

@@ -1,3 +1,5 @@
+import * as rbc from '@transia/ripple-binary-codec'
+import { verify as verifyKeypairSignature } from '@transia/ripple-keypairs'
 import {
   classicAddressToXAddress,
   decodeAccountID,
@@ -14,8 +16,6 @@ import {
   isValidXAddress,
   xAddressToClassicAddress,
 } from '@transia/ripple-address-codec'
-import * as rbc from '@transia/ripple-binary-codec'
-import { verify as verifyKeypairSignature } from '@transia/ripple-keypairs'
 
 import { LedgerEntry } from '../models/ledger'
 import { Response } from '../models/methods'
@@ -39,9 +39,8 @@ import {
   hashLedgerHeader,
   hashEscrow,
   hashPaymentChannel,
-  hashURIToken,
 } from './hashes'
-import { calculateHookOn, hexHookParameters, TTS } from './hooks'
+import { calculateHookOn, hexNamespace, hexHookParameters, TTS } from './hooks'
 import parseNFTokenID from './parseNFTokenID'
 import {
   percentToTransferRate,
@@ -174,7 +173,6 @@ const hashes = {
   hashLedgerHeader,
   hashEscrow,
   hashPaymentChannel,
-  hashURIToken,
 }
 
 export {
@@ -226,6 +224,7 @@ export {
   createCrossChainPayment,
   parseNFTokenID,
   calculateHookOn,
+  hexNamespace,
   hexHookParameters,
   TTS,
 }

packages/xrpl/src/utils/parseNFTokenID.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-magic-numbers -- Doing hex string parsing. */
-import { encodeAccountID } from '@transia/ripple-address-codec'
 import BigNumber from 'bignumber.js'
+import { encodeAccountID } from '@transia/ripple-address-codec'
 
 import { XrplError } from '../errors'
 

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/requests/submit.test.ts

@@ -1,5 +1,5 @@
-import { decode } from '@transia/ripple-binary-codec'
 import { assert } from 'chai'
+import { decode } from '@transia/ripple-binary-codec'
 
 import {
   AccountSet,

packages/xrpl/test/integration/requests/submitMultisigned.test.ts

@@ -1,5 +1,5 @@
-import { decode } from '@transia/ripple-binary-codec'
 import { assert } from 'chai'
+import { decode } from '@transia/ripple-binary-codec'
 
 import {
   AccountSet,

packages/xrpl/test/integration/transactions/nftokenMint.test.ts

@@ -1,6 +1,6 @@
-import { Client } from '@transia/xrpl'
 import { assert } from 'chai'
 import _ from 'lodash'
+import { Client } from 'xrpl'
 
 import {
   convertStringToHex,

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/integration/utils.ts

@@ -1,7 +1,7 @@
-import { decode } from '@transia/ripple-binary-codec'
 import { assert } from 'chai'
 import omit from 'lodash/omit'
 import throttle from 'lodash/throttle'
+import { decode } from '@transia/ripple-binary-codec'
 
 import {
   Client,

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/remit.test.ts

@@ -1,369 +0,0 @@
-import { assert } from 'chai'
-
-import { validate, ValidationError } from '../../src'
-import { validateRemit } from '../../src/models/transactions/remit'
-
-/**
- * Remit Verification Testing.
- *
- * Providing runtime verification testing for each specific transaction type.
- */
-
-// eslint-disable-next-line max-statements -- ignore
-describe('Remit', function () {
-  let remit
-
-  beforeEach(function () {
-    remit = {
-      TransactionType: 'Remit',
-      Account: 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo',
-      Destination: 'rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy',
-      DestinationTag: 1,
-      Fee: '12',
-      Flags: 0,
-      LastLedgerSequence: 65953073,
-      Sequence: 65923914,
-      SigningPubKey:
-        '02F9E33F16DF9507705EC954E3F94EB5F10D1FC4A354606DBE6297DBB1096FE654',
-      TxnSignature:
-        '3045022100E3FAE0EDEC3D6A8FF6D81BC9CF8288A61B7EEDE8071E90FF9314CB4621058D10022043545CF631706D700CEE65A1DB83EFDD185413808292D9D90F14D87D3DC2D8CB',
-      Amounts: [
-        { AmountEntry: { Amount: '1000' } },
-        {
-          AmountEntry: {
-            Amount: {
-              currency: 'USD',
-              issuer: 'rcXY84C4g14iFp6taFXjjQGVeHqSCh9RX',
-              value: '1',
-            },
-          },
-        },
-      ],
-      MintURIToken: {
-        URI: 'DEADBEEF',
-        Digest:
-          '6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B',
-        Flags: 1,
-      },
-      URITokenIDs: [
-        'AED08CC1F50DD5F23A1948AF86153A3F3B7593E5EC77D65A02BB1B29E05AB6AE',
-      ],
-      InvoiceID:
-        '6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B',
-      Blob: 'DEADBEEF',
-      Inform: 'rB5Ux4Lv2nRx6eeoAAsZmtctnBQ2LiACnk',
-    } as any
-  })
-
-  it(`verifies valid Remit`, function () {
-    assert.doesNotThrow(() => validateRemit(remit))
-    assert.doesNotThrow(() => validate(remit))
-  })
-
-  it(`throws w/ Bad Amounts`, function () {
-    remit.Amounts = {}
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Amounts must be an array',
-    )
-  })
-  it(`throws w/ Empty Amounts`, function () {
-    remit.Amounts = []
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: empty field Amounts',
-    )
-  })
-  it(`throws w/ Max Amounts`, function () {
-    remit.Amounts = [
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-    ]
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: max field Amounts',
-    )
-  })
-  it(`throws w/ Duplicate native amounts`, function () {
-    remit.Amounts = [
-      { AmountEntry: { Amount: '1000' } },
-      { AmountEntry: { Amount: '1000' } },
-    ]
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Duplicate Native amounts are not allowed',
-    )
-  })
-  it(`throws w/ Duplicate amounts`, function () {
-    remit.Amounts = [
-      {
-        AmountEntry: {
-          Amount: {
-            currency: 'USD',
-            issuer: 'rcXY84C4g14iFp6taFXjjQGVeHqSCh9RX',
-            value: '1',
-          },
-        },
-      },
-      {
-        AmountEntry: {
-          Amount: {
-            currency: 'USD',
-            issuer: 'rcXY84C4g14iFp6taFXjjQGVeHqSCh9RX',
-            value: '1',
-          },
-        },
-      },
-    ]
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Duplicate amounts are not allowed',
-    )
-  })
-  it(`throws w/ Bad URITokenIDs`, function () {
-    remit.URITokenIDs = {}
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: invalid field URITokenIDs',
-    )
-  })
-  it(`throws w/ Empty URITokenIDs`, function () {
-    remit.URITokenIDs = []
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: empty field URITokenIDs',
-    )
-  })
-  it(`throws w/ Empty URITokenIDs`, function () {
-    remit.URITokenIDs = [
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-      'DEADBEEF',
-    ]
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: max field URITokenIDs',
-    )
-  })
-  it(`throws w/ Invalid URITokenID`, function () {
-    remit.URITokenIDs = [1]
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: URITokenID must be a hex string',
-    )
-  })
-  it(`throws w/ Invalid URITokenID`, function () {
-    remit.URITokenIDs = ['ZZ11']
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: URITokenID must be a hex string',
-    )
-  })
-  it(`throws w/ Duplicate URITokenIDs`, function () {
-    remit.URITokenIDs = ['DEADBEEF']
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: URITokenID must be exactly 64 characters',
-    )
-  })
-  it(`throws w/ Duplicate URITokenIDs`, function () {
-    remit.URITokenIDs = [
-      'AED08CC1F50DD5F23A1948AF86153A3F3B7593E5EC77D65A02BB1B29E05AB6AE',
-      'AED08CC1F50DD5F23A1948AF86153A3F3B7593E5EC77D65A02BB1B29E05AB6AE',
-    ]
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Duplicate URITokens are not allowed',
-    )
-  })
-  // it(`throws w/ Bad MintURIToken`, function () {
-  //   remit.MintURIToken = []
-  //   assert.throws(
-  //     () => validateRemit(remit),
-  //     ValidationError,
-  //     'Remit: invalid MintURIToken',
-  //   )
-  // })
-  it(`throws w/ Missing MintURIToken.URI`, function () {
-    remit.MintURIToken = {}
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: missing field MintURIToken.URI',
-    )
-  })
-  it(`throws w/ Bad MintURIToken.URI`, function () {
-    remit.MintURIToken = {
-      URI: 1,
-    }
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: MintURIToken.URI must be a hex string',
-    )
-  })
-  it(`throws w/ Bad MintURIToken.URI`, function () {
-    remit.MintURIToken = {
-      URI: 'ZZ11',
-    }
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: MintURIToken.URI must be a hex string',
-    )
-  })
-  it(`throws w/ Bad MintURIToken Less than 1`, function () {
-    remit.MintURIToken = {
-      URI: '',
-    }
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: MintURIToken.URI must be a hex string',
-    )
-  })
-  it(`throws w/ Bad MintURIToken.Digest`, function () {
-    remit.MintURIToken = {
-      URI: 'DEADBEEF',
-      Digest: 1,
-    }
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: MintURIToken.Digest must be a string',
-    )
-  })
-  it(`throws w/ Bad MintURIToken.Digest`, function () {
-    remit.MintURIToken = {
-      URI: 'DEADBEEF',
-      Digest: 'ZZ11',
-    }
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Digest must be exactly 64 characters',
-    )
-  })
-  it(`throws w/ Bad Destination`, function () {
-    remit.Destination = 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo'
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Destination must not be equal to the account',
-    )
-  })
-  it(`throws w/ Bad Destination Tag`, function () {
-    remit.DestinationTag = '1'
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: DestinationTag must be a number',
-    )
-  })
-  it(`throws w/ Bad Inform`, function () {
-    remit.Inform = 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo'
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Inform must not be equal to the account or destination',
-    )
-  })
-  it(`throws w/ Bad Blob Type`, function () {
-    remit.Blob = 1
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Blob must be a string',
-    )
-  })
-  it(`throws w/ Bad Blob Not Hex`, function () {
-    remit.Blob = 'ZZ11'
-    assert.throws(
-      () => validateRemit(remit),
-      ValidationError,
-      'Remit: Blob must be a hex string',
-    )
-  })
-  // it(`throws w/ Bad Blob Max Size`, function () {
-  //   remit.Blob = ''
-  //   assert.throws(
-  //     () => validateRemit(remit),
-  //     ValidationError,
-  //     'Remit: Blob must be a hex 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',
         },
@@ -166,8 +166,7 @@ describe('Models Utils', function () {
         AccountRootFlags.lsfDisallowIncomingNFTokenOffer |
         AccountRootFlags.lsfDisallowIncomingCheck |
         AccountRootFlags.lsfDisallowIncomingPayChan |
-        AccountRootFlags.lsfDisallowIncomingTrustline |
+        AccountRootFlags.lsfDisallowIncomingTrustline
-        AccountRootFlags.lsfDisallowIncomingRemit
 
       const parsed = parseAccountRootFlags(accountRootFlags)
 
@@ -184,8 +183,7 @@ describe('Models Utils', function () {
           parsed.lsfDisallowIncomingNFTokenOffer &&
           parsed.lsfDisallowIncomingCheck &&
           parsed.lsfDisallowIncomingPayChan &&
-          parsed.lsfDisallowIncomingTrustline &&
+          parsed.lsfDisallowIncomingTrustline,
-          parsed.lsfDisallowIncomingRemit,
       )
     })
 
@@ -205,7 +203,6 @@ describe('Models Utils', function () {
       assert.isUndefined(parsed.lsfDisallowIncomingCheck)
       assert.isUndefined(parsed.lsfDisallowIncomingPayChan)
       assert.isUndefined(parsed.lsfDisallowIncomingTrustline)
-      assert.isUndefined(parsed.lsfDisallowIncomingRemit)
     })
   })
 })

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

@@ -1,8 +1,8 @@
 import fs from 'fs'
 import path from 'path'
 
-import { encode } from '@transia/ripple-binary-codec'
 import { assert } from 'chai'
+import { encode } from '@transia/ripple-binary-codec'
 
 import { OfferCreate, Transaction, ValidationError } from '../../src'
 import {
@@ -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/utils/hooks.test.ts

@@ -1,6 +1,11 @@
 import { assert } from 'chai'
 
-import { calculateHookOn, hexHookParameters, TTS } from '../../src'
+import {
+  calculateHookOn,
+  hexNamespace,
+  hexHookParameters,
+  TTS,
+} from '../../src'
 
 describe('test hook on', function () {
   it('invalid', function () {
@@ -26,6 +31,16 @@ describe('test hook on', function () {
   })
 })
 
+describe('test hook namespace', function () {
+  it('basic', async function () {
+    const result = await hexNamespace('starter')
+    assert.equal(
+      result,
+      '4FF9961269BF7630D32E15276569C94470174A5DA79FA567C0F62251AA9A36B9',
+    )
+  })
+})
+
 describe('test hook parameters', function () {
   it('basic', async function () {
     const parameters = [

packages/xrpl/test/wallet/index.test.ts

@@ -1,5 +1,5 @@
-import { decode } from '@transia/ripple-binary-codec'
 import { assert } from 'chai'
+import { decode } from '@transia/ripple-binary-codec'
 
 import { NFTokenMint, Payment, Transaction } from '../../src'
 import ECDSA from '../../src/ECDSA'
@@ -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 () {

packages/xrpl/tsconfig.models.json

@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src",
-    "outDir": "../xrpl-models/dist"
-  },
-  "include": ["./src/models/**/*.ts", "./src/errors.ts"],
-}