fix: impersonated connector and wagmi config chains

bgd-labs · Jan 13, 2024 · 036b7f0 · 036b7f0
1 parent 5987562
commit 036b7f0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 39 deletions.
diff --git a/src/web3/connectors/ImpersonatedConnector.ts b/src/web3/connectors/ImpersonatedConnector.ts
@@ -50,7 +50,6 @@ export function impersonated(parameters: ImpersonatedParameters) {
     type: impersonated.type,
     async setup() {
       connectedChainId = config.chains[0].id;
-      accountAddress = [parameters.getAccountAddress() || zeroAddress];
     },
     async connect({ chainId } = {}) {
       if (features.connectError) {
@@ -117,9 +116,12 @@ export function impersonated(parameters: ImpersonatedParameters) {
     async onDisconnect(_error) {
       config.emitter.emit('disconnect');
       connected = false;
+      accountAddress = undefined;
     },
     async getProvider({ chainId }: { chainId?: number } = {}) {
-      accountAddress = [parameters.getAccountAddress() || zeroAddress];
+      accountAddress = parameters.getAccountAddress()
+        ? [parameters.getAccountAddress() || zeroAddress]
+        : undefined;
       const chain =
         config.chains.find((x) => x.id === chainId) ?? config.chains[0];
       const url = chain.rpcUrls.default.http[0]!;
@@ -173,7 +175,7 @@ export function impersonated(parameters: ImpersonatedParameters) {
 
         return result;
       };
-      return custom({ request })({ retryCount: 0 });
+      return custom({ request })({ retryCount: 1 });
     },
   }));
 }
diff --git a/src/web3/store/walletSlice.ts b/src/web3/store/walletSlice.ts
@@ -122,18 +122,6 @@ export function createWalletSlice({
     isActiveWalletSetting: false,
     setActiveWallet: async (wallet) => {
       const config = get().wagmiConfig;
-      if (
-        config &&
-        config.chains.some((chain) => chain.id !== wallet.chainId)
-      ) {
-        config.setState((state) => ({
-          ...state,
-          chains: state.current
-            ? [VIEM_CHAINS[state.chainId], ...config.chains]
-            : [],
-        }));
-      }
-
       const getPublicClientLocal = (localConf: Config, chain: Chain) => {
         let publicClient = undefined;
         try {
@@ -348,28 +336,6 @@ export function createWalletSlice({
           isContractAddress: activeWallet.isContractAddress,
         });
         set({ isActiveWalletAccountChanging: false });
-        // on initial connection
-      } else if (
-        account &&
-        account.address &&
-        account.chainId &&
-        !activeWallet &&
-        config &&
-        !get().isActiveWalletAccountChanging
-      ) {
-        console.log('changed acc on initial', account);
-
-        set({ isActiveWalletAccountChanging: true });
-        await get().setActiveWallet({
-          walletType: config.state.connections.get(config.state.current || '')
-            ?.connector.type as WalletType,
-          address: account.address,
-          chainId: account.chainId,
-          chain: account.chain || VIEM_CHAINS[account.chainId],
-          isActive: true,
-          isContractAddress: false,
-        });
-        set({ isActiveWalletAccountChanging: false });
       }
     },
 

diff --git a/src/web3/utils/createWagmiConfig.ts b/src/web3/utils/createWagmiConfig.ts
@@ -3,6 +3,7 @@ import { Chain, mainnet } from 'viem/chains';
 import { Config, createConfig, http } from 'wagmi';
 
 import { fallBackConfig } from '../../utils/chainInfoHelpers';
+import { VIEM_CHAINS } from '../../utils/chains';
 import { AllConnectorsInitProps, initAllConnectors } from '../connectors';
 
 interface ICreateWagmiConfig {
@@ -48,12 +49,23 @@ export function createWagmiConfig({
 
   const chainsArrayUnique = [
     ...new Map(chainsArray.map((item) => [item['id'], item])).values(),
-  ];
+  ].filter((chain) => chain.id !== chainsArray[0].id);
+
+  console.log('chainsArrayUnique', chainsArrayUnique);
+  console.log(
+    'chainsArrayTotal',
+    Object.values(VIEM_CHAINS).filter((chain) =>
+      chainsArrayUnique.forEach((c) => chain.id !== c.id),
+    ),
+  );
 
   return createConfig({
     chains: [
       chainsArray[0],
-      ...chainsArrayUnique.filter((chain) => chain.id !== chainsArray[0].id),
+      ...chainsArrayUnique,
+      ...Object.values(VIEM_CHAINS).filter((chain) =>
+        chainsArrayUnique.forEach((c) => chain.id !== c.id),
+      ),
     ],
     multiInjectedProviderDiscovery: false,
     connectors,