@injectivelabs/wallet-evm 1.15.21 → 1.15.22

package/dist/cjs/strategy/strategy.d.ts

@@ -1,9 +1,10 @@
-import { TxRaw, TxResponse, DirectSignResponse, AminoSignResponse } from '@injectivelabs/sdk-ts';
+import { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
 import { ErrorContext, ThrownException } from '@injectivelabs/exceptions';
-import { Wallet, StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, ConcreteWalletStrategy, ConcreteWalletStrategyArgs, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { Wallet, StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, BrowserEip1993Provider, ConcreteWalletStrategy, ConcreteWalletStrategyArgs, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
 export declare class EvmWallet extends BaseConcreteStrategy implements ConcreteWalletStrategy {
     wallet?: Wallet;
+    evmProviders: Partial<Record<Wallet, BrowserEip1993Provider>>;
     constructor(args: (ConcreteWalletStrategyArgs | ConcreteEthereumWalletStrategyArgs) & {
         wallet: Wallet;
     });

package/dist/cjs/strategy/strategy.js

@@ -10,11 +10,37 @@ const utils_1 = require("@injectivelabs/utils");
 const index_js_1 = require("./utils/index.js");
 class EvmWallet extends wallet_base_2.BaseConcreteStrategy {
     wallet;
+    evmProviders = {};
     constructor(args) {
         super(args);
         if (!(0, wallet_base_1.isEvmBrowserWallet)(args.wallet)) {
             throw new exceptions_1.WalletException(new Error(`Evm Wallet for ${(0, utils_1.capitalize)(args.wallet)} is not supported.`));
         }
+        if (!(0, sdk_ts_1.isServerSide)()) {
+            window.addEventListener('eip6963:announceProvider', (announcement) => {
+                const event = announcement;
+                const walletName = event.detail.info.name.toLowerCase();
+                if (walletName === wallet_base_2.Wallet.Metamask.toLowerCase()) {
+                    this.evmProviders[wallet_base_2.Wallet.Metamask] = event.detail.provider;
+                }
+                if (walletName === wallet_base_2.Wallet.Rainbow.toLowerCase()) {
+                    this.evmProviders[wallet_base_2.Wallet.Rainbow] = event.detail.provider;
+                }
+                if (walletName === wallet_base_2.Wallet.Phantom.toLowerCase()) {
+                    this.evmProviders[wallet_base_2.Wallet.Phantom] = event.detail.provider;
+                }
+                if (walletName === wallet_base_2.Wallet.OkxWallet.toLowerCase()) {
+                    this.evmProviders[wallet_base_2.Wallet.OkxWallet] = event.detail.provider;
+                }
+                if (walletName === wallet_base_2.Wallet.BitGet.toLowerCase()) {
+                    this.evmProviders[wallet_base_2.Wallet.BitGet] = event.detail.provider;
+                }
+                if (walletName === wallet_base_2.Wallet.TrustWallet.toLowerCase()) {
+                    this.evmProviders[wallet_base_2.Wallet.TrustWallet] = event.detail.provider;
+                }
+            });
+            window.dispatchEvent(new Event('eip6963:requestProvider'));
+        }
         this.wallet = args.wallet;
     }
     EvmWalletException(error, context) {
@@ -33,6 +59,9 @@ class EvmWallet extends wallet_base_2.BaseConcreteStrategy {
         if (this.wallet === wallet_base_2.Wallet.TrustWallet) {
             return new exceptions_1.TrustWalletException(error, context);
         }
+        if (this.wallet === wallet_base_2.Wallet.Rainbow) {
+            return new exceptions_1.RainbowWalletException(error, context);
+        }
         return new exceptions_1.WalletException(error, context);
     }
     async getWalletDeviceType() {
@@ -215,7 +244,11 @@ class EvmWallet extends wallet_base_2.BaseConcreteStrategy {
         ethereum.on('accountsChanged', callback);
     }
     async getEthereum() {
-        const provider = this.wallet === wallet_base_2.Wallet.Metamask
+        const evmProvider = this.evmProviders[this.wallet];
+        if (evmProvider) {
+            return evmProvider;
+        }
+        const backUpProvider = this.wallet === wallet_base_2.Wallet.Metamask
             ? await (0, index_js_1.getMetamaskProvider)()
             : this.wallet === wallet_base_2.Wallet.Phantom
                 ? await (0, index_js_1.getPhantomProvider)()
@@ -225,15 +258,17 @@ class EvmWallet extends wallet_base_2.BaseConcreteStrategy {
                         ? await (0, index_js_1.getOkxWalletProvider)()
                         : this.wallet === wallet_base_2.Wallet.TrustWallet
                             ? await (0, index_js_1.getTrustWalletProvider)()
-                            : undefined;
-        if (!provider) {
+                            : this.wallet === wallet_base_2.Wallet.Rainbow
+                                ? await (0, index_js_1.getRainbowProvider)()
+                                : undefined;
+        if (!backUpProvider) {
             throw this.EvmWalletException(new Error(`Please install the ${this.wallet} wallet extension.`), {
                 code: exceptions_1.UnspecifiedErrorCode,
                 type: exceptions_1.ErrorType.WalletNotInstalledError,
                 contextModule: wallet_base_2.WalletAction.GetAccounts,
             });
         }
-        return provider;
+        return backUpProvider;
     }
 }
 exports.EvmWallet = EvmWallet;

package/dist/cjs/strategy/utils/index.d.ts

@@ -1,5 +1,6 @@
 export { getOkxWalletProvider } from './Okx.js';
 export { getBitGetProvider } from './bitget.js';
 export { getPhantomProvider } from './phantom.js';
+export { getRainbowProvider } from './rainbow.js';
 export { getMetamaskProvider } from './metamask.js';
 export { getTrustWalletProvider } from './trustWallet.js';

package/dist/cjs/strategy/utils/index.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrustWalletProvider = exports.getMetamaskProvider = exports.getPhantomProvider = exports.getBitGetProvider = exports.getOkxWalletProvider = void 0;
+exports.getTrustWalletProvider = exports.getMetamaskProvider = exports.getRainbowProvider = exports.getPhantomProvider = exports.getBitGetProvider = exports.getOkxWalletProvider = void 0;
 var Okx_js_1 = require("./Okx.js");
 Object.defineProperty(exports, "getOkxWalletProvider", { enumerable: true, get: function () { return Okx_js_1.getOkxWalletProvider; } });
 var bitget_js_1 = require("./bitget.js");
 Object.defineProperty(exports, "getBitGetProvider", { enumerable: true, get: function () { return bitget_js_1.getBitGetProvider; } });
 var phantom_js_1 = require("./phantom.js");
 Object.defineProperty(exports, "getPhantomProvider", { enumerable: true, get: function () { return phantom_js_1.getPhantomProvider; } });
+var rainbow_js_1 = require("./rainbow.js");
+Object.defineProperty(exports, "getRainbowProvider", { enumerable: true, get: function () { return rainbow_js_1.getRainbowProvider; } });
 var metamask_js_1 = require("./metamask.js");
 Object.defineProperty(exports, "getMetamaskProvider", { enumerable: true, get: function () { return metamask_js_1.getMetamaskProvider; } });
 var trustWallet_js_1 = require("./trustWallet.js");

package/dist/cjs/strategy/utils/rainbow.d.ts

@@ -0,0 +1,4 @@
+import { BrowserEip1993Provider } from '@injectivelabs/wallet-base';
+export declare function getRainbowProvider({ timeout }?: {
+    timeout: number;
+}): Promise<BrowserEip1993Provider>;

package/dist/cjs/strategy/utils/rainbow.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRainbowProvider = getRainbowProvider;
+const sdk_ts_1 = require("@injectivelabs/sdk-ts");
+const $window = ((0, sdk_ts_1.isServerSide)()
+    ? {}
+    : window);
+async function getRainbowProvider({ timeout } = { timeout: 3000 }) {
+    const provider = getRainbowWalletFromWindow();
+    if (provider) {
+        return provider;
+    }
+    return listenForRainbowWalletInitialized({
+        timeout,
+    });
+}
+async function listenForRainbowWalletInitialized({ timeout } = { timeout: 3000 }) {
+    return new Promise((resolve) => {
+        const handleInitialization = () => {
+            resolve(getRainbowWalletFromWindow());
+        };
+        $window.addEventListener('rainbow#initialized', handleInitialization, {
+            once: true,
+        });
+        setTimeout(() => {
+            $window.removeEventListener('rainbow#initialized', handleInitialization);
+            resolve(null);
+        }, timeout);
+    });
+}
+function getRainbowWalletFromWindow() {
+    const injectedProviderExist = typeof window !== 'undefined' &&
+        (typeof $window.ethereum !== 'undefined' ||
+            typeof $window.rainbow !== 'undefined');
+    // No injected providers exist.
+    if (!injectedProviderExist) {
+        return;
+    }
+    if ($window.rainbow) {
+        return $window.rainbow;
+    }
+    if ($window.ethereum.isRainbow) {
+        return $window.ethereum;
+    }
+    if ($window.providers) {
+        return $window.providers.find((p) => p.isRainbow);
+    }
+    return;
+}

package/dist/esm/strategy/strategy.d.ts

@@ -1,9 +1,10 @@
-import { TxRaw, TxResponse, DirectSignResponse, AminoSignResponse } from '@injectivelabs/sdk-ts';
+import { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
 import { ErrorContext, ThrownException } from '@injectivelabs/exceptions';
-import { Wallet, StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, ConcreteWalletStrategy, ConcreteWalletStrategyArgs, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { Wallet, StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, BrowserEip1993Provider, ConcreteWalletStrategy, ConcreteWalletStrategyArgs, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
 export declare class EvmWallet extends BaseConcreteStrategy implements ConcreteWalletStrategy {
     wallet?: Wallet;
+    evmProviders: Partial<Record<Wallet, BrowserEip1993Provider>>;
     constructor(args: (ConcreteWalletStrategyArgs | ConcreteEthereumWalletStrategyArgs) & {
         wallet: Wallet;
     });

package/dist/esm/strategy/strategy.js

@@ -1,17 +1,43 @@
 /* eslint-disable class-methods-use-this */
 import { isEvmBrowserWallet } from '@injectivelabs/wallet-base';
-import { toUtf8, TxGrpcApi, } from '@injectivelabs/sdk-ts';
-import { ErrorType, WalletException, BitGetException, MetamaskException, OkxWalletException, UnspecifiedErrorCode, TransactionException, TrustWalletException, } from '@injectivelabs/exceptions';
+import { toUtf8, TxGrpcApi, isServerSide, } from '@injectivelabs/sdk-ts';
+import { ErrorType, WalletException, BitGetException, MetamaskException, OkxWalletException, UnspecifiedErrorCode, TransactionException, TrustWalletException, RainbowWalletException, } from '@injectivelabs/exceptions';
 import { Wallet, WalletAction, WalletDeviceType, WalletEventListener, BaseConcreteStrategy, } from '@injectivelabs/wallet-base';
 import { sleep, capitalize } from '@injectivelabs/utils';
-import { getBitGetProvider, getPhantomProvider, getMetamaskProvider, getOkxWalletProvider, getTrustWalletProvider, } from './utils/index.js';
+import { getBitGetProvider, getPhantomProvider, getRainbowProvider, getMetamaskProvider, getOkxWalletProvider, getTrustWalletProvider, } from './utils/index.js';
 export class EvmWallet extends BaseConcreteStrategy {
     wallet;
+    evmProviders = {};
     constructor(args) {
         super(args);
         if (!isEvmBrowserWallet(args.wallet)) {
             throw new WalletException(new Error(`Evm Wallet for ${capitalize(args.wallet)} is not supported.`));
         }
+        if (!isServerSide()) {
+            window.addEventListener('eip6963:announceProvider', (announcement) => {
+                const event = announcement;
+                const walletName = event.detail.info.name.toLowerCase();
+                if (walletName === Wallet.Metamask.toLowerCase()) {
+                    this.evmProviders[Wallet.Metamask] = event.detail.provider;
+                }
+                if (walletName === Wallet.Rainbow.toLowerCase()) {
+                    this.evmProviders[Wallet.Rainbow] = event.detail.provider;
+                }
+                if (walletName === Wallet.Phantom.toLowerCase()) {
+                    this.evmProviders[Wallet.Phantom] = event.detail.provider;
+                }
+                if (walletName === Wallet.OkxWallet.toLowerCase()) {
+                    this.evmProviders[Wallet.OkxWallet] = event.detail.provider;
+                }
+                if (walletName === Wallet.BitGet.toLowerCase()) {
+                    this.evmProviders[Wallet.BitGet] = event.detail.provider;
+                }
+                if (walletName === Wallet.TrustWallet.toLowerCase()) {
+                    this.evmProviders[Wallet.TrustWallet] = event.detail.provider;
+                }
+            });
+            window.dispatchEvent(new Event('eip6963:requestProvider'));
+        }
         this.wallet = args.wallet;
     }
     EvmWalletException(error, context) {
@@ -30,6 +56,9 @@ export class EvmWallet extends BaseConcreteStrategy {
         if (this.wallet === Wallet.TrustWallet) {
             return new TrustWalletException(error, context);
         }
+        if (this.wallet === Wallet.Rainbow) {
+            return new RainbowWalletException(error, context);
+        }
         return new WalletException(error, context);
     }
     async getWalletDeviceType() {
@@ -212,7 +241,11 @@ export class EvmWallet extends BaseConcreteStrategy {
         ethereum.on('accountsChanged', callback);
     }
     async getEthereum() {
-        const provider = this.wallet === Wallet.Metamask
+        const evmProvider = this.evmProviders[this.wallet];
+        if (evmProvider) {
+            return evmProvider;
+        }
+        const backUpProvider = this.wallet === Wallet.Metamask
             ? await getMetamaskProvider()
             : this.wallet === Wallet.Phantom
                 ? await getPhantomProvider()
@@ -222,14 +255,16 @@ export class EvmWallet extends BaseConcreteStrategy {
                         ? await getOkxWalletProvider()
                         : this.wallet === Wallet.TrustWallet
                             ? await getTrustWalletProvider()
-                            : undefined;
-        if (!provider) {
+                            : this.wallet === Wallet.Rainbow
+                                ? await getRainbowProvider()
+                                : undefined;
+        if (!backUpProvider) {
             throw this.EvmWalletException(new Error(`Please install the ${this.wallet} wallet extension.`), {
                 code: UnspecifiedErrorCode,
                 type: ErrorType.WalletNotInstalledError,
                 contextModule: WalletAction.GetAccounts,
             });
         }
-        return provider;
+        return backUpProvider;
     }
 }

package/dist/esm/strategy/utils/index.d.ts

@@ -1,5 +1,6 @@
 export { getOkxWalletProvider } from './Okx.js';
 export { getBitGetProvider } from './bitget.js';
 export { getPhantomProvider } from './phantom.js';
+export { getRainbowProvider } from './rainbow.js';
 export { getMetamaskProvider } from './metamask.js';
 export { getTrustWalletProvider } from './trustWallet.js';

package/dist/esm/strategy/utils/index.js

@@ -1,5 +1,6 @@
 export { getOkxWalletProvider } from './Okx.js';
 export { getBitGetProvider } from './bitget.js';
 export { getPhantomProvider } from './phantom.js';
+export { getRainbowProvider } from './rainbow.js';
 export { getMetamaskProvider } from './metamask.js';
 export { getTrustWalletProvider } from './trustWallet.js';

package/dist/esm/strategy/utils/rainbow.d.ts

@@ -0,0 +1,4 @@
+import { BrowserEip1993Provider } from '@injectivelabs/wallet-base';
+export declare function getRainbowProvider({ timeout }?: {
+    timeout: number;
+}): Promise<BrowserEip1993Provider>;

package/dist/esm/strategy/utils/rainbow.js

@@ -0,0 +1,46 @@
+import { isServerSide } from '@injectivelabs/sdk-ts';
+const $window = (isServerSide()
+    ? {}
+    : window);
+export async function getRainbowProvider({ timeout } = { timeout: 3000 }) {
+    const provider = getRainbowWalletFromWindow();
+    if (provider) {
+        return provider;
+    }
+    return listenForRainbowWalletInitialized({
+        timeout,
+    });
+}
+async function listenForRainbowWalletInitialized({ timeout } = { timeout: 3000 }) {
+    return new Promise((resolve) => {
+        const handleInitialization = () => {
+            resolve(getRainbowWalletFromWindow());
+        };
+        $window.addEventListener('rainbow#initialized', handleInitialization, {
+            once: true,
+        });
+        setTimeout(() => {
+            $window.removeEventListener('rainbow#initialized', handleInitialization);
+            resolve(null);
+        }, timeout);
+    });
+}
+function getRainbowWalletFromWindow() {
+    const injectedProviderExist = typeof window !== 'undefined' &&
+        (typeof $window.ethereum !== 'undefined' ||
+            typeof $window.rainbow !== 'undefined');
+    // No injected providers exist.
+    if (!injectedProviderExist) {
+        return;
+    }
+    if ($window.rainbow) {
+        return $window.rainbow;
+    }
+    if ($window.ethereum.isRainbow) {
+        return $window.ethereum;
+    }
+    if ($window.providers) {
+        return $window.providers.find((p) => p.isRainbow);
+    }
+    return;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-evm",
   "description": "EVM wallet strategies for use with @injectivelabs/wallet-core.",
-  "version": "1.15.21",
+  "version": "1.15.22",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -56,17 +56,17 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^1.15.18",
-    "@injectivelabs/networks": "^1.15.19",
-    "@injectivelabs/sdk-ts": "^1.15.21",
-    "@injectivelabs/ts-types": "^1.15.19",
-    "@injectivelabs/utils": "^1.15.19",
-    "@injectivelabs/wallet-base": "^1.15.21"
+    "@injectivelabs/exceptions": "^1.15.19",
+    "@injectivelabs/networks": "^1.15.20",
+    "@injectivelabs/sdk-ts": "^1.15.22",
+    "@injectivelabs/ts-types": "^1.15.20",
+    "@injectivelabs/utils": "^1.15.20",
+    "@injectivelabs/wallet-base": "^1.15.22"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "gitHead": "2c15bac69ae75a5e7036cc64469a720452b414ac",
+  "gitHead": "3c10a76aa66dec3c20e234db53280fd8ced12c11",
   "typedoc": {
     "entryPoint": "./src/index.ts",
     "readmeFile": "./README.md",