@dynamic-labs/ethereum 5.0.0-rc.0 → 5.0.0-rc.2

package/src/injected/InjectedWalletBase.js

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { EthereumWalletConnector } from '@dynamic-labs/ethereum-core';
+import { isMobile, WalletRequiresInAppBrowserError } from '@dynamic-labs/utils';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { logger } from '../utils/logger.js';
 import { WalletConnectConnector } from '../walletConnect/WalletConnectConnector/WalletConnectConnector.js';
@@ -68,9 +69,40 @@ class InjectedWalletBase extends EthereumWalletConnector {
             yield this.getAddress();
         });
     }
+    getSigner() {
+        const _super = Object.create(null, {
+            getSigner: { get: () => super.getSigner }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const signer = yield _super.getSigner.call(this);
+            if (signer) {
+                return signer;
+            }
+            // On mobile web (outside the wallet's in-app browser) there is no injected
+            // provider for these wallets, so signing silently returns nothing. Redirect
+            // into the wallet's in-app browser so signing can continue there, or throw a
+            // clear error when neither a provider nor a redirect is possible.
+            if (isMobile() && !this.isInstalledOnBrowser()) {
+                const didOpenInAppBrowser = this.openInAppBrowserIfRequired();
+                if (!didOpenInAppBrowser) {
+                    throw new WalletRequiresInAppBrowserError(this.name);
+                }
+            }
+            return undefined;
+        });
+    }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            // Trigger the in-app-browser redirect up front (mirroring getAddress) so
+            // that on mobile web an in-app-browser wallet redirects into its in-app
+            // browser instead of silently signing nothing. Delegating to the helper
+            // afterwards keeps signing to a single address request (no duplicate wallet
+            // prompt), since the helper resolves the address itself.
+            const didOpenInAppBrowser = this.openInAppBrowserIfRequired();
+            if (didOpenInAppBrowser) {
+                return undefined;
+            }
             return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
         });
     }

package/src/injected/PhantomEvm.cjs

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
@@ -13,22 +12,15 @@ class PhantomEvm extends InjectedWalletBase.InjectedWalletBase {
         this.name = 'Phantom';
         this.overrideKey = 'phantomevm';
     }
-    getAddress() {
-        const _super = Object.create(null, {
-            getAddress: { get: () => super.getAddress }
-        });
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser()) {
-                return _super.getAddress.call(this);
-            }
-            if (utils.isMobile()) {
-                utils.handleMobileWalletRedirect({
-                    nativeLink: 'phantom://browse',
-                    universalLink: 'https://phantom.app/ul/browse',
-                });
-            }
-            return undefined;
-        });
+    openInAppBrowserIfRequired() {
+        if (utils.isMobile() && !this.isInstalledOnBrowser()) {
+            utils.handleMobileWalletRedirect({
+                nativeLink: 'phantom://browse',
+                universalLink: 'https://phantom.app/ul/browse',
+            });
+            return true;
+        }
+        return false;
     }
     canGetChainAddress() {
         var _a, _b;

package/src/injected/PhantomEvm.d.ts

@@ -2,6 +2,6 @@ import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class PhantomEvm extends InjectedWalletBase {
     name: string;
     overrideKey: string;
-    getAddress(): Promise<string | undefined>;
+    openInAppBrowserIfRequired(): boolean;
     canGetChainAddress(): boolean;
 }

package/src/injected/PhantomEvm.js

@@ -1,5 +1,4 @@
 'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect } from '@dynamic-labs/utils';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 
@@ -9,22 +8,15 @@ class PhantomEvm extends InjectedWalletBase {
         this.name = 'Phantom';
         this.overrideKey = 'phantomevm';
     }
-    getAddress() {
-        const _super = Object.create(null, {
-            getAddress: { get: () => super.getAddress }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser()) {
-                return _super.getAddress.call(this);
-            }
-            if (isMobile()) {
-                handleMobileWalletRedirect({
-                    nativeLink: 'phantom://browse',
-                    universalLink: 'https://phantom.app/ul/browse',
-                });
-            }
-            return undefined;
-        });
+    openInAppBrowserIfRequired() {
+        if (isMobile() && !this.isInstalledOnBrowser()) {
+            handleMobileWalletRedirect({
+                nativeLink: 'phantom://browse',
+                universalLink: 'https://phantom.app/ul/browse',
+            });
+            return true;
+        }
+        return false;
     }
     canGetChainAddress() {
         var _a, _b;

package/src/types.d.ts

@@ -1,5 +1,5 @@
 import { type EventEmitter } from 'eventemitter3';
-import { PublicClient } from 'viem';
+import { EIP1193Provider, PublicClient } from 'viem';
 import type { BaseAccountSDKOpts } from '@dynamic-labs-connectors/base-account-evm';
 import { ProviderCondition } from '@dynamic-labs/wallet-connector-core';
 import { RegisterEvmProvidersConfig } from '@dynamic-labs/ethereum-core';
@@ -8,7 +8,7 @@ declare global {
         ethereum: IEthereum;
     }
     interface Window {
-        ethereum?: IEthereum;
+        ethereum?: EIP1193Provider;
         phantom?: IWindowPhantom;
         zerionWallet?: IEthereum;
         coinbaseWalletExtension?: IEthereum;