ALL-5473 - Fix SOL duplicate txID on other places

tatumio · Mar 5, 2024 · cad73e8 · cad73e8
1 parent d562121
commit cad73e8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tatumio",
-  "version": "2.2.54",
+  "version": "2.2.55",
   "license": "MIT",
   "repository": "https://github.com/tatumio/tatum-js",
   "scripts": {

diff --git a/packages/blockchain/solana/src/lib/services/solana.marketplace.ts b/packages/blockchain/solana/src/lib/services/solana.marketplace.ts
@@ -2,6 +2,7 @@ import web3, {
   Connection,
   LAMPORTS_PER_SOL,
   PublicKey,
+  sendAndConfirmTransaction,
   SYSVAR_INSTRUCTIONS_PUBKEY,
   Transaction,
   TransactionInstruction,
@@ -239,7 +240,7 @@ export const solanaMarketPlaceService = (
 
     const signers = [web3.generateKeyPair(params.fromPrivateKey)]
     return {
-      txId: await connection.sendTransaction(transaction, signers),
+      txId: await sendAndConfirmTransaction(connection, transaction, signers),
       contractAddress: auctionHouse.toBase58(),
       feeAccount: feeAccount.toBase58(),
       treasuryAccount: treasuryAccount.toBase58(),
@@ -315,7 +316,7 @@ export const solanaMarketPlaceService = (
 
     const signers = [web3.generateKeyPair(params.fromPrivateKey)]
     return {
-      txId: await connection.sendTransaction(transaction, signers),
+      txId: await sendAndConfirmTransaction(connection, transaction, signers),
     }
   }
 
@@ -446,7 +447,7 @@ export const solanaMarketPlaceService = (
     }
 
     return {
-      txId: await connection.sendTransaction(transaction, signers),
+      txId: await sendAndConfirmTransaction(connection, transaction, signers),
       listingId: receipt.toBase58(),
     }
   }
@@ -804,7 +805,7 @@ export const solanaMarketPlaceService = (
     }
 
     return {
-      txId: await connection.sendTransaction(transaction, signers),
+      txId: await sendAndConfirmTransaction(connection, transaction, signers),
     }
   }
 
@@ -895,7 +896,7 @@ export const solanaMarketPlaceService = (
     }
 
     return {
-      txId: await connection.sendTransaction(transaction, signers),
+      txId: await sendAndConfirmTransaction(connection, transaction, signers),
     }
   }
 
@@ -951,7 +952,7 @@ export const solanaMarketPlaceService = (
     const signers = [web3.generateKeyPair(fromPrivateKey)]
 
     return {
-      txId: await connection.sendTransaction(transaction, signers),
+      txId: await sendAndConfirmTransaction(connection, transaction, signers),
     }
   }
 
@@ -1005,7 +1006,7 @@ export const solanaMarketPlaceService = (
     const signers = [web3.generateKeyPair(fromPrivateKey)]
 
     return {
-      txId: await connection.sendTransaction(transaction, signers),
+      txId: await sendAndConfirmTransaction(connection, transaction, signers),
     }
   }
 

diff --git a/packages/blockchain/solana/src/lib/services/solana.nft.ts b/packages/blockchain/solana/src/lib/services/solana.nft.ts
@@ -7,7 +7,14 @@ import {
   VerifySolanaNFTKMS,
 } from '@tatumio/api-client'
 import { Blockchain } from '@tatumio/shared-core'
-import { Keypair, PublicKey, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  SystemProgram,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
 import {
   createInitializeMintInstruction,
   createMintToInstruction,
@@ -82,7 +89,7 @@ const transferSignedTransaction = async (
     signers.push(web3.generateKeyPair(body.feePayerPrivateKey))
   }
   return {
-    txId: await connection.sendTransaction(transaction, signers),
+    txId: await sendAndConfirmTransaction(connection, transaction, signers),
   }
 }
 
@@ -278,7 +285,7 @@ const burnSignedTransaction = async (
     signers.push(web3.generateKeyPair(body.feePayerPrivateKey))
   }
   return {
-    txId: await connection.sendTransaction(transaction, signers),
+    txId: await sendAndConfirmTransaction(connection, transaction, signers),
   }
 }
 
@@ -328,7 +335,7 @@ const verifySignedTransaction = async (
     signers.push(web3.generateKeyPair(body.feePayerPrivateKey))
   }
   return {
-    txId: await connection.sendTransaction(transaction, signers),
+    txId: await sendAndConfirmTransaction(connection, transaction, signers),
   }
 }
 

diff --git a/packages/blockchain/solana/src/lib/services/solana.spl.ts b/packages/blockchain/solana/src/lib/services/solana.spl.ts
@@ -1,7 +1,7 @@
 import { SolanaWeb3 } from './solana.web3'
 import { ApiServices, ChainDeploySolanaSplKMS, ChainTransferSolanaSplKMS } from '@tatumio/api-client'
 import { Blockchain } from '@tatumio/shared-core'
-import { Keypair, PublicKey, SystemProgram, Transaction } from '@solana/web3.js'
+import { Keypair, PublicKey, sendAndConfirmTransaction, SystemProgram, Transaction } from '@solana/web3.js'
 import {
   createInitializeMintInstruction,
   createMintToInstruction,
@@ -63,7 +63,7 @@ const transferSignedTransaction = async (
     signers.push(web3.generateKeyPair(body.feePayerPrivateKey))
   }
   return {
-    txId: await connection.sendTransaction(transaction, signers),
+    txId: await sendAndConfirmTransaction(connection, transaction, signers),
   }
 }
 
@@ -129,7 +129,7 @@ const deploySignedTransaction = async (
     signers.push(web3.generateKeyPair(body.feePayerPrivateKey))
   }
   return {
-    txId: await connection.sendTransaction(transaction, signers),
+    txId: await sendAndConfirmTransaction(connection, transaction, signers),
     contractAddress: mint.publicKey.toBase58(),
   }
 }