@dynamic-labs/ethereum 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+### [1.3.1](https://github.com/dynamic-labs/DynamicAuth/compare/v1.3.0...v1.3.1) (2024-03-08)
+
+
+### Bug Fixes
+
+* pass account and chain to walletClient ([#4865](https://github.com/dynamic-labs/DynamicAuth/issues/4865)) ([#4905](https://github.com/dynamic-labs/DynamicAuth/issues/4905)) ([0f4e79f](https://github.com/dynamic-labs/DynamicAuth/commit/0f4e79ff36f8a3ef63c59bb9f80429cdefbe7307))
+* update btckit network conversion for signpsbt to use correct network ([#4882](https://github.com/dynamic-labs/DynamicAuth/issues/4882)) ([3c14f55](https://github.com/dynamic-labs/DynamicAuth/commit/3c14f55f6e37718a095752d0e04bfbac45fee75c))
+* better auth state handling when logged in with disabled wallets ([#4862](https://github.com/dynamic-labs/DynamicAuth/issues/4862)) ([8cc2a1c](https://github.com/dynamic-labs/DynamicAuth/commit/8cc2a1c4f31cf6acb61d814a3410c5e77da21c50))
+
 ## [1.3.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.2.0...v1.3.0) (2024-03-05)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -32,12 +32,13 @@
     "@walletconnect/universal-provider": "2.10.6",
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
-    "@dynamic-labs/rpc-providers": "1.3.0",
-    "@dynamic-labs/turnkey": "1.3.0",
-    "@dynamic-labs/types": "1.3.0",
-    "@dynamic-labs/utils": "1.3.0",
-    "@dynamic-labs/wallet-book": "1.3.0",
-    "@dynamic-labs/wallet-connector-core": "1.3.0",
+    "@dynamic-labs/rpc-providers": "1.3.1",
+    "@dynamic-labs/turnkey": "1.3.1",
+    "@dynamic-labs/types": "1.3.1",
+    "@dynamic-labs/utils": "1.3.1",
+    "@dynamic-labs/viem-utils": "1.3.1",
+    "@dynamic-labs/wallet-book": "1.3.1",
+    "@dynamic-labs/wallet-connector-core": "1.3.1",
     "stream": "0.0.2"
   },
   "peerDependencies": {

package/src/coinbase/coinbase.cjs

@@ -45,10 +45,10 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
             return;
         this.teardownEventListeners = setupResponse.tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
         if (this.isInstalledOnBrowser()) {
-            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
         }
         return viem.createWalletClient({
             transport: viem.custom(client.getCoinbaseProvider({

package/src/coinbase/coinbase.d.ts

@@ -14,7 +14,7 @@ export declare class Coinbase extends EthWalletConnector {
     ethProviderHelper: EthProviderHelper | undefined;
     constructor({ appName, appLogoUrl, evmNetworks, ...props }: CoinbaseOpts);
     setupEventListeners(): void;
-    getWalletClient(): {
+    getWalletClient(chainId?: string): {
         account: import("viem").Account | undefined;
         batch?: {
             multicall?: boolean | {

package/src/coinbase/coinbase.js

@@ -41,10 +41,10 @@ class Coinbase extends EthWalletConnector {
             return;
         this.teardownEventListeners = setupResponse.tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
         if (this.isInstalledOnBrowser()) {
-            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
         }
         return createWalletClient({
             transport: custom(getCoinbaseProvider({

package/src/ethProviderHelper.cjs

@@ -4,8 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
 var viem = require('viem');
+var accounts = require('viem/accounts');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var viemUtils = require('@dynamic-labs/viem-utils');
 var eip6963Provider = require('./eip6963Provider.cjs');
 
 class EthProviderHelper {
@@ -75,12 +77,14 @@ class EthProviderHelper {
     findProvider() {
         return this.getInstalledProvider();
     }
-    findWalletClient() {
+    findWalletClient(chainId) {
         const provider = this.findProvider();
         if (!provider) {
             return undefined;
         }
         return viem.createWalletClient({
+            account: this.account,
+            chain: chainId ? viemUtils.chainsMap[chainId] : undefined,
             transport: viem.custom(provider),
         });
     }
@@ -98,6 +102,7 @@ class EthProviderHelper {
             try {
                 const [lowercaseAddress] = yield client.requestAddresses();
                 const publicAddress = viem.getAddress(lowercaseAddress);
+                this.account = accounts.toAccount(publicAddress);
                 return publicAddress;
             }
             catch (err) {

package/src/ethProviderHelper.d.ts

@@ -4,6 +4,7 @@ import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { IEthereum, ProviderFlag } from './types';
 export declare class EthProviderHelper {
     private wallet;
+    private account;
     constructor(wallet: WalletSchema);
     getInstalledProvider(): IEthereum | undefined;
     getEip6963Config(): {
@@ -27,7 +28,7 @@ export declare class EthProviderHelper {
     eip6963ProviderLookup(rdns: string): IEthereum | undefined;
     isInstalledHelper(): boolean;
     findProvider(): IEthereum | undefined;
-    findWalletClient(): WalletClient | undefined;
+    findWalletClient(chainId?: string): WalletClient | undefined;
     fetchPublicAddress(): Promise<Hex | undefined>;
     fetchPublicAddressWithProvider(client: WalletClient): Promise<Hex | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/ethProviderHelper.js

@@ -1,7 +1,9 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { createWalletClient, custom, getAddress } from 'viem';
+import { toAccount } from 'viem/accounts';
 import { ProviderLookup, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
 import { getProvidersFromWindow } from '@dynamic-labs/utils';
+import { chainsMap } from '@dynamic-labs/viem-utils';
 import { Eip6963ProviderSingleton } from './eip6963Provider.js';
 
 class EthProviderHelper {
@@ -71,12 +73,14 @@ class EthProviderHelper {
     findProvider() {
         return this.getInstalledProvider();
     }
-    findWalletClient() {
+    findWalletClient(chainId) {
         const provider = this.findProvider();
         if (!provider) {
             return undefined;
         }
         return createWalletClient({
+            account: this.account,
+            chain: chainId ? chainsMap[chainId] : undefined,
             transport: custom(provider),
         });
     }
@@ -94,6 +98,7 @@ class EthProviderHelper {
             try {
                 const [lowercaseAddress] = yield client.requestAddresses();
                 const publicAddress = getAddress(lowercaseAddress);
+                this.account = toAccount(publicAddress);
                 return publicAddress;
             }
             catch (err) {

package/src/injected/InjectedWalletBase.cjs

@@ -51,9 +51,9 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
     }
     isInstalledOnBrowser() {
         var _a;

package/src/injected/InjectedWalletBase.d.ts

@@ -14,7 +14,7 @@ declare abstract class InjectedWalletBase extends EthWalletConnector {
     getEthProviderHelper(): EthProviderHelper | undefined;
     getMobileOrInstalledWallet(): InjectedWalletBase;
     setupEventListeners(): void;
-    getWalletClient(): WalletClient | undefined;
+    getWalletClient(chainId?: string): WalletClient | undefined;
     isInstalledOnBrowser(): boolean;
     fetchPublicAddress(): Promise<string | undefined>;
     connect(): Promise<void>;

package/src/injected/InjectedWalletBase.js

@@ -49,9 +49,9 @@ class InjectedWalletBase extends EthWalletConnector {
         const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
     }
     isInstalledOnBrowser() {
         var _a;