@dynamic-labs/ethereum 4.0.0-alpha.4 → 4.0.0-alpha.40

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.cjs

@@ -0,0 +1,44 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../_virtual/_tslib.cjs');
+var InjectedWalletBase = require('../../injected/InjectedWalletBase.cjs');
+var logger = require('../logger.cjs');
+
+const getConnectorConstructorInjectedWallet = (key, wallet) => {
+    const { shortName } = wallet;
+    const name = shortName || wallet.name;
+    const walletConnectorFallback = Boolean(wallet.walletConnect);
+    return class extends InjectedWalletBase.InjectedWalletBase {
+        constructor() {
+            super(...arguments);
+            this.name = name;
+            this.walletConnectorFallback = walletConnectorFallback;
+            // this is the key from the wallet book entry so that we don't purely rely on the normalized name
+            this.overrideKey = key;
+        }
+        getAddress() {
+            const _super = Object.create(null, {
+                getAddress: { get: () => super.getAddress }
+            });
+            return _tslib.__awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if (this.isInstalledOnBrowser()) {
+                    return _super.getAddress.call(this);
+                }
+                const inAppBrowserBase = (_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl;
+                if (!inAppBrowserBase) {
+                    const error = new Error(`No inAppBrowserBase found for ${this.name}.`);
+                    logger.logger.error(error.message);
+                    throw error;
+                }
+                window.location.href = `${inAppBrowserBase}/${window.location.href}`;
+                return undefined;
+            });
+        }
+    };
+};
+
+exports.getConnectorConstructorInjectedWallet = getConnectorConstructorInjectedWallet;

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.d.ts

@@ -0,0 +1,3 @@
+import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+export declare const getConnectorConstructorInjectedWallet: (key: string, wallet: WalletSchema) => WalletConnectorConstructor;

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.js

@@ -0,0 +1,40 @@
+'use client'
+import { __awaiter } from '../../../_virtual/_tslib.js';
+import { InjectedWalletBase } from '../../injected/InjectedWalletBase.js';
+import { logger } from '../logger.js';
+
+const getConnectorConstructorInjectedWallet = (key, wallet) => {
+    const { shortName } = wallet;
+    const name = shortName || wallet.name;
+    const walletConnectorFallback = Boolean(wallet.walletConnect);
+    return class extends InjectedWalletBase {
+        constructor() {
+            super(...arguments);
+            this.name = name;
+            this.walletConnectorFallback = walletConnectorFallback;
+            // this is the key from the wallet book entry so that we don't purely rely on the normalized name
+            this.overrideKey = key;
+        }
+        getAddress() {
+            const _super = Object.create(null, {
+                getAddress: { get: () => super.getAddress }
+            });
+            return __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if (this.isInstalledOnBrowser()) {
+                    return _super.getAddress.call(this);
+                }
+                const inAppBrowserBase = (_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl;
+                if (!inAppBrowserBase) {
+                    const error = new Error(`No inAppBrowserBase found for ${this.name}.`);
+                    logger.error(error.message);
+                    throw error;
+                }
+                window.location.href = `${inAppBrowserBase}/${window.location.href}`;
+                return undefined;
+            });
+        }
+    };
+};
+
+export { getConnectorConstructorInjectedWallet };

package/src/utils/getConnectorConstructorInjectedWallet/index.d.ts

@@ -0,0 +1 @@
+export { getConnectorConstructorInjectedWallet } from './getConnectorConstructorInjectedWallet';

package/src/utils/logger.cjs

@@ -0,0 +1,10 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var logger$1 = require('@dynamic-labs/logger');
+
+const logger = new logger$1.Logger('@dynamic-labs/ethereum');
+
+exports.logger = logger;

package/src/utils/logger.d.ts

@@ -0,0 +1,2 @@
+import { Logger } from '@dynamic-labs/logger';
+export declare const logger: Logger;

package/src/utils/logger.js

@@ -0,0 +1,6 @@
+'use client'
+import { Logger } from '@dynamic-labs/logger';
+
+const logger = new Logger('@dynamic-labs/ethereum');
+
+export { logger };

package/src/walletConnect/walletConnect.cjs

@@ -8,10 +8,8 @@ var EthereumProvider = require('@walletconnect/ethereum-provider');
 var EventEmitter = require('eventemitter3');
 var viem = require('viem');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
-var parseIntSafe = require('../utils/parseIntSafe.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,12 +21,10 @@ const sessionTopicKey = (walletName) => `dynamic-wc2-session-topic-${walletName}
 const swicthedNetworkKey = (walletName) => `dynamic-wc2-switched-network-${walletName}`;
 const currentChainKey = (walletName) => `dynamic-wc2-current-chain-${walletName}`;
 const ee = new EventEmitter__default["default"]();
-class WalletConnect extends ethereumCore.EthWalletConnector {
+class WalletConnect extends ethereumCore.EthereumWalletConnector {
     constructor(opts) {
         var _a;
         super(opts);
-        this.supportedChains = ['EVM', 'ETH'];
-        this.connectedChain = 'EVM';
         this.isInitialized = false;
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
@@ -46,7 +42,7 @@ class WalletConnect extends ethereumCore.EthWalletConnector {
             (_a = Boolean(localStorage.getItem(this.swicthedNetworkKey))) !== null && _a !== void 0 ? _a : false;
         const lsCurrentChain = localStorage.getItem(this.currentChainKey);
         this.currentChainId = lsCurrentChain
-            ? parseIntSafe.parseIntSafe(lsCurrentChain)
+            ? utils.parseIntSafe(lsCurrentChain)
             : undefined;
     }
     getMappedChains() {
@@ -199,7 +195,7 @@ class WalletConnect extends ethereumCore.EthWalletConnector {
             }
             const { name, data } = params.event;
             if (name === 'chainChanged') {
-                const chainId = parseIntSafe.parseIntSafe(data);
+                const chainId = utils.parseIntSafe(data);
                 if (chainId === this.currentChainId) {
                     walletConnectorCore.logger.debug(`ignoring chainChanged event with same chain id as current chain id: ${chainId}`);
                     return;
@@ -271,8 +267,7 @@ class WalletConnect extends ethereumCore.EthWalletConnector {
                     throw new utils.DynamicError('No provider found');
                 }
             }
-            const metadata = walletBook.getWalletBookWallet(this.walletBook, this.key, this.walletFallback);
-            walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnect.provider.signer.uri, metadata, {
+            walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnect.provider.signer.uri, this.metadata.deepLinks, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
             }, this.deepLinkPreference);
@@ -357,9 +352,8 @@ class WalletConnect extends ethereumCore.EthWalletConnector {
         if (!this.session) {
             return;
         }
-        const metadata = walletBook.getWalletBookWallet(this.walletBook, this.key);
         const deepLink = walletConnectorCore.getDeepLink({
-            metadata,
+            deepLinks: this.metadata.deepLinks,
             mode: 'regular',
             preference: this.deepLinkPreference,
             uri: (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.signer.uri,

package/src/walletConnect/walletConnect.d.ts

@@ -1,17 +1,15 @@
 import type { SessionTypes } from '@walletconnect/types';
 import { WalletClient, Account, Transport, Chain as ViemChain } from 'viem';
-import { Chain, GetAddressOpts, DeepLinkVariant, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
+import { GetAddressOpts, DeepLinkVariant, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
-import { EthWalletConnector, EthWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
-export type WalletConnectOpts = EthWalletConnectorOpts & {
+import { EthereumWalletConnector, EthereumWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
+export type WalletConnectOpts = EthereumWalletConnectorOpts & {
     projectId?: string;
     walletName: string;
     deepLinkPreference?: DeepLinkVariant;
     walletConnectPreferredChains?: `eip155:${number}`[];
 };
-export declare class WalletConnect extends EthWalletConnector implements IWalletConnectConnector {
-    supportedChains: Chain[];
-    connectedChain: Chain;
+export declare class WalletConnect extends EthereumWalletConnector implements IWalletConnectConnector {
     name: string;
     session: SessionTypes.Struct | undefined;
     isInitialized: boolean;

package/src/walletConnect/walletConnect.js

@@ -4,22 +4,18 @@ import EthereumProvider from '@walletconnect/ethereum-provider';
 import EventEmitter from 'eventemitter3';
 import { createWalletClient, custom } from 'viem';
 import { logger, performPlatformSpecificConnectionMethod, getDeepLink } from '@dynamic-labs/wallet-connector-core';
-import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { DynamicError, sleep, isMobile } from '@dynamic-labs/utils';
-import { EthWalletConnector, chainsMap } from '@dynamic-labs/ethereum-core';
-import { parseIntSafe } from '../utils/parseIntSafe.js';
+import { parseIntSafe, DynamicError, sleep, isMobile } from '@dynamic-labs/utils';
+import { EthereumWalletConnector, chainsMap } from '@dynamic-labs/ethereum-core';
 
 const activeAccountKey = (walletName) => `dynamic-wc2-active-account-${walletName}`;
 const sessionTopicKey = (walletName) => `dynamic-wc2-session-topic-${walletName}`;
 const swicthedNetworkKey = (walletName) => `dynamic-wc2-switched-network-${walletName}`;
 const currentChainKey = (walletName) => `dynamic-wc2-current-chain-${walletName}`;
 const ee = new EventEmitter();
-class WalletConnect extends EthWalletConnector {
+class WalletConnect extends EthereumWalletConnector {
     constructor(opts) {
         var _a;
         super(opts);
-        this.supportedChains = ['EVM', 'ETH'];
-        this.connectedChain = 'EVM';
         this.isInitialized = false;
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
@@ -262,8 +258,7 @@ class WalletConnect extends EthWalletConnector {
                     throw new DynamicError('No provider found');
                 }
             }
-            const metadata = getWalletBookWallet(this.walletBook, this.key, this.walletFallback);
-            performPlatformSpecificConnectionMethod(WalletConnect.provider.signer.uri, metadata, {
+            performPlatformSpecificConnectionMethod(WalletConnect.provider.signer.uri, this.metadata.deepLinks, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
             }, this.deepLinkPreference);
@@ -348,9 +343,8 @@ class WalletConnect extends EthWalletConnector {
         if (!this.session) {
             return;
         }
-        const metadata = getWalletBookWallet(this.walletBook, this.key);
         const deepLink = getDeepLink({
-            metadata,
+            deepLinks: this.metadata.deepLinks,
             mode: 'regular',
             preference: this.deepLinkPreference,
             uri: (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.signer.uri,

package/src/injected/UnknownInjected.cjs

@@ -1,21 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var walletBook = require('@dynamic-labs/wallet-book');
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
-
-class UnknownInjected extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
-        this.name = 'Unknown';
-        this.overrideKey = 'unknown';
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-    }
-    isInstalledOnBrowser() {
-        return false;
-    }
-}
-
-exports.UnknownInjected = UnknownInjected;

package/src/injected/UnknownInjected.d.ts

@@ -1,8 +0,0 @@
-import { EthWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class UnknownInjected extends InjectedWalletBase {
-    name: string;
-    overrideKey: string;
-    constructor(props: EthWalletConnectorOpts);
-    isInstalledOnBrowser(): boolean;
-}

package/src/injected/UnknownInjected.js

@@ -1,17 +0,0 @@
-'use client'
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import InjectedWalletBase from './InjectedWalletBase.js';
-
-class UnknownInjected extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
-        this.name = 'Unknown';
-        this.overrideKey = 'unknown';
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
-    }
-    isInstalledOnBrowser() {
-        return false;
-    }
-}
-
-export { UnknownInjected };

package/src/utils/isString.d.ts

@@ -1 +0,0 @@
-export declare const isString: (value: unknown) => value is string;

package/src/utils/last.d.ts

@@ -1 +0,0 @@
-export declare const last: <T = unknown>(array: T[]) => T | undefined;

package/src/utils/parseIntSafe.cjs

@@ -1,23 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-
-const parseIntSafe = (value, radix = 10) => {
-    try {
-        const int = parseInt(String(value), radix);
-        if (isNaN(int)) {
-            walletConnectorCore.logger.error(`Error parsing ${value}`);
-            return undefined;
-        }
-        return int;
-    }
-    catch (e) {
-        walletConnectorCore.logger.error(`Error parsing ${value} to int: ${e}`);
-    }
-    return undefined;
-};
-
-exports.parseIntSafe = parseIntSafe;

package/src/utils/parseIntSafe.d.ts

@@ -1 +0,0 @@
-export declare const parseIntSafe: (value: string | number, radix?: number) => number | undefined;

package/src/utils/parseIntSafe.js

@@ -1,19 +0,0 @@
-'use client'
-import { logger } from '@dynamic-labs/wallet-connector-core';
-
-const parseIntSafe = (value, radix = 10) => {
-    try {
-        const int = parseInt(String(value), radix);
-        if (isNaN(int)) {
-            logger.error(`Error parsing ${value}`);
-            return undefined;
-        }
-        return int;
-    }
-    catch (e) {
-        logger.error(`Error parsing ${value} to int: ${e}`);
-    }
-    return undefined;
-};
-
-export { parseIntSafe };