@meshconnect/web-link-sdk 3.2.3 → 3.2.4

package/Link.js

@@ -159,7 +159,7 @@ function handleLinkEvent(event) {
 }
 function handleWalletBrowserEvent(event) {
     return __awaiter(this, void 0, void 0, function () {
-        var walletFactory, _a, payload, networkType, strategy, result, error_1, payload, networkType, strategy, result, error_2, payload, networkType, strategy, result, error_3, payload, networkType, strategy, result, error_4, payload, getResponseType, networkType, strategy, result, responseType, error_5, errorType, payload, responseType, networkType, strategy, result, error_6, payload, responseType, networkType, strategy, result, error_7, payload, networkType, strategy, error_8;
+        var walletFactory, _a, payload, networkType, strategy, result, error_1, payload, networkType, strategy, result, error_2, payload, networkType, strategy, result, error_3, payload, networkType, strategy, result, error_4, payload, getResponseType, networkType, strategy, result, responseType, error_5, errorType, payload, getResponseType, networkType, strategy, result, responseType, error_6, errorType, payload, responseType, networkType, strategy, result, error_7, payload, responseType, networkType, strategy, result, error_8, payload, networkType, strategy, error_9;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -172,13 +172,13 @@ function handleWalletBrowserEvent(event) {
                         case 'walletBrowserChainSwitchRequest': return [3 /*break*/, 11];
                         case 'walletBrowserNativeTransferRequest': return [3 /*break*/, 16];
                         case 'walletBrowserNonNativeTransferRequest': return [3 /*break*/, 21];
-                        case 'walletBrowserNativeSmartDeposit': return [3 /*break*/, 21];
                         case 'walletBrowserNonNativeSmartDeposit': return [3 /*break*/, 21];
-                        case 'walletBrowserTransactionBatchRequest': return [3 /*break*/, 26];
-                        case 'walletBrowserWalletCapabilities': return [3 /*break*/, 31];
-                        case 'walletBrowserDisconnect': return [3 /*break*/, 36];
+                        case 'walletBrowserNativeSmartDeposit': return [3 /*break*/, 26];
+                        case 'walletBrowserTransactionBatchRequest': return [3 /*break*/, 31];
+                        case 'walletBrowserWalletCapabilities': return [3 /*break*/, 36];
+                        case 'walletBrowserDisconnect': return [3 /*break*/, 41];
                     }
-                    return [3 /*break*/, 44];
+                    return [3 /*break*/, 49];
                 case 1:
                     payload = event.data.payload;
                     _c.label = 2;
@@ -203,7 +203,7 @@ function handleWalletBrowserEvent(event) {
                     console.error('Connection error:', error_1);
                     handleErrorAndSendMessage(error_1, 'SDKinjectedConnectionCompleted');
                     return [3 /*break*/, 5];
-                case 5: return [3 /*break*/, 44];
+                case 5: return [3 /*break*/, 49];
                 case 6:
                     payload = event.data.payload;
                     _c.label = 7;
@@ -223,7 +223,7 @@ function handleWalletBrowserEvent(event) {
                     error_2 = _c.sent();
                     handleErrorAndSendMessage(error_2, 'SDKsignRequestCompleted');
                     return [3 /*break*/, 10];
-                case 10: return [3 /*break*/, 44];
+                case 10: return [3 /*break*/, 49];
                 case 11:
                     payload = event.data.payload;
                     _c.label = 12;
@@ -248,7 +248,7 @@ function handleWalletBrowserEvent(event) {
                     console.error('Chain switch failed:', error_3);
                     handleErrorAndSendMessage(error_3, 'SDKswitchChainCompleted');
                     return [3 /*break*/, 15];
-                case 15: return [3 /*break*/, 44];
+                case 15: return [3 /*break*/, 49];
                 case 16:
                     payload = event.data.payload;
                     _c.label = 17;
@@ -268,7 +268,7 @@ function handleWalletBrowserEvent(event) {
                     error_4 = _c.sent();
                     handleErrorAndSendMessage(error_4, 'SDKnativeTransferCompleted');
                     return [3 /*break*/, 20];
-                case 20: return [3 /*break*/, 44];
+                case 20: return [3 /*break*/, 49];
                 case 21:
                     payload = event.data.payload;
                     getResponseType = function (type) {
@@ -304,18 +304,30 @@ function handleWalletBrowserEvent(event) {
                     errorType = getResponseType(event.data.type);
                     handleErrorAndSendMessage(error_5, errorType);
                     return [3 /*break*/, 25];
-                case 25: return [3 /*break*/, 44];
+                case 25: return [3 /*break*/, 49];
                 case 26:
                     payload = event.data.payload;
-                    responseType = 'SDKtransactionBatchCompleted';
+                    getResponseType = function (type) {
+                        switch (type) {
+                            case 'walletBrowserNonNativeTransferRequest':
+                                return 'SDKnonNativeTransferCompleted';
+                            case 'walletBrowserNativeSmartDeposit':
+                                return 'SDKnativeSmartDepositCompleted';
+                            case 'walletBrowserNonNativeSmartDeposit':
+                                return 'SDKnonNativeSmartDepositCompleted';
+                            default:
+                                return 'SDKnonNativeTransferCompleted';
+                        }
+                    };
                     _c.label = 27;
                 case 27:
                     _c.trys.push([27, 29, , 30]);
-                    networkType = (payload.from.startsWith('0x') ? 'evm' : 'solana');
+                    networkType = (payload.address.startsWith('0x') ? 'evm' : 'solana');
                     strategy = walletFactory.getStrategy(networkType);
-                    return [4 /*yield*/, strategy.sendTransactionBatch(payload)];
+                    return [4 /*yield*/, strategy.sendNativeSmartContractInteraction(payload)];
                 case 28:
                     result = _c.sent();
+                    responseType = getResponseType(event.data.type);
                     sendMessageToIframe({
                         type: responseType,
                         payload: {
@@ -325,64 +337,88 @@ function handleWalletBrowserEvent(event) {
                     return [3 /*break*/, 30];
                 case 29:
                     error_6 = _c.sent();
-                    handleErrorAndSendMessage(error_6, responseType);
+                    errorType = getResponseType(event.data.type);
+                    handleErrorAndSendMessage(error_6, errorType);
                     return [3 /*break*/, 30];
-                case 30: return [3 /*break*/, 44];
+                case 30: return [3 /*break*/, 49];
                 case 31:
                     payload = event.data.payload;
-                    responseType = 'SDKwalletCapabilitiesCompleted';
+                    responseType = 'SDKtransactionBatchCompleted';
                     _c.label = 32;
                 case 32:
                     _c.trys.push([32, 34, , 35]);
                     networkType = (payload.from.startsWith('0x') ? 'evm' : 'solana');
                     strategy = walletFactory.getStrategy(networkType);
-                    return [4 /*yield*/, strategy.getWalletCapabilities(payload)];
+                    return [4 /*yield*/, strategy.sendTransactionBatch(payload)];
                 case 33:
                     result = _c.sent();
                     sendMessageToIframe({
                         type: responseType,
-                        payload: result
+                        payload: {
+                            txHash: result
+                        }
                     });
                     return [3 /*break*/, 35];
                 case 34:
                     error_7 = _c.sent();
                     handleErrorAndSendMessage(error_7, responseType);
                     return [3 /*break*/, 35];
-                case 35: return [3 /*break*/, 44];
+                case 35: return [3 /*break*/, 49];
                 case 36:
                     payload = event.data.payload;
+                    responseType = 'SDKwalletCapabilitiesCompleted';
                     _c.label = 37;
                 case 37:
-                    _c.trys.push([37, 42, , 43]);
-                    if (!(payload === null || payload === void 0 ? void 0 : payload.networkType)) return [3 /*break*/, 39];
+                    _c.trys.push([37, 39, , 40]);
+                    networkType = (payload.from.startsWith('0x') ? 'evm' : 'solana');
+                    strategy = walletFactory.getStrategy(networkType);
+                    return [4 /*yield*/, strategy.getWalletCapabilities(payload)];
+                case 38:
+                    result = _c.sent();
+                    sendMessageToIframe({
+                        type: responseType,
+                        payload: result
+                    });
+                    return [3 /*break*/, 40];
+                case 39:
+                    error_8 = _c.sent();
+                    handleErrorAndSendMessage(error_8, responseType);
+                    return [3 /*break*/, 40];
+                case 40: return [3 /*break*/, 49];
+                case 41:
+                    payload = event.data.payload;
+                    _c.label = 42;
+                case 42:
+                    _c.trys.push([42, 47, , 48]);
+                    if (!(payload === null || payload === void 0 ? void 0 : payload.networkType)) return [3 /*break*/, 44];
                     networkType = (payload.networkType === 'solana' ? 'solana' : 'evm');
                     strategy = walletFactory.getStrategy(networkType);
                     return [4 /*yield*/, strategy.disconnect(payload)];
-                case 38:
+                case 43:
                     _c.sent();
-                    return [3 /*break*/, 41];
-                case 39: 
+                    return [3 /*break*/, 46];
+                case 44: 
                 // Disconnect from all if no specific network type
                 return [4 /*yield*/, Promise.all([
                         walletFactory.getStrategy('solana').disconnect(payload),
                         walletFactory.getStrategy('evm').disconnect(payload)
                     ])];
-                case 40:
+                case 45:
                     // Disconnect from all if no specific network type
                     _c.sent();
-                    _c.label = 41;
-                case 41:
+                    _c.label = 46;
+                case 46:
                     sendMessageToIframe({
                         type: 'SDKdisconnectSuccess'
                     });
-                    return [3 /*break*/, 43];
-                case 42:
-                    error_8 = _c.sent();
-                    console.error('Error during disconnect:', error_8);
-                    handleErrorAndSendMessage(error_8, 'SDKdisconnectSuccess');
-                    return [3 /*break*/, 43];
-                case 43: return [3 /*break*/, 44];
-                case 44: return [2 /*return*/];
+                    return [3 /*break*/, 48];
+                case 47:
+                    error_9 = _c.sent();
+                    console.error('Error during disconnect:', error_9);
+                    handleErrorAndSendMessage(error_9, 'SDKdisconnectSuccess');
+                    return [3 /*break*/, 48];
+                case 48: return [3 /*break*/, 49];
+                case 49: return [2 /*return*/];
             }
         });
     });

package/package.json

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

package/utils/connectors/evm/transactions.d.ts

@@ -7,6 +7,10 @@ export declare const sendEVMTransaction: (toAddress: string, amount: bigint, fro
  * Sends an EVM token transaction
  */
 export declare const sendEVMTokenTransaction: (contractAddress: string, abi: ethers.InterfaceAbi, functionName: string, args: unknown[], fromAddress: string) => Promise<string | Error>;
+/**
+ * Sends an native smart contract transaction
+ */
+export declare const sendNativeSmartContractTransaction: (contractAddress: string, abi: ethers.InterfaceAbi, functionName: string, args: unknown[], fromAddress: string, value?: string) => Promise<string | Error>;
 /**
  * Sends a batch of EVM transactions
  */

package/utils/connectors/evm/transactions.js

@@ -204,6 +204,91 @@ export var sendEVMTokenTransaction = function (contractAddress, abi, functionNam
         }
     });
 }); };
+/**
+ * Sends an native smart contract transaction
+ */
+export var sendNativeSmartContractTransaction = function (contractAddress, abi, functionName, args, fromAddress, value) { return __awaiter(void 0, void 0, void 0, function () {
+    var activeRawProvider, chainIdHex, chainId, provider, signer, network, contract, txOptions, gasLimit, maxFeePerGas, maxPriorityFeePerGas, tx, receipt, txError_3, error_3;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 9, , 10]);
+                activeRawProvider = getActiveRawProvider();
+                if (!activeRawProvider) {
+                    throw new Error('No active EVM provider');
+                }
+                return [4 /*yield*/, activeRawProvider.request({
+                        method: 'eth_chainId'
+                    })];
+            case 1:
+                chainIdHex = _a.sent();
+                chainId = parseInt(chainIdHex, 16);
+                provider = new ethers.BrowserProvider(activeRawProvider);
+                return [4 /*yield*/, provider.getSigner(fromAddress)
+                    // Verify we're still on the same network before proceeding
+                ];
+            case 2:
+                signer = _a.sent();
+                return [4 /*yield*/, provider.getNetwork()];
+            case 3:
+                network = _a.sent();
+                if (Number(network.chainId) !== chainId) {
+                    throw new Error('Network changed during transaction setup');
+                }
+                contract = new ethers.Contract(contractAddress, abi, signer);
+                txOptions = {};
+                gasLimit = (args === null || args === void 0 ? void 0 : args[1]) !== undefined ? toSafeNumber(args[1], 'gasLimit') : undefined;
+                maxFeePerGas = (args === null || args === void 0 ? void 0 : args[2]) !== undefined
+                    ? toSafeNumber(args[2], 'maxFeePerGas')
+                    : undefined;
+                maxPriorityFeePerGas = (args === null || args === void 0 ? void 0 : args[3]) !== undefined
+                    ? toSafeNumber(args[3], 'maxPriorityFeePerGas')
+                    : undefined;
+                txOptions.gasLimit = gasLimit ? BigInt(Math.floor(gasLimit)) : undefined;
+                txOptions.maxFeePerGas = maxFeePerGas
+                    ? BigInt(Math.floor(maxFeePerGas))
+                    : undefined;
+                txOptions.maxPriorityFeePerGas = maxPriorityFeePerGas
+                    ? BigInt(Math.floor(maxPriorityFeePerGas))
+                    : undefined;
+                if (value) {
+                    txOptions.value = value;
+                }
+                _a.label = 4;
+            case 4:
+                _a.trys.push([4, 7, , 8]);
+                return [4 /*yield*/, contract[functionName](args[0], txOptions)
+                    // Wait for transaction confirmation
+                ];
+            case 5:
+                tx = _a.sent();
+                return [4 /*yield*/, tx.wait()];
+            case 6:
+                receipt = _a.sent();
+                return [2 /*return*/, receipt ? receipt.hash : ''];
+            case 7:
+                txError_3 = _a.sent();
+                if (isUserRejection(txError_3)) {
+                    return [2 /*return*/, new Error('Transaction was rejected by user')];
+                }
+                throw txError_3;
+            case 8: return [3 /*break*/, 10];
+            case 9:
+                error_3 = _a.sent();
+                console.error('Token transaction error:', error_3);
+                if (isUserRejection(error_3)) {
+                    return [2 /*return*/, new Error('Transaction was rejected by user')];
+                }
+                if (error_3.code === 'NETWORK_ERROR') {
+                    return [2 /*return*/, new Error('Network changed during transaction. Please try again.')];
+                }
+                return [2 /*return*/, error_3 instanceof Error
+                        ? error_3
+                        : new Error('Failed to send token transaction')];
+            case 10: return [2 /*return*/];
+        }
+    });
+}); };
 function toSafeNumber(value, name) {
     if (typeof value !== 'number' || Number.isNaN(value)) {
         throw new TypeError("Invalid ".concat(name, ": expected a number, got ").concat(typeof value, " (").concat(value, ")"));
@@ -214,7 +299,7 @@ function toSafeNumber(value, name) {
  * Sends a batch of EVM transactions
  */
 export var sendEVMTransactionBatch = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var activeRawProvider, provider, response, result, txError_3, error_3;
+    var activeRawProvider, provider, response, result, txError_4, error_4;
     var _a, _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -252,23 +337,23 @@ export var sendEVMTransactionBatch = function (params) { return __awaiter(void 0
                     ? new Error('Failed to send batched transactions')
                     : (_b = (_a = result.receipts.find(function (x) { return x; })) === null || _a === void 0 ? void 0 : _a.transactionHash) !== null && _b !== void 0 ? _b : new Error('Failed to get batched transactions receipt')];
             case 8:
-                txError_3 = _c.sent();
-                if (isUserRejection(txError_3)) {
+                txError_4 = _c.sent();
+                if (isUserRejection(txError_4)) {
                     return [2 /*return*/, new Error('Transaction was rejected by user')];
                 }
-                throw txError_3;
+                throw txError_4;
             case 9: return [3 /*break*/, 11];
             case 10:
-                error_3 = _c.sent();
-                console.error('Token transaction error:', error_3);
-                if (isUserRejection(error_3)) {
+                error_4 = _c.sent();
+                console.error('Token transaction error:', error_4);
+                if (isUserRejection(error_4)) {
                     return [2 /*return*/, new Error('Transaction was rejected by user')];
                 }
-                if (error_3.code === 'NETWORK_ERROR') {
+                if (error_4.code === 'NETWORK_ERROR') {
                     return [2 /*return*/, new Error('Network changed during transaction. Please try again.')];
                 }
-                return [2 /*return*/, error_3 instanceof Error
-                        ? error_3
+                return [2 /*return*/, error_4 instanceof Error
+                        ? error_4
                         : new Error('Failed to send token transaction')];
             case 11: return [2 /*return*/];
         }

package/utils/version.d.ts

@@ -1 +1 @@
-export declare const sdkVersion = "3.2.3";
+export declare const sdkVersion = "3.2.4";

package/utils/version.js

@@ -1 +1 @@
-export var sdkVersion = '3.2.3';
+export var sdkVersion = '3.2.4';

package/utils/wallet/EVMWalletStrategy.d.ts

@@ -14,6 +14,7 @@ export declare class EVMWalletStrategy extends BaseWalletStrategy {
     }>;
     sendNativeTransfer(payload: TransferPayload): Promise<string>;
     sendSmartContractInteraction(payload: SmartContractPayload): Promise<string>;
+    sendNativeSmartContractInteraction(payload: SmartContractPayload): Promise<string>;
     sendTransactionBatch(payload: TransactionBatchPayload): Promise<string>;
     getWalletCapabilities(payload: WalletCapabilitiesPayload): Promise<{
         atomic: {

package/utils/wallet/EVMWalletStrategy.js

@@ -50,7 +50,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { BaseWalletStrategy } from './WalletStrategy';
-import { connectToEVMWallet, disconnectFromEVMWallet, signEVMMessage, sendEVMTransaction, sendEVMTokenTransaction, switchEVMChain, findAvailableProviders, sendEVMTransactionBatch, getWalletCapabilities } from '../connectors/evm';
+import { connectToEVMWallet, disconnectFromEVMWallet, signEVMMessage, sendEVMTransaction, sendEVMTokenTransaction, sendNativeSmartContractTransaction, switchEVMChain, findAvailableProviders, sendEVMTransactionBatch, getWalletCapabilities } from '../connectors/evm';
 var EVMWalletStrategy = /** @class */ (function (_super) {
     __extends(EVMWalletStrategy, _super);
     function EVMWalletStrategy() {
@@ -192,14 +192,14 @@ var EVMWalletStrategy = /** @class */ (function (_super) {
             });
         });
     };
-    EVMWalletStrategy.prototype.sendTransactionBatch = function (payload) {
+    EVMWalletStrategy.prototype.sendNativeSmartContractInteraction = function (payload) {
         return __awaiter(this, void 0, void 0, function () {
             var result, error_7;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, sendEVMTransactionBatch(payload)];
+                        return [4 /*yield*/, sendNativeSmartContractTransaction(payload.address, JSON.parse(payload.abi), payload.functionName, payload.args, payload.account, payload.value)];
                     case 1:
                         result = _a.sent();
                         if (result instanceof Error) {
@@ -214,6 +214,28 @@ var EVMWalletStrategy = /** @class */ (function (_super) {
             });
         });
     };
+    EVMWalletStrategy.prototype.sendTransactionBatch = function (payload) {
+        return __awaiter(this, void 0, void 0, function () {
+            var result, error_8;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, sendEVMTransactionBatch(payload)];
+                    case 1:
+                        result = _a.sent();
+                        if (result instanceof Error) {
+                            throw result;
+                        }
+                        return [2 /*return*/, result];
+                    case 2:
+                        error_8 = _a.sent();
+                        throw this.handleError(error_8, 'send EVM smart contract interaction');
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     EVMWalletStrategy.prototype.getWalletCapabilities = function (payload) {
         return __awaiter(this, void 0, void 0, function () {
             var result;

package/utils/wallet/SolanaWalletStrategy.d.ts

@@ -18,6 +18,7 @@ export declare class SolanaWalletStrategy extends BaseWalletStrategy {
     }>;
     sendNativeTransfer(payload: TransferPayload): Promise<string>;
     sendSmartContractInteraction(payload: SmartContractPayload): Promise<string>;
+    sendNativeSmartContractInteraction(): Promise<string>;
     sendTransactionBatch(): Promise<string>;
     getWalletCapabilities(): Promise<{
         atomic: {

package/utils/wallet/SolanaWalletStrategy.js

@@ -209,6 +209,9 @@ var SolanaWalletStrategy = /** @class */ (function (_super) {
             });
         });
     };
+    SolanaWalletStrategy.prototype.sendNativeSmartContractInteraction = function () {
+        throw new Error('Method not implemented.');
+    };
     SolanaWalletStrategy.prototype.sendTransactionBatch = function () {
         throw new Error('Method not implemented.');
     };

package/utils/wallet/WalletStrategy.d.ts

@@ -13,6 +13,7 @@ export interface WalletStrategy {
     }>;
     sendNativeTransfer(payload: TransferPayload): Promise<string>;
     sendSmartContractInteraction(payload: SmartContractPayload): Promise<string>;
+    sendNativeSmartContractInteraction(payload: SmartContractPayload): Promise<string>;
     sendTransactionBatch(payload: TransactionBatchPayload): Promise<string>;
     getWalletCapabilities(payload: WalletCapabilitiesPayload): Promise<{
         atomic: {
@@ -40,6 +41,7 @@ export declare abstract class BaseWalletStrategy implements WalletStrategy {
     }>;
     abstract sendNativeTransfer(payload: TransferPayload): Promise<string>;
     abstract sendSmartContractInteraction(payload: SmartContractPayload): Promise<string>;
+    abstract sendNativeSmartContractInteraction(payload: SmartContractPayload): Promise<string>;
     abstract sendTransactionBatch(payload: TransactionBatchPayload): Promise<string>;
     abstract getWalletCapabilities(payload: WalletCapabilitiesPayload): Promise<{
         atomic: {