@injectivelabs/wallet-evm 1.16.7 → 1.16.8

package/README.md

@@ -13,7 +13,7 @@ _Package to use Wallets EVM on Injective via the wallet strategy._
 ## 📚 Installation
 
 ```bash
-yarn add @injectivelabs/wallet-evm
+pnpm add @injectivelabs/wallet-evm
 ```
 
 ---

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

@@ -1,11 +1,11 @@
 import { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
 import { ErrorContext, ThrownException } from '@injectivelabs/exceptions';
-import { Wallet, StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, BrowserEip1993Provider, ConcreteWalletStrategy, ConcreteWalletStrategyArgs, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
-import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { Wallet, StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, BrowserEip1993Provider, ConcreteWalletStrategy, ConcreteWalletStrategyArgs, ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
 export declare class EvmWallet extends BaseConcreteStrategy implements ConcreteWalletStrategy {
     wallet?: Wallet;
     evmProviders: Partial<Record<Wallet, BrowserEip1993Provider>>;
-    constructor(args: (ConcreteWalletStrategyArgs | ConcreteEthereumWalletStrategyArgs) & {
+    constructor(args: (ConcreteWalletStrategyArgs | ConcreteEvmWalletStrategyArgs) & {
         wallet: Wallet;
     });
     EvmWalletException(error: Error, context?: ErrorContext): ThrownException;
@@ -16,7 +16,7 @@ export declare class EvmWallet extends BaseConcreteStrategy implements ConcreteW
     getSessionOrConfirm(address: AccountAddress): Promise<string>;
     sendEvmTransaction(transaction: unknown, _options: {
         address: AccountAddress;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
     }): Promise<string>;
     sendTransaction(transaction: TxRaw, options: SendTransactionOptions): Promise<TxResponse>;
     signEip712TypedData(eip712json: string, address: AccountAddress): Promise<string>;

package/dist/cjs/strategy/strategy.js

@@ -23,6 +23,9 @@ class EvmWallet extends wallet_base_2.BaseConcreteStrategy {
                 if (walletName === wallet_base_2.Wallet.Metamask.toLowerCase()) {
                     this.evmProviders[wallet_base_2.Wallet.Metamask] = event.detail.provider;
                 }
+                if (walletName === wallet_base_2.Wallet.Rabby.toLowerCase()) {
+                    this.evmProviders[wallet_base_2.Wallet.Rabby] = event.detail.provider;
+                }
                 if (walletName === wallet_base_2.Wallet.Rainbow.toLowerCase()) {
                     this.evmProviders[wallet_base_2.Wallet.Rainbow] = event.detail.provider;
                 }
@@ -250,17 +253,19 @@ class EvmWallet extends wallet_base_2.BaseConcreteStrategy {
         }
         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)()
-                : this.wallet === wallet_base_2.Wallet.BitGet
-                    ? await (0, index_js_1.getBitGetProvider)()
-                    : this.wallet === wallet_base_2.Wallet.OkxWallet
-                        ? await (0, index_js_1.getOkxWalletProvider)()
-                        : this.wallet === wallet_base_2.Wallet.TrustWallet
-                            ? await (0, index_js_1.getTrustWalletProvider)()
-                            : this.wallet === wallet_base_2.Wallet.Rainbow
-                                ? await (0, index_js_1.getRainbowProvider)()
-                                : undefined;
+            : this.wallet === wallet_base_2.Wallet.Rabby
+                ? await (0, index_js_1.getRabbyProvider)()
+                : this.wallet === wallet_base_2.Wallet.Phantom
+                    ? await (0, index_js_1.getPhantomProvider)()
+                    : this.wallet === wallet_base_2.Wallet.BitGet
+                        ? await (0, index_js_1.getBitGetProvider)()
+                        : this.wallet === wallet_base_2.Wallet.OkxWallet
+                            ? await (0, index_js_1.getOkxWalletProvider)()
+                            : this.wallet === wallet_base_2.Wallet.TrustWallet
+                                ? await (0, index_js_1.getTrustWalletProvider)()
+                                : 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,

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

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

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

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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; } });
+exports.getTrustWalletProvider = exports.getMetamaskProvider = exports.getRainbowProvider = exports.getPhantomProvider = exports.getOkxWalletProvider = exports.getBitGetProvider = exports.getRabbyProvider = void 0;
+var rabby_js_1 = require("./rabby.js");
+Object.defineProperty(exports, "getRabbyProvider", { enumerable: true, get: function () { return rabby_js_1.getRabbyProvider; } });
 var bitget_js_1 = require("./bitget.js");
 Object.defineProperty(exports, "getBitGetProvider", { enumerable: true, get: function () { return bitget_js_1.getBitGetProvider; } });
+var Okx_js_1 = require("./Okx.js");
+Object.defineProperty(exports, "getOkxWalletProvider", { enumerable: true, get: function () { return Okx_js_1.getOkxWalletProvider; } });
 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");

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

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

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

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

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

@@ -1,4 +1,4 @@
 import { Wallet, BrowserEip1993Provider } from '@injectivelabs/wallet-base';
-import { EthereumChainId } from '@injectivelabs/ts-types';
+import { EvmChainId } from '@injectivelabs/ts-types';
 export declare const getEvmProvider: (wallet: Wallet) => Promise<BrowserEip1993Provider>;
-export declare const updateEvmNetwork: (wallet: Wallet, chainId: EthereumChainId) => Promise<unknown>;
+export declare const updateEvmNetwork: (wallet: Wallet, chainId: EvmChainId) => Promise<unknown>;

package/dist/cjs/utils/index.js

@@ -4,6 +4,7 @@ exports.updateEvmNetwork = exports.getEvmProvider = void 0;
 const wallet_base_1 = require("@injectivelabs/wallet-base");
 const utils_1 = require("@injectivelabs/utils");
 const exceptions_1 = require("@injectivelabs/exceptions");
+const rabby_js_1 = require("../strategy/utils/rabby.js");
 const Okx_js_1 = require("../strategy/utils/Okx.js");
 const bitget_js_1 = require("../strategy/utils/bitget.js");
 const phantom_js_1 = require("../strategy/utils/phantom.js");
@@ -18,6 +19,9 @@ const getEvmProvider = async (wallet) => {
         if (wallet === wallet_base_1.Wallet.Metamask) {
             provider = (await (0, metamask_js_1.getMetamaskProvider)());
         }
+        if (wallet === wallet_base_1.Wallet.Rabby) {
+            provider = (await (0, rabby_js_1.getRabbyProvider)());
+        }
         if (wallet === wallet_base_1.Wallet.BitGet) {
             provider = (await (0, bitget_js_1.getBitGetProvider)());
         }

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

@@ -1,11 +1,11 @@
 import { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
 import { ErrorContext, ThrownException } from '@injectivelabs/exceptions';
-import { Wallet, StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, BrowserEip1993Provider, ConcreteWalletStrategy, ConcreteWalletStrategyArgs, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
-import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { Wallet, StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, BrowserEip1993Provider, ConcreteWalletStrategy, ConcreteWalletStrategyArgs, ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
 export declare class EvmWallet extends BaseConcreteStrategy implements ConcreteWalletStrategy {
     wallet?: Wallet;
     evmProviders: Partial<Record<Wallet, BrowserEip1993Provider>>;
-    constructor(args: (ConcreteWalletStrategyArgs | ConcreteEthereumWalletStrategyArgs) & {
+    constructor(args: (ConcreteWalletStrategyArgs | ConcreteEvmWalletStrategyArgs) & {
         wallet: Wallet;
     });
     EvmWalletException(error: Error, context?: ErrorContext): ThrownException;
@@ -16,7 +16,7 @@ export declare class EvmWallet extends BaseConcreteStrategy implements ConcreteW
     getSessionOrConfirm(address: AccountAddress): Promise<string>;
     sendEvmTransaction(transaction: unknown, _options: {
         address: AccountAddress;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
     }): Promise<string>;
     sendTransaction(transaction: TxRaw, options: SendTransactionOptions): Promise<TxResponse>;
     signEip712TypedData(eip712json: string, address: AccountAddress): Promise<string>;

package/dist/esm/strategy/strategy.js

@@ -4,7 +4,7 @@ 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, getRainbowProvider, getMetamaskProvider, getOkxWalletProvider, getTrustWalletProvider, } from './utils/index.js';
+import { getRabbyProvider, getBitGetProvider, getPhantomProvider, getRainbowProvider, getMetamaskProvider, getOkxWalletProvider, getTrustWalletProvider, } from './utils/index.js';
 export class EvmWallet extends BaseConcreteStrategy {
     wallet;
     evmProviders = {};
@@ -20,6 +20,9 @@ export class EvmWallet extends BaseConcreteStrategy {
                 if (walletName === Wallet.Metamask.toLowerCase()) {
                     this.evmProviders[Wallet.Metamask] = event.detail.provider;
                 }
+                if (walletName === Wallet.Rabby.toLowerCase()) {
+                    this.evmProviders[Wallet.Rabby] = event.detail.provider;
+                }
                 if (walletName === Wallet.Rainbow.toLowerCase()) {
                     this.evmProviders[Wallet.Rainbow] = event.detail.provider;
                 }
@@ -247,17 +250,19 @@ export class EvmWallet extends BaseConcreteStrategy {
         }
         const backUpProvider = this.wallet === Wallet.Metamask
             ? await getMetamaskProvider()
-            : this.wallet === Wallet.Phantom
-                ? await getPhantomProvider()
-                : this.wallet === Wallet.BitGet
-                    ? await getBitGetProvider()
-                    : this.wallet === Wallet.OkxWallet
-                        ? await getOkxWalletProvider()
-                        : this.wallet === Wallet.TrustWallet
-                            ? await getTrustWalletProvider()
-                            : this.wallet === Wallet.Rainbow
-                                ? await getRainbowProvider()
-                                : undefined;
+            : this.wallet === Wallet.Rabby
+                ? await getRabbyProvider()
+                : this.wallet === Wallet.Phantom
+                    ? await getPhantomProvider()
+                    : this.wallet === Wallet.BitGet
+                        ? await getBitGetProvider()
+                        : this.wallet === Wallet.OkxWallet
+                            ? await getOkxWalletProvider()
+                            : this.wallet === Wallet.TrustWallet
+                                ? await getTrustWalletProvider()
+                                : this.wallet === Wallet.Rainbow
+                                    ? await getRainbowProvider()
+                                    : undefined;
         if (!backUpProvider) {
             throw this.EvmWalletException(new Error(`Please install the ${this.wallet} wallet extension.`), {
                 code: UnspecifiedErrorCode,

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
 import { Wallet, BrowserEip1993Provider } from '@injectivelabs/wallet-base';
-import { EthereumChainId } from '@injectivelabs/ts-types';
+import { EvmChainId } from '@injectivelabs/ts-types';
 export declare const getEvmProvider: (wallet: Wallet) => Promise<BrowserEip1993Provider>;
-export declare const updateEvmNetwork: (wallet: Wallet, chainId: EthereumChainId) => Promise<unknown>;
+export declare const updateEvmNetwork: (wallet: Wallet, chainId: EvmChainId) => Promise<unknown>;

package/dist/esm/utils/index.js

@@ -1,6 +1,7 @@
 import { Wallet, isEvmBrowserWallet, } from '@injectivelabs/wallet-base';
 import { capitalize } from '@injectivelabs/utils';
 import { WalletException } from '@injectivelabs/exceptions';
+import { getRabbyProvider } from '../strategy/utils/rabby.js';
 import { getOkxWalletProvider } from '../strategy/utils/Okx.js';
 import { getBitGetProvider } from '../strategy/utils/bitget.js';
 import { getPhantomProvider } from '../strategy/utils/phantom.js';
@@ -15,6 +16,9 @@ export const getEvmProvider = async (wallet) => {
         if (wallet === Wallet.Metamask) {
             provider = (await getMetamaskProvider());
         }
+        if (wallet === Wallet.Rabby) {
+            provider = (await getRabbyProvider());
+        }
         if (wallet === Wallet.BitGet) {
             provider = (await getBitGetProvider());
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-evm",
   "description": "EVM wallet strategies for use with @injectivelabs/wallet-core.",
-  "version": "1.16.7",
+  "version": "1.16.8",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -41,10 +41,10 @@
     }
   },
   "scripts": {
-    "build": "yarn build:cjs && yarn build:esm && yarn build:post",
+    "build": "pnpm build:cjs && pnpm build:esm && pnpm build:post",
     "build:cjs": "tsc --build --force tsconfig.build.json",
     "build:esm": "tsc --build --force tsconfig.build.esm.json",
-    "build:watch": "tsc --build -w tsconfig.build.json && tsc -w --build tsconfig.build.esm.json && yarn build:post",
+    "build:watch": "tsc --build -w tsconfig.build.json && tsc -w --build tsconfig.build.esm.json && pnpm build:post",
     "build:post": "shx cp ../../../etc/stub/package.json.stub dist/cjs/package.json && shx cp ../../../etc/stub/package.esm.json.stub dist/esm/package.json",
     "clean": "tsc --build tsconfig.build.json --clean && tsc --build tsconfig.build.esm.json --clean && shx rm -rf coverage *.log junit.xml dist && jest --clearCache && shx mkdir -p dist",
     "test": "jest",
@@ -56,17 +56,17 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^1.16.7",
-    "@injectivelabs/networks": "^1.16.7",
-    "@injectivelabs/sdk-ts": "^1.16.7",
-    "@injectivelabs/ts-types": "^1.16.7",
-    "@injectivelabs/utils": "^1.16.7",
-    "@injectivelabs/wallet-base": "^1.16.7"
+    "@injectivelabs/exceptions": "1.16.6",
+    "@injectivelabs/networks": "1.16.8",
+    "@injectivelabs/sdk-ts": "1.16.8",
+    "@injectivelabs/ts-types": "1.16.8",
+    "@injectivelabs/utils": "1.16.8",
+    "@injectivelabs/wallet-base": "1.16.8"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "gitHead": "78f656ef404ef511dfe6e4cc9defcae0a7cbec76",
+  "gitHead": "8bdbbfff8a07053ec2cd91a7103bfe99975672b4",
   "typedoc": {
     "entryPoint": "./src/index.ts",
     "readmeFile": "./README.md",