Merge branch 'transia-hooks' into denis-uritoken

revert transactors

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

@@ -13,10 +13,10 @@
     "update:confirm": "npx npm-check-updates --configFileName .ncurc.json -u"
   },
   "dependencies": {
-    "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"
+    "@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"
   },
   "devDependencies": {
     "@types/brorand": "^1.0.30",

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

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

packages/ripple-address-codec/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "ripple-address-codec",
-  "version": "4.2.5",
+  "name": "@transia/ripple-address-codec",
+  "version": "4.2.8-alpha.0",
   "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": "ripple-binary-codec",
-  "version": "1.4.3",
+  "name": "@transia/ripple-binary-codec",
+  "version": "1.4.6-alpha.1",
   "description": "XRP Ledger binary codec",
   "files": [
     "dist/*",
@@ -12,12 +12,12 @@
     "test": "test"
   },
   "dependencies": {
+    "@transia/ripple-address-codec": "^4.2.8-alpha.0",
     "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"
+    "decimal.js": "^10.2.0"
   },
   "scripts": {
     "build": "tsc -b && copyfiles ./src/enums/definitions.json ./dist/enums/",
@@ -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,27 @@
     [
       "LockCount",
       {
-        "nth": 47,
+        "nth": 49,
+        "isVLEncoded": false,
+        "isSerialized": true,
+        "isSigningField": true,
+        "type": "UInt32"
+      }
+    ],
+    [
+      "FirstNFTokenSequence",
+      {
+        "nth": 50,
+        "isVLEncoded": false,
+        "isSerialized": true,
+        "isSigningField": true,
+        "type": "UInt32"
+      }
+    ],
+    [
+      "ImportSequence",
+      {
+        "nth": 97,
         "isVLEncoded": false,
         "isSerialized": true,
         "isSigningField": true,
@@ -1325,6 +1346,16 @@
         "type": "Hash256"
       }
     ],
+    [
+      "URITokenID",
+      {
+        "nth": 36,
+        "isVLEncoded": false,
+        "isSerialized": true,
+        "isSigningField": true,
+        "type": "Hash256"
+      }
+    ],
     [
       "Amount",
       {
@@ -1485,6 +1516,36 @@
         "type": "Amount"
       }
     ],
+    [
+      "BaseFeeDrops",
+      {
+        "nth": 22,
+        "isVLEncoded": false,
+        "isSerialized": true,
+        "isSigningField": true,
+        "type": "Amount"
+      }
+    ],
+    [
+      "ReserveBaseDrops",
+      {
+        "nth": 23,
+        "isVLEncoded": false,
+        "isSerialized": true,
+        "isSigningField": true,
+        "type": "Amount"
+      }
+    ],
+    [
+      "ReserveIncrementDrops",
+      {
+        "nth": 24,
+        "isVLEncoded": false,
+        "isSerialized": true,
+        "isSigningField": true,
+        "type": "Amount"
+      }
+    ],
     [
       "PublicKey",
       {
@@ -2264,6 +2325,8 @@
     "telREQUIRES_NETWORK_ID": -385,
     "telNETWORK_ID_MAKES_TX_NON_CANONICAL": -384,
     "telNON_LOCAL_EMITTED_TXN": -383,
+    "telIMPORT_VL_KEY_NOT_RECOGNISED": -382,
+    "telCAN_NOT_QUEUE_IMPORT": -381,
 
     "temMALFORMED": -299,
     "temBAD_AMOUNT": -298,
@@ -2304,10 +2367,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,
@@ -2335,6 +2398,7 @@
     "tefTOO_BIG": -181,
     "tefNO_TICKET": -180,
     "tefNFTOKEN_IS_NOT_TRANSFERABLE": -179,
+    "tefPAST_IMPORT_SEQ": -178,
 
     "terRETRY": -99,
     "terFUNDS_SPENT": -98,
@@ -2348,7 +2412,8 @@
     "terNO_RIPPLE": -90,
     "terQUEUED": -89,
     "terPRE_TICKET": -88,
-    "terNO_HOOK": -87,
+    "terNO_AMM": -87,
+    "terNO_HOOK": -86,
 
     "tesSUCCESS": 0,
 
@@ -2423,7 +2488,8 @@
     "tecXCHAIN_ACCOUNT_CREATE_TOO_MANY": 183,
     "tecXCHAIN_PAYMENT_FAILED": 184,
     "tecXCHAIN_SELF_COMMIT": 185,
-    "tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR": 186
+    "tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR": 186,
+    "tecLAST_POSSIBLE_ENTRY": 255
   },
   "TRANSACTION_TYPES": {
     "Invalid": -1,
@@ -2455,6 +2521,12 @@
     "NFTokenCreateOffer": 27,
     "NFTokenCancelOffer": 28,
     "NFTokenAcceptOffer": 29,
+    "URITokenMint": 45,
+    "URITokenBurn": 46,
+    "URITokenBuy": 47,
+    "URITokenCreateSellOffer": 48,
+    "URITokenCancelSellOffer": 49,
+    "Import": 97,
     "Invoke": 99,
     "EnableAmendment": 100,
     "SetFee": 101,

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

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

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

@@ -5,7 +5,10 @@ import {
   XrplDefinitionsBase,
 } from '../enums'
 import { SerializedType, JsonObject } from './serialized-type'
-import { xAddressToClassicAddress, isValidXAddress } from 'ripple-address-codec'
+import {
+  xAddressToClassicAddress,
+  isValidXAddress,
+} from '@transia/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('ripple-address-codec')
+const { encodeAccountID } = require('@transia/ripple-address-codec')
 const { binary } = require('../src/coretypes')
 const { Amount, Hash160 } = coreTypes
 const { makeParser, readJSON } = binary

packages/ripple-keypairs/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "ripple-keypairs",
-  "version": "1.1.5",
+  "name": "@transia/ripple-keypairs",
+  "version": "1.1.8-alpha.0",
   "description": "Cryptographic key pairs for the XRP Ledger",
   "scripts": {
     "build": "tsc -b",
@@ -17,15 +17,15 @@
     "test": "test"
   },
   "dependencies": {
+    "@transia/ripple-address-codec": "^4.2.8-alpha.0",
     "bn.js": "^5.1.1",
     "brorand": "^1.0.5",
     "elliptic": "^6.5.4",
-    "hash.js": "^1.0.3",
-    "ripple-address-codec": "^4.2.5"
+    "hash.js": "^1.0.3"
   },
   "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/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 'ripple-address-codec'
+import * as addressCodec from '@transia/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 'ripple-address-codec'
+import * as api from '@transia/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 'ripple-address-codec'
+import * as api from '@transia/ripple-address-codec'
 
 function toHex(bytes: Buffer) {
   return Buffer.from(bytes).toString('hex').toUpperCase()

packages/xrpl/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "xrpl",
-  "version": "2.7.0",
+  "name": "@transia/xrpl",
+  "version": "2.7.3-alpha.1",
   "license": "ISC",
   "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
   "files": [
@@ -22,14 +22,14 @@
     "https-proxy-agent": false
   },
   "dependencies": {
+    "@transia/ripple-address-codec": "^4.2.8-alpha.0",
+    "@transia/ripple-binary-codec": "^1.4.6-alpha.1",
+    "@transia/ripple-keypairs": "^1.1.8-alpha.0",
     "bignumber.js": "^9.0.0",
     "bip32": "^2.0.6",
     "bip39": "^3.0.4",
     "https-proxy-agent": "^5.0.0",
     "lodash": "^4.17.4",
-    "ripple-address-codec": "^4.2.5",
-    "ripple-binary-codec": "^1.4.3",
-    "ripple-keypairs": "^1.1.5",
     "ws": "^8.2.2"
   },
   "devDependencies": {
@@ -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/Wallet/fundWallet.ts

@@ -1,7 +1,7 @@
 import { IncomingMessage } from 'http'
 import { request as httpsRequest, RequestOptions } from 'https'
 
-import { isValidClassicAddress } from 'ripple-address-codec'
+import { isValidClassicAddress } from '@transia/ripple-address-codec'
 
 import type { Client } from '../client'
 import { RippledError, XRPLFaucetError } from '../errors'

packages/xrpl/src/Wallet/index.ts

@@ -1,28 +1,28 @@
 /* eslint-disable max-lines -- There are lots of equivalent constructors which make sense to have here. */
-import BigNumber from 'bignumber.js'
-import { fromSeed } from 'bip32'
-import { mnemonicToSeedSync, validateMnemonic } from 'bip39'
-import isEqual from 'lodash/isEqual'
-import omitBy from 'lodash/omitBy'
 import {
   classicAddressToXAddress,
   isValidXAddress,
   xAddressToClassicAddress,
   encodeSeed,
-} from 'ripple-address-codec'
+} from '@transia/ripple-address-codec'
 import {
   decode,
   encodeForSigning,
   encodeForMultisigning,
   encode,
-} from 'ripple-binary-codec'
+} from '@transia/ripple-binary-codec'
 import {
   deriveAddress,
   deriveKeypair,
   generateSeed,
   verify,
   sign,
-} from 'ripple-keypairs'
+} from '@transia/ripple-keypairs'
+import BigNumber from 'bignumber.js'
+import { fromSeed } from 'bip32'
+import { mnemonicToSeedSync, validateMnemonic } from 'bip39'
+import isEqual from 'lodash/isEqual'
+import omitBy from 'lodash/omitBy'
 
 import ECDSA from '../ECDSA'
 import { ValidationError, XrplError } from '../errors'

packages/xrpl/src/Wallet/signer.ts

@@ -1,13 +1,13 @@
-import { BigNumber } from 'bignumber.js'
-import { flatMap } from 'lodash'
-import { decodeAccountID } from 'ripple-address-codec'
+import { decodeAccountID } from '@transia/ripple-address-codec'
 import {
   decode,
   encode,
   encodeForSigning,
   encodeForSigningClaim,
-} from 'ripple-binary-codec'
-import { sign as signWithKeypair, verify } from 'ripple-keypairs'
+} from '@transia/ripple-binary-codec'
+import { sign as signWithKeypair, verify } from '@transia/ripple-keypairs'
+import { BigNumber } from 'bignumber.js'
+import { flatMap } from 'lodash'
 
 import { ValidationError } from '../errors'
 import { Signer } from '../models/common'

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/client/partialPayment.ts

@@ -1,5 +1,5 @@
+import { decode } from '@transia/ripple-binary-codec'
 import BigNumber from 'bignumber.js'
-import { decode } from 'ripple-binary-codec'
 
 import type {
   AccountTxResponse,

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

@@ -97,14 +97,15 @@ export interface Hook {
    * The object that describes the hook in Hooks.
    */
   Hook: {
+    HookHash?: string
     /**
      * The code that is executed when the hook is triggered.
      */
-    CreateCode: string
+    CreateCode?: string
     /**
      * The flags that are set on the hook.
      */
-    Flags: number
+    Flags?: number
     /**
      * The transactions that triggers the hook. Represented as a 256Hash
      */

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

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

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

@@ -1,10 +1,16 @@
 /* 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 'ripple-binary-codec'
+import { TRANSACTION_TYPES } from '@transia/ripple-binary-codec'
 
 import { ValidationError } from '../../errors'
-import { Amount, IssuedCurrencyAmount, Memo, Signer } from '../common'
+import {
+  Amount,
+  HookParameter,
+  IssuedCurrencyAmount,
+  Memo,
+  Signer,
+} from '../common'
 import { onlyHasFields } from '../utils'
 
 const MEMO_SIZE = 3
@@ -159,6 +165,14 @@ export interface BaseTransaction {
    * account it says it is from.
    */
   TxnSignature?: string
+  /**
+   * The network id of the transaction.
+   */
+  NetworkID?: number
+  /**
+   * The hook parameters of the transaction.
+   */
+  HookParameters?: HookParameter[]
 }
 
 /**
@@ -252,6 +266,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/models/transactions/import.ts

@@ -0,0 +1,24 @@
+import { BaseTransaction, validateBaseTransaction } from './common'
+
+/**
+ *
+ *
+ * @category Transaction Models
+ */
+export interface Import extends BaseTransaction {
+  TransactionType: 'Import'
+  /**
+   * Hex value representing a VL Blob.
+   */
+  Blob?: string
+}
+
+/**
+ * Verify the form and type of an Import at runtime.
+ *
+ * @param tx - An Import Transaction.
+ * @throws When the Import is Malformed.
+ */
+export function validateImport(tx: Record<string, unknown>): void {
+  validateBaseTransaction(tx)
+}

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

@@ -14,6 +14,7 @@ export { DepositPreauth } from './depositPreauth'
 export { EscrowCancel } from './escrowCancel'
 export { EscrowCreate } from './escrowCreate'
 export { EscrowFinish } from './escrowFinish'
+export { Import } from './import'
 export { Invoke } from './invoke'
 export { NFTokenAcceptOffer } from './NFTokenAcceptOffer'
 export { NFTokenBurn } from './NFTokenBurn'
@@ -43,7 +44,16 @@ export {
 export { PaymentChannelCreate } from './paymentChannelCreate'
 export { PaymentChannelFund } from './paymentChannelFund'
 export { SetRegularKey } from './setRegularKey'
-export { SetHook } from './setHook'
+export { SetHookFlagsInterface, SetHookFlags, SetHook } from './setHook'
 export { SignerListSet } from './signerListSet'
 export { TicketCreate } from './ticketCreate'
 export { TrustSetFlagsInterface, TrustSetFlags, TrustSet } from './trustSet'
+export {
+  URITokenMintFlagsInterface,
+  URITokenMintFlags,
+  URITokenMint,
+} from './uriTokenMint'
+export { URITokenBurn } from './uriTokenBurn'
+export { URITokenCreateSellOffer } from './uriTokenCreateSellOffer'
+export { URITokenBuy } from './uriTokenBuy'
+export { URITokenCancelSellOffer } from './uriTokenCancelSellOffer'

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

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

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

@@ -1,5 +1,19 @@
 import { Amount } from '../common'
 
+export interface HookExecution {
+  HookExecution: {
+    HookAccount: string
+    HookEmitCount: number
+    HookExecutionIndex: number
+    HookHash: string
+    HookInstructionCount: string
+    HookResult: number
+    HookReturnCode: number
+    HookReturnString: string
+    HookStateChangeCount: number
+  }
+}
+
 export interface CreatedNode {
   CreatedNode: {
     LedgerEntryType: string
@@ -60,6 +74,7 @@ export function isDeletedNode(node: Node): node is DeletedNode {
 }
 
 export interface TransactionMetadata {
+  HookExecutions?: HookExecution[]
   AffectedNodes: Node[]
   DeliveredAmount?: Amount
   // "unavailable" possible for transactions before 2014-01-20

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

@@ -1,7 +1,30 @@
 import { ValidationError } from '../../errors'
 import { Hook } from '../common'
 
-import { BaseTransaction, validateBaseTransaction } from './common'
+import { BaseTransaction, GlobalFlags, validateBaseTransaction } from './common'
+
+/**
+ * Enum representing values for Set Hook Transaction Flags.
+ *
+ * @category Transaction Flags
+ */
+export enum SetHookFlags {
+  /**
+   */
+  hsfOverride = 0x00000001,
+  /**
+   */
+  hsfNSDelete = 0x00000010,
+  /**
+   */
+  hsfCollect = 0x00000100,
+}
+
+export interface SetHookFlagsInterface extends GlobalFlags {
+  hsfOverride?: boolean
+  hsfNSDelete?: boolean
+  hsfCollect?: boolean
+}
 
 /**
  *
@@ -14,6 +37,8 @@ export interface SetHook extends BaseTransaction {
    *
    */
   Hooks: Hook[]
+
+  Flags?: number | SetHookFlagsInterface
 }
 
 const MAX_HOOKS = 4

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

@@ -13,6 +13,8 @@ import { DepositPreauth, validateDepositPreauth } from './depositPreauth'
 import { EscrowCancel, validateEscrowCancel } from './escrowCancel'
 import { EscrowCreate, validateEscrowCreate } from './escrowCreate'
 import { EscrowFinish, validateEscrowFinish } from './escrowFinish'
+import { Import, validateImport } from './import'
+import { Invoke, validateInvoke } from './invoke'
 import { TransactionMetadata } from './metadata'
 import {
   NFTokenAcceptOffer,
@@ -48,6 +50,17 @@ import { SetRegularKey, validateSetRegularKey } from './setRegularKey'
 import { SignerListSet, validateSignerListSet } from './signerListSet'
 import { TicketCreate, validateTicketCreate } from './ticketCreate'
 import { TrustSet, validateTrustSet } from './trustSet'
+import { URITokenBurn, validateURITokenBurn } from './uriTokenBurn'
+import { URITokenBuy, validateURITokenBuy } from './uriTokenBuy'
+import {
+  URITokenCancelSellOffer,
+  validateURITokenCancelSellOffer,
+} from './uriTokenCancelSellOffer'
+import {
+  URITokenCreateSellOffer,
+  validateURITokenCreateSellOffer,
+} from './uriTokenCreateSellOffer'
+import { URITokenMint, validateURITokenMint } from './uriTokenMint'
 
 /**
  * @category Transaction Models
@@ -62,6 +75,8 @@ export type Transaction =
   | EscrowCancel
   | EscrowCreate
   | EscrowFinish
+  | Import
+  | Invoke
   | NFTokenAcceptOffer
   | NFTokenBurn
   | NFTokenCancelOffer
@@ -78,6 +93,11 @@ export type Transaction =
   | SignerListSet
   | TicketCreate
   | TrustSet
+  | URITokenBurn
+  | URITokenBuy
+  | URITokenCancelSellOffer
+  | URITokenMint
+  | URITokenCreateSellOffer
 
 /**
  * @category Transaction Models
@@ -142,6 +162,14 @@ export function validate(transaction: Record<string, unknown>): void {
       validateEscrowFinish(tx)
       break
 
+    case 'Import':
+      validateImport(tx)
+      break
+
+    case 'Invoke':
+      validateInvoke(tx)
+      break
+
     case 'NFTokenAcceptOffer':
       validateNFTokenAcceptOffer(tx)
       break
@@ -206,6 +234,26 @@ export function validate(transaction: Record<string, unknown>): void {
       validateTrustSet(tx)
       break
 
+    case 'URITokenMint':
+      validateURITokenMint(tx)
+      break
+
+    case 'URITokenBurn':
+      validateURITokenBurn(tx)
+      break
+
+    case 'URITokenCreateSellOffer':
+      validateURITokenCreateSellOffer(tx)
+      break
+
+    case 'URITokenBuy':
+      validateURITokenBuy(tx)
+      break
+
+    case 'URITokenCancelSellOffer':
+      validateURITokenCancelSellOffer(tx)
+      break
+
     default:
       throw new ValidationError(
         `Invalid field TransactionType: ${tx.TransactionType}`,

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

@@ -0,0 +1,60 @@
+import { ValidationError } from '../../errors'
+
+import { BaseTransaction, validateBaseTransaction } from './common'
+
+/**
+ * Map of flags to boolean values representing {@link URITokenBurn} transaction
+ * flags.
+ *
+ * @category Transaction Flags
+ *
+ * @example
+ * ```typescript
+ * const tx: URITokenBurn = {
+ * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
+ * TransactionType: 'URITokenBurn',
+ * }
+ *
+ * // Autofill the tx to see how flags actually look compared to the interface usage.
+ * const autofilledTx = await client.autofill(tx)
+ * console.log(autofilledTx)
+ * // {
+ * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * // URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
+ * // TransactionType: 'URITokenBurn',
+ * // Sequence: 21970384,
+ * // Fee: '12',
+ * // LastLedgerSequence: 21970404
+ * // }
+ * ```
+ */
+
+/**
+ * An URITokenBurn transaction is effectively a limit order . It defines an
+ * intent to exchange currencies, and creates an Offer object if not completely.
+ * Fulfilled when placed. Offers can be partially fulfilled.
+ *
+ * @category Transaction Models
+ */
+export interface URITokenBurn extends BaseTransaction {
+  TransactionType: 'URITokenBurn'
+  /**
+   * Identifies the URIToken object to be removed by the transaction.
+   */
+  URITokenID: string
+}
+
+/**
+ * Verify the form and type of an URITokenBurn at runtime.
+ *
+ * @param tx - An URITokenBurn Transaction.
+ * @throws When the URITokenBurn is Malformed.
+ */
+export function validateURITokenBurn(tx: Record<string, unknown>): void {
+  validateBaseTransaction(tx)
+
+  if (tx.URITokenID == null) {
+    throw new ValidationError('NFTokenBurn: missing field URITokenID')
+  }
+}

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

@@ -0,0 +1,83 @@
+import { ValidationError } from '../../errors'
+import { Amount } from '../common'
+
+import { BaseTransaction, isAmount, validateBaseTransaction } from './common'
+
+/**
+ * Map of flags to boolean values representing {@link URITokenBuy} transaction
+ * flags.
+ *
+ * @category Transaction Flags
+ *
+ * @example
+ * ```typescript
+ * const tx: URITokenBuy = {
+ * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
+ * Amount: '1000000',
+ * TransactionType: 'URITokenBuy',
+ * }
+ *
+ * // Autofill the tx to see how flags actually look compared to the interface usage.
+ * const autofilledTx = await client.autofill(tx)
+ * console.log(autofilledTx)
+ * // {
+ * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * // URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
+ * // Amount: '1000000',
+ * // TransactionType: 'URITokenBuy',
+ * // Sequence: 21970384,
+ * // Fee: '12',
+ * // LastLedgerSequence: 21970404
+ * // }
+ * ```
+ */
+
+/**
+ * An URITokenBuy transaction is effectively a limit order . It defines an
+ * intent to exchange currencies, and creates an Offer object if not completely.
+ * Fulfilled when placed. Offers can be partially fulfilled.
+ *
+ * @category Transaction Models
+ */
+export interface URITokenBuy extends BaseTransaction {
+  TransactionType: 'URITokenBuy'
+  /**
+   * Identifies the URITokenID of the NFToken object that the
+   * offer references.
+   */
+  URITokenID: string
+  /**
+   * Indicates the amount expected or offered for the Token.
+   *
+   * The amount must be non-zero, except when this is a sell
+   * offer and the asset is XRP. This would indicate that the current
+   * owner of the token is giving it away free, either to anyone at all,
+   * or to the account identified by the Destination field.
+   */
+  Amount: Amount
+}
+
+/**
+ * Verify the form and type of an URITokenBuy at runtime.
+ *
+ * @param tx - An URITokenBuy Transaction.
+ * @throws When the URITokenBuy is Malformed.
+ */
+export function validateURITokenBuy(tx: Record<string, unknown>): void {
+  validateBaseTransaction(tx)
+
+  if (tx.Account === tx.Destination) {
+    throw new ValidationError(
+      'URITokenBuy: Destination and Account must not be equal',
+    )
+  }
+
+  if (tx.URITokenID == null) {
+    throw new ValidationError('URITokenBuy: missing field URITokenID')
+  }
+
+  if (!isAmount(tx.Amount)) {
+    throw new ValidationError('URITokenBuy: invalid Amount')
+  }
+}

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

@@ -0,0 +1,65 @@
+import { ValidationError } from '../../errors'
+
+import { BaseTransaction, validateBaseTransaction } from './common'
+
+/**
+ * Map of flags to boolean values representing {@link URITokenCancelSellOffer} transaction
+ * flags.
+ *
+ * @category Transaction Flags
+ *
+ * @example
+ * ```typescript
+ * const tx: URITokenCancelSellOffer = {
+ * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
+ * TransactionType: 'URITokenCancelSellOffer',
+ * }
+ *
+ * // Autofill the tx to see how flags actually look compared to the interface usage.
+ * const autofilledTx = await client.autofill(tx)
+ * console.log(autofilledTx)
+ * // {
+ * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * // URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
+ * // TransactionType: 'URITokenCancelSellOffer',
+ * // Sequence: 21970384,
+ * // Fee: '12',
+ * // LastLedgerSequence: 21970404
+ * // }
+ * ```
+ */
+
+/**
+ * An URITokenCancelSellOffer transaction is effectively a limit order . It defines an
+ * intent to exchange currencies, and creates an Offer object if not completely.
+ * Fulfilled when placed. Offers can be partially fulfilled.
+ *
+ * @category Transaction Models
+ */
+export interface URITokenCancelSellOffer extends BaseTransaction {
+  TransactionType: 'URITokenCancelSellOffer'
+  /**
+   * Identifies the URITokenID of the NFToken object that the
+   * offer references.
+   */
+  URITokenID: string
+}
+
+/**
+ * Verify the form and type of an URITokenCancelSellOffer at runtime.
+ *
+ * @param tx - An URITokenCancelSellOffer Transaction.
+ * @throws When the URITokenCancelSellOffer is Malformed.
+ */
+export function validateURITokenCancelSellOffer(
+  tx: Record<string, unknown>,
+): void {
+  validateBaseTransaction(tx)
+
+  if (tx.URITokenID == null) {
+    throw new ValidationError(
+      'URITokenCancelSellOffer: missing field URITokenID',
+    )
+  }
+}

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

@@ -0,0 +1,93 @@
+import { ValidationError } from '../../errors'
+import { Amount } from '../common'
+
+import { BaseTransaction, isAmount, validateBaseTransaction } from './common'
+
+/**
+ * Map of flags to boolean values representing {@link URITokenCreateSellOffer} transaction
+ * flags.
+ *
+ * @category Transaction Flags
+ *
+ * @example
+ * ```typescript
+ * const tx: URITokenCreateSellOffer = {
+ * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
+ * Amount: '1000000',
+ * TransactionType: 'URITokenCreateSellOffer',
+ * }
+ *
+ * // Autofill the tx to see how flags actually look compared to the interface usage.
+ * const autofilledTx = await client.autofill(tx)
+ * console.log(autofilledTx)
+ * // {
+ * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * // URITokenID: '7AFCE32EBA8BD310CC2D00BE10B76E2183337EA20444D4580E4DBDB396C101FB',
+ * // Amount: '1000000',
+ * // TransactionType: 'URITokenCreateSellOffer',
+ * // Sequence: 21970384,
+ * // Fee: '12',
+ * // LastLedgerSequence: 21970404
+ * // }
+ * ```
+ */
+
+/**
+ * An URITokenCreateSellOffer transaction is effectively a limit order . It defines an
+ * intent to exchange currencies, and creates an Offer object if not completely.
+ * Fulfilled when placed. Offers can be partially fulfilled.
+ *
+ * @category Transaction Models
+ */
+export interface URITokenCreateSellOffer extends BaseTransaction {
+  TransactionType: 'URITokenCreateSellOffer'
+  /**
+   * Identifies the URITokenID of the NFToken object that the
+   * offer references.
+   */
+  URITokenID: string
+  /**
+   * Indicates the amount expected or offered for the Token.
+   *
+   * The amount must be non-zero, except when this is a sell
+   * offer and the asset is XRP. This would indicate that the current
+   * owner of the token is giving it away free, either to anyone at all,
+   * or to the account identified by the Destination field.
+   */
+  Amount: Amount
+  /**
+   * If present, indicates that this offer may only be
+   * accepted by the specified account. Attempts by other
+   * accounts to accept this offer MUST fail.
+   */
+  Destination?: string
+}
+
+/**
+ * Verify the form and type of an URITokenCreateSellOffer at runtime.
+ *
+ * @param tx - An URITokenCreateSellOffer Transaction.
+ * @throws When the URITokenCreateSellOffer is Malformed.
+ */
+export function validateURITokenCreateSellOffer(
+  tx: Record<string, unknown>,
+): void {
+  validateBaseTransaction(tx)
+
+  if (tx.Account === tx.Destination) {
+    throw new ValidationError(
+      'URITokenCreateSellOffer: Destination and Account must not be equal',
+    )
+  }
+
+  if (tx.URITokenID == null) {
+    throw new ValidationError(
+      'URITokenCreateSellOffer: missing field URITokenID',
+    )
+  }
+
+  if (!isAmount(tx.Amount)) {
+    throw new ValidationError('URITokenCreateSellOffer: invalid Amount')
+  }
+}

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

@@ -0,0 +1,92 @@
+import { ValidationError } from '../../errors'
+import { isHex } from '../utils'
+
+import { BaseTransaction, GlobalFlags, validateBaseTransaction } from './common'
+
+/**
+ * Transaction Flags for an URITokenMint Transaction.
+ *
+ * @category Transaction Flags
+ */
+export enum URITokenMintFlags {
+  /**
+   * If set, indicates that the minted token may be burned by the issuer even
+   * if the issuer does not currently hold the token. The current holder of
+   * the token may always burn it.
+   */
+  tfBurnable = 0x00000001,
+}
+
+/**
+ * Map of flags to boolean values representing {@link URITokenMint} transaction
+ * flags.
+ *
+ * @category Transaction Flags
+ *
+ * @example
+ * ```typescript
+ * const tx: URITokenMint = {
+ * Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * URI: '697066733A2F2F434944',
+ * TransactionType: 'URITokenMint',
+ * Flags: {
+ *   tfBurnable: true,
+ *  },
+ * }
+ *
+ * // Autofill the tx to see how flags actually look compared to the interface usage.
+ * const autofilledTx = await client.autofill(tx)
+ * console.log(autofilledTx)
+ * // {
+ * // Account: 'rhFcpWDHLqpBmX4ezWiA5VLSS4e1BHqhHd',
+ * // URI: '697066733A2F2F434944',
+ * // TransactionType: 'URITokenMint',
+ * // Flags: 0,
+ * // Sequence: 21970384,
+ * // Fee: '12',
+ * // LastLedgerSequence: 21970404
+ * // }
+ * ```
+ */
+export interface URITokenMintFlagsInterface extends GlobalFlags {
+  tfBurnable?: boolean
+}
+
+/**
+ * An URITokenMint transaction is effectively a limit order . It defines an
+ * intent to exchange currencies, and creates an Offer object if not completely.
+ * Fulfilled when placed. Offers can be partially fulfilled.
+ *
+ * @category Transaction Models
+ */
+export interface URITokenMint extends BaseTransaction {
+  TransactionType: 'URITokenMint'
+  Flags?: number | URITokenMintFlagsInterface
+  /**
+   * URI that points to the data and/or metadata associated with the NFT.
+   * This field need not be an HTTP or HTTPS URL; it could be an IPFS URI, a
+   * magnet link, immediate data encoded as an RFC2379 "data" URL, or even an
+   * opaque issuer-specific encoding. The URI is NOT checked for validity, but
+   * the field is limited to a maximum length of 256 bytes.
+   *
+   * This field must be hex-encoded. You can use `convertStringToHex` to
+   * convert this field to the proper encoding.
+   */
+  URI: string
+
+  Digest?: string
+}
+
+/**
+ * Verify the form and type of an URITokenMint at runtime.
+ *
+ * @param tx - An URITokenMint Transaction.
+ * @throws When the URITokenMint is Malformed.
+ */
+export function validateURITokenMint(tx: Record<string, unknown>): void {
+  validateBaseTransaction(tx)
+
+  if (typeof tx.URI === 'string' && !isHex(tx.URI)) {
+    throw new ValidationError('URITokenMint: URI must be in hex format')
+  }
+}

packages/xrpl/src/models/utils/flags.ts

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

packages/xrpl/src/sugar/autofill.ts

@@ -1,5 +1,8 @@
+import {
+  xAddressToClassicAddress,
+  isValidXAddress,
+} from '@transia/ripple-address-codec'
 import BigNumber from 'bignumber.js'
-import { xAddressToClassicAddress, isValidXAddress } from 'ripple-address-codec'
 
 import type { Client } from '..'
 import { ValidationError, XrplError } from '../errors'
@@ -12,6 +15,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 +43,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/src/sugar/submit.ts

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

packages/xrpl/src/sugar/utils.ts

@@ -1,4 +1,7 @@
-import { xAddressToClassicAddress, isValidXAddress } from 'ripple-address-codec'
+import {
+  xAddressToClassicAddress,
+  isValidXAddress,
+} from '@transia/ripple-address-codec'
 
 /**
  * If an address is an X-Address, converts it to a classic address.

packages/xrpl/src/utils/derive.ts

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

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

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

@@ -3,8 +3,8 @@
 /* eslint-disable no-bitwise  -- this file mimics behavior in rippled. It uses
    bitwise operators for and-ing numbers with a mask and bit shifting. */
 
+import { decodeAccountID } from '@transia/ripple-address-codec'
 import BigNumber from 'bignumber.js'
-import { decodeAccountID } from 'ripple-address-codec'
 
 import hashLedger, {
   hashLedgerHeader,

packages/xrpl/src/utils/hooks.ts

@@ -4,9 +4,11 @@
  * This module contains the transaction types and the function to calculate the hook on
  */
 
-// eslint-disable-next-line @typescript-eslint/no-require-imports -- Required
-import createHash = require('create-hash')
-import { TRANSACTION_TYPES, TRANSACTION_TYPE_MAP } from 'ripple-binary-codec'
+import {
+  TRANSACTION_TYPES,
+  TRANSACTION_TYPE_MAP,
+} from '@transia/ripple-binary-codec'
+// import createHash = require('create-hash')
 
 import { XrplError } from '../errors'
 import { HookParameter } from '../models/common'
@@ -42,7 +44,7 @@ export function calculateHookOn(arr: Array<keyof TTS>): string {
         `invalid transaction type '${String(nth)}' in HookOn array`,
       )
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- Required
+
     const tts: Record<string, number> = TRANSACTION_TYPE_MAP
     let value = BigInt(hash)
     // eslint-disable-next-line no-bitwise -- Required
@@ -56,32 +58,12 @@ export function calculateHookOn(arr: Array<keyof TTS>): string {
   return hash.toUpperCase()
 }
 
-/**
- * Calculate the sha256 of a string
- *
- * @param string - the string to calculate the sha256
- * @returns the sha256
- */
-export async function sha256(string: string): Promise<string> {
-  const hash = createHash('sha256')
-  hash.update(string)
-  const hashBuffer = hash.digest()
-  const hashArray = Array.from(new Uint8Array(hashBuffer))
-  const hashHex = hashArray
-    // eslint-disable-next-line @typescript-eslint/no-magic-numbers -- Required
-    .map((bytes) => bytes.toString(16).padStart(2, '0'))
-    .join('')
-  return hashHex
+function isHex(value: string): boolean {
+  return /^[0-9A-F]+$/iu.test(value)
 }
 
-/**
- * Calculate the hex of a namespace
- *
- * @param namespace - the namespace to calculate the hex
- * @returns the hex
- */
-export async function hexNamespace(namespace: string): Promise<string> {
-  return (await sha256(namespace)).toUpperCase()
+function hexValue(value: string): string {
+  return Buffer.from(value, 'utf8').toString('hex').toUpperCase()
 }
 
 /**
@@ -93,20 +75,21 @@ export async function hexNamespace(namespace: string): Promise<string> {
 export function hexHookParameters(data: HookParameter[]): HookParameter[] {
   const hookParameters: HookParameter[] = []
   for (const parameter of data) {
+    let hookPName = parameter.HookParameter.HookParameterName
+    let hookPValue = parameter.HookParameter.HookParameterValue
+
+    if (!isHex(hookPName)) {
+      hookPName = hexValue(hookPName)
+    }
+
+    if (!isHex(hookPValue)) {
+      hookPValue = hexValue(hookPValue)
+    }
+
     hookParameters.push({
       HookParameter: {
-        HookParameterName: Buffer.from(
-          parameter.HookParameter.HookParameterName,
-          'utf8',
-        )
-          .toString('hex')
-          .toUpperCase(),
-        HookParameterValue: Buffer.from(
-          parameter.HookParameter.HookParameterValue,
-          'utf8',
-        )
-          .toString('hex')
-          .toUpperCase(),
+        HookParameterName: hookPName,
+        HookParameterValue: hookPValue,
       },
     })
   }

packages/xrpl/src/utils/index.ts

@@ -13,9 +13,9 @@ import {
   isValidClassicAddress,
   isValidXAddress,
   xAddressToClassicAddress,
-} from 'ripple-address-codec'
-import * as rbc from 'ripple-binary-codec'
-import { verify as verifyKeypairSignature } from 'ripple-keypairs'
+} from '@transia/ripple-address-codec'
+import * as rbc from '@transia/ripple-binary-codec'
+import { verify as verifyKeypairSignature } from '@transia/ripple-keypairs'
 
 import { LedgerEntry } from '../models/ledger'
 import { Response } from '../models/methods'
@@ -40,7 +40,7 @@ import {
   hashEscrow,
   hashPaymentChannel,
 } from './hashes'
-import { calculateHookOn, hexNamespace, hexHookParameters, TTS } from './hooks'
+import { calculateHookOn, hexHookParameters, TTS } from './hooks'
 import parseNFTokenID from './parseNFTokenID'
 import {
   percentToTransferRate,
@@ -224,7 +224,6 @@ export {
   createCrossChainPayment,
   parseNFTokenID,
   calculateHookOn,
-  hexNamespace,
   hexHookParameters,
   TTS,
 }

packages/xrpl/src/utils/parseNFTokenID.ts

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

packages/xrpl/src/utils/signPaymentChannelClaim.ts

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

packages/xrpl/src/utils/verifyPaymentChannelClaim.ts

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

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

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

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

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

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

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

packages/xrpl/test/integration/utils.ts

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

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

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

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

@@ -1,11 +1,6 @@
 import { assert } from 'chai'
 
-import {
-  calculateHookOn,
-  hexNamespace,
-  hexHookParameters,
-  TTS,
-} from '../../src'
+import { calculateHookOn, hexHookParameters, TTS } from '../../src'
 
 describe('test hook on', function () {
   it('invalid', function () {
@@ -18,7 +13,7 @@ describe('test hook on', function () {
     const result = calculateHookOn([])
     assert.equal(
       result,
-      '000000000000000000000000000000000000000000000000000000003E3FF5BF',
+      'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFFF',
     )
   })
   it('one', function () {
@@ -26,17 +21,7 @@ describe('test hook on', function () {
     const result = calculateHookOn(invokeOn)
     assert.equal(
       result,
-      '000000000000000000000000000000000000000000000000000000003E3FF5B7',
-    )
-  })
-})
-
-describe('test hook namespace', function () {
-  it('basic', async function () {
-    const result = await hexNamespace('starter')
-    assert.equal(
-      result,
-      '4FF9961269BF7630D32E15276569C94470174A5DA79FA567C0F62251AA9A36B9',
+      'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFF7',
     )
   })
 })

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

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

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

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