Merge branch 'main' into network-id

Co-authored-by: Mayukha Vadari <mvadari@gmail.com>

.ci-config/rippled.cfg

@@ -110,7 +110,7 @@ validators.txt
 # If you need the version of rippled to be more up to date, you may need to make a comment on this repo: https://github.com/WietseWind/docker-rippled
 
 [amendments]
-# Devnet amendments as of June 28th, 2023
+# Devnet amendments as of March 28th, 2023
 B4E4F5D2D6FB84DF7399960A732309C9FD530EAE5941838160042833625A6076 NegativeUNL
 DF8B4536989BDACE3F934F29423848B9F1D76D09BE6A1FCFE7E7F06AA26ABEAD fixRemoveNFTokenAutoTrustLine
 3C43D9A973AA4443EF3FC38E42DD306160FBFFDAB901CD8BAA15D09F2597EB87 NonFungibleTokensV1
@@ -156,11 +156,3 @@ E2E6F2866106419B88C50045ACE96368558C345566AC8F2BDF5A5B5587F0E6FA fix1368
 42EEA5E28A97824821D4EF97081FE36A54E9593C6E4F20CBAE098C69D2E072DC fix1373
 4C97EBA926031A7CF7D7B36FDE3ED66DDA5421192D63DE53FFB46E43B9DC8373 MultiSign
 157D2D480E006395B76F948E3E07A45A05FE10230D88A7993C71F97AE4B1F2D1 Checks
-32A122F1352A4C7B3A6D790362CC34749C5E57FCE896377BFDC6CCD14F6CD627 NonFungibleTokensV1_1
-# 1.10.0 Amendments
-47C3002ABA31628447E8E9A8B315FAA935CE30183F9A9B86845E469CA2CDC3DF DisallowIncoming
-73761231F7F3D94EC3D8C63D91BDD0D89045C6F71B917D1925C01253515A6669 fixNonFungibleTokensV1_2
-F1ED6B4A411D8B872E65B9DCB4C8B100375B0DD3D62D07192E011D6D7F339013 fixTrustLinesToSelf
-2E2FB9CF8A44EB80F4694D38AADAE9B8B7ADAFD2F092E10068E61C98C4F092B0 fixUniversalNumber
-75A7E01C505DD5A179DFE3E000A9B6F1EDDEB55A12F95579A23E15B15DC8BE5A ImmediateOfferKilled
-93E516234E35E08CA689FA33A6D38E103881F8DCB53023F728C307AA89D515A7 XRPFees

.github/workflows/nodejs.yml

@@ -195,45 +195,3 @@ jobs:
       - name: Stop docker container
         if: always()
         run: docker stop rippled-service
-
-  snippets:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    strategy:
-      matrix:
-        node-version: [14.x, 16.x, 18.x, 20.x]
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Setup npm version 9
-        run: |
-          npm i -g npm@9 --registry=https://registry.npmjs.org
-
-      - name: Cache node modules
-        id: cache-nodemodules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules
-        with:
-          # caching node_modules
-          path: |
-            node_modules
-            */*/node_modules
-          key: ${{ runner.os }}-deps-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-deps-${{ matrix.node-version }}-
-            ${{ runner.os }}-deps-
-
-      - name: Install Dependencies
-        if: steps.cache-nodemodules.outputs.cache-hit != 'true'
-        run: npm ci
-
-      - run: npm run build
-      - name: Run Snippets
-        run: (for i in packages/xrpl/snippets/src/*.ts; do echo "Running $i" && npx ts-node $i || exit 1; done)

package.json

@@ -13,10 +13,10 @@
     "update:confirm": "npx npm-check-updates --configFileName .ncurc.json -u"
   },
   "dependencies": {
-    "@transia/ripple-address-codec": "file:packages/ripple-address-codec",
-    "@transia/ripple-binary-codec": "file:packages/ripple-binary-codec",
-    "@transia/ripple-keypairs": "file:packages/ripple-keypairs",
-    "@transia/xrpl": "file:packages/xrpl"
+    "ripple-address-codec": "file:packages/ripple-address-codec",
+    "ripple-binary-codec": "file:packages/ripple-binary-codec",
+    "ripple-keypairs": "file:packages/ripple-keypairs",
+    "xrpl": "file:packages/xrpl"
   },
   "devDependencies": {
     "@types/brorand": "^1.0.30",

packages/ripple-address-codec/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@transia/ripple-address-codec",
+  "name": "ripple-address-codec",
   "version": "4.3.0",
   "description": "encodes/decodes base58 encoded XRP Ledger identifiers",
   "files": [
@@ -15,7 +15,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com/Transia-RnD/xrpl.js/tree/beta"
+    "url": "git@github.com:XRPLF/xrpl.js.git"
   },
   "prepublish": "tsc -b",
   "prepublishOnly": "tslint -b ./ && jest",

packages/ripple-binary-codec/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@transia/ripple-binary-codec",
+  "name": "ripple-binary-codec",
   "version": "1.6.0",
   "description": "XRP Ledger binary codec",
   "files": [
@@ -17,7 +17,7 @@
     "buffer": "6.0.3",
     "create-hash": "^1.2.0",
     "decimal.js": "^10.2.0",
-    "@transia/ripple-address-codec": "^4.3.0"
+    "ripple-address-codec": "^4.3.0"
   },
   "scripts": {
     "build": "tsc -b && copyfiles ./src/enums/definitions.json ./dist/enums/",
@@ -28,7 +28,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com/Transia-RnD/xrpl.js/tree/beta"
+    "url": "git@github.com:XRPLF/xrpl.js.git"
   },
   "bugs": {
     "url": "https://github.com/XRPLF/xrpl.js/issues"

packages/ripple-binary-codec/src/types/account-id.ts

@@ -3,7 +3,7 @@ import {
   encodeAccountID,
   isValidXAddress,
   xAddressToClassicAddress,
-} from '@transia/ripple-address-codec'
+} from 'ripple-address-codec'
 import { Hash160 } from './hash-160'
 import { Buffer } from 'buffer/'
 

packages/ripple-binary-codec/src/types/st-object.ts

@@ -5,7 +5,7 @@ import {
   XrplDefinitionsBase,
 } from '../enums'
 import { SerializedType, JsonObject } from './serialized-type'
-import { xAddressToClassicAddress, isValidXAddress } from '@transia/ripple-address-codec'
+import { xAddressToClassicAddress, isValidXAddress } from 'ripple-address-codec'
 import { BinaryParser } from '../serdes/binary-parser'
 import { BinarySerializer, BytesList } from '../serdes/binary-serializer'
 import { Buffer } from 'buffer/'

packages/ripple-binary-codec/test/binary-parser.test.js

@@ -1,7 +1,7 @@
 const { coreTypes } = require('../src/types')
 const Decimal = require('decimal.js')
 
-const { encodeAccountID } = require('@transia/ripple-address-codec')
+const { encodeAccountID } = require('ripple-address-codec')
 const { binary } = require('../src/coretypes')
 const { Amount, Hash160 } = coreTypes
 const { makeParser, readJSON } = binary

packages/ripple-keypairs/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@transia/ripple-keypairs",
+  "name": "ripple-keypairs",
   "version": "1.3.0",
   "description": "Cryptographic key pairs for the XRP Ledger",
   "scripts": {
@@ -21,11 +21,11 @@
     "brorand": "^1.0.5",
     "elliptic": "^6.5.4",
     "hash.js": "^1.0.3",
-    "@transia/ripple-address-codec": "^4.3.0"
+    "ripple-address-codec": "^4.3.0"
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com/Transia-RnD/xrpl.js/tree/beta"
+    "url": "git@github.com:XRPLF/xrpl.js.git"
   },
   "license": "ISC",
   "prettier": "@xrplf/prettier-config",

packages/ripple-keypairs/src/index.ts

@@ -3,7 +3,7 @@ import brorand = require('brorand')
 import * as hashjs from 'hash.js'
 import * as elliptic from 'elliptic'
 
-import * as addressCodec from '@transia/ripple-address-codec'
+import * as addressCodec from 'ripple-address-codec'
 import { derivePrivateKey, accountPublicFromPublicGenerator } from './secp256k1'
 import * as utils from './utils'
 

packages/ripple-keypairs/test/codec.test.ts

@@ -1,5 +1,5 @@
 import assert from 'assert'
-import * as api from '@transia/ripple-address-codec'
+import * as api from 'ripple-address-codec'
 
 function toHex(bytes) {
   return Buffer.from(bytes).toString('hex').toUpperCase()

packages/ripple-keypairs/test/xrp-codec.test.ts

@@ -1,5 +1,5 @@
 import assert from 'assert'
-import * as api from '@transia/ripple-address-codec'
+import * as api from 'ripple-address-codec'
 
 function toHex(bytes: Buffer) {
   return Buffer.from(bytes).toString('hex').toUpperCase()

packages/xrpl/.eslintrc.js

@@ -59,13 +59,9 @@ module.exports = {
     'no-shadow': 'off',
     '@typescript-eslint/no-shadow': ['error'],
     'jsdoc/check-examples': 'off',
-    // We want to use certain fields like "@interface" to make join types treated as interfaces.
-    'jsdoc/check-tag-names': 'off',
-    'jsdoc/require-hyphen-before-param-description': 'off',
 
     'tsdoc/syntax': 'off',
     'jsdoc/require-description-complete-sentence': 'off',
-    'import/prefer-default-export': 'off',
   },
   overrides: [
     {

packages/xrpl/HISTORY.md

@@ -3,34 +3,12 @@
 Subscribe to [the **xrpl-announce** mailing list](https://groups.google.com/g/xrpl-announce) for release announcements. We recommend that xrpl.js (ripple-lib) users stay up-to-date with the latest stable release.
 ## Unreleased
 
-### Added
-* Add `BurnedNFTokens`, `FirstNFTSequence`, `MintedNFTokens`,
-`NFTokenMinter`, and `WalletLocator` to `AccountRoot`.
-* Add `ledger_hash` and `ledger_index` to `account_nfts`,
-  `nft_buy_offers`, and `nft_sell_offers` requests.
-* Add `nft_page` to `ledger_entry` request.
-* Add types for `NFTokenPage` and `NFTokenOffer` LedgerEntries.
-* Add type for NFToken object that is stored on a `NFTokenPage`.
-* Add type for `account_info`'s `account_flags` property.
-* Add types for `EnableAmendment`, `SetFee`, and `UNLModify` transactions.
-* Add the new fields for `XRPFees` amendment and id for the `FeeSettings`
-* Add `FeeSettings`, `NegativeUNL`, and `Amendments` singleton ledger entry ids.
-* Add `WalletLocator` to `SignerEntry` on `SignerList` (LedgerEntry).
-* Export many nested types and interfaces
-
-### Breaking
-* If you were deep importing these types previously you will need to import them from `xrpl` and rename them:
-  * `methods/accountLines`: `Trustline` -> `AccountLinesTrustline`
-  * `methods/bookOffers`: `TakerAmount` -> `BookOfferCurrency`
-  * `methods/ledgerData`: `BinaryLedgerEntry` -> `LedgerDataBinaryLedgerEntry`
-
 ## 2.8.0 (2023-06-13)
 
 ### Added
 * Adds support for npm v9
 
 ### Fixed
-* `getNFTokenID` now also accepts metadata from `tx` in binary format
 * Fixed `ServerState.transitions` typing, it is now a string instead of a number. (Only used in return from `server_state` request)
 * Added `destination_amount` to `PathOption` which is returned as part of a `path_find` request
 * Removed the `decode(encode(tx)) == tx` check from the wallet signing process

packages/xrpl/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@transia/xrpl",
+  "name": "xrpl",
   "version": "2.8.1",
   "license": "ISC",
   "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
@@ -27,9 +27,9 @@
     "bip39": "^3.0.4",
     "https-proxy-agent": "^5.0.0",
     "lodash": "^4.17.4",
-    "@transia/ripple-address-codec": "^4.3.0",
-    "@transia/ripple-binary-codec": "^1.6.0",
-    "@transia/ripple-keypairs": "^1.3.0",
+    "ripple-address-codec": "^4.3.0",
+    "ripple-binary-codec": "^1.6.0",
+    "ripple-keypairs": "^1.3.0",
     "ws": "^8.2.2"
   },
   "devDependencies": {
@@ -75,7 +75,7 @@
   "prettier": "@xrplf/prettier-config",
   "repository": {
     "type": "git",
-    "url": "git@github.com/Transia-RnD/xrpl.js/tree/beta"
+    "url": "git@github.com:XRPLF/xrpl.js.git"
   },
   "readmeFilename": "README.md",
   "engines": {

packages/xrpl/snippets/src/getTransaction.ts

@@ -1,6 +1,6 @@
 import { Client, LedgerResponse, TxResponse } from '../../src'
 
-const client = new Client('wss://s2.ripple.com:51233')
+const client = new Client('wss://s.altnet.rippletest.net:51233')
 
 async function getTransaction(): Promise<void> {
   await client.connect()
@@ -19,11 +19,10 @@ async function getTransaction(): Promise<void> {
     })
     console.log(tx)
 
-    // The meta field can be undefined if the transaction has not been validated yet (and so has not changed the ledger).
+    // The meta field would be a string(hex) when the `binary` parameter is `true` for the `tx` request.
     if (tx.result.meta == null) {
       throw new Error('meta not included in the response')
     }
-
     /*
      * delivered_amount is the amount actually received by the destination account.
      * Use this field to determine how much was delivered, regardless of whether the transaction is a partial payment.

packages/xrpl/snippets/src/multisigning.ts

@@ -4,7 +4,6 @@ import {
   AccountSet,
   convertStringToHex,
   SignerListSet,
-  Wallet,
 } from '../../src'
 
 const client = new Client('wss://s.altnet.rippletest.net:51233')
@@ -16,8 +15,12 @@ async function multisigning(): Promise<void> {
    * In practice, users generally will not have all keys in one spot,
    * hence, users need to implement a way to get signatures.
    */
-  const wallet1 = Wallet.generate()
-  const wallet2 = Wallet.generate()
+  const { wallet: wallet1 } = await client.fundWallet(null, {
+    usageContext: 'code snippets',
+  })
+  const { wallet: wallet2 } = await client.fundWallet(null, {
+    usageContext: 'code snippets',
+  })
   const { wallet: walletMaster } = await client.fundWallet(null, {
     usageContext: 'code snippets',
   })

packages/xrpl/src/Wallet/fundWallet.ts

@@ -1,7 +1,7 @@
 import { IncomingMessage } from 'http'
 import { request as httpsRequest, RequestOptions } from 'https'
 
-import { isValidClassicAddress } from '@transia/ripple-address-codec'
+import { isValidClassicAddress } from 'ripple-address-codec'
 
 import type { Client } from '../client'
 import { RippledError, XRPLFaucetError } from '../errors'
@@ -12,7 +12,7 @@ import {
   getDefaultFaucetPath,
 } from './defaultFaucets'
 
-import { Wallet } from '.'
+import Wallet from '.'
 
 // Interval to check an account balance
 const INTERVAL_SECONDS = 1

packages/xrpl/src/Wallet/index.ts

@@ -7,20 +7,20 @@ import {
   isValidXAddress,
   xAddressToClassicAddress,
   encodeSeed,
-} from '@transia/ripple-address-codec'
+} from 'ripple-address-codec'
 import {
   decode,
   encodeForSigning,
   encodeForMultisigning,
   encode,
-} from '@transia/ripple-binary-codec'
+} from 'ripple-binary-codec'
 import {
   deriveAddress,
   deriveKeypair,
   generateSeed,
   verify,
   sign,
-} from '@transia/ripple-keypairs'
+} from 'ripple-keypairs'
 
 import ECDSA from '../ECDSA'
 import { ValidationError } from '../errors'
@@ -76,7 +76,7 @@ function hexFromBuffer(buffer: Buffer): string {
  *
  * @category Signing
  */
-export class Wallet {
+class Wallet {
   public readonly publicKey: string
   public readonly privateKey: string
   public readonly classicAddress: string
@@ -502,3 +502,5 @@ function removeTrailingZeros(tx: Transaction): void {
     tx.Amount.value = new BigNumber(tx.Amount.value).toString()
   }
 }
+
+export default Wallet

packages/xrpl/src/Wallet/signer.ts

@@ -1,19 +1,19 @@
 import { BigNumber } from 'bignumber.js'
 import { flatMap } from 'lodash'
-import { decodeAccountID } from '@transia/ripple-address-codec'
+import { decodeAccountID } from 'ripple-address-codec'
 import {
   decode,
   encode,
   encodeForSigning,
   encodeForSigningClaim,
-} from '@transia/ripple-binary-codec'
-import { sign as signWithKeypair, verify } from '@transia/ripple-keypairs'
+} from 'ripple-binary-codec'
+import { sign as signWithKeypair, verify } from 'ripple-keypairs'
 
 import { ValidationError } from '../errors'
 import { Signer } from '../models/common'
 import { Transaction, validate } from '../models/transactions'
 
-import { Wallet } from '.'
+import Wallet from '.'
 
 /**
  * Takes several transactions with Signer fields (in object or blob form) and creates a
@@ -32,13 +32,9 @@ function multisign(transactions: Array<Transaction | string>): string {
     throw new ValidationError('There were 0 transactions to multisign')
   }
 
-  const decodedTransactions: Transaction[] = transactions.map(
-    (txOrBlob: string | Transaction) => {
-      return getDecodedTransaction(txOrBlob)
-    },
-  )
+  transactions.forEach((txOrBlob) => {
+    const tx: Transaction = getDecodedTransaction(txOrBlob)
 
-  decodedTransactions.forEach((tx) => {
     /*
      * This will throw a more clear error for JS users if any of the supplied transactions has incorrect formatting
      */
@@ -57,6 +53,12 @@ function multisign(transactions: Array<Transaction | string>): string {
     }
   })
 
+  const decodedTransactions: Transaction[] = transactions.map(
+    (txOrBlob: string | Transaction) => {
+      return getDecodedTransaction(txOrBlob)
+    },
+  )
+
   validateTransactionEquivalence(decodedTransactions)
 
   return encode(getTransactionWithAllSigners(decodedTransactions))
@@ -152,11 +154,10 @@ function compareSigners(left: Signer, right: Signer): number {
   )
 }
 
-const NUM_BITS_IN_HEX = 16
-
 function addressToBigNumber(address: string): BigNumber {
   const hex = Buffer.from(decodeAccountID(address)).toString('hex')
-  return new BigNumber(hex, NUM_BITS_IN_HEX)
+  const numberOfBitsInHex = 16
+  return new BigNumber(hex, numberOfBitsInHex)
 }
 
 function getDecodedTransaction(txOrBlob: Transaction | string): Transaction {

packages/xrpl/src/client/BroadcastClient.ts

@@ -15,7 +15,7 @@ import { Client, ClientOptions } from '.'
  *
  * @category Clients
  */
-export class BroadcastClient extends Client {
+export default class BroadcastClient extends Client {
   private readonly clients: Client[]
 
   /**

packages/xrpl/src/client/partialPayment.ts

@@ -1,10 +1,9 @@
 import BigNumber from 'bignumber.js'
-import { decode } from '@transia/ripple-binary-codec'
+import { decode } from 'ripple-binary-codec'
 
 import type {
   AccountTxResponse,
   Response,
-  ResponseWarning,
   TransactionEntryResponse,
   TransactionStream,
   TxResponse,
@@ -112,7 +111,7 @@ export function handlePartialPayment(
   response: Response,
 ): void {
   if (hasPartialPayment(command, response)) {
-    const warnings: ResponseWarning[] = response.warnings ?? []
+    const warnings = response.warnings ?? []
 
     const warning = {
       id: WARN_PARTIAL_PAYMENT_CODE,

packages/xrpl/src/index.ts

@@ -1,5 +1,5 @@
 // Broadcast client is experimental
-export { BroadcastClient } from './client/BroadcastClient'
+export { default as BroadcastClient } from './client/BroadcastClient'
 
 export { Client, ClientOptions } from './client'
 
@@ -7,11 +7,9 @@ export * from './models'
 
 export * from './utils'
 
-export { default as ECDSA } from './ECDSA'
-
 export * from './errors'
 
-export { Wallet } from './Wallet'
+export { default as Wallet } from './Wallet'
 
 export { keyToRFC1751Mnemonic, rfc1751MnemonicToKey } from './Wallet/rfc1751'
 

packages/xrpl/src/models/common/index.ts

@@ -1,10 +1,10 @@
 export type LedgerIndex = number | ('validated' | 'closed' | 'current')
 
-export interface XRP {
+interface XRP {
   currency: 'XRP'
 }
 
-export interface IssuedCurrency {
+interface IssuedCurrency {
   currency: string
   issuer: string
 }
@@ -43,7 +43,7 @@ export type StreamType =
   | 'server'
   | 'validations'
 
-export interface PathStep {
+interface PathStep {
   account?: string
   currency?: string
   issuer?: string
@@ -119,7 +119,7 @@ export interface NFTOffer {
 }
 
 /**
- * One NFToken that might be returned from an {@link NFTInfoResponse}
+ * One NFToken that might be returned from either an {@link NFTInfoResponse}
  *
  * @category Responses
  */

packages/xrpl/src/models/index.ts

@@ -13,4 +13,3 @@ export {
 } from './utils/flags'
 export * from './methods'
 export * from './transactions'
-export * from './common'

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

@@ -72,16 +72,6 @@ export default interface AccountRoot extends BaseLedgerEntry {
    * account to each other.
    */
   TransferRate?: number
-  /** An arbitrary 256-bit value that users can set. */
-  WalletLocator?: string
-  /** Total NFTokens this account's issued that have been burned. This number is always equal or less than MintedNFTokens. */
-  BurnedNFTokens?: number
-  /** The sequence that the account first minted an NFToken */
-  FirstNFTSequence: number
-  /** Total NFTokens have been minted by and on behalf of this account. */
-  MintedNFTokens?: number
-  /** Another account that can mint NFTokens on behalf of this account. */
-  NFTokenMinter?: string
 }
 
 /**

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

@@ -1,12 +1,6 @@
 import BaseLedgerEntry from './BaseLedgerEntry'
 
-/**
- * The unique id for the Amendments object https://xrpl.org/amendments-object.html#amendments-id-format
- */
-export const AMENDMENTS_ID =
-  '7DB0788C020F02780A673DC74757F23823FA3014C1866E72CC4CD8B226CD6EF4'
-
-export interface Majority {
+interface Majority {
   Majority: {
     /** The Amendment ID of the pending amendment. */
     Amendment: string

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

@@ -1,13 +1,17 @@
 import BaseLedgerEntry from './BaseLedgerEntry'
 
 /**
- * The unique id for the FeeSettings object https://xrpl.org/feesettings.html#feesettings-id-format
+ * The FeeSettings object type contains the current base transaction cost and
+ * reserve amounts as determined by fee voting.
+ *
+ * @category Ledger Entries
  */
-export const FEE_SETTINGS_ID =
-  '4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A651'
-
-export interface FeeSettingsPreAmendmentFields {
-  /** The transaction cost of the "reference transaction" in drops of XRP as hexadecimal. */
+export default interface FeeSettings extends BaseLedgerEntry {
+  LedgerEntryType: 'FeeSettings'
+  /**
+   * The transaction cost of the "reference transaction" in drops of XRP as
+   * hexadecimal.
+   */
   BaseFee: string
   /** The BaseFee translated into "fee units". */
   ReferenceFeeUnits: number
@@ -15,38 +19,9 @@ export interface FeeSettingsPreAmendmentFields {
   ReserveBase: number
   /** The incremental owner reserve for owning objects, as drops of XRP. */
   ReserveIncrement: number
-}
-
-export interface FeeSettingsPostAmendmentFields {
-  /** The transaction cost of the "reference transaction" in drops of XRP as hexadecimal. */
-  BaseFeeDrops: string
-  /** The base reserve for an account in the XRP Ledger, as drops of XRP. */
-  ReserveBaseDrops: string
-  /** The incremental owner reserve for owning objects, as drops of XRP. */
-  ReserveIncrementDrops: string
-}
-
-export interface FeeSettingsBase extends BaseLedgerEntry {
-  LedgerEntryType: 'FeeSettings'
   /**
-   * A bit-map of boolean flags for this object. No flags are defined for this type.
+   * A bit-map of boolean flags for this object. No flags are defined for this
+   * type.
    */
-  Flags: 0
+  Flags: number
 }
-
-/**
- * The FeeSettings object type contains the current base transaction cost and
- * reserve amounts as determined by fee voting.
- *
- * The fields will be based on the status of the `XRPFees` amendment.
- * - Before: {@link FeeSettingsPreAmendmentFields}
- * - After: {@link FeeSettingsPostAmendmentFields}
- *
- * @interface
- *
- * @category Ledger Entries
- */
-type FeeSettings = FeeSettingsBase &
-  (FeeSettingsPreAmendmentFields | FeeSettingsPostAmendmentFields)
-
-export default FeeSettings

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

@@ -1,16 +0,0 @@
-import { Amount } from '../common'
-
-import BaseLedgerEntry from './BaseLedgerEntry'
-
-export interface NFTokenOffer extends BaseLedgerEntry {
-  LedgerEntryType: 'NFTokenOffer'
-  Amount: Amount
-  Destination?: string
-  Expiration: number
-  Flags: number
-  NFTokenOfferNode?: string
-  Owner: string
-  OwnerNode?: string
-  PreviousTxnID: string
-  PreviousTxnLgrSeq: number
-}

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

@@ -1,20 +0,0 @@
-import BaseLedgerEntry from './BaseLedgerEntry'
-
-export interface NFToken {
-  NFToken: {
-    Flags: number
-    Issuer: string
-    NFTokenID: string
-    NFTokenTaxon: number
-    URI?: string
-  }
-}
-
-export interface NFTokenPage extends BaseLedgerEntry {
-  LedgerEntryType: 'NFTokenPage'
-  NextPageMin?: string
-  NFTokens: NFToken[]
-  PreviousPageMin?: string
-  PreviousTxnID?: string
-  PreviousTxnLgrSeq?: number
-}

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

@@ -1,10 +1,9 @@
 import BaseLedgerEntry from './BaseLedgerEntry'
 
-/**
- * The unique id for the nUNL object https://xrpl.org/negativeunl.html#negativeunl-id-format
- */
-export const NEGATIVE_UNL_ID =
-  '2E8A59AA9D3B5B186B0B9E0F62E6C02587CA74A4D778938E957B6357D364B244'
+interface DisabledValidator {
+  FirstLedgerSequence: number
+  PublicKey: string
+}
 
 /**
  * The NegativeUNL object type contains the current status of the Negative UNL,
@@ -17,10 +16,7 @@ export default interface NegativeUNL extends BaseLedgerEntry {
   /**
    * A list of trusted validators that are currently disabled.
    */
-  DisabledValidators?: Array<{
-    FirstLedgerSequence: number
-    PublicKey: string
-  }>
+  DisabledValidators?: DisabledValidator[]
   /**
    * The public key of a trusted validator that is scheduled to be disabled in
    * the next flag ledger.

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

@@ -1,7 +1,12 @@
-import { SignerEntry } from '../common'
-
 import BaseLedgerEntry from './BaseLedgerEntry'
 
+interface SignerEntry {
+  SignerEntry: {
+    Account: string
+    SignerWeight: number
+  }
+}
+
 /**
  * The SignerList object type represents a list of parties that, as a group,
  * are authorized to sign a transaction in place of an individual account. You

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

@@ -2,22 +2,16 @@ import AccountRoot, {
   AccountRootFlags,
   AccountRootFlagsInterface,
 } from './AccountRoot'
-import Amendments, { Majority, AMENDMENTS_ID } from './Amendments'
+import Amendments from './Amendments'
 import Check from './Check'
 import DepositPreauth from './DepositPreauth'
 import DirectoryNode from './DirectoryNode'
 import Escrow from './Escrow'
-import FeeSettings, {
-  FeeSettingsPreAmendmentFields,
-  FeeSettingsPostAmendmentFields,
-  FEE_SETTINGS_ID,
-} from './FeeSettings'
+import FeeSettings from './FeeSettings'
 import Ledger from './Ledger'
 import LedgerEntry from './LedgerEntry'
 import LedgerHashes from './LedgerHashes'
-import NegativeUNL, { NEGATIVE_UNL_ID } from './NegativeUNL'
-import { NFTokenOffer } from './NFTokenOffer'
-import { NFToken, NFTokenPage } from './NFTokenPage'
+import NegativeUNL from './NegativeUNL'
 import Offer, { OfferFlags } from './Offer'
 import PayChannel from './PayChannel'
 import RippleState, { RippleStateFlags } from './RippleState'
@@ -28,25 +22,16 @@ export {
   AccountRoot,
   AccountRootFlags,
   AccountRootFlagsInterface,
-  AMENDMENTS_ID,
   Amendments,
   Check,
   DepositPreauth,
   DirectoryNode,
   Escrow,
-  FEE_SETTINGS_ID,
   FeeSettings,
-  FeeSettingsPreAmendmentFields,
-  FeeSettingsPostAmendmentFields,
   Ledger,
   LedgerEntry,
   LedgerHashes,
-  Majority,
-  NEGATIVE_UNL_ID,
   NegativeUNL,
-  NFTokenOffer,
-  NFTokenPage,
-  NFToken,
   Offer,
   OfferFlags,
   PayChannel,

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

@@ -1,6 +1,8 @@
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { LedgerIndex } from '../common'
 
-export interface Channel {
+import { BaseRequest, BaseResponse } from './baseMethod'
+
+interface Channel {
   account: string
   amount: string
   balance: string
@@ -24,9 +26,7 @@ export interface Channel {
  *
  * @category Requests
  */
-export interface AccountChannelsRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface AccountChannelsRequest extends BaseRequest {
   command: 'account_channels'
   /**
    * The unique identifier of an account, typically the account's address. The
@@ -40,6 +40,13 @@ export interface AccountChannelsRequest
    * account.
    */
   destination_account?: string
+  /** 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * Limit the number of transactions to retrieve. Cannot be less than 10 or
    * more than 400. The default is 200.

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

@@ -1,4 +1,6 @@
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { LedgerIndex } from '../common'
+
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The `account_currencies` command retrieves a list of currencies that an
@@ -7,12 +9,17 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface AccountCurrenciesRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface AccountCurrenciesRequest extends BaseRequest {
   command: 'account_currencies'
   /** A unique identifier for the account, most commonly the account's address. */
   account: string
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * If true, then the account field only accepts a public key or XRP Ledger
    * address. Otherwise, account can be a secret or passphrase (not

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

@@ -1,6 +1,7 @@
+import { LedgerIndex } from '../common'
 import { AccountRoot, SignerList } from '../ledger'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The `account_info` command retrieves information about an account, its
@@ -9,10 +10,17 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface AccountInfoRequest extends BaseRequest, LookupByLedgerRequest {
+export interface AccountInfoRequest extends BaseRequest {
   command: 'account_info'
   /** A unique identifier for the account, most commonly the account's address. */
   account: string
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * Whether to get info about this account's queued transactions. Can only be
    * used when querying for the data from the current open ledger. Not available
@@ -31,7 +39,7 @@ export interface AccountInfoRequest extends BaseRequest, LookupByLedgerRequest {
   strict?: boolean
 }
 
-export interface AccountQueueTransaction {
+interface QueueTransaction {
   /**
    * Whether this transaction changes this address's ways of authorizing
    * transactions.
@@ -50,7 +58,7 @@ export interface AccountQueueTransaction {
   seq: number
 }
 
-export interface AccountQueueData {
+interface QueueData {
   /** Number of queued transactions from this address. */
   txn_count: number
   /**
@@ -70,63 +78,7 @@ export interface AccountQueueData {
    */
   max_spend_drops_total?: string
   /** Information about each queued transaction from this address. */
-  transactions?: AccountQueueTransaction[]
-}
-
-export interface AccountInfoAccountFlags {
-  /**
-   * Enable rippling on this address's trust lines by default. Required for issuing addresses; discouraged for others.
-   */
-  defaultRipple: boolean
-  /**
-   * This account can only receive funds from transactions it sends, and from preauthorized accounts.
-   * (It has DepositAuth enabled.)
-   */
-  depositAuth: boolean
-  /**
-   * Disallows use of the master key to sign transactions for this account.
-   */
-  disableMasterKey: boolean
-  /**
-   * Disallow incoming Checks from other accounts.
-   */
-  disallowIncomingCheck?: boolean
-  /**
-   * Disallow incoming NFTOffers from other accounts. Part of the DisallowIncoming amendment.
-   */
-  disallowIncomingNFTokenOffer?: boolean
-  /**
-   * Disallow incoming PayChannels from other accounts. Part of the DisallowIncoming amendment.
-   */
-  disallowIncomingPayChan?: boolean
-  /**
-   * Disallow incoming Trustlines from other accounts. Part of the DisallowIncoming amendment.
-   */
-  disallowIncomingTrustline?: boolean
-  /**
-   * Client applications should not send XRP to this account. Not enforced by rippled.
-   */
-  disallowIncomingXRP: boolean
-  /**
-   * All assets issued by this address are frozen.
-   */
-  globalFreeze: boolean
-  /**
-   * This address cannot freeze trust lines connected to it. Once enabled, cannot be disabled.
-   */
-  noFreeze: boolean
-  /**
-   * The account has used its free SetRegularKey transaction.
-   */
-  passwordSpent: boolean
-  /**
-   * This account must individually approve other users for those users to hold this account's issued currencies.
-   */
-  requireAuthorization: boolean
-  /**
-   * Requires incoming payments to specify a Destination Tag.
-   */
-  requireDestinationTag: boolean
+  transactions?: QueueTransaction[]
 }
 
 /**
@@ -145,11 +97,6 @@ export interface AccountInfoResponse extends BaseResponse {
      * present.
      */
     account_data: AccountRoot & { signer_lists?: SignerList[] }
-
-    /**
-     * A map of account flags parsed out.  This will only be available for rippled nodes 1.11.0 and higher.
-     */
-    account_flags?: AccountInfoAccountFlags
     /**
      * The ledger index of the current in-progress ledger, which was used when
      * retrieving this information.
@@ -168,7 +115,7 @@ export interface AccountInfoResponse extends BaseResponse {
      * fields may be omitted because the values are calculated "lazily" by the
      * queuing mechanism.
      */
-    queue_data?: AccountQueueData
+    queue_data?: QueueData
     /**
      * True if this data is from a validated ledger version; if omitted or set
      * to false, this data is not final.

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

@@ -1,6 +1,8 @@
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { LedgerIndex } from '../common'
 
-export interface AccountLinesTrustline {
+import { BaseRequest, BaseResponse } from './baseMethod'
+
+export interface Trustline {
   /** The unique Address of the counterparty to this trust line. */
   account: string
   /**
@@ -72,12 +74,17 @@ export interface AccountLinesTrustline {
  *
  * @category Requests
  */
-export interface AccountLinesRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface AccountLinesRequest extends BaseRequest {
   command: 'account_lines'
   /** A unique identifier for the account, most commonly the account's Address. */
   account: string
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * The Address of a second account. If provided, show only lines of trust
    * connecting the two accounts.
@@ -111,7 +118,7 @@ export interface AccountLinesResponse extends BaseResponse {
      * Array of trust line objects. If the number of trust lines is large, only
      * returns up to the limit at a time.
      */
-    lines: AccountLinesTrustline[]
+    lines: Trustline[]
     /**
      * The ledger index of the current open ledger, which was used when
      * retrieving this information.

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

@@ -1,4 +1,4 @@
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The `account_nfts` method retrieves all of the NFTs currently owned by the
@@ -6,7 +6,7 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface AccountNFTsRequest extends BaseRequest, LookupByLedgerRequest {
+export interface AccountNFTsRequest extends BaseRequest {
   command: 'account_nfts'
   /**
    * The unique identifier of an account, typically the account's address. The

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

@@ -1,3 +1,4 @@
+import { LedgerIndex } from '../common'
 import {
   Check,
   DepositPreauth,
@@ -9,9 +10,9 @@ import {
   Ticket,
 } from '../ledger'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
-export type AccountObjectType =
+type AccountObjectType =
   | 'check'
   | 'deposit_preauth'
   | 'escrow'
@@ -30,9 +31,7 @@ export type AccountObjectType =
  *
  * @category Requests
  */
-export interface AccountObjectsRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface AccountObjectsRequest extends BaseRequest {
   command: 'account_objects'
   /** A unique identifier for the account, most commonly the account's address. */
   account: string
@@ -47,6 +46,13 @@ export interface AccountObjectsRequest
    * from being deleted. The default is false.
    */
   deletion_blockers_only?: boolean
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * Ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * The maximum number of objects to include in the results. Must be within
    * the inclusive range 10 to 400 on non-admin connections. The default is 200.
@@ -63,7 +69,7 @@ export interface AccountObjectsRequest
  * Account Objects can be a Check, a DepositPreauth, an Escrow, an Offer, a
  * PayChannel, a SignerList, a Ticket, or a RippleState.
  */
-export type AccountObject =
+type AccountObject =
   | Check
   | DepositPreauth
   | Escrow

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

@@ -1,6 +1,6 @@
-import { Amount } from '../common'
+import { Amount, LedgerIndex } from '../common'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The account_offers method retrieves a list of offers made by a given account
@@ -9,12 +9,17 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface AccountOffersRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface AccountOffersRequest extends BaseRequest {
   command: 'account_offers'
   /** A unique identifier for the account, most commonly the account's Address. */
   account: string
+  /** A 20-byte hex string identifying the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or "current", "closed", or
+   * "validated" to select a ledger dynamically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * Limit the number of transactions to retrieve. The server is not required
    * to honor this value. Must be within the inclusive range 10 to 400.

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

@@ -1,7 +1,7 @@
-import { ResponseOnlyTxInfo } from '../common'
+import { LedgerIndex, ResponseOnlyTxInfo } from '../common'
 import { Transaction, TransactionMetadata } from '../transactions'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The account_tx method retrieves a list of transactions that involved the
@@ -10,7 +10,7 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface AccountTxRequest extends BaseRequest, LookupByLedgerRequest {
+export interface AccountTxRequest extends BaseRequest {
   command: 'account_tx'
   /** A unique identifier for the account, most commonly the account's address. */
   account: string
@@ -26,6 +26,10 @@ export interface AccountTxRequest extends BaseRequest, LookupByLedgerRequest {
    * version available.
    */
   ledger_index_max?: number
+  /** Use to look for transactions from a single ledger only. */
+  ledger_hash?: string
+  /** Use to look for transactions from a single ledger only. */
+  ledger_index?: LedgerIndex
   /**
    * If true, return transactions as hex strings instead of JSON. The default is
    * false.
@@ -49,7 +53,7 @@ export interface AccountTxRequest extends BaseRequest, LookupByLedgerRequest {
   marker?: unknown
 }
 
-export interface AccountTxTransaction {
+interface AccountTransaction {
   /** The ledger index of the ledger version that included this transaction. */
   ledger_index: number
   /**
@@ -98,7 +102,7 @@ export interface AccountTxResponse extends BaseResponse {
      * Array of transactions matching the request's criteria, as explained
      * below.
      */
-    transactions: AccountTxTransaction[]
+    transactions: AccountTransaction[]
     /**
      * If included and set to true, the information in this response comes from
      * a validated ledger version. Otherwise, the information is subject to

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

@@ -1,5 +1,3 @@
-import { LedgerIndex } from '../common'
-
 import type { Request } from '.'
 
 export interface BaseRequest {
@@ -16,14 +14,7 @@ export interface BaseRequest {
   api_version?: number
 }
 
-export interface LookupByLedgerRequest {
-  /** A 20-byte hex string for the ledger version to use. */
-  ledger_hash?: string
-  /** The ledger index of the ledger to use, or a shortcut string. */
-  ledger_index?: LedgerIndex
-}
-
-export interface ResponseWarning {
+interface Warning {
   id: number
   message: string
   details?: { [key: string]: string }
@@ -35,7 +26,7 @@ export interface BaseResponse {
   type: 'response' | string
   result: unknown
   warning?: 'load'
-  warnings?: ResponseWarning[]
+  warnings?: Warning[]
   forwarded?: boolean
   api_version?: number
 }

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

@@ -1,9 +1,9 @@
-import { Amount } from '../common'
+import { Amount, LedgerIndex } from '../common'
 import { Offer } from '../ledger'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
-export interface BookOfferCurrency {
+export interface TakerAmount {
   currency: string
   issuer?: string
 }
@@ -14,8 +14,15 @@ export interface BookOfferCurrency {
  *
  * @category Requests
  */
-export interface BookOffersRequest extends BaseRequest, LookupByLedgerRequest {
+export interface BookOffersRequest extends BaseRequest {
   command: 'book_offers'
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * If provided, the server does not provide more than this many offers in the
    * results. The total number of results returned may be fewer than the limit,
@@ -32,13 +39,13 @@ export interface BookOffersRequest extends BaseRequest, LookupByLedgerRequest {
    * receive, as an object with currency and issuer fields (omit issuer for
    * XRP), like currency amounts.
    */
-  taker_gets: BookOfferCurrency
+  taker_gets: TakerAmount
   /**
    * Specification of which currency the account taking the offer would pay, as
    * an object with currency and issuer fields (omit issuer for XRP), like
    * currency amounts.
    */
-  taker_pays: BookOfferCurrency
+  taker_pays: TakerAmount
 }
 
 export interface BookOffer extends Offer {

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

@@ -1,4 +1,6 @@
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { LedgerIndex } from '../common'
+
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The deposit_authorized command indicates whether one account is authorized to
@@ -7,14 +9,19 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface DepositAuthorizedRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface DepositAuthorizedRequest extends BaseRequest {
   command: 'deposit_authorized'
   /** The sender of a possible payment. */
   source_account: string
   /** The recipient of a possible payment. */
   destination_account: string
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
 }
 
 /**

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

@@ -1,4 +1,6 @@
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { LedgerIndex } from '../common'
+
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The gateway_balances command calculates the total balances issued by a given
@@ -19,9 +21,7 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface GatewayBalancesRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface GatewayBalancesRequest extends BaseRequest {
   command: 'gateway_balances'
   /** The Address to check. This should be the issuing address. */
   account: string
@@ -35,9 +35,16 @@ export interface GatewayBalancesRequest
    * Such addresses.
    */
   hotwallet?: string | string[]
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger version to use, or a shortcut string to
+   * choose a ledger automatically.
+   */
+  ledger_index?: LedgerIndex
 }
 
-export interface GatewayBalance {
+interface Balance {
   currency: string
   value: string
 }
@@ -60,12 +67,12 @@ export interface GatewayBalancesResponse extends BaseResponse {
      * Amounts issued to the hotwallet addresses from the request. The keys are
      * addresses and the values are arrays of currency amounts they hold.
      */
-    balances?: { [address: string]: GatewayBalance[] }
+    balances?: { [address: string]: Balance[] }
     /**
      * Total amounts held that are issued by others. In the recommended
      * configuration, the issuing address should have none.
      */
-    assets?: { [address: string]: GatewayBalance[] }
+    assets?: { [address: string]: Balance[] }
     /**
      * The identifying hash of the ledger version that was used to generate
      * this response.

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

@@ -1,58 +1,23 @@
-/* eslint-disable max-lines -- There is a lot to export */
 import {
   AccountChannelsRequest,
   AccountChannelsResponse,
-  Channel,
 } from './accountChannels'
 import {
   AccountCurrenciesRequest,
   AccountCurrenciesResponse,
 } from './accountCurrencies'
-import {
-  AccountInfoAccountFlags,
-  AccountInfoRequest,
-  AccountInfoResponse,
-  AccountQueueData,
-  AccountQueueTransaction,
-} from './accountInfo'
-import {
-  AccountLinesRequest,
-  AccountLinesResponse,
-  AccountLinesTrustline,
-} from './accountLines'
-import {
-  AccountNFToken,
-  AccountNFTsRequest,
-  AccountNFTsResponse,
-} from './accountNFTs'
-import {
-  AccountObject,
-  AccountObjectsRequest,
-  AccountObjectsResponse,
-  AccountObjectType,
-} from './accountObjects'
+import { AccountInfoRequest, AccountInfoResponse } from './accountInfo'
+import { AccountLinesRequest, AccountLinesResponse } from './accountLines'
+import { AccountNFTsRequest, AccountNFTsResponse } from './accountNFTs'
+import { AccountObjectsRequest, AccountObjectsResponse } from './accountObjects'
 import {
   AccountOffer,
   AccountOffersRequest,
   AccountOffersResponse,
 } from './accountOffers'
-import {
-  AccountTxRequest,
-  AccountTxResponse,
-  AccountTxTransaction,
-} from './accountTx'
-import {
-  BaseRequest,
-  BaseResponse,
-  ErrorResponse,
-  ResponseWarning,
-} from './baseMethod'
-import {
-  BookOffersRequest,
-  BookOffer,
-  BookOffersResponse,
-  BookOfferCurrency,
-} from './bookOffers'
+import { AccountTxRequest, AccountTxResponse } from './accountTx'
+import { ErrorResponse } from './baseMethod'
+import { BookOffersRequest, BookOffer, BookOffersResponse } from './bookOffers'
 import { ChannelVerifyRequest, ChannelVerifyResponse } from './channelVerify'
 import {
   DepositAuthorizedRequest,
@@ -60,34 +25,17 @@ import {
 } from './depositAuthorized'
 import { FeeRequest, FeeResponse } from './fee'
 import {
-  GatewayBalance,
   GatewayBalancesRequest,
   GatewayBalancesResponse,
 } from './gatewayBalances'
-import {
-  LedgerBinary,
-  LedgerModifiedOfferCreateTransaction,
-  LedgerQueueData,
-  LedgerRequest,
-  LedgerResponse,
-} from './ledger'
+import { LedgerRequest, LedgerResponse } from './ledger'
 import { LedgerClosedRequest, LedgerClosedResponse } from './ledgerClosed'
 import { LedgerCurrentRequest, LedgerCurrentResponse } from './ledgerCurrent'
-import {
-  LedgerDataBinaryLedgerEntry,
-  LedgerDataLabeledLedgerEntry,
-  LedgerDataLedgerState,
-  LedgerDataRequest,
-  LedgerDataResponse,
-} from './ledgerData'
+import { LedgerDataRequest, LedgerDataResponse } from './ledgerData'
 import { LedgerEntryRequest, LedgerEntryResponse } from './ledgerEntry'
 import { ManifestRequest, ManifestResponse } from './manifest'
 import { NFTBuyOffersRequest, NFTBuyOffersResponse } from './nftBuyOffers'
-import {
-  NFTHistoryRequest,
-  NFTHistoryResponse,
-  NFTHistoryTransaction,
-} from './nftHistory'
+import { NFTHistoryRequest, NFTHistoryResponse } from './nftHistory'
 import { NFTInfoRequest, NFTInfoResponse } from './nftInfo'
 import { NFTSellOffersRequest, NFTSellOffersResponse } from './nftSellOffers'
 import { NoRippleCheckRequest, NoRippleCheckResponse } from './norippleCheck'
@@ -97,24 +45,11 @@ import {
   PathFindCreateRequest,
   PathFindStatusRequest,
   PathFindResponse,
-  PathFindPathOption,
 } from './pathFind'
 import { PingRequest, PingResponse } from './ping'
 import { RandomRequest, RandomResponse } from './random'
-import {
-  RipplePathFindPathOption,
-  RipplePathFindRequest,
-  RipplePathFindResponse,
-  SourceCurrencyAmount,
-} from './ripplePathFind'
-import {
-  JobType,
-  ServerInfoRequest,
-  ServerInfoResponse,
-  ServerState,
-  StateAccounting,
-  StateAccountingFinal,
-} from './serverInfo'
+import { RipplePathFindRequest, RipplePathFindResponse } from './ripplePathFind'
+import { ServerInfoRequest, ServerInfoResponse } from './serverInfo'
 import { ServerStateRequest, ServerStateResponse } from './serverState'
 import { SubmitRequest, SubmitResponse } from './submit'
 import {
@@ -122,15 +57,12 @@ import {
   SubmitMultisignedResponse,
 } from './submitMultisigned'
 import {
-  BooksSnapshot,
   ConsensusStream,
   LedgerStream,
-  LedgerStreamResponse,
   OrderBookStream,
   PathFindStream,
   PeerStatusStream,
   Stream,
-  SubscribeBook,
   SubscribeRequest,
   SubscribeResponse,
   TransactionStream,
@@ -141,11 +73,7 @@ import {
   TransactionEntryResponse,
 } from './transactionEntry'
 import { TxRequest, TxResponse } from './tx'
-import {
-  UnsubscribeBook,
-  UnsubscribeRequest,
-  UnsubscribeResponse,
-} from './unsubscribe'
+import { UnsubscribeRequest, UnsubscribeResponse } from './unsubscribe'
 /**
  * @category Requests
  */
@@ -249,31 +177,19 @@ type Response =
   | NFTHistoryResponse
 
 export {
-  // Allow users to define their own requests and responses.  This is useful for releasing experimental versions
-  BaseRequest,
-  BaseResponse,
   Request,
   Response,
-  ResponseWarning,
-  // account methods with types
-  Channel,
+  // account methods
   AccountChannelsRequest,
   AccountChannelsResponse,
   AccountCurrenciesRequest,
   AccountCurrenciesResponse,
-  AccountInfoAccountFlags,
   AccountInfoRequest,
   AccountInfoResponse,
-  AccountQueueData,
-  AccountQueueTransaction,
   AccountLinesRequest,
   AccountLinesResponse,
-  AccountLinesTrustline,
-  AccountNFToken,
   AccountNFTsRequest,
   AccountNFTsResponse,
-  AccountObject,
-  AccountObjectType,
   AccountObjectsRequest,
   AccountObjectsResponse,
   AccountOffer,
@@ -281,8 +197,6 @@ export {
   AccountOffersResponse,
   AccountTxRequest,
   AccountTxResponse,
-  AccountTxTransaction,
-  GatewayBalance,
   GatewayBalancesRequest,
   GatewayBalancesResponse,
   NoRippleCheckRequest,
@@ -290,21 +204,15 @@ export {
   // ledger methods
   LedgerRequest,
   LedgerResponse,
-  LedgerQueueData,
-  LedgerBinary,
-  LedgerModifiedOfferCreateTransaction,
   LedgerClosedRequest,
   LedgerClosedResponse,
   LedgerCurrentRequest,
   LedgerCurrentResponse,
   LedgerDataRequest,
-  LedgerDataLabeledLedgerEntry,
-  LedgerDataBinaryLedgerEntry,
   LedgerDataResponse,
-  LedgerDataLedgerState,
   LedgerEntryRequest,
   LedgerEntryResponse,
-  // transaction methods with types
+  // transaction methods
   SubmitRequest,
   SubmitResponse,
   SubmitMultisignedRequest,
@@ -313,34 +221,27 @@ export {
   TransactionEntryResponse,
   TxRequest,
   TxResponse,
-  // path and order book methods with types
+  // path and order book methods
   BookOffersRequest,
   BookOffer,
-  BookOfferCurrency,
   BookOffersResponse,
   DepositAuthorizedRequest,
   DepositAuthorizedResponse,
   PathFindRequest,
   PathFindCreateRequest,
   PathFindCloseRequest,
-  PathFindPathOption,
   PathFindStatusRequest,
   PathFindResponse,
-  RipplePathFindPathOption,
   RipplePathFindRequest,
   RipplePathFindResponse,
-  SourceCurrencyAmount,
   // payment channel methods
   ChannelVerifyRequest,
   ChannelVerifyResponse,
-  // Subscribe methods/streams with types
+  // Subscribe methods/streams
   SubscribeRequest,
   SubscribeResponse,
-  SubscribeBook,
   Stream,
-  BooksSnapshot,
   LedgerStream,
-  LedgerStreamResponse,
   ValidationStream,
   TransactionStream,
   PathFindStream,
@@ -349,8 +250,7 @@ export {
   ConsensusStream,
   UnsubscribeRequest,
   UnsubscribeResponse,
-  UnsubscribeBook,
-  // server info methods with types
+  // server info methods
   FeeRequest,
   FeeResponse,
   ManifestRequest,
@@ -359,10 +259,6 @@ export {
   ServerInfoResponse,
   ServerStateRequest,
   ServerStateResponse,
-  JobType,
-  ServerState,
-  StateAccountingFinal,
-  StateAccounting,
   // utility methods
   PingRequest,
   PingResponse,
@@ -379,5 +275,4 @@ export {
   NFTInfoResponse,
   NFTHistoryRequest,
   NFTHistoryResponse,
-  NFTHistoryTransaction,
 }

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

@@ -1,8 +1,9 @@
+import { LedgerIndex } from '../common'
 import { Ledger } from '../ledger'
 import { Transaction, TransactionAndMetadata } from '../transactions'
 import { TransactionMetadata } from '../transactions/metadata'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * Retrieve information about the public ledger. Expects a response in the form
@@ -24,8 +25,15 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface LedgerRequest extends BaseRequest, LookupByLedgerRequest {
+export interface LedgerRequest extends BaseRequest {
   command: 'ledger'
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * Admin required If true, return full information on the entire ledger.
    * Ignored if you did not specify a ledger version. Defaults to false.
@@ -67,19 +75,20 @@ export interface LedgerRequest extends BaseRequest, LookupByLedgerRequest {
   queue?: boolean
 }
 
-/**
- * Special case transaction definition when the request contains `owner_funds: true`.
- */
-export interface LedgerModifiedOfferCreateTransaction {
-  transaction: Transaction
-  metadata: TransactionMetadata & { owner_funds: string }
+interface ModifiedMetadata extends TransactionMetadata {
+  owner_funds: string
 }
 
-export interface LedgerQueueData {
+interface ModifiedOfferCreateTransaction {
+  transaction: Transaction
+  metadata: ModifiedMetadata
+}
+
+interface LedgerQueueData {
   account: string
   tx:
     | TransactionAndMetadata
-    | LedgerModifiedOfferCreateTransaction
+    | ModifiedOfferCreateTransaction
     | { tx_blob: string }
   retries_remaining: number
   preflight_result: string
@@ -90,7 +99,7 @@ export interface LedgerQueueData {
   max_spend_drops?: string
 }
 
-export interface LedgerBinary
+interface BinaryLedger
   extends Omit<Omit<Ledger, 'transactions'>, 'accountState'> {
   accountState?: string[]
   transactions?: string[]
@@ -104,7 +113,7 @@ export interface LedgerBinary
 export interface LedgerResponse extends BaseResponse {
   result: {
     /** The complete header data of this {@link Ledger}. */
-    ledger: Ledger | LedgerBinary
+    ledger: Ledger | BinaryLedger
     /** Unique identifying hash of the entire ledger. */
     ledger_hash: string
     /** The Ledger Index of this ledger. */

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

@@ -1,6 +1,7 @@
+import { LedgerIndex } from '../common'
 import { LedgerEntry } from '../ledger'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The `ledger_data` method retrieves contents of the specified ledger. You can
@@ -20,8 +21,15 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface LedgerDataRequest extends BaseRequest, LookupByLedgerRequest {
+export interface LedgerDataRequest extends BaseRequest {
   command: 'ledger_data'
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /**
    * If set to true, return ledger objects as hashed hex strings instead of
    * JSON.
@@ -39,18 +47,13 @@ export interface LedgerDataRequest extends BaseRequest, LookupByLedgerRequest {
   marker?: unknown
 }
 
-export type LedgerDataLabeledLedgerEntry = {
-  ledgerEntryType: string
-} & LedgerEntry
+type LabeledLedgerEntry = { ledgerEntryType: string } & LedgerEntry
 
-export interface LedgerDataBinaryLedgerEntry {
+export interface BinaryLedgerEntry {
   data: string
 }
 
-export type LedgerDataLedgerState = { index: string } & (
-  | LedgerDataBinaryLedgerEntry
-  | LedgerDataLabeledLedgerEntry
-)
+type State = { index: string } & (BinaryLedgerEntry | LabeledLedgerEntry)
 
 /**
  * The response expected from a {@link LedgerDataRequest}.
@@ -67,7 +70,7 @@ export interface LedgerDataResponse extends BaseResponse {
      * Array of JSON objects containing data from the ledger's state tree,
      * as defined below.
      */
-    state: LedgerDataLedgerState[]
+    state: State[]
     /**
      * Server-defined value indicating the response is paginated. Pass this to
      * the next call to resume where this call left off.

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

@@ -1,6 +1,7 @@
+import { LedgerIndex } from '../common'
 import { LedgerEntry } from '../ledger'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The `ledger_entry` method returns a single ledger object from the XRP Ledger
@@ -18,7 +19,7 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface LedgerEntryRequest extends BaseRequest, LookupByLedgerRequest {
+export interface LedgerEntryRequest extends BaseRequest {
   command: 'ledger_entry'
   /**
    * If true, return the requested ledger object's contents as a hex string in
@@ -26,6 +27,10 @@ export interface LedgerEntryRequest extends BaseRequest, LookupByLedgerRequest {
    * default is false.
    */
   binary?: boolean
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /** The ledger index of the ledger to use, or a shortcut string. */
+  ledger_index?: LedgerIndex
 
   /*
    * Only one of the following properties should be defined in a single request
@@ -132,11 +137,6 @@ export interface LedgerEntryRequest extends BaseRequest, LookupByLedgerRequest {
         ticket_sequence: number
       }
     | string
-
-  /**
-   * Must be the object ID of the NFToken page, as hexadecimal
-   */
-  nft_page?: string
 }
 
 /**

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

@@ -1,6 +1,6 @@
 import { NFTOffer } from '../common'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The `nft_buy_offers` method retrieves all of buy offers for the specified
@@ -8,9 +8,7 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface NFTBuyOffersRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface NFTBuyOffersRequest extends BaseRequest {
   command: 'nft_buy_offers'
   /**
    * The unique identifier of an NFToken. The request returns buy offers for this NFToken.

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

@@ -1,7 +1,7 @@
-import { ResponseOnlyTxInfo } from '../common'
+import { LedgerIndex, ResponseOnlyTxInfo } from '../common'
 import { Transaction, TransactionMetadata } from '../transactions'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The nft_history method retrieves a list of transactions that involved the
@@ -10,7 +10,7 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface NFTHistoryRequest extends BaseRequest, LookupByLedgerRequest {
+export interface NFTHistoryRequest extends BaseRequest {
   command: 'nft_history'
   /**
    * The unique identifier of an NFToken.
@@ -28,6 +28,10 @@ export interface NFTHistoryRequest extends BaseRequest, LookupByLedgerRequest {
    * version available.
    */
   ledger_index_max?: number
+  /** Use to look for transactions from a single ledger only. */
+  ledger_hash?: string
+  /** Use to look for transactions from a single ledger only. */
+  ledger_index?: LedgerIndex
   /**
    * If true, return transactions as hex strings instead of JSON. The default is
    * false.
@@ -51,7 +55,7 @@ export interface NFTHistoryRequest extends BaseRequest, LookupByLedgerRequest {
   marker?: unknown
 }
 
-export interface NFTHistoryTransaction {
+interface NFTokenTransaction {
   /** The ledger index of the ledger version that included this transaction. */
   ledger_index: number
   /**
@@ -102,7 +106,7 @@ export interface NFTHistoryResponse extends BaseResponse {
      * Array of transactions matching the request's criteria, as explained
      * below.
      */
-    transactions: NFTHistoryTransaction[]
+    transactions: NFTokenTransaction[]
     /**
      * If included and set to true, the information in this response comes from
      * a validated ledger version. Otherwise, the information is subject to

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

@@ -1,18 +1,26 @@
-import { NFToken } from '../common'
+import { LedgerIndex, NFToken } from '../common'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
- * The `nft_info` method retrieves information about an NFToken.
+ * The `nft_info` method retrieves information about NFToken
+ * NFToken.
  *
  * @category Requests
  */
-export interface NFTInfoRequest extends BaseRequest, LookupByLedgerRequest {
+export interface NFTInfoRequest extends BaseRequest {
   command: 'nft_info'
   /**
    * The unique identifier of an NFToken.
    */
   nft_id: string
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
 }
 
 /**

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

@@ -1,6 +1,6 @@
 import { NFTOffer } from '../common'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The `nft_sell_offers` method retrieves all of sell offers for the specified
@@ -8,9 +8,7 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface NFTSellOffersRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface NFTSellOffersRequest extends BaseRequest {
   command: 'nft_sell_offers'
   /**
    * The unique identifier of an NFToken. The request returns sell offers for this NFToken.

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

@@ -55,7 +55,7 @@ export type PathFindRequest =
   | PathFindCloseRequest
   | PathFindStatusRequest
 
-export interface PathFindPathOption {
+interface PathOption {
   /** Array of arrays of objects defining payment paths. */
   paths_computed: Path[]
   /**
@@ -82,7 +82,7 @@ export interface PathFindResponse extends BaseResponse {
      * empty, then no paths were found connecting the source and destination
      * accounts.
      */
-    alternatives: PathFindPathOption[]
+    alternatives: PathOption[]
     /** Unique address of the account that would receive a transaction. */
     destination_account: string
     /** Currency amount provided in the WebSocket request. */

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

@@ -1,8 +1,8 @@
-import { Amount, Path } from '../common'
+import { Amount, LedgerIndex, Path } from '../common'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
-export interface SourceCurrencyAmount {
+interface SourceCurrencyAmount {
   currency: string
   issuer?: string
 }
@@ -14,9 +14,7 @@ export interface SourceCurrencyAmount {
  *
  * @category Requests
  */
-export interface RipplePathFindRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface RipplePathFindRequest extends BaseRequest {
   command: 'ripple_path_find'
   /** Unique address of the account that would send funds in a transaction. */
   source_account: string
@@ -37,10 +35,17 @@ export interface RipplePathFindRequest
    * entry in the array should be a JSON object with a mandatory currency field
    * and optional issuer field, like how currency amounts are specified.
    */
-  source_currencies?: SourceCurrencyAmount[]
+  source_currencies?: SourceCurrencyAmount
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
 }
 
-export interface RipplePathFindPathOption {
+interface PathOption {
   /** Array of arrays of objects defining payment paths. */
   paths_computed: Path[]
   /**
@@ -62,7 +67,7 @@ export interface RipplePathFindResponse extends BaseResponse {
      * empty, then there are no paths connecting the source and destination
      * accounts.
      */
-    alternatives: RipplePathFindPathOption[]
+    alternatives: PathOption[]
     /** Unique address of the account that would receive a payment transaction. */
     destination_account: string
     /**

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

@@ -14,7 +14,7 @@ export interface SubmitMultisignedRequest extends BaseRequest {
   /**
    * Transaction in JSON format with an array of Signers. To be successful, the
    * weights of the signatures must be equal or higher than the quorum of the.
-   * {@link Transaction Type/SignerList}.
+   * {@link SignerList}.
    */
   tx_json: Transaction
   /**

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

@@ -11,7 +11,7 @@ import { TransactionMetadata } from '../transactions/metadata'
 
 import type { BaseRequest, BaseResponse } from './baseMethod'
 
-export interface SubscribeBook {
+interface Book {
   /**
    * Specification of which currency the account taking the Offer would
    * receive, as a currency object with no amount.
@@ -60,7 +60,7 @@ export interface SubscribeRequest extends BaseRequest {
    * Array of objects defining order books  to monitor for updates, as detailed
    * Below.
    */
-  books?: SubscribeBook[]
+  books?: Book[]
   /**
    * URL where the server sends a JSON-RPC callbacks for each event.
    * Admin-only.
@@ -72,7 +72,7 @@ export interface SubscribeRequest extends BaseRequest {
   url_password?: string
 }
 
-export type BooksSnapshot = Offer[]
+type BooksSnapshot = Offer[]
 
 /**
  * Response expected from a {@link SubscribeRequest}.
@@ -102,8 +102,8 @@ export interface LedgerStream extends BaseStream {
    * Transaction cost applies starting with the following ledger version.
    */
   fee_base: number
-  /** The reference transaction cost in "fee units". This is not returned after the SetFees amendment is enabled. */
-  fee_ref?: number
+  /** The reference transaction cost in "fee units". */
+  fee_ref: number
   /** The identifying hash of the ledger version that was closed. */
   ledger_hash: string
   /** The ledger index of the ledger that was closed. */
@@ -143,8 +143,8 @@ export interface LedgerStreamResponse {
    * Transaction cost applies starting with the following ledger version.
    */
   fee_base: number
-  /** The reference transaction cost in "fee units". This is not returned after the SetFees amendment is enabled. */
-  fee_ref?: number
+  /** The reference transaction cost in "fee units". */
+  fee_ref: number
   /** The identifying hash of the ledger version that was closed. */
   ledger_hash: string
   /** The ledger index of the ledger that was closed. */

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

@@ -1,7 +1,7 @@
-import { ResponseOnlyTxInfo } from '../common'
+import { LedgerIndex, ResponseOnlyTxInfo } from '../common'
 import { Transaction, TransactionMetadata } from '../transactions'
 
-import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
+import { BaseRequest, BaseResponse } from './baseMethod'
 
 /**
  * The `transaction_entry` method retrieves information on a single transaction
@@ -10,11 +10,15 @@ import { BaseRequest, BaseResponse, LookupByLedgerRequest } from './baseMethod'
  *
  * @category Requests
  */
-export interface TransactionEntryRequest
-  extends BaseRequest,
-    LookupByLedgerRequest {
+export interface TransactionEntryRequest extends BaseRequest {
   command: 'transaction_entry'
-
+  /** A 20-byte hex string for the ledger version to use. */
+  ledger_hash?: string
+  /**
+   * The ledger index of the ledger to use, or a shortcut string to choose a
+   * ledger automatically.
+   */
+  ledger_index?: LedgerIndex
   /** Unique hash of the transaction you are looking up. */
   tx_hash: string
 }

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

@@ -46,8 +46,7 @@ export interface TxResponse<T extends BaseTransaction = Transaction>
     hash: string
     /** The ledger index of the ledger that includes this transaction. */
     ledger_index?: number
-    /** Transaction metadata, which describes the results of the transaction.
-     *  Can be undefined if a transaction has not been validated yet. */
+    /** Transaction metadata, which describes the results of the transaction. */
     meta?: TransactionMetadata | string
     /**
      * If true, this data comes from a validated ledger version; if omitted or.

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

@@ -2,7 +2,7 @@ import { Currency, StreamType } from '../common'
 
 import type { BaseRequest, BaseResponse } from './baseMethod'
 
-export interface UnsubscribeBook {
+interface Book {
   taker_gets: Currency
   taker_pays: Currency
   both?: boolean
@@ -36,7 +36,7 @@ export interface UnsubscribeRequest extends BaseRequest {
    * Array of objects defining order books to unsubscribe from, as explained
    * below.
    */
-  books?: UnsubscribeBook[]
+  books?: Book[]
 }
 
 /**

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

@@ -1,20 +0,0 @@
-/**
- * Mark a change to the Negative UNL.
- *
- * @category Pseudo Transaction Models
- */
-export interface UNLModify {
-  TransactionType: 'UNLModify'
-  /**
-   * The ledger index where this pseudo-transaction appears.
-   * This distinguishes the pseudo-transaction from other occurrences of the same change.
-   */
-  LedgerSequence: number
-  /**
-   * If 0, this change represents removing a validator from the Negative UNL.
-   * If 1, this change represents adding a validator to the Negative UNL.
-   */
-  UNLModifyDisabling: 0 | 1
-  /** The validator to add or remove, as identified by its master public key. */
-  UNLModifyValidator: string
-}

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

@@ -1,6 +1,6 @@
 /* eslint-disable complexity -- Necessary for validateAccountSet */
 
-import { isValidClassicAddress } from '@transia/ripple-address-codec'
+import { isValidClassicAddress } from 'ripple-address-codec'
 
 import { ValidationError } from '../../errors'
 

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

@@ -1,7 +1,7 @@
 /* eslint-disable max-lines-per-function -- Necessary for validateBaseTransaction */
 /* eslint-disable complexity -- Necessary for validateBaseTransaction */
 /* eslint-disable max-statements -- Necessary for validateBaseTransaction */
-import { TRANSACTION_TYPES } from '@transia/ripple-binary-codec'
+import { TRANSACTION_TYPES } from 'ripple-binary-codec'
 
 import { ValidationError } from '../../errors'
 import { Amount, IssuedCurrencyAmount, Memo, Signer } from '../common'

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

@@ -1,26 +0,0 @@
-import { BaseTransaction } from './common'
-
-/**
- * Transaction Flags for an EnableAmendment Transaction.
- *
- * @category Transaction Flags
- */
-export enum EnableAmendmentFlags {
-  /** Support for this amendment increased to at least 80% of trusted validators starting with this ledger version. */
-  tfGotMajority = 0x00010000,
-  /** Support for this amendment decreased to less than 80% of trusted validators starting with this ledger version. */
-  tfLostMajority = 0x00020000,
-}
-
-/**
- * Mark a change in the status of a proposed amendment when it gains majority, looses majority, or is enabled.
- *
- * @category Pseudo Transaction Models
- */
-export interface EnableAmendment extends BaseTransaction {
-  TransactionType: 'EnableAmendment'
-  /** A unique identifier for the amendment. */
-  Amendment: string
-  /** The ledger index where this pseudo-transaction appears. */
-  LedgerSequence: number
-}

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

@@ -1,6 +1,5 @@
-export { BaseTransaction } from './common'
 export { validate, TransactionAndMetadata, Transaction } from './transaction'
-export * from './metadata'
+export { TransactionMetadata } from './metadata'
 export {
   AccountSetAsfFlags,
   AccountSetTfFlags,
@@ -15,7 +14,6 @@ export { DepositPreauth } from './depositPreauth'
 export { EscrowCancel } from './escrowCancel'
 export { EscrowCreate } from './escrowCreate'
 export { EscrowFinish } from './escrowFinish'
-export { EnableAmendment, EnableAmendmentFlags } from './enableAmendment'
 export { NFTokenAcceptOffer } from './NFTokenAcceptOffer'
 export { NFTokenBurn } from './NFTokenBurn'
 export { NFTokenCancelOffer } from './NFTokenCancelOffer'
@@ -43,9 +41,7 @@ export {
 } from './paymentChannelClaim'
 export { PaymentChannelCreate } from './paymentChannelCreate'
 export { PaymentChannelFund } from './paymentChannelFund'
-export { SetFee, SetFeePreAmendment, SetFeePostAmendment } from './setFee'
 export { SetRegularKey } from './setRegularKey'
 export { SignerListSet } from './signerListSet'
 export { TicketCreate } from './ticketCreate'
 export { TrustSetFlagsInterface, TrustSetFlags, TrustSet } from './trustSet'
-export { UNLModify } from './UNLModify'

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

@@ -1,48 +0,0 @@
-import { BaseTransaction } from './common'
-
-export interface SetFeePreAmendment extends BaseTransaction {
-  /**
-   * The charge, in drops of XRP, for the reference transaction, as hex. (This is the transaction cost before scaling for load.)
-   */
-  BaseFee: string
-  /**
-   * The cost, in fee units, of the [reference transaction](https://xrpl.org/transaction-cost.html#reference-transaction-cost)
-   */
-  ReferenceFeeUnits: number
-  /**
-   * The base reserve, in drops
-   */
-  ReserveBase: number
-  /**
-   * The incremental reserve, in drops
-   */
-  ReserveIncrement: number
-}
-
-export interface SetFeePostAmendment extends BaseTransaction {
-  /**
-   * The charge, in drops of XRP, for the reference transaction. (This is the transaction cost before scaling for load.)
-   */
-  BaseFeeDrops: string
-  /**
-   * The base reserve, in drops
-   */
-  ReserveBaseDrops: string
-  /**
-   * The incremental reserve, in drops
-   */
-  ReserveIncrementDrops: string
-}
-
-/**
- * Marks a change in transaction cost or reserve requirements as a result of Fee Voting.
- *
- * The output will be based on the status of the `XRPFees` amendment at the time of this transaction.
- * - Before: {@link SetFeePostAmendment}
- * - After: {@link SetFeePostAmendment}
- *
- * @category Pseudo Transaction Models
- */
-export type SetFee = {
-  TransactionType: 'SetFee'
-} & (SetFeePreAmendment | SetFeePostAmendment)

packages/xrpl/src/sugar/autofill.ts

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js'
-import { xAddressToClassicAddress, isValidXAddress } from '@transia/ripple-address-codec'
+import { xAddressToClassicAddress, isValidXAddress } from 'ripple-address-codec'
 
 import type { Client } from '..'
 import { ValidationError, XrplError } from '../errors'

packages/xrpl/src/sugar/balances.ts

@@ -1,12 +1,9 @@
 import flatMap from 'lodash/flatMap'
 
 import type { Client } from '..'
-import {
-  AccountLinesRequest,
-  AccountLinesTrustline,
-  LedgerIndex,
-  AccountInfoRequest,
-} from '../models'
+import { LedgerIndex } from '../models/common'
+import { AccountInfoRequest } from '../models/methods'
+import { AccountLinesRequest, Trustline } from '../models/methods/accountLines'
 import { dropsToXrp } from '../utils'
 
 interface Balance {
@@ -15,7 +12,7 @@ interface Balance {
   issuer?: string
 }
 
-function formatBalances(trustlines: AccountLinesTrustline[]): Balance[] {
+function formatBalances(trustlines: Trustline[]): Balance[] {
   return trustlines.map((trustline) => ({
     value: trustline.balance,
     currency: trustline.currency,

packages/xrpl/src/sugar/getOrderbook.ts

@@ -8,8 +8,8 @@ import { LedgerIndex } from '../models/common'
 import { OfferFlags } from '../models/ledger/Offer'
 import {
   BookOffer,
-  BookOfferCurrency,
   BookOffersRequest,
+  TakerAmount,
 } from '../models/methods/bookOffers'
 
 const DEFAULT_LIMIT = 20
@@ -51,8 +51,8 @@ const getOrderbookOptionsSet = new Set([
 // eslint-disable-next-line max-params, complexity -- Once bound to Client, getOrderbook only has 3 parameters.
 async function getOrderbook(
   this: Client,
-  currency1: BookOfferCurrency,
-  currency2: BookOfferCurrency,
+  currency1: TakerAmount,
+  currency2: TakerAmount,
   options: {
     limit?: number
     ledger_index?: LedgerIndex

packages/xrpl/src/sugar/submit.ts

@@ -1,4 +1,4 @@
-import { decode, encode } from '@transia/ripple-binary-codec'
+import { decode, encode } from 'ripple-binary-codec'
 
 import type { Client, SubmitRequest, SubmitResponse, Wallet } from '..'
 import { ValidationError, XrplError } from '../errors'

packages/xrpl/src/sugar/utils.ts

@@ -1,4 +1,4 @@
-import { xAddressToClassicAddress, isValidXAddress } from '@transia/ripple-address-codec'
+import { xAddressToClassicAddress, isValidXAddress } from 'ripple-address-codec'
 
 /**
  * If an address is an X-Address, converts it to a classic address.
@@ -7,6 +7,7 @@ import { xAddressToClassicAddress, isValidXAddress } from '@transia/ripple-addre
  * @returns The account's classic address.
  * @throws Error if the X-Address has an associated tag.
  */
+// eslint-disable-next-line import/prefer-default-export -- okay for a utils file - there could be more exports later
 export function ensureClassicAddress(account: string): string {
   if (isValidXAddress(account)) {
     const { classicAddress, tag } = xAddressToClassicAddress(account)

packages/xrpl/src/utils/derive.ts

@@ -1,5 +1,5 @@
-import { classicAddressToXAddress } from '@transia/ripple-address-codec'
-import { deriveKeypair, deriveAddress } from '@transia/ripple-keypairs'
+import { classicAddressToXAddress } from 'ripple-address-codec'
+import { deriveKeypair, deriveAddress } from 'ripple-keypairs'
 
 /**
  * Derive an X-Address from a public key and a destination tag.

packages/xrpl/src/utils/getNFTokenID.ts

@@ -1,7 +1,5 @@
-import { decode } from '@transia/ripple-binary-codec'
 import flatMap from 'lodash/flatMap'
 
-import { NFToken } from '../models/ledger/NFTokenPage'
 import {
   CreatedNode,
   isCreatedNode,
@@ -10,41 +8,31 @@ import {
   TransactionMetadata,
 } from '../models/transactions/metadata'
 
-/**
- * Ensures that the metadata is in a deserialized format to parse.
- *
- * @param meta - the metadata from a `tx` method call. Can be in json format or binary format.
- * @returns the metadata in a deserialized format.
- */
-function ensureDecodedMeta(
-  meta: TransactionMetadata | string,
-): TransactionMetadata {
-  if (typeof meta === 'string') {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Meta is either metadata or serialized metadata.
-    return decode(meta) as unknown as TransactionMetadata
+interface NFToken {
+  NFToken: {
+    NFTokenID: string
+    URI: string
   }
-  return meta
 }
 
 /**
  * Gets the NFTokenID for an NFT recently minted with NFTokenMint.
  *
- * @param meta - Metadata from the response to submitting and waiting for an NFTokenMint transaction or from a `tx` method call.
+ * @param meta - Metadata from the response to submitting an NFTokenMint transaction.
  * @returns The NFTokenID for the minted NFT.
  * @throws if meta is not TransactionMetadata.
  */
 export default function getNFTokenID(
-  meta: TransactionMetadata | string | undefined,
+  meta: TransactionMetadata,
 ): string | undefined {
-  if (typeof meta !== 'string' && meta?.AffectedNodes === undefined) {
-    throw new TypeError(`Unable to parse the parameter given to getNFTokenID.
-      'meta' must be the metadata from an NFTokenMint transaction. Received ${JSON.stringify(
-        meta,
-      )} instead.`)
+  /* eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- Provides a nicer error for js users */
+  if (meta.AffectedNodes === undefined) {
+    throw new TypeError(`Unable to parse the parameter given to getNFTokenID. 
+    'meta' must be the metadata from an NFTokenMint transaction. Received ${JSON.stringify(
+      meta,
+    )} instead.`)
   }
 
-  const decodedMeta = ensureDecodedMeta(meta)
-
   /*
    * When a mint results in splitting an existing page,
    * it results in a created page and a modified node. Sometimes,
@@ -58,7 +46,7 @@ export default function getNFTokenID(
    * if the PreviousFields contains NFTokens
    */
 
-  const affectedNodes = decodedMeta.AffectedNodes.filter((node) => {
+  const affectedNodes = meta.AffectedNodes.filter((node) => {
     if (isCreatedNode(node)) {
       return node.CreatedNode.LedgerEntryType === 'NFTokenPage'
     }

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

@@ -4,7 +4,7 @@
    bitwise operators for and-ing numbers with a mask and bit shifting. */
 
 import BigNumber from 'bignumber.js'
-import { decode, encode } from '@transia/ripple-binary-codec'
+import { decode, encode } from 'ripple-binary-codec'
 
 import { ValidationError, XrplError } from '../../errors'
 import type { Ledger } from '../../models/ledger'

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

@@ -4,7 +4,7 @@
    bitwise operators for and-ing numbers with a mask and bit shifting. */
 
 import BigNumber from 'bignumber.js'
-import { decodeAccountID } from '@transia/ripple-address-codec'
+import { decodeAccountID } from 'ripple-address-codec'
 
 import hashLedger, {
   hashLedgerHeader,

packages/xrpl/src/utils/index.ts

@@ -13,9 +13,9 @@ import {
   isValidClassicAddress,
   isValidXAddress,
   xAddressToClassicAddress,
-} from '@transia/ripple-address-codec'
-import * as rbc from '@transia/ripple-binary-codec'
-import { verify as verifyKeypairSignature } from '@transia/ripple-keypairs'
+} from 'ripple-address-codec'
+import * as rbc from 'ripple-binary-codec'
+import { verify as verifyKeypairSignature } from 'ripple-keypairs'
 
 import { LedgerEntry } from '../models/ledger'
 import { Response } from '../models/methods'

packages/xrpl/src/utils/parseNFTokenID.ts

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

packages/xrpl/src/utils/signPaymentChannelClaim.ts

@@ -1,5 +1,5 @@
-import { encodeForSigningClaim } from '@transia/ripple-binary-codec'
-import { sign } from '@transia/ripple-keypairs'
+import { encodeForSigningClaim } from 'ripple-binary-codec'
+import { sign } from 'ripple-keypairs'
 
 import { xrpToDrops } from './xrpConversion'
 

packages/xrpl/src/utils/verifyPaymentChannelClaim.ts

@@ -1,5 +1,5 @@
-import { encodeForSigningClaim } from '@transia/ripple-binary-codec'
-import { verify } from '@transia/ripple-keypairs'
+import { encodeForSigningClaim } from 'ripple-binary-codec'
+import { verify } from 'ripple-keypairs'
 
 import { xrpToDrops } from './xrpConversion'
 

packages/xrpl/test/client/submit.test.ts

@@ -4,7 +4,7 @@ import cloneDeep from 'lodash/cloneDeep'
 
 import { multisign, ValidationError } from '../../src'
 import { Transaction } from '../../src/models/transactions'
-import { Wallet } from '../../src/Wallet'
+import Wallet from '../../src/Wallet'
 import rippled from '../fixtures/rippled'
 import {
   setupClient,

packages/xrpl/test/fixtures/rippled/subscribe.json

@@ -4,6 +4,7 @@
   "type": "response",
   "result": {
     "fee_base": 10,
+    "fee_ref": 10,
     "hostid": "NAP",
     "ledger_hash": "60EBABF55F6AB58864242CADA0B24FBEA027F2426917F39CA56576B335C0065A",
     "ledger_index": 8819951,

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

@@ -1,6 +1,7 @@
 import { assert } from 'chai'
 
-import { LedgerDataBinaryLedgerEntry, LedgerDataRequest } from '../../../src'
+import { LedgerDataRequest } from '../../../src'
+import type { BinaryLedgerEntry } from '../../../src/models/methods/ledgerData'
 import serverUrl from '../serverUrl'
 import {
   setupClient,
@@ -57,7 +58,7 @@ describe('ledger_data', function () {
 
       assert.equal(ledgerDataResponse.result.state.length, 5)
       ledgerDataResponse.result.state.forEach((item) => {
-        assert.typeOf((item as LedgerDataBinaryLedgerEntry).data, 'string')
+        assert.typeOf((item as BinaryLedgerEntry).data, 'string')
         assert.typeOf(item.index, 'string')
       })
     },

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

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

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

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

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

@@ -158,6 +158,7 @@ describe('subscribe', function () {
         // Explicitly checking that there are only known fields in the return
         const expectedResult = {
           fee_base: ledgerResponse.fee_base,
+          fee_ref: ledgerResponse.fee_ref,
           ledger_hash: ledgerResponse.ledger_hash,
           ledger_index: ledgerResponse.ledger_index,
           ledger_time: ledgerResponse.ledger_time,
@@ -165,6 +166,7 @@ describe('subscribe', function () {
           reserve_inc: ledgerResponse.reserve_inc,
           validated_ledgers: ledgerResponse.validated_ledgers,
         }
+
         assert.equal(response.type, 'response')
         assert.deepEqual(response.result, expectedResult)
 

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

@@ -1,87 +1,69 @@
 import { assert } from 'chai'
-import { TransactionMetadata, TxRequest } from 'xrpl'
+import _ from 'lodash'
+import { Client } from 'xrpl'
 
-import { convertStringToHex, getNFTokenID, NFTokenMint } from '../../../src'
-import { hashSignedTx } from '../../../src/utils/hashes'
-import serverUrl from '../serverUrl'
 import {
-  setupClient,
-  teardownClient,
-  type XrplIntegrationTestContext,
-} from '../setup'
-import { testTransaction } from '../utils'
+  convertStringToHex,
+  getNFTokenID,
+  NFTokenMint,
+  TransactionMetadata,
+} from '../../../src'
 
 // how long before each test case times out
 const TIMEOUT = 20000
 
 describe('NFTokenMint', function () {
-  let testContext: XrplIntegrationTestContext
-
-  beforeEach(async () => {
-    testContext = await setupClient(serverUrl)
-  })
-  afterEach(async () => teardownClient(testContext))
-
+  // TODO: Once we update our integration tests to handle NFTs, replace this client with XrplIntegrationTestContext
   it(
     'get NFTokenID',
     async function () {
+      const client = new Client('wss://s.altnet.rippletest.net:51233/')
+      await client.connect()
+
+      const { wallet, balance: _balance } = await client.fundWallet(null, {
+        usageContext: 'integration-test',
+      })
+
       const tx: NFTokenMint = {
         TransactionType: 'NFTokenMint',
-        Account: testContext.wallet.address,
+        Account: wallet.address,
         URI: convertStringToHex('https://www.google.com'),
         NFTokenTaxon: 0,
       }
-      const response = await testTransaction(
-        testContext.client,
-        tx,
-        testContext.wallet,
-      )
-      assert.equal(response.type, 'response')
+      try {
+        const response = await client.submitAndWait(tx, {
+          wallet,
+        })
+        assert.equal(response.type, 'response')
+        assert.equal(
+          (response.result.meta as TransactionMetadata).TransactionResult,
+          'tesSUCCESS',
+        )
 
-      const txRequest: TxRequest = {
-        command: 'tx',
-        transaction: hashSignedTx(response.result.tx_blob),
+        const accountNFTs = await client.request({
+          command: 'account_nfts',
+          account: wallet.address,
+        })
+
+        const nftokenID =
+          getNFTokenID(response.result.meta as TransactionMetadata) ??
+          'undefined'
+        const accountHasNFT = accountNFTs.result.account_nfts.some(
+          (value) => value.NFTokenID === nftokenID,
+        )
+
+        assert.isTrue(
+          accountHasNFT,
+          `Expected to find an NFT with NFTokenID ${nftokenID} in account ${
+            wallet.address
+          } but did not find it.
+        \n\nHere's what was returned from 'account_nfts' for ${
+          wallet.address
+        }: ${JSON.stringify(accountNFTs)}`,
+        )
+      } finally {
+        await client.disconnect()
       }
-      const txResponse = await testContext.client.request(txRequest)
-
-      assert.equal(
-        (txResponse.result.meta as TransactionMetadata).TransactionResult,
-        'tesSUCCESS',
-      )
-
-      const accountNFTs = await testContext.client.request({
-        command: 'account_nfts',
-        account: testContext.wallet.address,
-      })
-
-      const nftokenID =
-        getNFTokenID(txResponse.result.meta as TransactionMetadata) ??
-        'undefined'
-
-      const accountHasNFT = accountNFTs.result.account_nfts.some(
-        (value) => value.NFTokenID === nftokenID,
-      )
-
-      assert.isTrue(
-        accountHasNFT,
-        `Expected to find an NFT with NFTokenID ${nftokenID} in account ${
-          testContext.wallet.address
-        } but did not find it.
-      \n\nHere's what was returned from 'account_nfts' for ${
-        testContext.wallet.address
-      }: ${JSON.stringify(accountNFTs)}`,
-      )
-
-      const binaryTxResponse = await testContext.client.request({
-        ...txRequest,
-        binary: true,
-      })
-
-      assert.equal(
-        nftokenID,
-        getNFTokenID(binaryTxResponse.result.meta) ?? 'undefined',
-        `getNFTokenID produced a different outcome when decoding the metadata in binary format.`,
-      )
     },
     TIMEOUT,
   )

packages/xrpl/test/integration/utils.ts

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

packages/xrpl/test/setupClient.ts

@@ -1,6 +1,6 @@
 import { Client } from '../src/client'
 // eslint-disable-next-line import/no-deprecated -- Will remove in 3.0.0
-import { BroadcastClient } from '../src/client/BroadcastClient'
+import BroadcastClient from '../src/client/BroadcastClient'
 
 import createMockRippled, {
   type MockedWebSocketServer,

packages/xrpl/test/utils/hashes.test.ts

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 
 import { assert } from 'chai'
-import { encode } from '@transia/ripple-binary-codec'
+import { encode } from 'ripple-binary-codec'
 
 import { OfferCreate, Transaction, ValidationError } from '../../src'
 import {

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

@@ -1,9 +1,9 @@
 import { assert } from 'chai'
-import { decode } from '@transia/ripple-binary-codec'
+import { decode } from 'ripple-binary-codec'
 
 import { NFTokenMint, Payment, Transaction } from '../../src'
 import ECDSA from '../../src/ECDSA'
-import { Wallet } from '../../src/Wallet'
+import Wallet from '../../src/Wallet'
 import requests from '../fixtures/requests'
 import responses from '../fixtures/responses'
 

packages/xrpl/test/wallet/signer.test.ts

@@ -1,8 +1,8 @@
 import { assert } from 'chai'
-import { decode, encode } from '@transia/ripple-binary-codec'
+import { decode, encode } from 'ripple-binary-codec'
 
 import { Transaction, ValidationError } from '../../src'
-import { Wallet } from '../../src/Wallet'
+import Wallet from '../../src/Wallet'
 import {
   authorizeChannel,
   multisign,