From 02b1b347d62cde70bf021742134c68ee01eeb9ea Mon Sep 17 00:00:00 2001 From: Lukas Kotol Date: Tue, 5 Mar 2024 13:59:03 +0100 Subject: [PATCH] Revert "ALL-5473 - Fix SOL duplicate txID (#1074)" This reverts commit d562121764d70ac6f4798fb87d6228d47534ed65. --- package.json | 2 +- .../solana/src/lib/__tests__/solana.tx.spec.ts | 4 ++-- .../blockchain/solana/src/lib/services/solana.tx.ts | 10 ++-------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 9f00e536b9..e536b2ef33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tatumio", - "version": "2.2.54", + "version": "2.2.53", "license": "MIT", "repository": "https://github.com/tatumio/tatum-js", "scripts": { diff --git a/packages/blockchain/solana/src/lib/__tests__/solana.tx.spec.ts b/packages/blockchain/solana/src/lib/__tests__/solana.tx.spec.ts index 57ff525b89..d629d7af22 100644 --- a/packages/blockchain/solana/src/lib/__tests__/solana.tx.spec.ts +++ b/packages/blockchain/solana/src/lib/__tests__/solana.tx.spec.ts @@ -6,7 +6,7 @@ import { FEE_PAYER } from '../services/solana.utils' jest.setTimeout(99999) -describe('SolanaSDK - tx', () => { +describe.skip('SolanaSDK - tx', () => { const sdk = TatumSolanaSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY, provider: 'https://api.devnet.solana.com', @@ -366,7 +366,7 @@ describe('SolanaSDK - tx', () => { }) }) - describe.skip('External signing', () => { + describe('External signing', () => { it('should send SPL token with fee payer', async () => { const tx = await sdk.spl.send.transferSignedTransaction( { diff --git a/packages/blockchain/solana/src/lib/services/solana.tx.ts b/packages/blockchain/solana/src/lib/services/solana.tx.ts index b6263c4714..e17d3322d8 100644 --- a/packages/blockchain/solana/src/lib/services/solana.tx.ts +++ b/packages/blockchain/solana/src/lib/services/solana.tx.ts @@ -1,10 +1,4 @@ -import { - LAMPORTS_PER_SOL, - PublicKey, - sendAndConfirmTransaction, - SystemProgram, - Transaction, -} from '@solana/web3.js' +import { LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction } from '@solana/web3.js' import { SolanaService, TransferSolanaBlockchainKMS } from '@tatumio/api-client' import { SolanaWeb3 } from './solana.web3' import BigNumber from 'bignumber.js' @@ -57,7 +51,7 @@ const transferSignedTransaction = async ( } return { - txId: await sendAndConfirmTransaction(connection, transaction, signers), + txId: await connection.sendTransaction(transaction, signers), } }