@meshconnect/web-link-sdk 3.2.12 → 3.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/web-link-sdk",
-  "version": "3.2.12",
+  "version": "3.2.13",
   "description": "A client-side JS library for integrating with Mesh Connect",
   "exports": "./index.js",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "util": "^0.12.4"
   },
   "dependencies": {
-    "@meshconnect/node-api": "^2.0.20",
+    "@meshconnect/node-api": "^2.0.21",
     "@meshconnect/solana-web3.js": "^1.0.4",
     "bs58": "^5.0.0",
     "buffer": "^6.0.3",

package/utils/connectors/solana/transaction.js

@@ -34,7 +34,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { PublicKey, SystemProgram, TransactionMessage, VersionedTransaction, TransactionInstruction, Connection } from '@meshconnect/solana-web3.js';
+import { PublicKey, SystemProgram, TransactionMessage, VersionedTransaction, TransactionInstruction } from '@meshconnect/solana-web3.js';
 import { getSolanaProvider } from './providerDiscovery';
 var TOKEN_PROGRAM_ID = new PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
 var TOKEN_2022_PROGRAM_ID = new PublicKey('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb');
@@ -134,10 +134,9 @@ export function createTransferTransaction(config) {
 }
 function createTransferInstructions(config) {
     return __awaiter(this, void 0, void 0, function () {
-        var fromPubkey, toPubkey, instructions, connection, token2022Accounts, tokenMintPubkey, fromTokenAccount2022_1, tokenProgram, fromTokenAccount, toTokenAccount_1;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var fromPubkey, toPubkey, instructions, tokenMintPubkey, fromTokenAccount, toTokenAccount;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     fromPubkey = new PublicKey(config.fromAddress);
                     toPubkey = new PublicKey(config.toAddress);
@@ -148,53 +147,33 @@ function createTransferInstructions(config) {
                         toPubkey: toPubkey,
                         lamports: Number(config.amount)
                     }));
-                    return [3 /*break*/, 7];
+                    return [3 /*break*/, 4];
                 case 1:
-                    connection = void 0;
-                    // special use case for PYUSD on solana devnet. TODO: make it generic
-                    if (config.tokenMint === 'CXk2AMBfi3TwaEL2468s6zP8xq9NxTXjp9gjMgzeUynM') {
-                        connection = new Connection('https://api.devnet.solana.com', 'confirmed');
-                    }
-                    else {
-                        connection = new Connection('https://alien-newest-vineyard.solana-mainnet.quiknode.pro/ebe5e35661d7edb7a5e48ab84bd9d477e472a40b', 'confirmed');
-                    }
-                    return [4 /*yield*/, connection.getTokenAccountsByOwner(fromPubkey, { programId: TOKEN_2022_PROGRAM_ID })];
-                case 2:
-                    token2022Accounts = _b.sent();
                     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;
-                    return [4 /*yield*/, getAssociatedTokenAddress(tokenMintPubkey, fromPubkey, tokenProgram.toBase58())];
-                case 4:
-                    fromTokenAccount = _b.sent();
-                    config.tokenProgram = tokenProgram.toBase58();
+                    return [4 /*yield*/, getAssociatedTokenAddress(tokenMintPubkey, fromPubkey, config.tokenProgram)];
+                case 2:
+                    fromTokenAccount = _a.sent();
                     return [4 /*yield*/, getAssociatedTokenAddress(tokenMintPubkey, toPubkey, config.tokenProgram)];
-                case 5:
-                    toTokenAccount_1 = _b.sent();
-                    return [4 /*yield*/, connection.getTokenAccountsByOwner(toPubkey, {
-                            programId: 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));
+                case 3:
+                    toTokenAccount = _a.sent();
+                    if (config.createATA) {
+                        instructions.push(createTokenAccountInstruction(fromPubkey, toTokenAccount, toPubkey, tokenMintPubkey, config.tokenProgram
+                            ? new PublicKey(config.tokenProgram)
+                            : TOKEN_PROGRAM_ID));
                     }
                     if (config.tokenProgram === TOKEN_2022_PROGRAM_ID.toBase58()) {
-                        instructions.push(createTransferCheckedInstruction(fromTokenAccount, toTokenAccount_1, fromPubkey, BigInt(config.amount), config.tokenDecimals, tokenMintPubkey));
+                        instructions.push(createTransferCheckedInstruction(fromTokenAccount, toTokenAccount, fromPubkey, BigInt(config.amount), config.tokenDecimals, tokenMintPubkey));
                     }
                     else {
                         instructions.push(createSPLTransferInstruction({
                             fromTokenAccount: fromTokenAccount,
-                            toTokenAccount: toTokenAccount_1,
+                            toTokenAccount: toTokenAccount,
                             owner: fromPubkey,
                             amount: BigInt(config.amount)
                         }));
                     }
-                    _b.label = 7;
-                case 7: return [2 /*return*/, instructions];
+                    _a.label = 4;
+                case 4: return [2 /*return*/, instructions];
             }
         });
     });

package/utils/connectors/solana/types.d.ts

@@ -66,6 +66,7 @@ export interface TransactionConfig {
     blockhash: string;
     walletName: string;
     tokenMint?: string;
+    createATA?: boolean;
     tokenProgram?: string;
     tokenDecimals?: number;
 }

package/utils/types.d.ts

@@ -133,7 +133,9 @@ export interface SmartContractPayload {
     account: string;
     value?: string;
     walletName?: string;
+    tokenProgram?: string;
     blockhash?: string;
+    createATA?: boolean;
     gasLimit?: number | null;
     maxFeePerGas?: number | null;
     maxPriorityFeePerGas?: number | null;

package/utils/version.d.ts

@@ -1 +1 @@
-export declare const sdkVersion = "3.2.12";
+export declare const sdkVersion = "3.2.13";

package/utils/version.js

@@ -1 +1 @@
-export var sdkVersion = '3.2.12';
+export var sdkVersion = '3.2.13';

package/utils/wallet/SolanaWalletStrategy.js

@@ -201,6 +201,8 @@ var SolanaWalletStrategy = /** @class */ (function (_super) {
                                 blockhash: payload.blockhash,
                                 walletName: payload.walletName || '',
                                 tokenMint: payload.address,
+                                createATA: payload.createATA || false,
+                                tokenProgram: payload.tokenProgram,
                                 tokenDecimals: decimals
                             })];
                     case 3: return [2 /*return*/, _c.sent()];
@@ -244,6 +246,8 @@ var SolanaWalletStrategy = /** @class */ (function (_super) {
                                 blockhash: payload.transactionInstructions.blockhash,
                                 walletName: payload.transactionInstructions.walletName || '',
                                 tokenMint: payload.transferConfig.address,
+                                createATA: payload.transferConfig.createATA || false,
+                                tokenProgram: payload.transferConfig.tokenProgram,
                                 tokenDecimals: decimals
                             })];
                     case 4: