@meshconnect/web-link-sdk 3.1.11 → 3.1.12

package/package.json

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

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

@@ -2,8 +2,8 @@ import { ethers } from 'ethers';
 /**
  * Sends a native EVM transaction
  */
-export declare const sendEVMTransaction: (toAddress: string, amount: bigint, fromAddress: string) => Promise<string | Error>;
+export declare const sendEVMTransaction: (toAddress: string, amount: bigint, fromAddress: string, gasLimit?: number | null, maxFeePerGas?: number | null, maxPriorityFeePerGas?: number | null) => Promise<string | Error>;
 /**
  * Sends an EVM token transaction
  */
-export declare const sendEVMTokenTransaction: (contractAddress: string, abi: ethers.InterfaceAbi, functionName: string, args: unknown[], fromAddress: string, value?: bigint, gasLimit?: bigint) => Promise<string | Error>;
+export declare const sendEVMTokenTransaction: (contractAddress: string, abi: ethers.InterfaceAbi, functionName: string, args: unknown[], fromAddress: string) => Promise<string | Error>;

package/utils/connectors/evm/transactions.js

@@ -34,15 +34,6 @@ 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 };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 import { ethers } from 'ethers';
 import { getActiveRawProvider } from './provider';
 var isUserRejection = function (error) {
@@ -60,7 +51,7 @@ var isUserRejection = function (error) {
 /**
  * Sends a native EVM transaction
  */
-export var sendEVMTransaction = function (toAddress, amount, fromAddress) { return __awaiter(void 0, void 0, void 0, function () {
+export var sendEVMTransaction = function (toAddress, amount, fromAddress, gasLimit, maxFeePerGas, maxPriorityFeePerGas) { return __awaiter(void 0, void 0, void 0, function () {
     var activeRawProvider, chainIdHex, chainId, provider, signer, network, tx, receipt, txError_1, error_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -93,7 +84,14 @@ export var sendEVMTransaction = function (toAddress, amount, fromAddress) { retu
                 _a.trys.push([4, 7, , 8]);
                 return [4 /*yield*/, signer.sendTransaction({
                         to: toAddress,
-                        value: amount
+                        value: amount,
+                        gasLimit: gasLimit ? BigInt(Math.floor(gasLimit)) : undefined,
+                        maxFeePerGas: maxFeePerGas
+                            ? BigInt(Math.floor(maxFeePerGas))
+                            : undefined,
+                        maxPriorityFeePerGas: maxPriorityFeePerGas
+                            ? BigInt(Math.floor(maxPriorityFeePerGas))
+                            : undefined
                     })];
             case 5:
                 tx = _a.sent();
@@ -127,12 +125,12 @@ export var sendEVMTransaction = function (toAddress, amount, fromAddress) { retu
 /**
  * Sends an EVM token transaction
  */
-export var sendEVMTokenTransaction = function (contractAddress, abi, functionName, args, fromAddress, value, gasLimit) { return __awaiter(void 0, void 0, void 0, function () {
-    var activeRawProvider, chainIdHex, chainId, provider, signer, network, contract, txOptions, feeData, tx, receipt, txError_2, error_2;
+export var sendEVMTokenTransaction = function (contractAddress, abi, functionName, args, fromAddress) { return __awaiter(void 0, void 0, void 0, function () {
+    var activeRawProvider, chainIdHex, chainId, provider, signer, network, contract, txOptions, gasLimit, maxFeePerGas, maxPriorityFeePerGas, tx, receipt, txError_2, error_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                _a.trys.push([0, 10, , 11]);
+                _a.trys.push([0, 9, , 10]);
                 activeRawProvider = getActiveRawProvider();
                 if (!activeRawProvider) {
                     throw new Error('No active EVM provider');
@@ -157,34 +155,40 @@ export var sendEVMTokenTransaction = function (contractAddress, abi, functionNam
                 }
                 contract = new ethers.Contract(contractAddress, abi, signer);
                 txOptions = {};
-                return [4 /*yield*/, provider.getFeeData()];
-            case 4:
-                feeData = _a.sent();
-                txOptions.gasPrice = feeData.gasPrice
-                    ? (feeData.gasPrice * BigInt(1000)) / BigInt(100)
+                gasLimit = (args === null || args === void 0 ? void 0 : args[2]) !== undefined ? toSafeNumber(args[2], 'gasLimit') : undefined;
+                maxFeePerGas = (args === null || args === void 0 ? void 0 : args[3]) !== undefined
+                    ? toSafeNumber(args[3], 'maxFeePerGas')
                     : undefined;
-                txOptions.gasLimit = gasLimit;
-                if (value) {
-                    txOptions.value = value;
-                }
-                _a.label = 5;
+                maxPriorityFeePerGas = (args === null || args === void 0 ? void 0 : args[4]) !== undefined
+                    ? toSafeNumber(args[4], '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;
+                _a.label = 4;
+            case 4:
+                _a.trys.push([4, 7, , 8]);
+                return [4 /*yield*/, contract[functionName](args[0], args[1], txOptions)
+                    // Wait for transaction confirmation
+                ];
             case 5:
-                _a.trys.push([5, 8, , 9]);
-                return [4 /*yield*/, contract[functionName].apply(contract, __spreadArray(__spreadArray([], args, false), [txOptions], false))];
-            case 6:
                 tx = _a.sent();
                 return [4 /*yield*/, tx.wait()];
-            case 7:
+            case 6:
                 receipt = _a.sent();
                 return [2 /*return*/, receipt ? receipt.hash : ''];
-            case 8:
+            case 7:
                 txError_2 = _a.sent();
                 if (isUserRejection(txError_2)) {
                     return [2 /*return*/, new Error('Transaction was rejected by user')];
                 }
                 throw txError_2;
-            case 9: return [3 /*break*/, 11];
-            case 10:
+            case 8: return [3 /*break*/, 10];
+            case 9:
                 error_2 = _a.sent();
                 console.error('Token transaction error:', error_2);
                 if (isUserRejection(error_2)) {
@@ -196,7 +200,13 @@ export var sendEVMTokenTransaction = function (contractAddress, abi, functionNam
                 return [2 /*return*/, error_2 instanceof Error
                         ? error_2
                         : new Error('Failed to send token transaction')];
-            case 11: return [2 /*return*/];
+            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, ")"));
+    }
+    return value;
+}

package/utils/types.d.ts

@@ -119,6 +119,9 @@ export interface TransferPayload {
     network: string;
     blockhash?: string;
     walletName?: string;
+    gasLimit?: number | null;
+    maxFeePerGas?: number | null;
+    maxPriorityFeePerGas?: number | null;
 }
 export interface SmartContractPayload {
     address: string;
@@ -129,7 +132,9 @@ export interface SmartContractPayload {
     value?: string;
     walletName?: string;
     blockhash?: string;
-    gasLimit?: string;
+    gasLimit?: number | null;
+    maxFeePerGas?: number | null;
+    maxPriorityFeePerGas?: number | null;
 }
 export interface DisconnectPayload {
     networkType?: string;

package/utils/version.d.ts

@@ -1 +1 @@
-export declare const sdkVersion = "3.1.11";
+export declare const sdkVersion = "3.1.12";

package/utils/version.js

@@ -1 +1 @@
-export var sdkVersion = '3.1.11';
+export var sdkVersion = '3.1.12';

package/utils/wallet/EVMWalletStrategy.js

@@ -155,7 +155,7 @@ var EVMWalletStrategy = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, sendEVMTransaction(payload.toAddress, BigInt(payload.amount * Math.pow(10, payload.decimalPlaces)), payload.account)];
+                        return [4 /*yield*/, sendEVMTransaction(payload.toAddress, BigInt(payload.amount * Math.pow(10, payload.decimalPlaces)), payload.account, payload.gasLimit, payload.maxFeePerGas, payload.maxPriorityFeePerGas)];
                     case 1:
                         result = _a.sent();
                         if (result instanceof Error) {
@@ -177,7 +177,7 @@ var EVMWalletStrategy = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, sendEVMTokenTransaction(payload.address, JSON.parse(payload.abi), payload.functionName, payload.args, payload.account, payload.value ? BigInt(payload.value) : undefined, payload.gasLimit ? BigInt(payload.gasLimit) : undefined)];
+                        return [4 /*yield*/, sendEVMTokenTransaction(payload.address, JSON.parse(payload.abi), payload.functionName, payload.args, payload.account)];
                     case 1:
                         result = _a.sent();
                         if (result instanceof Error) {