dracoder-web3-package 2.0.2 → 2.0.4

package/index.js

@@ -1,8 +1,29 @@
 "use strict";
 
 const { Web3 } = require("web3");
+const { isAddress } = require("web3-validator");
 const { abiToken } = require("./helpers/factory_data");
 
+// Variable para guardar
+// la configuración de red
+let networkConfig = null;
+
+// Configuración por defecto
+const defaultNetworkConfig = {
+  chainId: "0x89",
+  chainName: "Polygon Mainnet",
+  nativeCurrency: {
+    name: "POL",
+    symbol: "POL",
+    decimals: 18,
+  },
+  rpcUrls: ["https://polygon-rpc.com/"],
+  blockExplorerUrls: ["https://polygonscan.com/"],
+  iconUrls: [
+    "https://polygonscan.com/assets/poly/images/svg/logos/chain-light.svg",
+  ],
+};
+
 const METAMASK_NOT_INSTALLED_MESSAGE = {
   ok: false,
   message: "You don't have Metamask installed.",
@@ -59,15 +80,15 @@ const clientTokenTransfer = async ({
     throw error;
   }
 
-  if (!web3.utils.isAddress(account)) {
+  if (!isAddress(account)) {
     throw new Error("Not valid account");
   }
 
-  if (!web3.utils.isAddress(tokenAddress)) {
+  if (!isAddress(tokenAddress)) {
     throw new Error("Is not a Token Address");
   }
 
-  if (!web3.utils.isAddress(walletAddressToTransferTo)) {
+  if (!isAddress(walletAddressToTransferTo)) {
     throw new Error("Is not a Wallet Address to transfer to");
   }
 
@@ -149,21 +170,7 @@ const isMetamaskInstalled = () => {
 };
 
 const checkWalletFormat = (account) => {
-  let web3;
-  if (!checkIfMetamaskIsAvailable()) {
-    return METAMASK_NOT_INSTALLED_MESSAGE;
-  }
-  try {
-    web3 = new Web3(Metamask);
-  } catch (error) {
-    return {
-      ok: false,
-      message: "Web3 can not be loaded. Metamask must be installed",
-      error: error,
-    };
-  }
-
-  if (!web3.utils.isAddress(account)) {
+  if (!isAddress(account)) {
     return {
       ok: false,
       message: "Wrong address format",
@@ -180,18 +187,25 @@ const selectOrAddPolygonMainNetwork = async () => {
   if (!checkIfMetamaskIsAvailable()) {
     return METAMASK_NOT_INSTALLED_MESSAGE;
   }
+
   await getMetamaskAccount().catch((error) => {
     throw error;
   });
+
+  const pickedNetworkConfig = getNetworkConfig();
+  const addedSuccessMsg = `${pickedNetworkConfig.chainName} added successfully`;
+  const switchedSuccessMsg = `${pickedNetworkConfig.chainName} established successfully`;
+
   try {
     // Primero intentar cambiar a la red de Polygon si ya existe
     await Metamask.request({
       method: "wallet_switchEthereumChain",
-      params: [{ chainId: "0x89" }], // ChainId de Polygon Mainnet en hexadecimal
+      params: [{ chainId: pickedNetworkConfig.chainId }],
     });
+
     return {
       ok: true,
-      message: "Already on polygon main network",
+      message: switchedSuccessMsg,
     };
   } catch (switchError) {
     // Si el error es 4902, significa que la red no está añadida
@@ -199,33 +213,31 @@ const selectOrAddPolygonMainNetwork = async () => {
       try {
         const response = await Metamask.request({
           method: "wallet_addEthereumChain",
-          params: [
-            {
-              chainId: "0x89",
-              chainName: "Polygon",
-              nativeCurrency: {
-                name: "POL",
-                symbol: "POL",
-                decimals: 18,
-              },
-              rpcUrls: ["https://polygon.llamarpc.com"],
-              blockExplorerUrls: ["https://polygonscan.com/"],
-              iconUrls: [
-                "https://polygonscan.com/assets/poly/images/svg/logos/chain-light.svg",
-              ],
-            },
-          ],
+          params: [pickedNetworkConfig],
         });
         return {
           ok: true,
-          message: "Polygon MainNet added successfully",
+          message: addedSuccessMsg,
           response: response,
         };
       } catch (error) {
+        const errorCode = error.code;
+
+        if (errorCode === -32603) {
+          // El código -32603 es un bug de Metamask
+          // https://github.com/MetaMask/metamask-extension/issues/33213
+          // https://github.com/MetaMask/metamask-extension/issues/32165
+          // La red realmente se ha añadido correctamente
+          return {
+            ok: true,
+            message: addedSuccessMsg,
+          };
+        }
+
         return {
           ok: false,
           message: error.message,
-          code: error.code,
+          code: errorCode,
         };
       }
     } else {
@@ -234,10 +246,53 @@ const selectOrAddPolygonMainNetwork = async () => {
   }
 };
 
+// Función para obtener la configuración actual
+const getNetworkConfig = () => {
+  return networkConfig || defaultNetworkConfig;
+};
+
+// Función para configurar la red desde el proyecto
+const setNetworkConfig = (config) => {
+  if (!config || typeof config !== "object") {
+    console.warn(
+      "Configuración de red inválida, usando configuración por defecto"
+    );
+
+    networkConfig = { ...defaultNetworkConfig };
+
+    return false;
+  }
+
+  // Validar que tenga los campos requeridos
+  const requiredFields = ["chainId", "chainName", "rpcUrls"];
+  const missingFields = requiredFields.filter((field) => !config[field]);
+
+  if (missingFields.length > 0) {
+    console.warn(
+      `Faltan campos requeridos en la configuración: ${missingFields.join(
+        ", "
+      )}`
+    );
+
+    networkConfig = { ...defaultNetworkConfig };
+
+    return false;
+  }
+
+  // Fusionar con configuración por defecto para campos opcionales
+  networkConfig = {
+    ...defaultNetworkConfig,
+    ...config,
+  };
+
+  return true;
+};
+
 module.exports = {
-  clientTokenTransfer,
+  setNetworkConfig,
+  checkWalletFormat,
   sendTokenToWallet,
+  clientTokenTransfer,
   isMetamaskInstalled,
-  checkWalletFormat,
   selectOrAddPolygonMainNetwork,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dracoder-web3-package",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Dracoder package used for web3 provider integration.",
   "main": "index.js",
   "keywords": [
@@ -16,7 +16,8 @@
   "author": "Dracoder S.L.",
   "license": "MIT",
   "dependencies": {
-    "web3": "^4.4.0"
+    "web3": "^4.4.0",
+    "web3-validator": "^2.0.6"
   },
   "devDependencies": {
     "@babel/core": "^7.15.0",