@openocean.finance/wallet 1.10.5 → 1.10.8

package/lib/TryWalletConnect/index.js

@@ -57,6 +57,7 @@ function isChainIdEq(wallet, chainId, utilsEht, k) {
             switch (_a.label) {
                 case 0:
                     key = k || 0;
+                    console.log('isChainIdEq====', key);
                     return [4 /*yield*/, (0, util_1.sleep)(1000)];
                 case 1:
                     _a.sent();
@@ -266,6 +267,7 @@ function linkAddOrSwitch(wallet, chain) {
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 9, , 22]);
+                    console.log('wallet_switchEthereumChain____start');
                     return [4 /*yield*/, currentProvider.request({
                             method: 'wallet_switchEthereumChain',
                             params: [{ chainId: params.chainId }],

package/lib/Wallets/WalletConnect.d.ts

@@ -11,6 +11,7 @@ declare class WalletConnect extends BaseWallet {
     modal: AppKit;
     modalIsClose: Boolean;
     disconnected: Boolean;
+    networks: any;
     init(chainId?: number, config?: any): void;
     getModalClose(): Boolean;
     /**
@@ -19,5 +20,7 @@ declare class WalletConnect extends BaseWallet {
      * @param config
      */
     requestConnect(chainId?: number, config?: any): Promise<any>;
+    switchNetwork(chainId: number): void;
+    disconnect(): Promise<void>;
 }
 export default WalletConnect;

package/lib/Wallets/WalletConnect.js

@@ -124,7 +124,7 @@ var WalletConnect = /** @class */ (function (_super) {
         var _this = this;
         if (chainId === void 0) { chainId = 1; }
         var projectId = config && config.projectId ? config.projectId : 'c1ca7adc83e89c7e7848440702f28f38'; // '90304d7fbed3543fd7cac4b24f800264'
-        var networks = [chains_1.mainnet, chains_1.telos, chains_1.opBNB, chains_1.mantle, chains_1.manta, chains_1.blast, chains_1.mode, chains_1.pulsechain, chains_1.merlin, chains_1.rootstock, chains_1.sei, chains_1.arbitrumSepolia, chains_1.gravity, chains_1.apeChain, chains_1.harmonyOne, chains_1.metis, chains_1.kava, chains_1.celo, chains_1.klaytn, chains_1.zksync, chains_1.linea, chains_1.lineaTestnet, chains_1.polygonZkEvm, chains_1.arbitrum, chains_1.bsc, chains_1.polygon, chains_1.okc, chains_1.xdc, chains_1.fantom, chains_1.avalanche, chains_1.optimism, chains_1.bob, chains_1.moonriver, chains_1.aurora, chains_1.cronos, chains_1.base];
+        var networks = this.networks = [chains_1.mainnet, chains_1.telos, chains_1.opBNB, chains_1.mantle, chains_1.manta, chains_1.blast, chains_1.mode, chains_1.pulsechain, chains_1.merlin, chains_1.rootstock, chains_1.sei, chains_1.arbitrumSepolia, chains_1.gravity, chains_1.apeChain, chains_1.harmonyOne, chains_1.metis, chains_1.kava, chains_1.celo, chains_1.klaytn, chains_1.zksync, chains_1.linea, chains_1.lineaTestnet, chains_1.polygonZkEvm, chains_1.arbitrum, chains_1.bsc, chains_1.polygon, chains_1.okc, chains_1.xdc, chains_1.fantom, chains_1.avalanche, chains_1.optimism, chains_1.bob, chains_1.moonriver, chains_1.aurora, chains_1.cronos, chains_1.base];
         var wagmiAdapter = new appkit_adapter_wagmi_1.WagmiAdapter({
             projectId: projectId,
             networks: networks
@@ -191,7 +191,7 @@ var WalletConnect = /** @class */ (function (_super) {
      */
     WalletConnect.prototype.requestConnect = function () {
         return __awaiter(this, arguments, void 0, function (chainId, config) {
-            var provider1_1, providerType, isConnected, currentChainId_1, chainId_1, address_1, address1, provider1, currentChainId, address;
+            var provider1_1, providerType, isConnected, currentChainId_1, modalChainId, currentChainId_2, modalChainId_1, address_1, address1, provider1, currentChainId, address;
             var _this = this;
             if (chainId === void 0) { chainId = 1; }
             return __generator(this, function (_a) {
@@ -206,7 +206,7 @@ var WalletConnect = /** @class */ (function (_super) {
                         _a.sent();
                         _a.label = 2;
                     case 2:
-                        if (!this.modal) return [3 /*break*/, 6];
+                        if (!this.modal) return [3 /*break*/, 7];
                         console.log('requestConnect222-----------------');
                         provider1_1 = this.modal.getWalletProvider();
                         console.log(provider1_1);
@@ -214,7 +214,7 @@ var WalletConnect = /** @class */ (function (_super) {
                         console.log('providerType', providerType);
                         isConnected = this.modal.getIsConnectedState();
                         console.log('requestConnect333-----------------');
-                        if (!(provider1_1 && isConnected && !this.disconnected)) return [3 /*break*/, 6];
+                        if (!(provider1_1 && isConnected && !this.disconnected)) return [3 /*break*/, 7];
                         // let provider =await provider1.getProvider()
                         // console.log(provider)
                         console.log('requestConnect333322222-----------------');
@@ -223,16 +223,23 @@ var WalletConnect = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
                     case 3:
                         currentChainId_1 = _a.sent();
-                        chainId_1 = this.modal.getChainId();
-                        console.log(currentChainId_1, chainId_1);
-                        console.log('requestConnect444-----------------');
-                        if (!(chainId_1 && currentChainId_1 != chainId_1)) return [3 /*break*/, 4];
+                        modalChainId = this.modal.getChainId();
+                        console.log('requestConnect444-------chainId----------');
+                        console.log(modalChainId, currentChainId_1, chainId);
+                        if (!(chainId && currentChainId_1 != chainId)) return [3 /*break*/, 5];
                         console.log('requestConnect555-----------------');
-                        throw new Error(types_1.EnumErrors.ChainIdNotMath);
+                        this.switchNetwork(+chainId);
+                        return [4 /*yield*/, this.sdk.eth.getChainId()];
                     case 4:
-                        console.log('requestConnect666-----------------');
-                        return [4 /*yield*/, this.sdk.eth.getAccounts()];
+                        currentChainId_2 = _a.sent();
+                        modalChainId_1 = this.modal.getChainId();
+                        console.log('requestConnect-------chainId----------');
+                        console.log(modalChainId_1, currentChainId_2, chainId);
+                        _a.label = 5;
                     case 5:
+                        console.log('requestConnect66-----------------');
+                        return [4 /*yield*/, this.sdk.eth.getAccounts()];
+                    case 6:
                         address_1 = (_a.sent())[0];
                         address1 = this.modal.getAddress();
                         console.log(address_1, address1);
@@ -240,17 +247,17 @@ var WalletConnect = /** @class */ (function (_super) {
                         this.chainId = currentChainId_1;
                         this.disconnected = false;
                         return [2 /*return*/, address_1];
-                    case 6:
+                    case 7:
                         console.log('requestConnect777-----------------');
                         return [4 /*yield*/, this.modal.open({
                                 view: 'Connect' //'Account' | 'Connect' | 'Networks' | 'ApproveTransaction' | 'OnRampProviders';
                             })];
-                    case 7:
+                    case 8:
                         _a.sent();
                         return [4 /*yield*/, (0, helper_1.autoWalletCheck)(function () {
                                 return _this.getModalClose();
                             }, 1000 * 60 * 6, 60 * 3)];
-                    case 8:
+                    case 9:
                         _a.sent();
                         console.log('autoWalletCheck-----------------');
                         provider1 = this.modal.getWalletProvider();
@@ -264,16 +271,17 @@ var WalletConnect = /** @class */ (function (_super) {
                         // console.log(provider)
                         this.sdk = new web3_1.default(provider1);
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
-                    case 9:
+                    case 10:
                         currentChainId = _a.sent();
                         console.log('autoWalletCheck333-----------------');
                         this.disconnected = false;
                         if (chainId && currentChainId != chainId) {
-                            throw new Error(types_1.EnumErrors.ChainIdNotMath);
+                            this.switchNetwork(chainId);
+                            // throw new Error(EnumErrors.ChainIdNotMath);
                         }
                         console.log('autoWalletCheck4444-----------------');
                         return [4 /*yield*/, this.sdk.eth.getAccounts()];
-                    case 10:
+                    case 11:
                         address = (_a.sent())[0];
                         this.address = address;
                         this.chainId = currentChainId;
@@ -284,6 +292,27 @@ var WalletConnect = /** @class */ (function (_super) {
             });
         });
     };
+    WalletConnect.prototype.switchNetwork = function (chainId) {
+        var chain = this.networks.find(function (item) { return item.id == chainId; });
+        if (chain) {
+            this.modal.switchNetwork(chain);
+        }
+    };
+    WalletConnect.prototype.disconnect = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        this.disconnected = true;
+                        return [4 /*yield*/, ((_b = (_a = this.modal.adapter) === null || _a === void 0 ? void 0 : _a.connectionControllerClient) === null || _b === void 0 ? void 0 : _b.disconnect())];
+                    case 1:
+                        _c.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     return WalletConnect;
 }(BaseWallet_1.default));
 exports.default = WalletConnect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/wallet",
-  "version": "1.10.5",
+  "version": "1.10.8",
   "description": "A multi-chain wallets manager",
   "main": "lib/index.js",
   "scripts": {
@@ -56,22 +56,22 @@
     "@onflow/fcl": "^0.0.71",
     "@ont-dev/ontology-dapi": "^0.5.7",
     "@project-serum/sol-wallet-adapter": "0.2.0",
-    "@reown/appkit": "^1.3.0",
-    "@reown/appkit-adapter-wagmi": "^1.3.0",
+    "@reown/appkit": "1.3.2",
+    "@reown/appkit-adapter-wagmi": "1.3.2",
     "@siddomains/sidjs": "^0.1.22",
     "@solana/web3.js": "^1.91.0",
     "@terra-money/terra.js": "3.1.10",
     "@uauth/js": "^2.4.0",
-    "@walletconnect/ethereum-provider": "^2.17.1",
-    "@walletconnect/modal": "^2.6.2",
+    "@walletconnect/ethereum-provider": "2.17.1",
+    "@walletconnect/modal": "2.6.2",
     "buffer": "^6.0.3",
     "fs": "^0.0.1-security",
     "near-api-js": "^0.44.2",
     "osmojs": "^13.0.0-rc.7-i-alpha",
     "path-browserify": "^1.0.1",
     "starknet": "^4.22.0",
-    "viem": "^2.21.42",
-    "wagmi": "^2.12.27",
+    "viem": "2.21.44",
+    "wagmi": "2.12.30",
     "web3": "^1.7.4",
     "web3-ledgerhq-frame-connector": "^1.1.0"
   },

package/lib/Wallets/Reown.d.ts

@@ -1,17 +0,0 @@
-import { EnumChains, EnumWalletName, EnumWalletType } from "../types";
-import BaseWallet from "./BaseWallet";
-declare class WalletConnect extends BaseWallet {
-    name: EnumWalletName;
-    icon: any;
-    supportChains: EnumChains[];
-    type: EnumWalletType;
-    sdk: any;
-    infuraId?: string;
-    /**
-     * connect metamask and get wallet address
-     * @param chainId specific chainId,throw error when not match
-     * @param config
-     */
-    requestConnect(chainId?: number, config?: any): Promise<any>;
-}
-export default WalletConnect;

package/lib/Wallets/Reown.js

@@ -1,185 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * @name WalletConnect
- * @author openocean
- * @date 2021/4/21
- * @desc
- */
-// @ts-ignore
-var walletconnect_svg_1 = __importDefault(require("../assets/walletconnect.svg"));
-var types_1 = require("../types");
-var BaseWallet_1 = __importDefault(require("./BaseWallet"));
-var web3_1 = __importDefault(require("web3"));
-var ethereum_provider_1 = require("@walletconnect/ethereum-provider");
-var WalletConnect = /** @class */ (function (_super) {
-    __extends(WalletConnect, _super);
-    function WalletConnect() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.name = types_1.EnumWalletName.WalletConnect;
-        _this.icon = walletconnect_svg_1.default;
-        _this.supportChains = [
-            types_1.EnumChains.ETH,
-            types_1.EnumChains.BSC,
-            types_1.EnumChains.Polygon,
-            types_1.EnumChains.OKEX,
-            types_1.EnumChains.XDai,
-            types_1.EnumChains.HECO,
-            types_1.EnumChains.Fantom,
-            types_1.EnumChains.Avalanche,
-            types_1.EnumChains.Arbitrum,
-            types_1.EnumChains.Optimism,
-            types_1.EnumChains.Boba,
-            types_1.EnumChains.Moonriver,
-            types_1.EnumChains.Aurora,
-            types_1.EnumChains.Cronos,
-            types_1.EnumChains.Harmony,
-            types_1.EnumChains.Metis,
-            types_1.EnumChains.Kava,
-            types_1.EnumChains.Celo,
-            types_1.EnumChains.Klaytn,
-            types_1.EnumChains.ZKSYNC,
-            types_1.EnumChains.Linea,
-            types_1.EnumChains.LineaTest,
-            types_1.EnumChains.PolygonzkEVM,
-            types_1.EnumChains.Telos,
-            types_1.EnumChains.OpBNB,
-            types_1.EnumChains.Mantle,
-            types_1.EnumChains.Manta,
-            types_1.EnumChains.X1,
-            types_1.EnumChains.Base,
-            types_1.EnumChains.Blast,
-            types_1.EnumChains.Mode,
-            types_1.EnumChains.PulseChain,
-            types_1.EnumChains.MerlinChain,
-            types_1.EnumChains.Rootstock,
-            types_1.EnumChains.Sei,
-            types_1.EnumChains.ArbitrumSepolia,
-            types_1.EnumChains.Gravity,
-            types_1.EnumChains.ApeChain,
-        ];
-        _this.type = types_1.EnumWalletType.WalletConnect;
-        _this.sdk = null;
-        return _this;
-    }
-    /**
-     * connect metamask and get wallet address
-     * @param chainId specific chainId,throw error when not match
-     * @param config
-     */
-    WalletConnect.prototype.requestConnect = function () {
-        return __awaiter(this, arguments, void 0, function (chainId, config) {
-            var rpcMap, provider, currentChainId, address;
-            if (chainId === void 0) { chainId = 1; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        rpcMap = {};
-                        this.supportChains.forEach(function (i) {
-                            var chain = config.chainsObj.chainObj[i];
-                            rpcMap[chain.chainId] = chain.rpcUrls[0];
-                        });
-                        console.log('chainId', chainId);
-                        console.log(rpcMap);
-                        console.log(config.chainsObj.chainIds);
-                        return [4 /*yield*/, ethereum_provider_1.EthereumProvider.init({
-                                projectId: config && config.projectId ? config.projectId : 'c1ca7adc83e89c7e7848440702f28f38', // required
-                                chains: [chainId],
-                                optionalChains: config.chainsObj.chainIds,
-                                rpcMap: rpcMap,
-                                optionalMethods: [
-                                    'wallet_addEthereumChain',
-                                    'wallet_switchEthereumChain',
-                                    "eth_signTypedData",
-                                    "eth_signTypedData_v4",
-                                    "eth_sign"
-                                ],
-                                showQrModal: true, // requires @walletconnect/modal
-                                qrModalOptions: {
-                                    themeVariables: {
-                                        "--wcm-z-index": "9999",
-                                    },
-                                    // themeMode: 'light'
-                                }
-                            })];
-                    case 1:
-                        provider = _a.sent();
-                        console.log('provider', provider);
-                        return [4 /*yield*/, provider.enable()];
-                    case 2:
-                        _a.sent();
-                        console.log('provider', provider);
-                        this.sdk = new web3_1.default(provider);
-                        return [4 /*yield*/, this.sdk.eth.getChainId()];
-                    case 3:
-                        currentChainId = _a.sent();
-                        if (chainId && currentChainId != chainId) {
-                            throw new Error(types_1.EnumErrors.ChainIdNotMath);
-                        }
-                        return [4 /*yield*/, this.sdk.eth.getAccounts()];
-                    case 4:
-                        address = (_a.sent())[0];
-                        this.address = address;
-                        this.chainId = currentChainId;
-                        return [2 /*return*/, address];
-                }
-            });
-        });
-    };
-    return WalletConnect;
-}(BaseWallet_1.default));
-exports.default = WalletConnect;