wallet provider

Author: pkieltyka

packages/provider/src/wallet-request-handler.ts

@@ -67,9 +67,14 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
 
     // TODO: if signer account is empty, aka user is not logged in to the wallet,
     // then prevent the use of many of the methods below.
+    const loggedIn = true // ..
 
     try {
 
+      if (!loggedIn && !publicJsonRpcMethods.includes(request.method)) {
+        throw new Error(`not logged in. ${request.method} is unavailable`)
+      }
+
       // wallet signer
       const signer = this.signer
       if (!signer) throw new Error('WalletRequestHandler: wallet signer is not configured')
@@ -441,3 +446,11 @@ export interface WalletUserPrompter {
   promptSignTransaction(txs: TransactionRequest, chaindId?: number): Promise<string>
   promptSendTransaction(txs: TransactionRequest, chaindId?: number): Promise<string>
 }
+
+const publicJsonRpcMethods = [
+  'net_version', 'eth_chainId', 'eth_getBalance', 'eth_getTransactionCount',
+  'eth_blockNumber', 'eth_getBlockByNumber', 'eth_getBlockByHash', 'eth_getTransactionByHash',
+  'eth_getCode', 'eth_estimateGas', 'eth_gasPrice',
+
+  'sequence_getWalletContext', 'sequence_getNetworks', 'sequence_setDefaultChain'
+]

packages/provider/src/wallet.ts

@@ -51,7 +51,6 @@ export class Wallet implements WalletProvider {
     router?: JsonRpcRouter
     allowProvider?: JsonRpcMiddleware
     cachedProvider?: CachedProvider
-    publicProvider?: PublicProvider
 
     windowMessageProvider?: WindowMessageProvider
     proxyMessageProvider?: ProxyMessageProvider // TODO ..
@@ -114,11 +113,6 @@ export class Wallet implements WalletProvider {
         // Provider proxy to support middleware stack of logging, caching and read-only rpc calls
         this.transport.cachedProvider = new CachedProvider()
 
-        // ..
-        // TODO: might not need this since getProvider() could do this for us..?
-        // but need to check chainId, etc. etc.. check later
-        // this.publicProvider = new PublicProvider()
-
         // ..
         this.transport.windowMessageProvider = new WindowMessageProvider(this.config.walletAppURL)
         this.transport.windowMessageProvider.register()
@@ -129,7 +123,6 @@ export class Wallet implements WalletProvider {
           this.transport.allowProvider,
           exceptionProviderMiddleware,
           this.transport.cachedProvider,
-          // this.publicProvider
         ], this.transport.windowMessageProvider)
 
         this.transport.provider = new Web3Provider(this.transport.router)
@@ -250,12 +243,6 @@ export class Wallet implements WalletProvider {
   }
 
   getNetworks = async (chainId?: ChainId): Promise<NetworkConfig[]> => {
-    // TODO: we should store the networks list in the session, but allow it to be refreshed here
-    // as well, consider an interface where we update the session whenever we call up the wallet window (for any reason)
-    // after some time (ie 1 hour)
-
-    // return this.getSigner().getNetworks()
-
     if (!this.isLoggedIn()) {
       throw new Error('login first')
     }
@@ -292,8 +279,8 @@ export class Wallet implements WalletProvider {
 
       await this.transport.windowMessageProvider.waitUntilConnected()
 
-      // setDefaultNetworkId
-      // it's important to send this right away upon connection
+      // setDefaultChain - it's important to send this right away upon connection. This will also
+      // update the network list in the session each time the wallet is opened & connected.
       const networks = await this.transport.provider.send('sequence_setDefaultChain', [this.config.defaultNetworkId])
       this.useNetworks(networks)
 
@@ -310,28 +297,21 @@ export class Wallet implements WalletProvider {
 
   getProvider(chainId?: ChainId): Web3Provider | undefined {
     // return the top-level provider message transport when chainId is unspecified
+    // and user has not logged in
+    if (chainId && !this.isLoggedIn()) {
+      throw new Error(`session is empty. login and try again.`)
+    }
     if (!chainId) {
-
-
-      // TODO: for the "defaultNetwork", we'll also have an entry here..
-      // maybe we should even return that instead of this.provider, as it will have built-in
-      // public-provider and other stuff..?
-      // if (this.networks && this.networks.length > 0 && this.providers[this.networks[0].chainId]) {
-      //   return this.providers[this.networks[0].chainId]
-      // }
-      // or... we set chainId = this.networks[0].chainId ..
-
       return this.transport.provider
     }
-
-    if (!this.isLoggedIn()) {
-      throw new Error(`session is empty. login and try again.`)
-    }
     if (this.session.networks.length === 0) {
       throw new Error('networks list is empty. upon logging in, networks should be populated')
     }
 
-    const network = findNetworkConfig(this.session.networks, chainId)
+    let network = this.session.networks[0]
+    if (chainId) {
+      network = findNetworkConfig(this.session.networks, chainId)
+    }
 
     // return memoized network provider
     if (this.providers[network.chainId]) {

packages/wallet/src/account.ts

@@ -109,12 +109,12 @@ export class Account extends Signer {
 
   getProvider(chainId?: number): Promise<JsonRpcProvider | undefined> {
     if (!chainId) return this.mainWallet().getProvider()
-    return this._wallets.find((w) => w.network.chainId === chainId)?.wallet.getProvider()
+    return this._wallets.find(w => w.network.chainId === chainId)?.wallet.getProvider()
   }
 
   getRelayer(chainId?: number): Promise<Relayer | undefined> {
     if (!chainId) return this.mainWallet().getRelayer()
-    return this._wallets.find((w) => w.network.chainId === chainId)?.wallet.getRelayer()
+    return this._wallets.find(w => w.network.chainId === chainId)?.wallet.getRelayer()
   }
 
   async getNetworks(): Promise<NetworkConfig[]> {