network id option 3

fixup add network id to server info fixture fixup! Revert "update tests and fixtures" This reverts commit a5deee1274.
2025-11-15 01:55:48 +00:00 · 2023-02-23 14:52:36 -05:00
parent a5deee1274
commit 07ff7630b1
35 changed files with 44 additions and 163 deletions
--- a/packages/xrpl/src/client/index.ts
+++ b/packages/xrpl/src/client/index.ts
@@ -101,6 +101,7 @@ import {
  getXrpBalance,
  submit,
  submitAndWait,
+  getNetworkID,
 } from '../sugar'
 import fundWallet from '../Wallet/fundWallet'

@@ -200,6 +201,13 @@ class Client extends EventEmitter {
   */
  public readonly maxFeeXRP: string

+  /**
+   * Network ID of the server this sdk is connected to
+   *
+   * @category Fee
+   */
+  public networkID: number
+
  /**
   * Creates a new Client with a websocket connection to a rippled server.
   *
@@ -218,6 +226,7 @@ class Client extends EventEmitter {

    this.feeCushion = options.feeCushion ?? DEFAULT_FEE_CUSHION
    this.maxFeeXRP = options.maxFeeXRP ?? DEFAULT_MAX_FEE_XRP
+    this.networkID = 1

    this.connection = new Connection(server, options)

@@ -282,6 +291,17 @@ class Client extends EventEmitter {
    return this.connection.getUrl()
  }

+  /**
+   * Set the network id of the connected client.
+   *
+   * @category Network
+   * @returns The Network ID of the server this client is connected to.
+   */
+  public async setNetworkID(): Promise<number> {
+    this.networkID = await this.getNetworkID()
+    return this.networkID
+  }
+
  /**
   * @category Network
   */
@@ -634,6 +654,11 @@ class Client extends EventEmitter {
   */
  public getLedgerIndex = getLedgerIndex

+  /**
+   * @category Abstraction
+   */
+  public getNetworkID = getNetworkID
+
  /**
   * @category Faucet
   */
--- a/packages/xrpl/src/sugar/autofill.ts
+++ b/packages/xrpl/src/sugar/autofill.ts
@@ -9,7 +9,6 @@ import { setTransactionFlagsToNumber } from '../models/utils/flags'
 import { xrpToDrops } from '../utils'

 import getFeeXrp from './getFeeXrp'
-import getNetworkID from './getNetworkID'

 // Expire unconfirmed transactions after 20 ledger versions, approximately 1 minute, by default
 const LEDGER_OFFSET = 20
@@ -42,7 +41,7 @@ async function autofill<T extends Transaction>(
  setTransactionFlagsToNumber(tx)
  const promises: Array<Promise<void>> = []
  if (tx.NetworkID == null) {
-    promises.push(setNetworkID(this, tx))
+    setNetworkID(this, tx)
  }
  if (tx.Sequence == null) {
    promises.push(setNextValidSequenceNumber(this, tx))
@@ -203,10 +202,10 @@ function scaleValue(value, multiplier): string {
  return new BigNumber(value).times(multiplier).toString()
 }

-async function setNetworkID(client: Client, tx: Transaction): Promise<void> {
-  const id = await getNetworkID(client)
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type -- no return
+function setNetworkID(client: Client, tx: Transaction) {
  // eslint-disable-next-line no-param-reassign -- param reassign is safe
-  tx.NetworkID = id
+  tx.NetworkID = client.networkID
 }

 async function setLatestValidatedLedgerSequence(
--- a/packages/xrpl/src/sugar/getNetworkID.ts
+++ b/packages/xrpl/src/sugar/getNetworkID.ts
@@ -5,11 +5,10 @@ import { XrplError } from '../errors'
 * Returns the network ID of the rippled server.
 *
 * @param this - The Client used to connect to the ledger.
- * @param client
 * @returns The network id.
 */
-export default async function getNetworkID(client: Client): Promise<number> {
-  const response = await client.request({
+export default async function getNetworkID(this: Client): Promise<number> {
+  const response = await this.request({
    command: 'server_info',
  })
  const networkID = response.result.info.network_id
--- a/packages/xrpl/src/sugar/index.ts
+++ b/packages/xrpl/src/sugar/index.ts
@@ -6,6 +6,8 @@ export { default as getLedgerIndex } from './getLedgerIndex'

 export { default as getOrderbook } from './getOrderbook'

+export { default as getNetworkID } from './getNetworkID'
+
 export * from './submit'

 export * from './utils'
--- a/packages/xrpl/test/client/autofill.test.ts
+++ b/packages/xrpl/test/client/autofill.test.ts
@@ -18,7 +18,6 @@ import { assertRejects } from '../testUtils'
 const Fee = '10'
 const Sequence = 1432
 const LastLedgerSequence = 2908734
-const NetworkID = 21338

 describe('client.autofill', function () {
  let testContext: XrplTestContext
@@ -36,14 +35,12 @@ describe('client.autofill', function () {
      Fee,
      Sequence,
      LastLedgerSequence,
-      NetworkID,
    }
    const txResult = await testContext.client.autofill(tx)

    assert.strictEqual(txResult.Fee, Fee)
    assert.strictEqual(txResult.Sequence, Sequence)
    assert.strictEqual(txResult.LastLedgerSequence, LastLedgerSequence)
-    assert.strictEqual(txResult.NetworkID, NetworkID)
  })

  it('converts Account & Destination X-address to their classic address', async function () {
@@ -61,10 +58,6 @@ describe('client.autofill', function () {
      'server_info',
      rippled.server_info.normal,
    )
-    testContext.mockRippled!.addResponse(
-      'server_info',
-      rippled.server_info.normal,
-    )
    testContext.mockRippled!.addResponse('ledger', rippled.ledger.normal)

    const txResult = await testContext.client.autofill(tx)
@@ -83,7 +76,6 @@ describe('client.autofill', function () {
      Authorize: 'rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo',
      Fee,
      LastLedgerSequence,
-      NetworkID,
    }
    testContext.mockRippled!.addResponse('account_info', {
      status: 'success',
@@ -109,10 +101,6 @@ describe('client.autofill', function () {
      'server_info',
      rippled.server_info.normal,
    )
-    testContext.mockRippled!.addResponse(
-      'server_info',
-      rippled.server_info.normal,
-    )
    testContext.mockRippled!.addResponse(
      'account_objects',
      rippled.account_objects.normal,
@@ -125,7 +113,6 @@ describe('client.autofill', function () {
      Fee,
      Sequence,
      LastLedgerSequence,
-      NetworkID,
    }

    await assertRejects(testContext.client.autofill(tx), XrplError)
@@ -139,7 +126,6 @@ describe('client.autofill', function () {
        Authorize: 'rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo',
        Sequence,
        LastLedgerSequence,
-        NetworkID,
      }
      testContext.mockRippled!.addResponse(
        'server_info',
@@ -169,10 +155,6 @@ describe('client.autofill', function () {
        'server_info',
        rippled.server_info.normal,
      )
-      testContext.mockRippled!.addResponse(
-        'server_info',
-        rippled.server_info.normal,
-      )

      const txResult = await testContext.client.autofill(tx)
      assert.strictEqual(txResult.Fee, '399')
@@ -189,10 +171,6 @@ describe('client.autofill', function () {
        rippled.account_info.normal,
      )
      testContext.mockRippled!.addResponse('ledger', rippled.ledger.normal)
-      testContext.mockRippled!.addResponse(
-        'server_info',
-        rippled.server_info.normal,
-      )
      testContext.mockRippled!.addResponse('server_state', {
        status: 'success',
        type: 'response',
@@ -236,10 +214,6 @@ describe('client.autofill', function () {
        'server_info',
        rippled.server_info.normal,
      )
-      testContext.mockRippled!.addResponse(
-        'server_info',
-        rippled.server_info.normal,
-      )
      const txResult = await testContext.client.autofill(tx, 4)

      assert.strictEqual(txResult.Fee, '459')
@@ -253,7 +227,6 @@ describe('client.autofill', function () {
      Authorize: 'rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo',
      Fee,
      Sequence,
-      NetworkID,
    }
    testContext.mockRippled!.addResponse('ledger', {
      status: 'success',
@@ -299,37 +272,9 @@ describe('client.autofill', function () {
        },
      },
    })
-    testContext.mockRippled!.addResponse(
-      'server_info',
-      rippled.server_info.normal,
-    )
    const txResult = await testContext.client.autofill(tx)
    assert.strictEqual(txResult.Fee, '12')
    assert.strictEqual(txResult.Sequence, 23)
    assert.strictEqual(txResult.LastLedgerSequence, 9038234)
-    assert.strictEqual(txResult.NetworkID, 21338)
-  })
-
-  it("should autofill NetworkID when it's missing", async function () {
-    const tx: Transaction = {
-      TransactionType: 'DepositPreauth',
-      Account: 'rGWrZyQqhTp9Xu7G5Pkayo7bXjH4k4QYpf',
-      Authorize: 'rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo',
-      Fee,
-      LastLedgerSequence,
-      Sequence,
-    }
-    testContext.mockRippled!.addResponse('server_info', {
-      status: 'success',
-      type: 'response',
-      result: {
-        info: {
-          network_id: 21338,
-        },
-      },
-    })
-    const txResult = await testContext.client.autofill(tx)
-
-    assert.strictEqual(txResult.NetworkID, 21338)
  })
 })
--- a/packages/xrpl/test/client/submit.test.ts
+++ b/packages/xrpl/test/client/submit.test.ts
@@ -34,7 +34,6 @@ describe('client.submit', function () {
      Sequence: 1,
      Fee: '12',
      LastLedgerSequence: 12312,
-      NetworkID: 21338,
    }

    it('should submit an unsigned transaction', async function () {
@@ -84,7 +83,6 @@ describe('client.submit', function () {
      LastLedgerSequence: 12312,
      Amount: '20000000',
      Fee: '12',
-      NetworkID: 21338,
      SigningPubKey:
        '030E58CDD076E798C84755590AAF6237CA8FAE821070A59F648B517A30DC6F589D',
      TxnSignature:
--- a/packages/xrpl/test/fixtures/responses/getServerInfo.json
+++ b/packages/xrpl/test/fixtures/responses/getServerInfo.json
@@ -8,6 +8,7 @@
    "proposers": 4
  },
  "load_factor": 1,
+  "network_id": 21338,
  "peers": 53,
  "pubkey_node": "n94wWvFUmaKGYrKUGgpv1DyYgDeXRGdACkNQaSe7zJiy5Znio7UC",
  "server_state": "full",
--- a/packages/xrpl/test/fixtures/rippled/serverInfo.json
+++ b/packages/xrpl/test/fixtures/rippled/serverInfo.json
@@ -12,8 +12,8 @@
        "converge_time_s": 2.007,
        "proposers": 4
      },
-      "network_id": 21338,
      "load_factor": 1,
+      "network_id": 21338,
      "peers": 53,
      "pubkey_node": "n94wWvFUmaKGYrKUGgpv1DyYgDeXRGdACkNQaSe7zJiy5Znio7UC",
      "server_state": "full",
--- a/packages/xrpl/test/models/NFTokenAcceptOffer.test.ts
+++ b/packages/xrpl/test/models/NFTokenAcceptOffer.test.ts
@@ -19,7 +19,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenBuyOffer: NFTOKEN_BUY_OFFER,
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -33,7 +32,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenSellOffer: NFTOKEN_SELL_OFFER,
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -46,7 +44,6 @@ describe('NFTokenAcceptOffer', function () {
      TransactionType: 'NFTokenAcceptOffer',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -65,7 +62,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenBuyOffer: NFTOKEN_BUY_OFFER,
      NFTokenBrokerFee: '1',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -84,7 +80,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenSellOffer: NFTOKEN_SELL_OFFER,
      NFTokenBrokerFee: '1',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -103,7 +98,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenBuyOffer: NFTOKEN_BUY_OFFER,
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -119,7 +113,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenBrokerFee: '1',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -135,7 +128,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenBuyOffer: NFTOKEN_BUY_OFFER,
      NFTokenBrokerFee: '0',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -155,7 +147,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenBuyOffer: NFTOKEN_BUY_OFFER,
      NFTokenBrokerFee: '-1',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -175,7 +166,6 @@ describe('NFTokenAcceptOffer', function () {
      NFTokenBuyOffer: NFTOKEN_BUY_OFFER,
      NFTokenBrokerFee: 1,
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
--- a/packages/xrpl/test/models/NFTokenBurn.test.ts
+++ b/packages/xrpl/test/models/NFTokenBurn.test.ts
@@ -17,7 +17,6 @@ describe('NFTokenBurn', function () {
      NFTokenID: TOKEN_ID,
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
@@ -30,7 +29,6 @@ describe('NFTokenBurn', function () {
      TransactionType: 'NFTokenBurn',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: 2147483648,
    } as any
--- a/packages/xrpl/test/models/NFTokenCancelOffer.test.ts
+++ b/packages/xrpl/test/models/NFTokenCancelOffer.test.ts
@@ -14,7 +14,6 @@ describe('NFTokenCancelOffer', function () {
  it(`verifies valid NFTokenCancelOffer`, function () {
    const validNFTokenCancelOffer = {
      TransactionType: 'NFTokenCancelOffer',
-      NetworkID: 21338,
      NFTokenOffers: [BUY_OFFER],
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
@@ -29,7 +28,6 @@ describe('NFTokenCancelOffer', function () {
    const invalid = {
      TransactionType: 'NFTokenCancelOffer',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
-      NetworkID: 21338,
      Fee: '5000000',
      Sequence: 2470665,
      Flags: 2147483648,
@@ -46,7 +44,6 @@ describe('NFTokenCancelOffer', function () {
    const invalid = {
      TransactionType: 'NFTokenCancelOffer',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
-      NetworkID: 21338,
      NFTokenOffers: [],
      Fee: '5000000',
      Sequence: 2470665,
--- a/packages/xrpl/test/models/NFTokenCreateOffer.test.ts
+++ b/packages/xrpl/test/models/NFTokenCreateOffer.test.ts
@@ -14,7 +14,6 @@ describe('NFTokenCreateOffer', function () {
  it(`verifies valid NFTokenCreateOffer buyside`, function () {
    const validNFTokenCreateOffer = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      NFTokenID: NFTOKEN_ID,
      Amount: '1',
      Owner: 'r9LqNeG6qHxjeUocjvVki2XR35weJ9mZgQ',
@@ -31,7 +30,6 @@ describe('NFTokenCreateOffer', function () {
  it(`verifies valid NFTokenCreateOffer sellside`, function () {
    const validNFTokenCreateOffer = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      NFTokenID: NFTOKEN_ID,
      Amount: '1',
      Flags: NFTokenCreateOfferFlags.tfSellNFToken,
@@ -48,7 +46,6 @@ describe('NFTokenCreateOffer', function () {
  it(`verifies w/ 0 Amount NFTokenCreateOffer sellside`, function () {
    const validNFTokenCreateOffer = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      NFTokenID: NFTOKEN_ID,
      Amount: '0',
      Flags: NFTokenCreateOfferFlags.tfSellNFToken,
@@ -65,7 +62,6 @@ describe('NFTokenCreateOffer', function () {
  it(`throws w/ Account === Owner`, function () {
    const invalid = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      NFTokenID: NFTOKEN_ID,
      Amount: '1',
      Expiration: 1000,
@@ -85,7 +81,6 @@ describe('NFTokenCreateOffer', function () {
  it(`throws w/ Account === Destination`, function () {
    const invalid = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      NFTokenID: NFTOKEN_ID,
      Amount: '1',
      Flags: NFTokenCreateOfferFlags.tfSellNFToken,
@@ -106,7 +101,6 @@ describe('NFTokenCreateOffer', function () {
  it(`throws w/out NFTokenID`, function () {
    const invalid = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      Amount: '1',
      Owner: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXe',
      Expiration: 1000,
@@ -126,7 +120,6 @@ describe('NFTokenCreateOffer', function () {
  it(`throws w/ invalid Amount`, function () {
    const invalid = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      NFTokenID: NFTOKEN_ID,
      Amount: 1,
      Owner: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXe',
@@ -147,7 +140,6 @@ describe('NFTokenCreateOffer', function () {
  it(`throws w/ missing Amount`, function () {
    const invalid = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      Owner: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXe',
      Expiration: 1000,
      NFTokenID: NFTOKEN_ID,
@@ -167,7 +159,6 @@ describe('NFTokenCreateOffer', function () {
  it(`throws w/ Owner for sell offer`, function () {
    const invalid = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      Expiration: 1000,
      Owner: 'r9LqNeG6qHxjeUocjvVki2XR35weJ9mZgQ',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
@@ -188,7 +179,6 @@ describe('NFTokenCreateOffer', function () {
  it(`throws w/out Owner for buy offer`, function () {
    const invalid = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      Expiration: 1000,
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Amount: '1',
@@ -207,7 +197,6 @@ describe('NFTokenCreateOffer', function () {
  it(`throws w/ 0 Amount for buy offer`, function () {
    const invalid = {
      TransactionType: 'NFTokenCreateOffer',
-      NetworkID: 21338,
      Expiration: 1000,
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Owner: 'r9LqNeG6qHxjeUocjvVki2XR35weJ9mZgQ',
--- a/packages/xrpl/test/models/NFTokenMint.test.ts
+++ b/packages/xrpl/test/models/NFTokenMint.test.ts
@@ -18,7 +18,6 @@ describe('NFTokenMint', function () {
      TransactionType: 'NFTokenMint',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: NFTokenMintFlags.tfTransferable,
      NFTokenTaxon: 0,
@@ -35,7 +34,6 @@ describe('NFTokenMint', function () {
      TransactionType: 'NFTokenMint',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: NFTokenMintFlags.tfTransferable,
      Issuer: 'r9LqNeG6qHxjeUocjvVki2XR35weJ9mZgQ',
@@ -55,7 +53,6 @@ describe('NFTokenMint', function () {
      TransactionType: 'NFTokenMint',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: NFTokenMintFlags.tfTransferable,
      Issuer: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
@@ -76,7 +73,6 @@ describe('NFTokenMint', function () {
      TransactionType: 'NFTokenMint',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
      Fee: '5000000',
-      NetworkID: 21338,
      Sequence: 2470665,
      Flags: NFTokenMintFlags.tfTransferable,
      NFTokenTaxon: 0,
--- a/packages/xrpl/test/models/accountDelete.test.ts
+++ b/packages/xrpl/test/models/accountDelete.test.ts
@@ -13,7 +13,6 @@ describe('AccountDelete', function () {
    const validAccountDelete = {
      TransactionType: 'AccountDelete',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
-      NetworkID: 21338,
      Destination: 'rPT1Sjq2YGrBMTttX4GZHjKu9dyfzbpAYe',
      DestinationTag: 13,
      Fee: '5000000',
@@ -28,7 +27,6 @@ describe('AccountDelete', function () {
    const invalidDestination = {
      TransactionType: 'AccountDelete',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
-      NetworkID: 21338,
      Fee: '5000000',
      Sequence: 2470665,
      Flags: 2147483648,
@@ -51,7 +49,6 @@ describe('AccountDelete', function () {
    const invalidDestination = {
      TransactionType: 'AccountDelete',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
-      NetworkID: 21338,
      Destination: 65478965,
      Fee: '5000000',
      Sequence: 2470665,
@@ -74,7 +71,6 @@ describe('AccountDelete', function () {
    const invalidDestinationTag = {
      TransactionType: 'AccountDelete',
      Account: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
-      NetworkID: 21338,
      Destination: 'rPT1Sjq2YGrBMTttX4GZHjKu9dyfzbpAYe',
      DestinationTag: 'gvftyujnbv',
      Fee: '5000000',
--- a/packages/xrpl/test/models/accountSet.test.ts
+++ b/packages/xrpl/test/models/accountSet.test.ts
@@ -15,7 +15,6 @@ describe('AccountSet', function () {
    account = {
      TransactionType: 'AccountSet',
      Account: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
-      NetworkID: 21338,
      Fee: '12',
      Sequence: 5,
      Domain: '6578616D706C652E636F6D',
--- a/packages/xrpl/test/models/baseTransaction.test.ts
+++ b/packages/xrpl/test/models/baseTransaction.test.ts
@@ -13,7 +13,6 @@ describe('BaseTransaction', function () {
    const txJson = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      Fee: '12',
      Sequence: 100,
      AccountTxnID: 'DEADBEEF',
@@ -64,7 +63,6 @@ describe('BaseTransaction', function () {
    const txJson = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
    }

    assert.doesNotThrow(() => validateBaseTransaction(txJson))
@@ -74,7 +72,6 @@ describe('BaseTransaction', function () {
    const invalidFee = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      Fee: 1000,
    } as any

@@ -89,7 +86,6 @@ describe('BaseTransaction', function () {
    const invalidSeq = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      Sequence: '145',
    } as any

@@ -104,7 +100,6 @@ describe('BaseTransaction', function () {
    const invalidID = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      AccountTxnID: ['WRONG'],
    } as any

@@ -119,7 +114,6 @@ describe('BaseTransaction', function () {
    const invalidLastLedgerSequence = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      LastLedgerSequence: '1000',
    } as any

@@ -134,7 +128,6 @@ describe('BaseTransaction', function () {
    const invalidSourceTag = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      SourceTag: ['ARRAY'],
    } as any

@@ -149,7 +142,6 @@ describe('BaseTransaction', function () {
    const invalidSigningPubKey = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      SigningPubKey: 1000,
    } as any

@@ -164,7 +156,6 @@ describe('BaseTransaction', function () {
    const invalidTicketSequence = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      TicketSequence: '1000',
    } as any

@@ -179,7 +170,6 @@ describe('BaseTransaction', function () {
    const invalidTxnSignature = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      TxnSignature: 1000,
    } as any

@@ -190,25 +180,10 @@ describe('BaseTransaction', function () {
    )
  })

-  it(`Handles invalid NetworkID`, function () {
-    const invalidTxnSignature = {
-      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
-      TransactionType: 'Payment',
-      NetworkID: '21338',
-    } as any
-
-    assert.throws(
-      () => validateBaseTransaction(invalidTxnSignature),
-      ValidationError,
-      'BaseTransaction: invalid NetworkID',
-    )
-  })
-
  it(`Handles invalid Signers`, function () {
    const invalidSigners = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      Signers: [],
    } as any

@@ -221,7 +196,6 @@ describe('BaseTransaction', function () {
    const invalidSigners2 = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      Signers: [
        {
          Signer: {
@@ -242,7 +216,6 @@ describe('BaseTransaction', function () {
    const invalidMemo = {
      Account: 'r97KeayHuEsDwyU1yPBVtMLLoQr79QcRFe',
      TransactionType: 'Payment',
-      NetworkID: 21338,
      Memos: [
        {
          Memo: {
--- a/packages/xrpl/test/models/checkCancel.test.ts
+++ b/packages/xrpl/test/models/checkCancel.test.ts
@@ -13,7 +13,6 @@ describe('CheckCancel', function () {
    const validCheckCancel = {
      Account: 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo',
      TransactionType: 'CheckCancel',
-      NetworkID: 21338,
      CheckID:
        '49647F0D748DC3FE26BDACBC57F251AADEFFF391403EC9BF87C97F67E9977FB0',
    } as any
--- a/packages/xrpl/test/models/checkCash.test.ts
+++ b/packages/xrpl/test/models/checkCash.test.ts
@@ -13,7 +13,6 @@ describe('CheckCash', function () {
    const validCheckCash = {
      Account: 'rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy',
      TransactionType: 'CheckCash',
-      NetworkID: 21338,
      Amount: '100000000',
      CheckID:
        '838766BA2B995C00744175F69A1B11E32C3DBC40E64801A4056FCBD657F57334',
@@ -28,7 +27,6 @@ describe('CheckCash', function () {
    const invalidCheckID = {
      Account: 'rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy',
      TransactionType: 'CheckCash',
-      NetworkID: 21338,
      Amount: '100000000',
      CheckID: 83876645678567890,
    } as any
@@ -49,7 +47,6 @@ describe('CheckCash', function () {
    const invalidAmount = {
      Account: 'rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy',
      TransactionType: 'CheckCash',
-      NetworkID: 21338,
      Amount: 100000000,
      CheckID:
        '838766BA2B995C00744175F69A1B11E32C3DBC40E64801A4056FCBD657F57334',
@@ -71,7 +68,6 @@ describe('CheckCash', function () {
    const invalidDeliverMin = {
      Account: 'rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy',
      TransactionType: 'CheckCash',
-      NetworkID: 21338,
      Amount: '100000000',
      DeliverMin: 852156963,
      CheckID:
@@ -94,7 +90,6 @@ describe('CheckCash', function () {
    const invalidDeliverMin = {
      Account: 'rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy',
      TransactionType: 'CheckCash',
-      NetworkID: 21338,
      DeliverMin: 852156963,
      CheckID:
        '838766BA2B995C00744175F69A1B11E32C3DBC40E64801A4056FCBD657F57334',
--- a/packages/xrpl/test/models/checkCreate.test.ts
+++ b/packages/xrpl/test/models/checkCreate.test.ts
@@ -20,7 +20,6 @@ describe('CheckCreate', function () {
        '6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B',
      DestinationTag: 1,
      Fee: '12',
-      NetworkID: 21338,
    } as any

    assert.doesNotThrow(() => validateCheckCreate(validCheck))
@@ -38,7 +37,6 @@ describe('CheckCreate', function () {
        '6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B',
      DestinationTag: 1,
      Fee: '12',
-      NetworkID: 21338,
    } as any

    assert.throws(
@@ -64,7 +62,6 @@ describe('CheckCreate', function () {
        '6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B',
      DestinationTag: 1,
      Fee: '12',
-      NetworkID: 21338,
    } as any

    assert.throws(
@@ -83,7 +80,6 @@ describe('CheckCreate', function () {
    const invalidDestinationTag = {
      TransactionType: 'CheckCreate',
      Account: 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo',
-      NetworkID: 21338,
      Destination: 'rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy',
      SendMax: '100000000',
      Expiration: 570113521,
@@ -116,7 +112,6 @@ describe('CheckCreate', function () {
        '6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B',
      DestinationTag: 1,
      Fee: '12',
-      NetworkID: 21338,
    } as any

    assert.throws(
@@ -141,7 +136,6 @@ describe('CheckCreate', function () {
      InvoiceID: 789656963258531,
      DestinationTag: 1,
      Fee: '12',
-      NetworkID: 21338,
    } as any

    assert.throws(
--- a/packages/xrpl/test/models/depositPreauth.test.ts
+++ b/packages/xrpl/test/models/depositPreauth.test.ts
@@ -15,7 +15,6 @@ describe('DepositPreauth', function () {
    depositPreauth = {
      TransactionType: 'DepositPreauth',
      Account: 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo',
-      NetworkID: 21338,
    } as any
  })

--- a/packages/xrpl/test/models/escrowCancel.test.ts
+++ b/packages/xrpl/test/models/escrowCancel.test.ts
@@ -17,7 +17,6 @@ describe('EscrowCancel', function () {
      Account: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      Owner: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      OfferSequence: 7,
-      NetworkID: 21338,
    }
  })

--- a/packages/xrpl/test/models/escrowCreate.test.ts
+++ b/packages/xrpl/test/models/escrowCreate.test.ts
@@ -15,7 +15,6 @@ describe('EscrowCreate', function () {
    escrow = {
      Account: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      TransactionType: 'EscrowCreate',
-      NetworkID: 21338,
      Amount: '10000',
      Destination: 'rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW',
      CancelAfter: 533257958,
--- a/packages/xrpl/test/models/escrowFinish.test.ts
+++ b/packages/xrpl/test/models/escrowFinish.test.ts
@@ -15,7 +15,6 @@ describe('EscrowFinish', function () {
    escrow = {
      Account: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      TransactionType: 'EscrowFinish',
-      NetworkID: 21338,
      Owner: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      OfferSequence: 7,
      Condition:
--- a/packages/xrpl/test/models/offerCancel.test.ts
+++ b/packages/xrpl/test/models/offerCancel.test.ts
@@ -15,7 +15,6 @@ describe('OfferCancel', function () {
    offer = {
      Account: 'rnKiczmiQkZFiDES8THYyLA2pQohC5C6EF',
      Fee: '10',
-      NetworkID: 21338,
      LastLedgerSequence: 65477334,
      OfferSequence: 60797528,
      Sequence: 60797535,
--- a/packages/xrpl/test/models/offerCreate.test.ts
+++ b/packages/xrpl/test/models/offerCreate.test.ts
@@ -13,7 +13,6 @@ describe('OfferCreate', function () {
    const offer = {
      Account: 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W',
      Fee: '10',
-      NetworkID: 21338,
      Flags: 0,
      LastLedgerSequence: 65453019,
      Sequence: 40949322,
@@ -38,7 +37,6 @@ describe('OfferCreate', function () {
    const offer2 = {
      Account: 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W',
      Fee: '10',
-      NetworkID: 21338,
      Flags: 0,
      LastLedgerSequence: 65453019,
      Sequence: 40949322,
@@ -61,7 +59,6 @@ describe('OfferCreate', function () {
    const offer3 = {
      Account: 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W',
      Fee: '10',
-      NetworkID: 21338,
      Flags: 0,
      LastLedgerSequence: 65453019,
      Sequence: 40949322,
@@ -90,7 +87,6 @@ describe('OfferCreate', function () {
    const offer = {
      Account: 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W',
      Fee: '10',
-      NetworkID: 21338,
      Flags: 0,
      LastLedgerSequence: 65453019,
      Sequence: 40949322,
@@ -124,7 +120,6 @@ describe('OfferCreate', function () {
    const offer = {
      Account: 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W',
      Fee: '10',
-      NetworkID: 21338,
      Flags: 0,
      LastLedgerSequence: 65453019,
      Sequence: 40949322,
@@ -158,7 +153,6 @@ describe('OfferCreate', function () {
    const offer = {
      Account: 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W',
      Fee: '10',
-      NetworkID: 21338,
      Flags: 0,
      LastLedgerSequence: 65453019,
      Sequence: 40949322,
@@ -188,7 +182,6 @@ describe('OfferCreate', function () {
    const offer = {
      Account: 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W',
      Fee: '10',
-      NetworkID: 21338,
      Flags: 0,
      LastLedgerSequence: 65453019,
      Sequence: 40949322,
--- a/packages/xrpl/test/models/payment.test.ts
+++ b/packages/xrpl/test/models/payment.test.ts
@@ -19,7 +19,6 @@ describe('Payment', function () {
      Destination: 'rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy',
      DestinationTag: 1,
      Fee: '12',
-      NetworkID: 21338,
      Flags: 2147483648,
      LastLedgerSequence: 65953073,
      Sequence: 65923914,
--- a/packages/xrpl/test/models/paymentChannelClaim.test.ts
+++ b/packages/xrpl/test/models/paymentChannelClaim.test.ts
@@ -15,7 +15,6 @@ describe('PaymentChannelClaim', function () {
    channel = {
      Account: 'rB5Ux4Lv2nRx6eeoAAsZmtctnBQ2LiACnk',
      TransactionType: 'PaymentChannelClaim',
-      NetworkID: 21338,
      Channel:
        'C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198',
      Balance: '1000000',
--- a/packages/xrpl/test/models/paymentChannelCreate.test.ts
+++ b/packages/xrpl/test/models/paymentChannelCreate.test.ts
@@ -15,7 +15,6 @@ describe('PaymentChannelCreate', function () {
    channel = {
      Account: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      TransactionType: 'PaymentChannelCreate',
-      NetworkID: 21338,
      Amount: '10000',
      Destination: 'rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW',
      SettleDelay: 86400,
--- a/packages/xrpl/test/models/paymentChannelFund.test.ts
+++ b/packages/xrpl/test/models/paymentChannelFund.test.ts
@@ -15,7 +15,6 @@ describe('PaymentChannelFund', function () {
    channel = {
      Account: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      TransactionType: 'PaymentChannelFund',
-      NetworkID: 21338,
      Channel:
        'C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198',
      Amount: '200000',
--- a/packages/xrpl/test/models/setRegularKey.test.ts
+++ b/packages/xrpl/test/models/setRegularKey.test.ts
@@ -16,7 +16,6 @@ describe('SetRegularKey', function () {
      TransactionType: 'SetRegularKey',
      Account: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      Fee: '12',
-      NetworkID: 21338,
      Flags: 0,
      RegularKey: 'rAR8rR8sUkBoCZFawhkWzY4Y5YoyuznwD',
    } as any
--- a/packages/xrpl/test/models/signerListSet.test.ts
+++ b/packages/xrpl/test/models/signerListSet.test.ts
@@ -17,7 +17,6 @@ describe('SignerListSet', function () {
      TransactionType: 'SignerListSet',
      Account: 'rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn',
      Fee: '12',
-      NetworkID: 21338,
      SignerQuorum: 3,
      SignerEntries: [
        {
--- a/packages/xrpl/test/models/ticketCreate.test.ts
+++ b/packages/xrpl/test/models/ticketCreate.test.ts
@@ -15,7 +15,6 @@ describe('TicketCreate', function () {
    ticketCreate = {
      TransactionType: 'TicketCreate',
      Account: 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo',
-      NetworkID: 21338,
      TicketCount: 150,
    } as any
  })
--- a/packages/xrpl/test/models/trustSet.test.ts
+++ b/packages/xrpl/test/models/trustSet.test.ts
@@ -15,7 +15,6 @@ describe('TrustSet', function () {
    trustSet = {
      TransactionType: 'TrustSet',
      Account: 'rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo',
-      NetworkID: 21338,
      LimitAmount: {
        currency: 'XRP',
        issuer: 'rcXY84C4g14iFp6taFXjjQGVeHqSCh9RX',
--- a/packages/xrpl/test/models/utils.test.ts
+++ b/packages/xrpl/test/models/utils.test.ts
@@ -50,7 +50,6 @@ describe('Models Utils', function () {
      const tx: OfferCreate = {
        Account: 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W',
        Fee: '10',
-        NetworkID: 21338,
        TakerGets: {
          currency: 'DSH',
          issuer: 'rcXY84C4g14iFp6taFXjjQGVeHqSCh9RX',
--- a/packages/xrpl/test/setupClient.ts
+++ b/packages/xrpl/test/setupClient.ts
@@ -5,6 +5,7 @@ import BroadcastClient from '../src/client/BroadcastClient'
 import createMockRippled, {
  type MockedWebSocketServer,
 } from './createMockRippled'
+import rippled from './fixtures/rippled'
 import { destroyServer, getFreePort } from './testUtils'

 export interface XrplTestContext {
@@ -30,7 +31,10 @@ async function setupMockRippledConnection(
    // We must have an error listener attached for reconnect errors
  })

-  return context.client.connect().then(() => context)
+  await context.client.connect()
+  context.mockRippled!.addResponse('server_info', rippled.server_info.normal)
+  await context.client.setNetworkID()
+  return context
 }

 async function setupMockRippledConnectionForBroadcast(
@@ -44,7 +48,10 @@ async function setupMockRippledConnectionForBroadcast(
    servers: ports,
  }

-  return context.client.connect().then(() => context)
+  await context.client.connect()
+  context.mockRippled!.addResponse('server_info', rippled.server_info.normal)
+  await context.client.setNetworkID()
+  return context
 }

 async function setupClient(): Promise<XrplTestContext> {