@openocean.finance/wallet 1.10.71 → 1.10.73

package/lib/Wallets/RabbyWallet.js

@@ -74,19 +74,47 @@ var RabbyWallet = /** @class */ (function (_super) {
         _this.icon = rabby_svg_1.default;
         _this.supportChains = [
             types_1.EnumChains.ETH,
+            types_1.EnumChains.ROPSTEN,
+            types_1.EnumChains.RINKEBY,
             types_1.EnumChains.BSC,
-            types_1.EnumChains.Base,
+            types_1.EnumChains.BSCTEST,
             types_1.EnumChains.Polygon,
+            types_1.EnumChains.OKEX,
+            types_1.EnumChains.XDai,
+            types_1.EnumChains.HECO,
             types_1.EnumChains.Fantom,
             types_1.EnumChains.Sonic,
             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.ONTEVM,
+            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.Scroll,
+            types_1.EnumChains.Base,
+            types_1.EnumChains.OpBNB,
+            types_1.EnumChains.Mantle,
+            types_1.EnumChains.Manta,
+            types_1.EnumChains.X1,
+            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,
             types_1.EnumChains.Bera,

package/lib/Wallets/WalletConnect.d.ts

@@ -1,26 +1,64 @@
 import { EnumChains, EnumWalletName, EnumWalletType } from "../types";
 import BaseWallet from "./BaseWallet";
+import Web3 from "web3";
 import { AppKit } from '@reown/appkit';
+declare const DEFAULT_METADATA: {
+    name: string;
+    description: string;
+    url: string;
+    icons: string[];
+};
+interface WalletConnectConfig {
+    projectId?: string;
+    metadata?: typeof DEFAULT_METADATA;
+}
 declare class WalletConnect extends BaseWallet {
     name: EnumWalletName;
     icon: any;
     supportChains: EnumChains[];
     type: EnumWalletType;
-    sdk: any;
+    sdk: Web3 | null;
     infuraId?: string;
-    modal: AppKit;
-    modalIsClose: Boolean;
-    disconnected: Boolean;
-    networks: any;
-    init(chainId?: number, config?: any): void;
-    getModalClose(): boolean | Boolean;
-    /**
-     * connect metamask and get wallet address
-     * @param chainId specific chainId,throw error when not match
-     * @param config
-     */
-    requestConnect(chainId?: number, config?: any): Promise<any>;
-    switchNetwork(chainId: number): Promise<void>;
+    modal: AppKit | null;
+    modalIsClosed: boolean;
+    disconnected: boolean;
+    wcProvider: any;
+    modalIsClose: boolean;
+    networks: any[];
+    /**
+     * Check if running in a wallet WebView (iOS wallet apps)
+     */
+    private isInWalletWebView;
+    /**
+     * Connect via WalletConnect v2 (used in wallet WebViews like Zerion/OKX/Trust iOS)
+     */
+    private connectViaWalletConnectV2;
+    /**
+     * Switch network using WalletConnect provider
+     */
+    private switchNetworkViaWC;
+    /**
+     * Add network using WalletConnect provider
+     */
+    private addNetworkViaWC;
+    initModal(chainId: number, config?: WalletConnectConfig): void;
+    /**
+     * Connect via AppKit (used in browser environments)
+     */
+    connectViaAppKit(chainId: number, config?: WalletConnectConfig): Promise<string>;
+    getModalClose(): boolean;
+    /**
+     * Connect wallet - automatically chooses WalletConnect v2 for wallet WebViews or AppKit for browsers
+     */
+    requestConnect(chainId?: number, config?: WalletConnectConfig): Promise<string>;
+    /**
+     * Switch to a different network
+     * Supports both AppKit modal and WalletConnect v2 provider
+     */
+    switchNetworkModal(chainId: number): Promise<void>;
+    /**
+     * Disconnect wallet
+     */
     disconnect(): Promise<void>;
 }
 export default WalletConnect;

package/lib/Wallets/WalletConnect.js

@@ -69,7 +69,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @name WalletConnect
  * @author openocean
  * @date 2021/4/21
- * @desc
+ * @desc WalletConnect wallet integration using AppKit and WalletConnect v2
  */
 // @ts-ignore
 var walletconnect_svg_1 = __importDefault(require("../assets/walletconnect.svg"));
@@ -81,6 +81,16 @@ var appkit_adapter_wagmi_1 = require("@reown/appkit-adapter-wagmi");
 var helper_1 = require("../helper");
 var chains_1 = require("viem/chains");
 var helper_2 = require("../helper");
+var ethereum_provider_1 = __importDefault(require("@walletconnect/ethereum-provider"));
+// Constants
+var DEFAULT_PROJECT_ID = 'c1ca7adc83e89c7e7848440702f28f38';
+var DEFAULT_METADATA = {
+    name: 'OpenOcean',
+    description: 'OpenOcean dex',
+    url: 'https://app.openocean.finance',
+    icons: ['https://s3.openocean.finance/token_logos/logos/1666922406718_40623932820124664.png'],
+};
+var NETWORK_SWITCH_DELAY = 1000;
 var WalletConnect = /** @class */ (function (_super) {
     __extends(WalletConnect, _super);
     function WalletConnect() {
@@ -140,18 +150,211 @@ var WalletConnect = /** @class */ (function (_super) {
         ];
         _this.type = types_1.EnumWalletType.WalletConnect;
         _this.sdk = null;
-        return _this;
-    }
-    WalletConnect.prototype.init = function (chainId, config) {
-        var _this = this;
-        if (chainId === void 0) { chainId = 1; }
-        var projectId = config && config.projectId ? config.projectId : 'c1ca7adc83e89c7e7848440702f28f38'; // '90304d7fbed3543fd7cac4b24f800264'
-        var networks = this.networks = [
+        _this.modal = null;
+        _this.modalIsClosed = true;
+        _this.disconnected = false;
+        _this.wcProvider = null;
+        _this.modalIsClose = true;
+        _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,
             chains_1.flare, chains_1.unichain, chains_1.monadTestnet, chains_1.swellchain, chains_1.plume, chains_1.berachain, chains_1.sonic, chains_1.gnosis, chains_1.plumeMainnet, chains_1.monad, chains_1.injective, chains_1.tac,
         ];
+        return _this;
+    }
+    /**
+     * Check if running in a wallet WebView (iOS wallet apps)
+     */
+    WalletConnect.prototype.isInWalletWebView = function () {
+        var ua = navigator.userAgent || '';
+        var isIOS = /iPhone|iPad|iPod/i.test(ua);
+        if (!isIOS)
+            return false;
+        var isSafari = /Safari/i.test(ua) && !/CriOS|FxiOS|EdgiOS/i.test(ua);
+        var isChrome = /CriOS/i.test(ua);
+        var isFirefox = /FxiOS/i.test(ua);
+        var isEdge = /EdgiOS/i.test(ua);
+        // If not Safari, Chrome, Firefox, or Edge, assume it's a Wallet WebView
+        return !(isSafari || isChrome || isFirefox || isEdge);
+    };
+    /**
+     * Connect via WalletConnect v2 (used in wallet WebViews like Zerion/OKX/Trust iOS)
+     */
+    WalletConnect.prototype.connectViaWalletConnectV2 = function (chainId, config) {
+        return __awaiter(this, void 0, void 0, function () {
+            var projectId, metadata, _a, address, currentChainId;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        projectId = (config === null || config === void 0 ? void 0 : config.projectId) || DEFAULT_PROJECT_ID;
+                        metadata = (config === null || config === void 0 ? void 0 : config.metadata) || DEFAULT_METADATA;
+                        _a = this;
+                        return [4 /*yield*/, ethereum_provider_1.default.init({
+                                projectId: projectId,
+                                chains: [chainId],
+                                optionalChains: this.networks.map(function (n) { return n.id; }),
+                                showQrModal: true,
+                                metadata: metadata,
+                            })];
+                    case 1:
+                        _a.wcProvider = _b.sent();
+                        return [4 /*yield*/, this.wcProvider.connect()];
+                    case 2:
+                        _b.sent();
+                        this.sdk = new web3_1.default(this.wcProvider);
+                        return [4 /*yield*/, this.sdk.eth.getAccounts()];
+                    case 3:
+                        address = (_b.sent())[0];
+                        this.address = address;
+                        return [4 /*yield*/, this.sdk.eth.getChainId()];
+                    case 4:
+                        currentChainId = _b.sent();
+                        if (!(chainId && currentChainId !== chainId)) return [3 /*break*/, 8];
+                        return [4 /*yield*/, this.switchNetworkViaWC(chainId)];
+                    case 5:
+                        _b.sent();
+                        return [4 /*yield*/, (0, helper_2.sleep)(NETWORK_SWITCH_DELAY)];
+                    case 6:
+                        _b.sent();
+                        return [4 /*yield*/, this.sdk.eth.getChainId()];
+                    case 7:
+                        // Verify chain switch
+                        currentChainId = _b.sent();
+                        if (currentChainId !== chainId) {
+                            throw new Error(types_1.EnumErrors.ChainIdNotMath);
+                        }
+                        _b.label = 8;
+                    case 8:
+                        this.chainId = currentChainId;
+                        this.disconnected = false;
+                        return [2 /*return*/, address];
+                }
+            });
+        });
+    };
+    /**
+     * Switch network using WalletConnect provider
+     */
+    WalletConnect.prototype.switchNetworkViaWC = function (chainId) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var chainIdHex, switchError_1;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (!this.wcProvider) {
+                            throw new Error('WalletConnect provider not initialized');
+                        }
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 3, , 7]);
+                        chainIdHex = "0x".concat(chainId.toString(16));
+                        return [4 /*yield*/, this.wcProvider.request({
+                                method: 'wallet_switchEthereumChain',
+                                params: [{ chainId: chainIdHex }],
+                            })];
+                    case 2:
+                        _c.sent();
+                        return [3 /*break*/, 7];
+                    case 3:
+                        switchError_1 = _c.sent();
+                        if (!(switchError_1.code === 4902 ||
+                            (((_b = (_a = switchError_1.data) === null || _a === void 0 ? void 0 : _a.originalError) === null || _b === void 0 ? void 0 : _b.code) === 4902))) return [3 /*break*/, 5];
+                        // Try to add the chain
+                        return [4 /*yield*/, this.addNetworkViaWC(chainId)];
+                    case 4:
+                        // Try to add the chain
+                        _c.sent();
+                        return [3 /*break*/, 6];
+                    case 5: throw switchError_1;
+                    case 6: return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Add network using WalletConnect provider
+     */
+    WalletConnect.prototype.addNetworkViaWC = function (chainId) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function () {
+            var chain, chainIdHex, rpcUrls, blockExplorerUrls, explorer, nativeCurrency, error_1;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        if (!this.wcProvider) {
+                            throw new Error('WalletConnect provider not initialized');
+                        }
+                        chain = this.networks.find(function (item) { return item.id === chainId; });
+                        if (!chain) {
+                            throw new Error("Chain with id ".concat(chainId, " is not supported"));
+                        }
+                        chainIdHex = "0x".concat(chainId.toString(16));
+                        rpcUrls = [];
+                        if (chain.rpcUrls) {
+                            if (Array.isArray(chain.rpcUrls)) {
+                                rpcUrls = chain.rpcUrls;
+                            }
+                            else if ((_a = chain.rpcUrls.default) === null || _a === void 0 ? void 0 : _a.http) {
+                                rpcUrls = Array.isArray(chain.rpcUrls.default.http)
+                                    ? chain.rpcUrls.default.http
+                                    : [chain.rpcUrls.default.http];
+                            }
+                            else if ((_b = chain.rpcUrls.public) === null || _b === void 0 ? void 0 : _b.http) {
+                                rpcUrls = Array.isArray(chain.rpcUrls.public.http)
+                                    ? chain.rpcUrls.public.http
+                                    : [chain.rpcUrls.public.http];
+                            }
+                        }
+                        blockExplorerUrls = [];
+                        if ((_d = (_c = chain.blockExplorers) === null || _c === void 0 ? void 0 : _c.default) === null || _d === void 0 ? void 0 : _d.url) {
+                            blockExplorerUrls = [chain.blockExplorers.default.url];
+                        }
+                        else if (chain.blockExplorers && typeof chain.blockExplorers === 'object') {
+                            explorer = Object.values(chain.blockExplorers)[0];
+                            if (explorer === null || explorer === void 0 ? void 0 : explorer.url) {
+                                blockExplorerUrls = [explorer.url];
+                            }
+                        }
+                        nativeCurrency = chain.nativeCurrency || {
+                            name: 'ETH',
+                            symbol: 'ETH',
+                            decimals: 18,
+                        };
+                        _e.label = 1;
+                    case 1:
+                        _e.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.wcProvider.request({
+                                method: 'wallet_addEthereumChain',
+                                params: [{
+                                        chainId: chainIdHex,
+                                        chainName: chain.name,
+                                        nativeCurrency: nativeCurrency,
+                                        rpcUrls: rpcUrls.length > 0 ? rpcUrls : undefined,
+                                        blockExplorerUrls: blockExplorerUrls.length > 0 ? blockExplorerUrls : undefined,
+                                    }],
+                            })];
+                    case 2:
+                        _e.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_1 = _e.sent();
+                        throw new Error("Failed to add network: ".concat((error_1 === null || error_1 === void 0 ? void 0 : error_1.message) || error_1));
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    WalletConnect.prototype.initModal = function (chainId, config) {
+        var _this = this;
+        // Prevent duplicate initialization
+        if (this.modal) {
+            return;
+        }
+        var projectId = config && config.projectId ? config.projectId : 'c1ca7adc83e89c7e7848440702f28f38'; // '90304d7fbed3543fd7cac4b24f800264'
+        var networks = this.networks;
         var wagmiAdapter = new appkit_adapter_wagmi_1.WagmiAdapter({
             projectId: projectId,
             networks: networks
@@ -196,17 +399,10 @@ var WalletConnect = /** @class */ (function (_super) {
             console.log(data);
         });
     };
-    WalletConnect.prototype.getModalClose = function () {
-        var open = this.modal.getState().open;
-        return this.modalIsClose || !open;
-    };
     /**
-     * connect metamask and get wallet address
-     * @param chainId specific chainId,throw error when not match
-     * @param config
+     * Connect via AppKit (used in browser environments)
      */
-    WalletConnect.prototype.requestConnect = function (chainId, config) {
-        if (chainId === void 0) { chainId = 1; }
+    WalletConnect.prototype.connectViaAppKit = function (chainId, config) {
         return __awaiter(this, void 0, void 0, function () {
             var provider1_1, providerType, isConnected, currentChainId_1, modalChainId, currentChainId_2, modalChainId_1, address_1, address1, _a, provider1, currentChainId, currentChainId_3, modalChainId, address, _b;
             var _this = this;
@@ -216,7 +412,7 @@ var WalletConnect = /** @class */ (function (_super) {
                         this.modalIsClose = false;
                         console.log('requestConnect1111-----------------');
                         if (!!this.modal) return [3 /*break*/, 2];
-                        this.init(chainId, config);
+                        this.initModal(chainId, config);
                         return [4 /*yield*/, (0, helper_2.sleep)(5000)];
                     case 1:
                         _c.sent();
@@ -225,7 +421,6 @@ var WalletConnect = /** @class */ (function (_super) {
                         if (!this.modal) return [3 /*break*/, 10];
                         console.log('requestConnect222-----------------');
                         provider1_1 = this.modal.getWalletProvider();
-                        console.log(provider1_1);
                         providerType = this.modal.getWalletProviderType();
                         console.log('providerType', providerType);
                         isConnected = this.modal.getIsConnectedState();
@@ -244,7 +439,7 @@ var WalletConnect = /** @class */ (function (_super) {
                         console.log(modalChainId, currentChainId_1, chainId);
                         if (!(chainId && currentChainId_1 != chainId)) return [3 /*break*/, 7];
                         console.log('requestConnect-----*********');
-                        return [4 /*yield*/, this.switchNetwork(+chainId)];
+                        return [4 /*yield*/, this.switchNetworkModal(+chainId)];
                     case 4:
                         _c.sent();
                         return [4 /*yield*/, (0, helper_2.sleep)(1000)];
@@ -302,7 +497,7 @@ var WalletConnect = /** @class */ (function (_super) {
                         console.log('autoWalletCheck333-----------------');
                         this.disconnected = false;
                         if (!(chainId && currentChainId != chainId)) return [3 /*break*/, 17];
-                        return [4 /*yield*/, this.switchNetwork(chainId)];
+                        return [4 /*yield*/, this.switchNetworkModal(chainId)];
                     case 14:
                         _c.sent();
                         return [4 /*yield*/, (0, helper_2.sleep)(1000)];
@@ -333,33 +528,100 @@ var WalletConnect = /** @class */ (function (_super) {
             });
         });
     };
-    WalletConnect.prototype.switchNetwork = function (chainId) {
+    WalletConnect.prototype.getModalClose = function () {
+        var open = this.modal.getState().open;
+        return this.modalIsClose || !open;
+    };
+    /**
+     * Connect wallet - automatically chooses WalletConnect v2 for wallet WebViews or AppKit for browsers
+     */
+    WalletConnect.prototype.requestConnect = function (chainId, config) {
+        if (chainId === void 0) { chainId = 1; }
+        return __awaiter(this, void 0, void 0, function () {
+            var inWallet;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        inWallet = this.isInWalletWebView();
+                        if (!inWallet) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.connectViaWalletConnectV2(chainId, config)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2: return [4 /*yield*/, this.connectViaAppKit(chainId, config)];
+                    case 3: 
+                    // Use AppKit for browser environments
+                    return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    /**
+     * Switch to a different network
+     * Supports both AppKit modal and WalletConnect v2 provider
+     */
+    WalletConnect.prototype.switchNetworkModal = function (chainId) {
         return __awaiter(this, void 0, void 0, function () {
-            var chain;
+            var chain, currentChainId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        chain = this.networks.find(function (item) { return item.id == chainId; });
+                        if (!this.sdk) {
+                            throw new Error('Wallet not connected. Please connect first.');
+                        }
+                        chain = this.networks.find(function (item) { return item.id === chainId; });
                         if (!chain) {
                             throw new Error("Chain with id ".concat(chainId, " is not supported"));
                         }
+                        if (!this.modal) return [3 /*break*/, 2];
+                        // AppKit modal (browser environment)
                         return [4 /*yield*/, this.modal.switchNetwork(chain)];
                     case 1:
+                        // AppKit modal (browser environment)
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2: throw new Error('Unable to determine connection type. Please reconnect.');
+                    case 3: 
+                    // Wait for network switch to complete
+                    return [4 /*yield*/, (0, helper_2.sleep)(NETWORK_SWITCH_DELAY)];
+                    case 4:
+                        // Wait for network switch to complete
                         _a.sent();
+                        return [4 /*yield*/, this.sdk.eth.getChainId()];
+                    case 5:
+                        currentChainId = _a.sent();
+                        if (currentChainId !== chainId) {
+                            throw new Error(types_1.EnumErrors.ChainIdNotMath);
+                        }
+                        this.chainId = currentChainId;
                         return [2 /*return*/];
                 }
             });
         });
     };
+    /**
+     * Disconnect wallet
+     */
     WalletConnect.prototype.disconnect = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.disconnected = true;
-                        return [4 /*yield*/, this.modal.disconnect()];
+                        if (!this.wcProvider) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.wcProvider.disconnect()];
                     case 1:
                         _a.sent();
+                        this.wcProvider = null;
+                        _a.label = 2;
+                    case 2:
+                        if (!this.modal) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.modal.disconnect()];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4:
+                        this.sdk = null;
+                        this.address = undefined;
+                        this.chainId = undefined;
                         return [2 /*return*/];
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/wallet",
-  "version": "1.10.71",
+  "version": "1.10.73",
   "description": "A multi-chain wallets manager",
   "main": "lib/index.js",
   "scripts": {