@meshconnect/web-link-sdk 3.2.8 → 3.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/web-link-sdk",
-  "version": "3.2.8",
+  "version": "3.2.10",
   "description": "A client-side JS library for integrating with Mesh Connect",
   "exports": "./index.js",
   "license": "MIT",

package/utils/connectors/solana/transaction.js

@@ -115,7 +115,7 @@ export function createSPLTransferInstruction(_a) {
 }
 export function createTransferTransaction(config) {
     return __awaiter(this, void 0, void 0, function () {
-        var fromPubkey, toPubkey, instructions, connection, token2022Accounts, tokenProgram, tokenMintPubkey, fromTokenAccount, toTokenAccount, messageV0;
+        var fromPubkey, toPubkey, instructions, connection, token2022Accounts, tokenMintPubkey, fromTokenAccount2022_1, tokenProgram, fromTokenAccount, toTokenAccount_1, messageV0;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -129,7 +129,7 @@ export function createTransferTransaction(config) {
                         toPubkey: toPubkey,
                         lamports: Number(config.amount)
                     }));
-                    return [3 /*break*/, 6];
+                    return [3 /*break*/, 7];
                 case 1:
                     connection = void 0;
                     // special use case for PYUSD on solana devnet. TODO: make it generic
@@ -142,37 +142,40 @@ export function createTransferTransaction(config) {
                     return [4 /*yield*/, connection.getTokenAccountsByOwner(fromPubkey, { programId: TOKEN_2022_PROGRAM_ID })];
                 case 2:
                     token2022Accounts = _b.sent();
-                    tokenProgram = (token2022Accounts === null || token2022Accounts === void 0 ? void 0 : token2022Accounts.value.length)
+                    tokenMintPubkey = new PublicKey(config.tokenMint);
+                    return [4 /*yield*/, getAssociatedTokenAddress(tokenMintPubkey, fromPubkey, TOKEN_2022_PROGRAM_ID.toBase58())];
+                case 3:
+                    fromTokenAccount2022_1 = _b.sent();
+                    tokenProgram = (token2022Accounts === null || token2022Accounts === void 0 ? void 0 : token2022Accounts.value.filter(function (x) { return x.pubkey.toBase58() === fromTokenAccount2022_1.toBase58(); }).length)
                         ? TOKEN_2022_PROGRAM_ID
                         : TOKEN_PROGRAM_ID;
                     config.tokenProgram = tokenProgram.toBase58();
-                    tokenMintPubkey = new PublicKey(config.tokenMint);
                     return [4 /*yield*/, getAssociatedTokenAddress(tokenMintPubkey, fromPubkey, config.tokenProgram)];
-                case 3:
+                case 4:
                     fromTokenAccount = _b.sent();
                     return [4 /*yield*/, getAssociatedTokenAddress(tokenMintPubkey, toPubkey, config.tokenProgram)];
-                case 4:
-                    toTokenAccount = _b.sent();
+                case 5:
+                    toTokenAccount_1 = _b.sent();
                     return [4 /*yield*/, connection.getTokenAccountsByOwner(toPubkey, {
                             programId: tokenProgram
                         })];
-                case 5:
-                    if (!((_a = (_b.sent())) === null || _a === void 0 ? void 0 : _a.value.length)) {
-                        instructions.push(createTokenAccountInstruction(toPubkey, toTokenAccount, toPubkey, tokenMintPubkey, tokenProgram));
+                case 6:
+                    if (!((_a = (_b.sent())) === null || _a === void 0 ? void 0 : _a.value.filter(function (x) { return x.pubkey.toBase58() === toTokenAccount_1.toBase58(); }).length)) {
+                        instructions.push(createTokenAccountInstruction(fromPubkey, toTokenAccount_1, toPubkey, tokenMintPubkey, tokenProgram));
                     }
                     if (config.tokenProgram === TOKEN_2022_PROGRAM_ID.toBase58()) {
-                        instructions.push(createTransferCheckedInstruction(fromTokenAccount, toTokenAccount, fromPubkey, BigInt(config.amount), config.tokenDecimals, tokenMintPubkey));
+                        instructions.push(createTransferCheckedInstruction(fromTokenAccount, toTokenAccount_1, fromPubkey, BigInt(config.amount), config.tokenDecimals, tokenMintPubkey));
                     }
                     else {
                         instructions.push(createSPLTransferInstruction({
                             fromTokenAccount: fromTokenAccount,
-                            toTokenAccount: toTokenAccount,
+                            toTokenAccount: toTokenAccount_1,
                             owner: fromPubkey,
                             amount: BigInt(config.amount)
                         }));
                     }
-                    _b.label = 6;
-                case 6:
+                    _b.label = 7;
+                case 7:
                     messageV0 = new TransactionMessage({
                         payerKey: fromPubkey,
                         recentBlockhash: config.blockhash,

package/utils/version.d.ts

@@ -1 +1 @@
-export declare const sdkVersion = "3.2.8";
+export declare const sdkVersion = "3.2.10";

package/utils/version.js

@@ -1 +1 @@
-export var sdkVersion = '3.2.8';
+export var sdkVersion = '3.2.10';