@reactmore/crypto-wallet-sdk 1.2.0 → 1.3.1

package/dist/crypto-wallet-sdk.esm.js

@@ -819,38 +819,50 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
   }();
   _proto.generateWallet = /*#__PURE__*/function () {
     var _generateWallet = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref2) {
-      var mnemonic, derivationPath, hdPath, getMnemonic, derivePrivateKey, _yield$this$wallet$ge, address, publicKey, _t2;
+      var mnemonic, privateKey, derivationPath, hdPath, derivePrivateKey, _yield$this$wallet$ge, address, publicKey;
       return _regenerator().w(function (_context2) {
         while (1) switch (_context2.n) {
           case 0:
-            mnemonic = _ref2.mnemonic, derivationPath = _ref2.derivationPath;
+            mnemonic = _ref2.mnemonic, privateKey = _ref2.privateKey, derivationPath = _ref2.derivationPath;
             hdPath = derivationPath || "m/44'/60'/0'/0/0";
-            if (!(mnemonic != null)) {
+            if (!(mnemonic && privateKey)) {
               _context2.n = 1;
               break;
             }
-            _t2 = mnemonic;
-            _context2.n = 3;
-            break;
+            throw new Error("Provide either mnemonic or privateKey, not both");
           case 1:
-            _context2.n = 2;
-            return this.generateMnemonic(12);
+            if (!privateKey) {
+              _context2.n = 2;
+              break;
+            }
+            derivePrivateKey = privateKey;
+            _context2.n = 6;
+            break;
           case 2:
-            _t2 = _context2.v;
-          case 3:
-            getMnemonic = _t2;
-            _context2.n = 4;
+            if (!mnemonic) {
+              _context2.n = 4;
+              break;
+            }
+            _context2.n = 3;
             return this.wallet.getDerivedPrivateKey({
-              mnemonic: getMnemonic,
+              mnemonic: mnemonic,
               hdPath: hdPath
             });
-          case 4:
+          case 3:
             derivePrivateKey = _context2.v;
+            _context2.n = 6;
+            break;
+          case 4:
             _context2.n = 5;
+            return this.wallet.getRandomPrivateKey();
+          case 5:
+            derivePrivateKey = _context2.v;
+          case 6:
+            _context2.n = 7;
             return this.wallet.getNewAddress({
               privateKey: derivePrivateKey
             });
-          case 5:
+          case 7:
             _yield$this$wallet$ge = _context2.v;
             address = _yield$this$wallet$ge.address;
             publicKey = _yield$this$wallet$ge.publicKey;
@@ -920,7 +932,7 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
   }();
   _proto.transfer = /*#__PURE__*/function () {
     var _transfer = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(_ref4) {
-      var privateKey, contractAddress, rpcUrl, args, _yield$this$getContra2, contract, providerInstance, gasFeeData, nonce, recipientAddress, prio, max, value, gasLimit, decimals, noFeeProvided, estimate, fee, signParams, signedTx, broadcast, _t3;
+      var privateKey, contractAddress, rpcUrl, args, _yield$this$getContra2, contract, providerInstance, gasFeeData, nonce, signer, recipientAddress, prio, max, txTo, txData, txValue, gasLimit, decimals, amount, noFeeProvided, estimate, fee, signParams, signedTx, broadcast, _t2, _t3, _t4, _t5, _t6;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.n) {
           case 0:
@@ -937,6 +949,7 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
             providerInstance = _yield$this$getContra2.providerInstance;
             gasFeeData = _yield$this$getContra2.gasFeeData;
             nonce = _yield$this$getContra2.nonce;
+            signer = _yield$this$getContra2.signer;
             _context4.n = 2;
             return this.wallet.validAddress({
               address: args.recipientAddress
@@ -947,7 +960,7 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
               _context4.n = 3;
               break;
             }
-            throw new Error("address not valid");
+            throw new Error("recipient address not valid");
           case 3:
             if (!(args.maxPriorityFeePerGas && args.maxFeePerGas)) {
               _context4.n = 4;
@@ -965,10 +978,10 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
               _context4.n = 5;
               break;
             }
-            throw new Error("Cannot use gasPrice with EIP-1559 fee fields");
+            throw new Error("Cannot mix gasPrice with EIP-1559 fields");
           case 5:
             if (!contractAddress) {
-              _context4.n = 11;
+              _context4.n = 12;
               break;
             }
             if (contract) {
@@ -981,93 +994,97 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
             return contract.decimals();
           case 7:
             decimals = _context4.v;
-            value = parseAmount(args.amount.toString(), decimals);
+            amount = parseAmount(args.amount.toString(), decimals);
+            txData = contract["interface"].encodeFunctionData("transfer", [args.recipientAddress, amount]);
+            txTo = contractAddress;
+            txValue = 0n;
             if (!args.gasLimit) {
               _context4.n = 8;
               break;
             }
-            _t3 = BigInt(args.gasLimit);
-            _context4.n = 10;
+            _t2 = BigInt(args.gasLimit);
+            _context4.n = 11;
             break;
           case 8:
+            _t3 = providerInstance;
             _context4.n = 9;
-            return contract.transfer.estimateGas(args.recipientAddress, value);
+            return signer.getAddress();
           case 9:
-            _t3 = _context4.v;
+            _t4 = _context4.v;
+            _t5 = contractAddress;
+            _t6 = txData;
+            _context4.n = 10;
+            return _t3.estimateGas.call(_t3, {
+              from: _t4,
+              to: _t5,
+              data: _t6
+            });
           case 10:
-            gasLimit = _t3;
-            _context4.n = 12;
-            break;
+            _t2 = _context4.v;
           case 11:
-            value = parseEther(args.amount.toString());
-            gasLimit = args.gasLimit ? BigInt(args.gasLimit) : 21000n;
+            gasLimit = _t2;
+            _context4.n = 13;
+            break;
           case 12:
-            // DEFAULT FEE
+            // ===== NATIVE TRANSFER =====
+            txTo = args.recipientAddress;
+            txValue = parseEther(args.amount.toString());
+            txData = args.data ? ethers.hexlify(ethers.toUtf8Bytes(args.data)) : '0x';
+            gasLimit = args.gasLimit ? BigInt(args.gasLimit) : 21000n;
+          case 13:
+            // =========================
+            // AUTO ESTIMATE FEE
+            // =========================
             noFeeProvided = !args.gasPrice && !args.maxFeePerGas && !args.maxPriorityFeePerGas;
-            if (!noFeeProvided) {
-              _context4.n = 17;
+            if (!(noFeeProvided && !contractAddress)) {
+              _context4.n = 16;
               break;
             }
-            _context4.n = 13;
+            _context4.n = 14;
             return this.estimateGas({
               rpcUrl: rpcUrl != null ? rpcUrl : this.config.rpcUrl,
-              recipientAddress: args.recipientAddress,
+              recipientAddress: txTo,
               amount: args.amount.toString(),
-              data: args.data
+              data: txData !== '0x' ? txData : undefined
             });
-          case 13:
+          case 14:
             estimate = _context4.v;
             gasLimit = BigInt(estimate.gasLimit);
-            // ===== LEGACY =====
             if (!(estimate.model === "LEGACY")) {
               _context4.n = 15;
               break;
             }
-            if (estimate.gasPrice) {
-              _context4.n = 14;
-              break;
-            }
-            throw new Error("LEGACY estimate missing gasPrice");
-          case 14:
-            args.gasPrice = estimate.gasPrice; // wei
+            args.gasPrice = estimate.gasPrice;
             return _context4.a(2, this.transfer(_extends({
               privateKey: privateKey,
               contractAddress: contractAddress,
               rpcUrl: rpcUrl
             }, args)));
           case 15:
-            // ===== EIP-1559 =====
             fee = estimate.fees.regular;
-            if (!(!(fee != null && fee.maxFeePerGas) || !(fee != null && fee.maxPriorityFeePerGas))) {
-              _context4.n = 16;
-              break;
-            }
-            throw new Error("EIP1559 estimate missing fee fields");
-          case 16:
             args.maxFeePerGas = fee.maxFeePerGas;
             args.maxPriorityFeePerGas = fee.maxPriorityFeePerGas;
-          case 17:
-            _context4.n = 18;
+          case 16:
+            _context4.n = 17;
             return this.buildSignParams({
-              args: _extends({}, args, {
-                privateKey: privateKey,
-                gasLimit: gasLimit
-              }),
+              privateKey: privateKey,
               nonce: nonce,
               gasFeeData: gasFeeData,
-              recipientAddress: recipientAddress,
-              value: value,
-              contractAddress: contractAddress
+              txTo: txTo,
+              txData: txData,
+              txValue: txValue,
+              gasLimit: gasLimit,
+              args: args
             });
-          case 18:
+          case 17:
             signParams = _context4.v;
-            _context4.n = 19;
+            _context4.n = 18;
             return this.wallet.signTransaction(signParams);
-          case 19:
+          case 18:
             signedTx = _context4.v;
-            _context4.n = 20;
+            _context4.n = 19;
             return providerInstance.broadcastTransaction(signedTx);
-          case 20:
+          case 19:
             broadcast = _context4.v;
             return _context4.a(2, successResponse(_extends({}, broadcast)));
         }
@@ -1080,7 +1097,7 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
   }();
   _proto.getTransaction = /*#__PURE__*/function () {
     var _getTransaction = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(_ref5) {
-      var hash, rpcUrl, withReceipt, _yield$this$getContra3, providerInstance, _yield$Promise$all, _tx, receipt, memo, tx, _t4;
+      var hash, rpcUrl, withReceipt, _yield$this$getContra3, providerInstance, _yield$Promise$all, _tx, receipt, memo, tx, _t7;
       return _regenerator().w(function (_context5) {
         while (1) switch (_context5.p = _context5.n) {
           case 0:
@@ -1119,8 +1136,8 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
             }));
           case 6:
             _context5.p = 6;
-            _t4 = _context5.v;
-            throw _t4;
+            _t7 = _context5.v;
+            throw _t7;
           case 7:
             return _context5.a(2);
         }
@@ -1180,7 +1197,7 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
   _proto.smartContractCall = /*#__PURE__*/function () {
     var _smartContractCall = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(args) {
       var _args$rpcUrl;
-      var _yield$this$getContra5, contract, gasFeeData, nonce, tx, overrides, _t5;
+      var _yield$this$getContra5, contract, gasFeeData, nonce, tx, overrides, _t8;
       return _regenerator().w(function (_context7) {
         while (1) switch (_context7.p = _context7.n) {
           case 0:
@@ -1231,8 +1248,8 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
             }));
           case 7:
             _context7.p = 7;
-            _t5 = _context7.v;
-            throw _t5;
+            _t8 = _context7.v;
+            throw _t8;
           case 8:
             return _context7.a(2);
         }
@@ -1245,7 +1262,7 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
   }();
   _proto.estimateGas = /*#__PURE__*/function () {
     var _estimateGas = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(_ref7) {
-      var rpcUrl, recipientAddress, amount, data, _yield$this$getContra6, providerInstance, _block$baseFeePerGas, _feeData$maxPriorityF, network, chainId, tx, _yield$Promise$all3, feeData, gasLimit, gasPrice, maxFeePerGas, maxPriorityFeePerGas, applyMultiplier, isEip1559, baseGasPrice, regularGasPrice, expressGasPrice, instantGasPrice, _regularFee, _expressFee, _instantFee, baseFee, priorityFee, block, regularPriority, regularMaxFee, expressPriority, expressMaxFee, instantPriority, instantMaxFee, MAX_GAS_GWEI, cap, regularFee, expressFee, instantFee, _t6;
+      var rpcUrl, recipientAddress, amount, data, _yield$this$getContra6, providerInstance, _block$baseFeePerGas, _feeData$maxPriorityF, network, chainId, tx, _yield$Promise$all3, feeData, gasLimit, gasPrice, maxFeePerGas, maxPriorityFeePerGas, applyMultiplier, isEip1559, baseGasPrice, regularGasPrice, expressGasPrice, instantGasPrice, _regularFee, _expressFee, _instantFee, baseFee, priorityFee, block, regularPriority, regularMaxFee, expressPriority, expressMaxFee, instantPriority, instantMaxFee, MAX_GAS_GWEI, cap, regularFee, expressFee, instantFee, _t9;
       return _regenerator().w(function (_context8) {
         while (1) switch (_context8.p = _context8.n) {
           case 0:
@@ -1348,8 +1365,8 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
             }));
           case 7:
             _context8.p = 7;
-            _t6 = _context8.v;
-            throw _t6;
+            _t9 = _context8.v;
+            throw _t9;
           case 8:
             return _context8.a(2);
         }
@@ -1362,56 +1379,57 @@ var EvmWallet = /*#__PURE__*/function (_BaseWallet) {
   }();
   _proto.buildSignParams = /*#__PURE__*/function () {
     var _buildSignParams = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(_ref8) {
-      var args, nonce, gasFeeData, recipientAddress, value, contractAddress, txBase, _t7, _t8, _t9, _t0, _t1, _t10, _t11, _t12;
+      var _args$nonce, _args$maxPriorityFeeP, _args$maxFeePerGas;
+      var privateKey, nonce, gasFeeData, txTo, txData, txValue, gasLimit, args, txBase, _t0, _t1, _t10, _t11, _t12, _t13, _t14;
       return _regenerator().w(function (_context9) {
         while (1) switch (_context9.n) {
           case 0:
-            args = _ref8.args, nonce = _ref8.nonce, gasFeeData = _ref8.gasFeeData, recipientAddress = _ref8.recipientAddress, value = _ref8.value, contractAddress = _ref8.contractAddress;
-            _t7 = _extends;
-            _t8 = recipientAddress.address;
-            _t9 = BigNumber$1(value.toString());
-            _t0 = args.data ? ethers.hexlify(ethers.toUtf8Bytes(args.data)) : '0x';
-            _t1 = args.nonce;
-            if (_t1) {
-              _context9.n = 2;
+            privateKey = _ref8.privateKey, nonce = _ref8.nonce, gasFeeData = _ref8.gasFeeData, txTo = _ref8.txTo, txData = _ref8.txData, txValue = _ref8.txValue, gasLimit = _ref8.gasLimit, args = _ref8.args;
+            _t0 = txTo;
+            _t1 = BigNumber$1(txValue.toString());
+            _t10 = txData;
+            if (!((_args$nonce = args.nonce) != null)) {
+              _context9.n = 1;
               break;
             }
-            _context9.n = 1;
-            return nonce;
+            _t11 = _args$nonce;
+            _context9.n = 3;
+            break;
           case 1:
-            _t1 = _context9.v;
+            _context9.n = 2;
+            return nonce;
           case 2:
-            _t10 = _t1;
-            _t11 = args.gasLimit ? BigNumber$1(args.gasLimit) : BigNumber$1(21000);
-            _t12 = Number(this.currentChain.id);
-            txBase = _t7({
-              to: _t8,
-              value: _t9,
-              data: _t0,
-              nonce: _t10,
-              gasLimit: _t11,
-              chainId: _t12
-            }, contractAddress ? {
-              contractAddress: contractAddress
-            } : {});
+            _t11 = _context9.v;
+          case 3:
+            _t12 = _t11;
+            _t13 = BigNumber$1(gasLimit.toString());
+            _t14 = Number(this.currentChain.id);
+            txBase = {
+              to: _t0,
+              value: _t1,
+              data: _t10,
+              nonce: _t12,
+              gasLimit: _t13,
+              chainId: _t14
+            };
             if (!args.gasPrice) {
-              _context9.n = 3;
+              _context9.n = 4;
               break;
             }
             return _context9.a(2, {
-              privateKey: args.privateKey,
+              privateKey: privateKey,
               data: _extends({}, txBase, {
                 gasPrice: BigNumber$1(parseGwei(args.gasPrice).toString()),
                 type: 0
               })
             });
-          case 3:
+          case 4:
             return _context9.a(2, {
-              privateKey: args.privateKey,
+              privateKey: privateKey,
               data: _extends({}, txBase, {
                 type: 2,
-                maxPriorityFeePerGas: BigNumber$1(args.maxPriorityFeePerGas ? args.maxPriorityFeePerGas : gasFeeData.maxPriorityFeePerGas.toString()),
-                maxFeePerGas: BigNumber$1(args.maxFeePerGas ? args.maxFeePerGas : gasFeeData.maxFeePerGas.toString())
+                maxPriorityFeePerGas: BigNumber$1((_args$maxPriorityFeeP = args.maxPriorityFeePerGas) != null ? _args$maxPriorityFeeP : gasFeeData.maxPriorityFeePerGas.toString()),
+                maxFeePerGas: BigNumber$1((_args$maxFeePerGas = args.maxFeePerGas) != null ? _args$maxFeePerGas : gasFeeData.maxFeePerGas.toString())
               })
             });
         }