Updated inputsWallet & connector

vocdoni · Nov 8, 2023 · fb4433d · fb4433d
1 parent 9cde35f
commit fb4433d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/rainbowkit-wallets/src/lib/inputsWallet.tsx b/packages/rainbowkit-wallets/src/lib/inputsWallet.tsx
@@ -1,7 +1,8 @@
-import { ethers } from 'ethers'
 import { createRoot } from 'react-dom/client'
 import { CreateWalletModal } from '../components/CreateWalletModal'
 import localStorageWallet from './localStorageWallet'
+import { WalletClient } from 'viem'
+import { WindowProvider } from 'wagmi'
 
 /**
  * This class is used to create a wallet from a form
@@ -10,7 +11,7 @@ export class inputsWallet extends localStorageWallet {
   private data: any
   private cancel: boolean = false
 
-  async create(): Promise<ethers.Wallet> {
+  async create(provider: WindowProvider): Promise<WalletClient> {
     // Create a div to render the modal
     const myDiv = document.createElement('div')
     myDiv.setAttribute('id', 'myDiv' + Math.random())
@@ -37,6 +38,6 @@ export class inputsWallet extends localStorageWallet {
       throw new Error('User cancelled')
     }
 
-    return await localStorageWallet.createWallet(JSON.stringify(this.data))
+    return await localStorageWallet.createWallet(JSON.stringify(this.data), provider)
   }
 }
diff --git a/packages/rainbowkit-wallets/src/wagmi/inputsConnector.ts b/packages/rainbowkit-wallets/src/wagmi/inputsConnector.ts
@@ -1,5 +1,6 @@
 import { inputsWallet } from '../lib/inputsWallet'
 import { localStorageConnector } from './localStorageConnector'
+import { WindowProvider } from '@wagmi/connectors'
 
 const IS_SERVER = typeof window === 'undefined'
 
@@ -9,13 +10,13 @@ export class inputsConnector extends localStorageConnector {
   readonly name = 'Inputs'
 
   protected async createWallet() {
-    let wallet = await inputsWallet.getWallet()
+    const provider = (await this.getProvider()) as WindowProvider
+    let wallet = await inputsWallet.getWallet(provider)
     if (!wallet) {
       const w = new inputsWallet()
-      wallet = await w.create()
+      wallet = await w.create(provider)
     }
 
-    wallet.connect(await this.getProvider())
-    this.wallet = wallet
+    this.wallet = wallet?.account
   }
 }
diff --git a/packages/rainbowkit-wallets/src/wagmi/localStorageConnector.ts b/packages/rainbowkit-wallets/src/wagmi/localStorageConnector.ts
@@ -32,7 +32,6 @@ export class localStorageConnector extends InjectedConnector {
       }
 
       const account = await this.getAccount()
-      const provider = await this.getProvider()
       const chainId = await this.getChainId()
 
       const cdata: ConnectorData = {
@@ -41,7 +40,6 @@ export class localStorageConnector extends InjectedConnector {
           id: chainId,
           unsupported: false,
         },
-        provider: provider as any,
       }
 
       return cdata
@@ -98,7 +96,7 @@ export class localStorageConnector extends InjectedConnector {
   onChainChanged = (chainId: string | number): void => {
     const id = normalizeChainId(chainId)
 
-    const unsupported = Connector.isChainUnsupported(id)
+    const unsupported = this.isChainUnsupported(id)
     this.emit('change', { chain: { id, unsupported } })
   }