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

packages/ripple-address-codec/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ripple-address-codec",
+  "name": "@transia/ripple-address-codec",
   "version": "4.2.5",
   "description": "encodes/decodes base58 encoded XRP Ledger identifiers",
   "files": [
@@ -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,5 +1,5 @@
 {
-  "name": "ripple-binary-codec",
+  "name": "@transia/ripple-binary-codec",
   "version": "1.4.3",
   "description": "XRP Ledger binary codec",
   "files": [
@@ -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

@@ -44,6 +44,7 @@
     "NegativeUNL": 78,
     "NFTokenPage": 80,
     "NFTokenOffer": 55,
+    "URIToken": 85,
     "Any": -3,
     "Child": -2,
     "Nickname": 110,
@@ -778,7 +779,7 @@
     [
       "LockCount",
       {
-        "nth": 47,
+        "nth": 49,
         "isVLEncoded": false,
         "isSerialized": true,
         "isSigningField": true,
@@ -1325,6 +1326,16 @@
         "type": "Hash256"
       }
     ],
+    [
+      "URITokenID",
+      {
+        "nth": 36,
+        "isVLEncoded": false,
+        "isSerialized": true,
+        "isSigningField": true,
+        "type": "Hash256"
+      }
+    ],
     [
       "Amount",
       {
@@ -2304,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,
@@ -2348,7 +2359,8 @@
     "terNO_RIPPLE": -90,
     "terQUEUED": -89,
     "terPRE_TICKET": -88,
-    "terNO_HOOK": -87,
+    "terNO_AMM": -87,
+    "terNO_HOOK": -86,
 
     "tesSUCCESS": 0,
 
@@ -2455,6 +2467,11 @@
     "NFTokenCreateOffer": 27,
     "NFTokenCancelOffer": 28,
     "NFTokenAcceptOffer": 29,
+    "URITokenMint": 45,
+    "URITokenBurn": 46,
+    "URITokenBuy": 47,
+    "URITokenCreateSellOffer": 48,
+    "URITokenCancelSellOffer": 49,
     "Invoke": 99,
     "EnableAmendment": 100,
     "SetFee": 101,

packages/ripple-keypairs/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ripple-keypairs",
+  "name": "@transia/ripple-keypairs",
   "version": "1.1.5",
   "description": "Cryptographic key pairs for the XRP Ledger",
   "scripts": {
@@ -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,5 +1,5 @@
 {
-  "name": "xrpl",
+  "name": "@transia/xrpl",
   "version": "2.7.0",
   "license": "ISC",
   "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
@@ -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,6 +159,10 @@ export interface BaseTransaction {
    * account it says it is from.
    */
   TxnSignature?: string
+  /**
+   * The network id of the transaction.
+   */
+  NetworkID?: number
 }
 
 /**
@@ -252,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'

packages/xrpl/test/models/setHook.test.ts

@@ -23,7 +23,7 @@ describe('SetHook', function () {
             CreateCode:
               '0061736D01000000011C0460057F7F7F7F7F017E60037F7F7E017E60027F7F017F60017F017E02230303656E76057472616365000003656E7606616363657074000103656E76025F670002030201030503010002062B077F0141B088040B7F004180080B7F0041A6080B7F004180080B7F0041B088040B7F0041000B7F0041010B07080104686F6F6B00030AC4800001C0800001017F230041106B220124002001200036020C41920841134180084112410010001A410022002000420010011A41012200200010021A200141106A240042000B0B2C01004180080B254163636570742E633A2043616C6C65642E00224163636570742E633A2043616C6C65642E22',
             HookOn:
-              '000000000000000000000000000000000000000000000000000000003E3FF5B7',
+              'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFF7',
             Flags: 1,
             HookApiVersion: 0,
             HookNamespace:
@@ -76,7 +76,7 @@ describe('SetHook', function () {
         CreateCode:
           '0061736D01000000011C0460057F7F7F7F7F017E60037F7F7E017E60027F7F017F60017F017E02230303656E76057472616365000003656E7606616363657074000103656E76025F670002030201030503010002062B077F0141B088040B7F004180080B7F0041A6080B7F004180080B7F0041B088040B7F0041000B7F0041010B07080104686F6F6B00030AC4800001C0800001017F230041106B220124002001200036020C41920841134180084112410010001A410022002000420010011A41012200200010021A200141106A240042000B0B2C01004180080B254163636570742E633A2043616C6C65642E00224163636570742E633A2043616C6C65642E22',
         HookOn:
-          '000000000000000000000000000000000000000000000000000000003E3FF5B7',
+          'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFF7',
         Flags: 1,
         HookApiVersion: 0,
         HookNamespace:
@@ -131,7 +131,7 @@ describe('SetHook', function () {
           CreateCode:
             '0061736D01000000011C0460057F7F7F7F7F017E60037F7F7E017E60027F7F017F60017F017E02230303656E76057472616365000003656E7606616363657074000103656E76025F670002030201030503010002062B077F0141B088040B7F004180080B7F0041A6080B7F004180080B7F0041B088040B7F0041000B7F0041010B07080104686F6F6B00030AC4800001C0800001017F230041106B220124002001200036020C41920841134180084112410010001A410022002000420010011A41012200200010021A200141106A240042000B0B2C01004180080B254163636570742E633A2043616C6C65642E00224163636570742E633A2043616C6C65642E22',
           HookOn:
-            '000000000000000000000000000000000000000000000000000000003E3FF5B7',
+            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFF7',
           Flags: 1,
           HookApiVersion: 0,
           HookNamespace: '',

packages/xrpl/test/utils/hooks.test.ts

@@ -18,7 +18,7 @@ describe('test hook on', function () {
     const result = calculateHookOn([])
     assert.equal(
       result,
-      '000000000000000000000000000000000000000000000000000000003E3FF5BF',
+      'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFFF',
     )
   })
   it('one', function () {
@@ -26,7 +26,7 @@ describe('test hook on', function () {
     const result = calculateHookOn(invokeOn)
     assert.equal(
       result,
-      '000000000000000000000000000000000000000000000000000000003E3FF5B7',
+      'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFF7',
     )
   })
 })