update package.json for @transia

* update definitions

* add network id to base transaction

* update server info

* update base tx

* add network id to autofill

* update tests and fixtures

* network id option 3

fixup

add network id to server info fixture

fixup!

Revert "update tests and fixtures"

This reverts commit a5deee1274.

* update autofill

* update getNetworkID

* remove set network func

* fixup!

remove autoset network id

remove my mistake

fixup!

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

package-lock.json

@@ -2722,22 +2722,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/@transia/ripple-address-codec": {
-      "resolved": "packages/ripple-address-codec",
-      "link": true
-    },
-    "node_modules/@transia/ripple-binary-codec": {
-      "resolved": "packages/ripple-binary-codec",
-      "link": true
-    },
-    "node_modules/@transia/ripple-keypairs": {
-      "resolved": "packages/ripple-keypairs",
-      "link": true
-    },
-    "node_modules/@transia/xrpl": {
-      "resolved": "packages/xrpl",
-      "link": true
-    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
@@ -17140,8 +17124,7 @@
       }
     },
     "packages/ripple-address-codec": {
-      "name": "@transia/ripple-address-codec",
-      "version": "4.2.6",
+      "version": "4.2.5",
       "license": "ISC",
       "dependencies": {
         "base-x": "^3.0.9",
@@ -17152,8 +17135,7 @@
       }
     },
     "packages/ripple-binary-codec": {
-      "name": "@transia/ripple-binary-codec",
-      "version": "1.4.4",
+      "version": "1.4.3",
       "license": "ISC",
       "dependencies": {
         "assert": "^2.0.0",
@@ -17176,8 +17158,7 @@
       }
     },
     "packages/ripple-keypairs": {
-      "name": "@transia/ripple-keypairs",
-      "version": "1.1.6",
+      "version": "1.1.5",
       "license": "ISC",
       "dependencies": {
         "bn.js": "^5.1.1",
@@ -17191,8 +17172,7 @@
       }
     },
     "packages/xrpl": {
-      "name": "@transia/xrpl",
-      "version": "2.7.1",
+      "version": "2.7.0",
       "license": "ISC",
       "dependencies": {
         "bignumber.js": "^9.0.0",
@@ -19370,70 +19350,6 @@
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
     },
-    "@transia/ripple-address-codec": {
-      "version": "file:packages/ripple-address-codec",
-      "requires": {
-        "base-x": "^3.0.9",
-        "create-hash": "^1.1.2"
-      }
-    },
-    "@transia/ripple-binary-codec": {
-      "version": "file:packages/ripple-binary-codec",
-      "requires": {
-        "assert": "^2.0.0",
-        "big-integer": "^1.6.48",
-        "buffer": "5.6.0",
-        "create-hash": "^1.2.0",
-        "decimal.js": "^10.2.0",
-        "ripple-address-codec": "^4.2.5"
-      },
-      "dependencies": {
-        "buffer": {
-          "version": "5.6.0",
-          "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4"
-          }
-        }
-      }
-    },
-    "@transia/ripple-keypairs": {
-      "version": "file:packages/ripple-keypairs",
-      "requires": {
-        "bn.js": "^5.1.1",
-        "brorand": "^1.0.5",
-        "elliptic": "^6.5.4",
-        "hash.js": "^1.0.3",
-        "ripple-address-codec": "^4.2.5"
-      }
-    },
-    "@transia/xrpl": {
-      "version": "file:packages/xrpl",
-      "requires": {
-        "@geut/browser-node-core": "^2.0.13",
-        "@types/node": "^14.18.36",
-        "assert-browserify": "^2.0.0",
-        "bignumber.js": "^9.0.0",
-        "bip32": "^2.0.6",
-        "bip39": "^3.0.4",
-        "browserify-fs": "^1.0.0",
-        "constants-browserify": "^1.0.0",
-        "https-browserify": "^1.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "karma": "^6.4.1",
-        "karma-chrome-launcher": "^3.1.1",
-        "karma-jasmine": "^5.1.0",
-        "karma-webpack": "^5.0.0",
-        "lodash": "^4.17.4",
-        "node-polyfill-webpack-plugin": "^2.0.1",
-        "react": "^18.2.0",
-        "ripple-address-codec": "^4.2.5",
-        "ripple-binary-codec": "^1.4.3",
-        "ripple-keypairs": "^1.1.5",
-        "typedoc": "^0.23.24",
-        "ws": "^8.2.2"
-      }
-    },
     "@tsconfig/node10": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",

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

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

packages/ripple-address-codec/package.json

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

packages/ripple-binary-codec/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transia/ripple-binary-codec",
-  "version": "1.4.4",
+  "version": "1.4.3",
   "description": "XRP Ledger binary codec",
   "files": [
     "dist/*",
@@ -28,7 +28,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:XRPLF/xrpl.js.git"
+    "url": "git@github.com/Transia-RnD/xrpl.js/tree/beta"
   },
   "bugs": {
     "url": "https://github.com/XRPLF/xrpl.js/issues"

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

@@ -779,7 +779,7 @@
     [
       "LockCount",
       {
-        "nth": 47,
+        "nth": 49,
         "isVLEncoded": false,
         "isSerialized": true,
         "isSigningField": true,
@@ -2315,10 +2315,10 @@
     "temSEQ_AND_TICKET": -263,
     "temBAD_NFTOKEN_TRANSFER_FEE": -262,
     "temAMM_BAD_TOKENS": -261,
-    "temEQUAL_DOOR_ACCOUNTS": -260,
-    "temBAD_XCHAIN_PROOF": -259,
-    "temSIDECHAIN_BAD_ISSUES": -258,
-    "temSIDECHAIN_NONDOOR_OWNER": -257,
+    "temXCHAIN_EQUAL_DOOR_ACCOUNTS": -260,
+    "temXCHAIN_BAD_PROOF": -259,
+    "temXCHAIN_BRIDGE_BAD_ISSUES": -258,
+    "temXCHAIN_BRIDGE_NONDOOR_OWNER": -257,
     "temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT": -256,
     "temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT": -255,
     "temXCHAIN_TOO_MANY_ATTESTATIONS": -254,
@@ -2359,7 +2359,8 @@
     "terNO_RIPPLE": -90,
     "terQUEUED": -89,
     "terPRE_TICKET": -88,
-    "terNO_HOOK": -87,
+    "terNO_AMM": -87,
+    "terNO_HOOK": -86,
 
     "tesSUCCESS": 0,
 

packages/ripple-keypairs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transia/ripple-keypairs",
-  "version": "1.1.6",
+  "version": "1.1.5",
   "description": "Cryptographic key pairs for the XRP Ledger",
   "scripts": {
     "build": "tsc -b",
@@ -25,7 +25,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:XRPLF/xrpl.js.git"
+    "url": "git@github.com/Transia-RnD/xrpl.js/tree/beta"
   },
   "license": "ISC",
   "prettier": "@xrplf/prettier-config",

packages/xrpl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transia/xrpl",
-  "version": "2.7.1",
+  "version": "2.7.0",
   "license": "ISC",
   "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
   "files": [
@@ -75,7 +75,7 @@
   "prettier": "@xrplf/prettier-config",
   "repository": {
     "type": "git",
-    "url": "git@github.com:XRPLF/xrpl.js.git"
+    "url": "git@github.com/Transia-RnD/xrpl.js/tree/beta"
   },
   "readmeFilename": "README.md",
   "engines": {

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)
 
@@ -634,6 +643,11 @@ class Client extends EventEmitter {
    */
   public getLedgerIndex = getLedgerIndex
 
+  /**
+   * @category Abstraction
+   */
+  public getNetworkID = getNetworkID
+
   /**
    * @category Faucet
    */

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

@@ -136,6 +136,10 @@ export interface ServerInfoResponse extends BaseResponse {
        * overall network's load factor.
        */
       load_factor?: number
+      /**
+       * The network id of the server.
+       */
+      network_id?: number
       /**
        * Current multiplier to the transaction cost based on
        * load to this server.

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

@@ -159,7 +159,9 @@ export interface BaseTransaction {
    * account it says it is from.
    */
   TxnSignature?: string
-
+  /**
+   * The network id of the transaction.
+   */
   NetworkID?: number
 }
 
@@ -254,6 +256,9 @@ export function validateBaseTransaction(common: Record<string, unknown>): void {
   ) {
     throw new ValidationError('BaseTransaction: invalid TxnSignature')
   }
+  if (common.NetworkID !== undefined && typeof common.NetworkID !== 'number') {
+    throw new ValidationError('BaseTransaction: invalid NetworkID')
+  }
 }
 
 /**

packages/xrpl/src/sugar/autofill.ts

@@ -12,6 +12,7 @@ import { getFeeXrp } from './getFeeXrp'
 
 // Expire unconfirmed transactions after 20 ledger versions, approximately 1 minute, by default
 const LEDGER_OFFSET = 20
+const RESTRICTED_NETWORKS = 1024
 interface ClassicAccountAndTag {
   classicAccount: string
   tag: number | false | undefined
@@ -39,8 +40,10 @@ async function autofill<T extends Transaction>(
   setValidAddresses(tx)
 
   setTransactionFlagsToNumber(tx)
-
   const promises: Array<Promise<void>> = []
+  if (this.networkID > RESTRICTED_NETWORKS && tx.NetworkID == null) {
+    tx.NetworkID = this.networkID
+  }
   if (tx.Sequence == null) {
     promises.push(setNextValidSequenceNumber(this, tx))
   }

packages/xrpl/src/sugar/getNetworkID.ts

@@ -0,0 +1,15 @@
+import type { Client } from '..'
+// import { XrplError } from '../errors'
+
+/**
+ * Returns the network ID of the rippled server.
+ *
+ * @param this - The Client used to connect to the ledger.
+ * @returns The network id.
+ */
+export default async function getNetworkID(this: Client): Promise<number> {
+  const response = await this.request({
+    command: 'server_info',
+  })
+  return response.result.info.network_id ?? 1
+}

packages/xrpl/src/sugar/index.ts

@@ -7,6 +7,8 @@ export { default as getLedgerIndex } from './getLedgerIndex'
 export { default as getOrderbook } from './getOrderbook'
 export { getFeeXrp, getFeeEstimateXrp } from './getFeeXrp'
 
+export { default as getNetworkID } from './getNetworkID'
+
 export * from './submit'
 
 export * from './utils'