@injectivelabs/wallet-base 1.16.7 → 1.16.8

package/README.md

@@ -13,7 +13,7 @@ _Base Package for the Wallet Strategy._
 ## 📚 Installation
 
 ```bash
-yarn add @injectivelabs/wallet-base
+pnpm add @injectivelabs/wallet-base
 ```
 
 ---

package/dist/cjs/base.d.ts

@@ -1,9 +1,9 @@
-import { ChainId, CosmosChainId, EthereumChainId } from '@injectivelabs/ts-types';
-import { WalletMetadata, WalletEventListener, ConcreteWalletStrategyArgs, ConcreteCosmosWalletStrategyArgs, ConcreteEthereumWalletStrategyArgs } from './types/index.js';
+import { ChainId, EvmChainId, CosmosChainId } from '@injectivelabs/ts-types';
+import { WalletMetadata, WalletEventListener, ConcreteWalletStrategyArgs, ConcreteEvmWalletStrategyArgs, ConcreteCosmosWalletStrategyArgs } from './types/index.js';
 export default abstract class BaseConcreteStrategy {
     protected chainId: ChainId | CosmosChainId;
-    protected ethereumChainId?: EthereumChainId;
+    protected evmChainId?: EvmChainId;
     protected listeners: Partial<Record<WalletEventListener, any>>;
     metadata?: WalletMetadata;
-    constructor(args: ConcreteWalletStrategyArgs | ConcreteEthereumWalletStrategyArgs | ConcreteCosmosWalletStrategyArgs);
+    constructor(args: ConcreteWalletStrategyArgs | ConcreteEvmWalletStrategyArgs | ConcreteCosmosWalletStrategyArgs);
 }

package/dist/cjs/base.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 class BaseConcreteStrategy {
     chainId;
-    ethereumChainId;
+    evmChainId;
     listeners = {};
     metadata;
     constructor(args) {
-        this.ethereumChainId =
-            'ethereumOptions' in args && args.ethereumOptions
-                ? args.ethereumOptions.ethereumChainId
+        this.evmChainId =
+            'evmOptions' in args && args.evmOptions
+                ? args.evmOptions.evmChainId
                 : undefined;
         this.chainId = args.chainId;
         this.metadata = args.metadata;

package/dist/cjs/types/enums.d.ts

@@ -12,6 +12,7 @@ export declare enum Wallet {
     Keplr = "keplr",
     Ninji = "ninji",
     Magic = "magic",
+    Rabby = "rabby",
     Ledger = "ledger",
     BitGet = "BitGet",
     OWallet = "owallet",

package/dist/cjs/types/enums.js

@@ -17,6 +17,7 @@ var Wallet;
     Wallet["Keplr"] = "keplr";
     Wallet["Ninji"] = "ninji";
     Wallet["Magic"] = "magic";
+    Wallet["Rabby"] = "rabby";
     Wallet["Ledger"] = "ledger";
     Wallet["BitGet"] = "BitGet";
     Wallet["OWallet"] = "owallet";

package/dist/cjs/types/provider.d.ts

@@ -2,6 +2,7 @@ import { type EIP1193Provider } from 'eip1193-provider';
 export interface BrowserEip1993Provider extends EIP1193Provider {
     removeAllListeners(): void;
     isTrust: boolean;
+    isRabby: boolean;
     isRainbow: boolean;
     isPhantom: boolean;
     isMetaMask: boolean;
@@ -10,6 +11,7 @@ export interface BrowserEip1993Provider extends EIP1193Provider {
 }
 export interface WindowWithEip1193Provider extends Window {
     rainbow: BrowserEip1993Provider;
+    rabby: BrowserEip1993Provider;
     ethereum: BrowserEip1993Provider;
     okxwallet: BrowserEip1993Provider;
     providers: BrowserEip1993Provider[];

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

@@ -1,4 +1,4 @@
-import { ChainId, AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId, AccountAddress } from '@injectivelabs/ts-types';
 import type { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
 import { StdSignDoc } from '@keplr-wallet/types';
 import { WalletDeviceType, Wallet } from './enums.js';
@@ -22,10 +22,10 @@ export type PrivateKeyMetadata = {
 export type WalletConnectMetadata = {
     projectId?: string;
 };
-export interface WalletStrategyEthereumOptions {
-    ethereumChainId: EthereumChainId;
+export interface WalletStrategyEvmOptions {
+    evmChainId: EvmChainId;
     rpcUrl?: string;
-    rpcUrls?: Partial<Record<EthereumChainId, string>>;
+    rpcUrls?: Partial<Record<EvmChainId, string>>;
 }
 export interface SendTransactionOptions {
     address: string;
@@ -51,16 +51,12 @@ export type TurnkeySession = {
 };
 export interface TurnkeyMetadata {
     apiBaseUrl: string;
-    iframeUrl?: string;
     otpInitPath?: string;
-    organizationId: string;
     otpVerifyPath?: string;
     googleClientId?: string;
     oauthLoginPath?: string;
     session?: TurnkeySession;
-    iframeElementId?: string;
     apiServerEndpoint: string;
-    iframeContainerId: string;
     credentialBundle?: string;
     googleRedirectUri?: string;
     expirationSeconds?: string;
@@ -76,12 +72,12 @@ export interface ConcreteWalletStrategyArgs {
     chainId: ChainId;
     metadata?: WalletMetadata;
 }
+export interface ConcreteEvmWalletStrategyArgs extends ConcreteWalletStrategyArgs {
+    evmOptions: WalletStrategyEvmOptions;
+}
 export interface ConcreteCosmosWalletStrategyArgs extends ConcreteWalletStrategyArgs {
     wallet?: Wallet;
 }
-export interface ConcreteEthereumWalletStrategyArgs extends ConcreteWalletStrategyArgs {
-    ethereumOptions: WalletStrategyEthereumOptions;
-}
 export interface ConcreteCosmosWalletStrategy {
     metadata?: WalletMetadata;
     setMetadata?(metadata?: WalletMetadata): void;
@@ -127,7 +123,7 @@ export type ConcreteStrategiesArg = {
 export interface WalletStrategyArguments {
     chainId: ChainId;
     metadata?: WalletMetadata;
-    ethereumOptions?: WalletStrategyEthereumOptions;
+    evmOptions?: WalletStrategyEvmOptions;
     disabledWallets?: Wallet[];
     wallet?: Wallet;
     strategies: ConcreteStrategiesArg;
@@ -160,7 +156,7 @@ export interface ConcreteWalletStrategy extends Omit<ConcreteCosmosWalletStrateg
      */
     sendEvmTransaction(transaction: unknown, options: {
         address: string;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
     }): Promise<string>;
     /**
      * Sign a cosmos transaction using the wallet provider
@@ -192,7 +188,7 @@ export interface ConcreteWalletStrategy extends Omit<ConcreteCosmosWalletStrateg
     signEip712TypedData(eip712TypedData: string, address: string): Promise<string>;
     signArbitrary(signer: string, data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): void;
+    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): void;
     onAccountChange?(callback: onAccountChangeCallback): Promise<void> | void;
     onChainIdChange?(callback: onChainIdChangeCallback): Promise<void> | void;
     disconnect?(): Promise<void> | void;
@@ -215,12 +211,12 @@ export interface WalletStrategy {
     enable(args?: unknown): Promise<boolean>;
     enableAndGetAddresses(args?: unknown): Promise<AccountAddress[]>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): Promise<void>;
+    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): Promise<void>;
     getSessionOrConfirm(address?: AccountAddress): Promise<string>;
     sendTransaction(tx: DirectSignResponse | TxRaw, options: SendTransactionOptions): Promise<TxResponse>;
     sendEvmTransaction(tx: any, options: {
         address: AccountAddress;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
     }): Promise<string>;
     signEip712TypedData(eip712TypedData: string, address: AccountAddress): Promise<string>;
     signAminoCosmosTransaction(transaction: {

package/dist/cjs/utils/wallet.js

@@ -4,6 +4,7 @@ exports.isCosmosAminoOnlyWallet = exports.isEip712V2OnlyWallet = exports.isCosmo
 const enums_js_1 = require("./../types/enums.js");
 const isEvmWallet = (wallet) => [
     enums_js_1.Wallet.Magic,
+    enums_js_1.Wallet.Rabby,
     enums_js_1.Wallet.BitGet,
     enums_js_1.Wallet.Ledger,
     enums_js_1.Wallet.Phantom,
@@ -23,6 +24,7 @@ exports.isEvmWallet = isEvmWallet;
 const isCosmosWallet = (wallet) => !(0, exports.isEvmWallet)(wallet);
 exports.isCosmosWallet = isCosmosWallet;
 const isEvmBrowserWallet = (wallet) => [
+    enums_js_1.Wallet.Rabby,
     enums_js_1.Wallet.BitGet,
     enums_js_1.Wallet.Rainbow,
     enums_js_1.Wallet.Phantom,

package/dist/esm/base.d.ts

@@ -1,9 +1,9 @@
-import { ChainId, CosmosChainId, EthereumChainId } from '@injectivelabs/ts-types';
-import { WalletMetadata, WalletEventListener, ConcreteWalletStrategyArgs, ConcreteCosmosWalletStrategyArgs, ConcreteEthereumWalletStrategyArgs } from './types/index.js';
+import { ChainId, EvmChainId, CosmosChainId } from '@injectivelabs/ts-types';
+import { WalletMetadata, WalletEventListener, ConcreteWalletStrategyArgs, ConcreteEvmWalletStrategyArgs, ConcreteCosmosWalletStrategyArgs } from './types/index.js';
 export default abstract class BaseConcreteStrategy {
     protected chainId: ChainId | CosmosChainId;
-    protected ethereumChainId?: EthereumChainId;
+    protected evmChainId?: EvmChainId;
     protected listeners: Partial<Record<WalletEventListener, any>>;
     metadata?: WalletMetadata;
-    constructor(args: ConcreteWalletStrategyArgs | ConcreteEthereumWalletStrategyArgs | ConcreteCosmosWalletStrategyArgs);
+    constructor(args: ConcreteWalletStrategyArgs | ConcreteEvmWalletStrategyArgs | ConcreteCosmosWalletStrategyArgs);
 }

package/dist/esm/base.js

@@ -1,12 +1,12 @@
 export default class BaseConcreteStrategy {
     chainId;
-    ethereumChainId;
+    evmChainId;
     listeners = {};
     metadata;
     constructor(args) {
-        this.ethereumChainId =
-            'ethereumOptions' in args && args.ethereumOptions
-                ? args.ethereumOptions.ethereumChainId
+        this.evmChainId =
+            'evmOptions' in args && args.evmOptions
+                ? args.evmOptions.evmChainId
                 : undefined;
         this.chainId = args.chainId;
         this.metadata = args.metadata;

package/dist/esm/types/enums.d.ts

@@ -12,6 +12,7 @@ export declare enum Wallet {
     Keplr = "keplr",
     Ninji = "ninji",
     Magic = "magic",
+    Rabby = "rabby",
     Ledger = "ledger",
     BitGet = "BitGet",
     OWallet = "owallet",

package/dist/esm/types/enums.js

@@ -14,6 +14,7 @@ export var Wallet;
     Wallet["Keplr"] = "keplr";
     Wallet["Ninji"] = "ninji";
     Wallet["Magic"] = "magic";
+    Wallet["Rabby"] = "rabby";
     Wallet["Ledger"] = "ledger";
     Wallet["BitGet"] = "BitGet";
     Wallet["OWallet"] = "owallet";

package/dist/esm/types/provider.d.ts

@@ -2,6 +2,7 @@ import { type EIP1193Provider } from 'eip1193-provider';
 export interface BrowserEip1993Provider extends EIP1193Provider {
     removeAllListeners(): void;
     isTrust: boolean;
+    isRabby: boolean;
     isRainbow: boolean;
     isPhantom: boolean;
     isMetaMask: boolean;
@@ -10,6 +11,7 @@ export interface BrowserEip1993Provider extends EIP1193Provider {
 }
 export interface WindowWithEip1193Provider extends Window {
     rainbow: BrowserEip1993Provider;
+    rabby: BrowserEip1993Provider;
     ethereum: BrowserEip1993Provider;
     okxwallet: BrowserEip1993Provider;
     providers: BrowserEip1993Provider[];

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

@@ -1,4 +1,4 @@
-import { ChainId, AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId, AccountAddress } from '@injectivelabs/ts-types';
 import type { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
 import { StdSignDoc } from '@keplr-wallet/types';
 import { WalletDeviceType, Wallet } from './enums.js';
@@ -22,10 +22,10 @@ export type PrivateKeyMetadata = {
 export type WalletConnectMetadata = {
     projectId?: string;
 };
-export interface WalletStrategyEthereumOptions {
-    ethereumChainId: EthereumChainId;
+export interface WalletStrategyEvmOptions {
+    evmChainId: EvmChainId;
     rpcUrl?: string;
-    rpcUrls?: Partial<Record<EthereumChainId, string>>;
+    rpcUrls?: Partial<Record<EvmChainId, string>>;
 }
 export interface SendTransactionOptions {
     address: string;
@@ -51,16 +51,12 @@ export type TurnkeySession = {
 };
 export interface TurnkeyMetadata {
     apiBaseUrl: string;
-    iframeUrl?: string;
     otpInitPath?: string;
-    organizationId: string;
     otpVerifyPath?: string;
     googleClientId?: string;
     oauthLoginPath?: string;
     session?: TurnkeySession;
-    iframeElementId?: string;
     apiServerEndpoint: string;
-    iframeContainerId: string;
     credentialBundle?: string;
     googleRedirectUri?: string;
     expirationSeconds?: string;
@@ -76,12 +72,12 @@ export interface ConcreteWalletStrategyArgs {
     chainId: ChainId;
     metadata?: WalletMetadata;
 }
+export interface ConcreteEvmWalletStrategyArgs extends ConcreteWalletStrategyArgs {
+    evmOptions: WalletStrategyEvmOptions;
+}
 export interface ConcreteCosmosWalletStrategyArgs extends ConcreteWalletStrategyArgs {
     wallet?: Wallet;
 }
-export interface ConcreteEthereumWalletStrategyArgs extends ConcreteWalletStrategyArgs {
-    ethereumOptions: WalletStrategyEthereumOptions;
-}
 export interface ConcreteCosmosWalletStrategy {
     metadata?: WalletMetadata;
     setMetadata?(metadata?: WalletMetadata): void;
@@ -127,7 +123,7 @@ export type ConcreteStrategiesArg = {
 export interface WalletStrategyArguments {
     chainId: ChainId;
     metadata?: WalletMetadata;
-    ethereumOptions?: WalletStrategyEthereumOptions;
+    evmOptions?: WalletStrategyEvmOptions;
     disabledWallets?: Wallet[];
     wallet?: Wallet;
     strategies: ConcreteStrategiesArg;
@@ -160,7 +156,7 @@ export interface ConcreteWalletStrategy extends Omit<ConcreteCosmosWalletStrateg
      */
     sendEvmTransaction(transaction: unknown, options: {
         address: string;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
     }): Promise<string>;
     /**
      * Sign a cosmos transaction using the wallet provider
@@ -192,7 +188,7 @@ export interface ConcreteWalletStrategy extends Omit<ConcreteCosmosWalletStrateg
     signEip712TypedData(eip712TypedData: string, address: string): Promise<string>;
     signArbitrary(signer: string, data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): void;
+    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): void;
     onAccountChange?(callback: onAccountChangeCallback): Promise<void> | void;
     onChainIdChange?(callback: onChainIdChangeCallback): Promise<void> | void;
     disconnect?(): Promise<void> | void;
@@ -215,12 +211,12 @@ export interface WalletStrategy {
     enable(args?: unknown): Promise<boolean>;
     enableAndGetAddresses(args?: unknown): Promise<AccountAddress[]>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): Promise<void>;
+    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): Promise<void>;
     getSessionOrConfirm(address?: AccountAddress): Promise<string>;
     sendTransaction(tx: DirectSignResponse | TxRaw, options: SendTransactionOptions): Promise<TxResponse>;
     sendEvmTransaction(tx: any, options: {
         address: AccountAddress;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
     }): Promise<string>;
     signEip712TypedData(eip712TypedData: string, address: AccountAddress): Promise<string>;
     signAminoCosmosTransaction(transaction: {

package/dist/esm/utils/wallet.js

@@ -1,6 +1,7 @@
 import { Wallet } from './../types/enums.js';
 export const isEvmWallet = (wallet) => [
     Wallet.Magic,
+    Wallet.Rabby,
     Wallet.BitGet,
     Wallet.Ledger,
     Wallet.Phantom,
@@ -18,6 +19,7 @@ export const isEvmWallet = (wallet) => [
 ].includes(wallet);
 export const isCosmosWallet = (wallet) => !isEvmWallet(wallet);
 export const isEvmBrowserWallet = (wallet) => [
+    Wallet.Rabby,
     Wallet.BitGet,
     Wallet.Rainbow,
     Wallet.Phantom,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-base",
   "description": "Base wallet strategy 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,14 +56,14 @@
     "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/exceptions": "1.16.6",
+    "@injectivelabs/networks": "1.16.8",
+    "@injectivelabs/sdk-ts": "1.16.8",
+    "@injectivelabs/ts-types": "1.16.8",
     "eip1193-provider": "^1.0.1"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "gitHead": "78f656ef404ef511dfe6e4cc9defcae0a7cbec76"
+  "gitHead": "8bdbbfff8a07053ec2cd91a7103bfe99975672b4"
 }