Publish

- @transia/ripple-binary-codec@1.4.6-alpha.8
 - @transia/xrpl@2.7.3-alpha.24

.vscode/settings.json

@@ -29,7 +29,7 @@
         "enable": true
     },
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
     "files.insertFinalNewline": true,
     "files.trimFinalNewlines": true,

packages/ripple-binary-codec/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transia/ripple-binary-codec",
-  "version": "1.4.6-alpha.6",
+  "version": "1.4.6-alpha.8",
   "description": "XRP Ledger binary codec",
   "files": [
     "dist/*",

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

@@ -2521,11 +2521,11 @@
     "temBAD_PATH": -291,
     "temBAD_PATH_LOOP": -290,
     "temBAD_REGKEY": -289,
-    "temBAD_SEND_XRP_LIMIT": -288,
-    "temBAD_SEND_XRP_MAX": -287,
-    "temBAD_SEND_XRP_NO_DIRECT": -286,
-    "temBAD_SEND_XRP_PARTIAL": -285,
-    "temBAD_SEND_XRP_PATHS": -284,
+    "temBAD_SEND_NATIVE_LIMIT": -288,
+    "temBAD_SEND_NATIVE_MAX": -287,
+    "temBAD_SEND_NATIVE_NO_DIRECT": -286,
+    "temBAD_SEND_NATIVE_PARTIAL": -285,
+    "temBAD_SEND_NATIVE_PATHS": -284,
     "temBAD_SEQUENCE": -283,
     "temBAD_SIGNATURE": -282,
     "temBAD_SRC_ACCOUNT": -281,
@@ -2557,7 +2557,6 @@
     "temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT": -255,
     "temXCHAIN_TOO_MANY_ATTESTATIONS": -254,
     "temHOOK_DATA_TOO_LARGE": -253,
-    "temHOOK_REJECTED": -252,
 
     "tefFAILURE": -199,
     "tefALREADY": -198,
@@ -2582,6 +2581,7 @@
     "tefNFTOKEN_IS_NOT_TRANSFERABLE": -179,
     "tefPAST_IMPORT_SEQ": -178,
     "tefPAST_IMPORT_VL_SEQ": -177,
+    "tefNONDIR_EMIT": -176,
 
     "terRETRY": -99,
     "terFUNDS_SPENT": -98,
@@ -2610,7 +2610,7 @@
     "tecINSUF_RESERVE_LINE": 122,
     "tecINSUF_RESERVE_OFFER": 123,
     "tecNO_DST": 124,
-    "tecNO_DST_INSUF_XRP": 125,
+    "tecNO_DST_INSUF_NATIVE": 125,
     "tecNO_LINE_INSUF_RESERVE": 126,
     "tecNO_LINE_REDUNDANT": 127,
     "tecPATH_DRY": 128,
@@ -2672,6 +2672,7 @@
     "tecXCHAIN_PAYMENT_FAILED": 184,
     "tecXCHAIN_SELF_COMMIT": 185,
     "tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR": 186,
+    "tecINSUF_RESERVE_SELLER": 187,
     "tecLAST_POSSIBLE_ENTRY": 255
   },
   "TRANSACTION_TYPES": {

packages/xrpl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transia/xrpl",
-  "version": "2.7.3-alpha.21",
+  "version": "2.7.3-alpha.24",
   "license": "ISC",
   "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
   "files": [
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@transia/ripple-address-codec": "^4.2.8-alpha.0",
-    "@transia/ripple-binary-codec": "^1.4.6-alpha.6",
+    "@transia/ripple-binary-codec": "^1.4.6-alpha.8",
     "@transia/ripple-keypairs": "^1.1.8-alpha.0",
     "bignumber.js": "^9.0.0",
     "bip32": "^2.0.6",

packages/xrpl/src/sugar/autofill.ts

@@ -3,16 +3,14 @@ import {
   isValidXAddress,
 } from '@transia/ripple-address-codec'
 import { encode } from '@transia/ripple-binary-codec'
-import BigNumber from 'bignumber.js'
 
 import type { Client } from '..'
 import { ValidationError, XrplError } from '../errors'
 import { AccountInfoRequest, AccountObjectsRequest } from '../models/methods'
 import { Transaction } from '../models/transactions'
 import { setTransactionFlagsToNumber } from '../models/utils/flags'
-import { xrpToDrops } from '../utils'
 
-import { getFeeEstimateXrp, getFeeXrp } from './getFeeXrp'
+import { getFeeEstimateXrp } from './getFeeXrp'
 
 // Expire unconfirmed transactions after 20 ledger versions, approximately 1 minute, by default
 const LEDGER_OFFSET = 20
@@ -51,22 +49,17 @@ async function autofill<T extends Transaction>(
   if (tx.Sequence == null) {
     promises.push(setNextValidSequenceNumber(this, tx))
   }
-  if (tx.Fee == null) {
-    promises.push(calculateFeePerTransactionType(this, tx, signersCount))
-  }
   if (tx.LastLedgerSequence == null) {
     promises.push(setLatestValidatedLedgerSequence(this, tx))
   }
   if (tx.TransactionType === 'AccountDelete') {
     promises.push(checkAccountDeleteBlockers(this, tx))
   }
-
   await Promise.all(promises).then(() => tx)
-  const copyTx = { ...tx }
-  copyTx.SigningPubKey = ``
-  const tx_blob = encode(copyTx)
-  // eslint-disable-next-line require-atomic-updates -- ignore
-  tx.Fee = await getFeeEstimateXrp(this, tx_blob)
+
+  if (tx.Fee == null) {
+    await calculateFeePerTransactionType(this, tx, signersCount)
+  }
   return tx
 }
 
@@ -153,64 +146,17 @@ async function setNextValidSequenceNumber(
   tx.Sequence = data.result.account_data.Sequence
 }
 
-async function fetchAccountDeleteFee(client: Client): Promise<BigNumber> {
-  const response = await client.request({ command: 'server_state' })
-  const fee = response.result.state.validated_ledger?.reserve_inc
-
-  if (fee == null) {
-    return Promise.reject(new Error('Could not fetch Owner Reserve.'))
-  }
-
-  return new BigNumber(fee)
-}
-
 async function calculateFeePerTransactionType(
   client: Client,
   tx: Transaction,
   signersCount = 0,
 ): Promise<void> {
-  // netFee is usually 0.00001 XRP (10 drops)
-  const netFeeXRP = await getFeeXrp(client)
-  const netFeeDrops = xrpToDrops(netFeeXRP)
-  let baseFee = new BigNumber(netFeeDrops)
-
-  // EscrowFinish Transaction with Fulfillment
-  if (tx.TransactionType === 'EscrowFinish' && tx.Fulfillment != null) {
-    const fulfillmentBytesSize: number = Math.ceil(tx.Fulfillment.length / 2)
-    // 10 drops × (33 + (Fulfillment size in bytes / 16))
-    const product = new BigNumber(
-      // eslint-disable-next-line @typescript-eslint/no-magic-numbers -- expected use of magic numbers
-      scaleValue(netFeeDrops, 33 + fulfillmentBytesSize / 16),
-    )
-    baseFee = product.dp(0, BigNumber.ROUND_CEIL)
-  }
-
-  // AccountDelete Transaction
-  if (tx.TransactionType === 'AccountDelete') {
-    baseFee = await fetchAccountDeleteFee(client)
-  }
-
-  /*
-   * Multi-signed Transaction
-   * 10 drops × (1 + Number of Signatures Provided)
-   */
-  if (signersCount > 0) {
-    baseFee = BigNumber.sum(baseFee, scaleValue(netFeeDrops, 1 + signersCount))
-  }
-
-  const maxFeeDrops = xrpToDrops(client.maxFeeXRP)
-  const totalFee =
-    tx.TransactionType === 'AccountDelete'
-      ? baseFee
-      : BigNumber.min(baseFee, maxFeeDrops)
-
-  // Round up baseFee and return it as a string
-  // eslint-disable-next-line no-param-reassign, @typescript-eslint/no-magic-numbers -- param reassign is safe, base 10 magic num
-  tx.Fee = totalFee.dp(0, BigNumber.ROUND_CEIL).toString(10)
-}
-
-function scaleValue(value, multiplier): string {
-  return new BigNumber(value).times(multiplier).toString()
+  const copyTx = { ...tx }
+  copyTx.SigningPubKey = ``
+  copyTx.Fee = `0`
+  const tx_blob = encode(copyTx)
+  // eslint-disable-next-line require-atomic-updates, no-param-reassign -- ignore
+  tx.Fee = await getFeeEstimateXrp(client, tx_blob, signersCount)
 }
 
 async function setLatestValidatedLedgerSequence(

packages/xrpl/src/sugar/getFeeXrp.ts

@@ -50,15 +50,20 @@ export async function getFeeXrp(
  *
  * @param client - The Client used to connect to the ledger.
  * @param txBlob - The encoded transaction to estimate the fee for.
+ * @param signersCount - The number of multisigners.
  * @returns The transaction fee.
  */
 export async function getFeeEstimateXrp(
   client: Client,
   txBlob: string,
+  signersCount = 0,
 ): Promise<string> {
   const response = await client.request({
     command: 'fee',
     tx_blob: txBlob,
   })
-  return response.result.drops.open_ledger_fee
+  const openLedgerFee = response.result.drops.open_ledger_fee
+  const baseFee = new BigNumber(response.result.drops.base_fee)
+  const totalFee = BigNumber.sum(openLedgerFee, Number(baseFee) * signersCount)
+  return new BigNumber(totalFee.toFixed(NUM_DECIMAL_PLACES)).toString(BASE_10)
 }