fix XRP ledger index

tatumio · Dec 13, 2021 · 7fcd19e · 7fcd19e
1 parent 4a67ad9
commit 7fcd19e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/blockchain/xrp.ts b/src/blockchain/xrp.ts
@@ -1,4 +1,4 @@
-import { get, post } from '../connector/tatum'
+import {get, post} from '../connector/tatum'
 import {TransactionHash} from '../model'
 
 /**
@@ -9,14 +9,14 @@ export const xrpGetFee = async (): Promise<{ drops: { base_fee: number } }> => g
 /**
  * For more details, see <a href="https://tatum.io/apidoc#operation/XrpGetAccountInfo" target="_blank">Tatum API documentation</a>
  */
-export const xrpGetAccountInfo = async (account: string): Promise<{ ledger_current_index: number, account_data: { Sequence: number } }> =>
-  get(`/v3/xrp/account/${account}`)
+export const xrpGetAccountInfo = async (account: string): Promise<{ ledger_current_index: number, ledger_index: number, account_data: { Sequence: number } }> =>
+    get(`/v3/xrp/account/${account}`)
 
 /**
  * For more details, see <a href="https://tatum.io/apidoc#operation/XrpBroadcast" target="_blank">Tatum API documentation</a>
  */
 export const xrpBroadcast = async (txData: string, signatureId?: string): Promise<TransactionHash> =>
-  post(`/v3/xrp/broadcast`, { txData, signatureId })
+    post(`/v3/xrp/broadcast`, {txData, signatureId})
 
 /**
  * For more details, see <a href="https://tatum.io/apidoc#operation/XrpGetLastClosedLedger" target="_blank">Tatum API documentation</a>
@@ -42,4 +42,4 @@ export const xrpGetTransaction = async (hash: string) => get(`/v3/xrp/transactio
  * For more details, see <a href="https://tatum.io/apidoc#operation/XrpGetAccountTx" target="_blank">Tatum API documentation</a>
  */
 export const xrpGetAccountTransactions = async (address: string, min?: number, marker?: string) =>
-  get(`/v3/xrp/account/tx/${address}${min ? `?min=${min}${marker ? `&marker=${marker}` : ''}` : marker ? `?marker=${marker}` : ''}`)
+    get(`/v3/xrp/account/tx/${address}${min ? `?min=${min}${marker ? `&marker=${marker}` : ''}` : marker ? `?marker=${marker}` : ''}`)
diff --git a/src/offchain/xrp.ts b/src/offchain/xrp.ts
@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js'
 import {RippleAPI} from 'ripple-lib'
 import {xrpGetAccountInfo, xrpGetFee} from '../blockchain'
-import { validateBody } from '../connector/tatum'
+import {validateBody} from '../connector/tatum'
 import {Currency, TransactionKMS, TransferXrpOffchain} from '../model'
 import {offchainBroadcast, offchainCancelWithdrawal, offchainStoreWithdrawal} from './common'
 
@@ -101,7 +101,7 @@ export const prepareXrpSignedOffchainTransaction =
         const prepared = await rippleAPI.preparePayment(account.account_data.Account, payment, {
             fee: `${fee}`,
             sequence: account.account_data.Sequence,
-            maxLedgerVersion: account.ledger_current_index + 5,
+            maxLedgerVersion: (account.ledger_current_index || account.ledger_index) + 500,
         })
         return (await rippleAPI.sign(prepared.txJSON, secret)).signedTransaction
     }
diff --git a/src/transaction/xrp.spec.ts b/src/transaction/xrp.spec.ts
@@ -8,6 +8,7 @@ describe('XRP transactions', () => {
     it('should test XRP transaction data', async () => {
         jest.spyOn(blockchain, 'xrpGetAccountInfo').mockResolvedValue({
             ledger_current_index: 1,
+            ledger_index: 1,
             account_data: {Sequence: 123}
         })
         const body = new TransferXrp()
@@ -23,6 +24,7 @@ describe('XRP transactions', () => {
     it('should not test XRP transaction data, missing amount', async () => {
         jest.spyOn(blockchain, 'xrpGetAccountInfo').mockResolvedValue({
             ledger_current_index: 1,
+            ledger_index: 1,
             account_data: {Sequence: 123}
         })
         const body = new TransferXrp()

diff --git a/src/transaction/xrp.ts b/src/transaction/xrp.ts
@@ -67,7 +67,7 @@ export const prepareXrpSignedTransaction = async (body: TransferXrp) => {
     }
     const accountInfo = await xrpGetAccountInfo(fromAccount)
     const sequence = accountInfo.account_data.Sequence
-    const maxLedgerVersion = accountInfo.ledger_current_index + 500
+    const maxLedgerVersion = (accountInfo.ledger_current_index || accountInfo.ledger_index) + 500
     const rippleAPI = new RippleAPI()
     const prepared = await rippleAPI.preparePayment(fromAccount, payment, {
         fee: f,