Merge in changes to gas module

Author: Adamj1232

packages/demo/src/App.svelte

@@ -13,6 +13,7 @@
   import coinbaseModule from '@web3-onboard/coinbase'
   import magicModule from '@web3-onboard/magic'
   import web3authModule from '@web3-onboard/web3auth'
+
   import dcentModule from '@web3-onboard/dcent'
   import {
     recoverAddress,

packages/gas/src/get.ts

@@ -1,13 +1,10 @@
 import { firstValueFrom, zip } from 'rxjs'
-import { map } from 'rxjs/operators'
 import { ajax } from 'rxjs/ajax'
 import { getRequestUrl } from './utils'
 import { RequestOptions, ChainId, GasPlatformResponse } from './types'
 import { validateRequest } from './validation'
 
-function get(
-  options: RequestOptions
-): Promise<Record<ChainId, GasPlatformResponse>> {
+function get(options: RequestOptions): Promise<GasPlatformResponse[]> {
   const invalid = validateRequest(options)
 
   if (invalid) {
@@ -26,14 +23,6 @@ function get(
       requestUrls.map(({ url, headers }) =>
         ajax.getJSON<GasPlatformResponse>(url, headers)
       )
-    ).pipe(
-      // reduce to mapping of chainId -> gas data
-      map(data =>
-        chains.reduce((acc, chainId, index) => {
-          acc[chainId] = data[index]
-          return acc
-        }, {})
-      )
     )
   )
 }

packages/gas/src/stream.ts

@@ -1,13 +1,11 @@
 import { Observable, timer, zip } from 'rxjs'
-import { switchMap, map } from 'rxjs/operators'
+import { switchMap } from 'rxjs/operators'
 import { ajax } from 'rxjs/ajax'
 import { getRequestUrl } from './utils'
-import { StreamOptions, ChainId, GasPlatformResponse } from './types'
+import { StreamOptions, GasPlatformResponse } from './types'
 import { validateRequest } from './validation'
 
-function stream(
-  options: StreamOptions
-): Observable<Record<ChainId, GasPlatformResponse>> {
+function stream(options: StreamOptions): Observable<GasPlatformResponse[]> {
   const invalid = validateRequest(options)
 
   if (invalid) {
@@ -29,13 +27,6 @@ function stream(
           ajax.getJSON<GasPlatformResponse>(url, headers)
         )
       )
-    ),
-    // reduce to mapping of chainId -> gas data
-    map(data =>
-      chains.reduce((acc, chainId, index) => {
-        acc[chainId] = data[index]
-        return acc
-      }, {})
     )
   )
 }

packages/injected/src/wallets.ts

@@ -1,11 +1,16 @@
 import type {
   EIP1193Provider,
   ChainListener,
-  SimpleEventEmitter
+  SimpleEventEmitter,
+  ChainId
 } from '@web3-onboard/common'
 
 import { createEIP1193Provider } from '@web3-onboard/common'
-import type { InjectedWalletModule, CustomWindow } from './types.js'
+import type {
+  InjectedWalletModule,
+  CustomWindow,
+  BinanceProvider
+} from './types.js'
 
 import {
   InjectedNameSpace,
@@ -65,11 +70,11 @@ const binance: InjectedWalletModule = {
     !!provider && !!provider[ProviderIdentityFlag.Binance],
   getIcon: async () => (await import('./icons/binance.js')).default,
   getInterface: async () => {
-    // We add this to the BinanceChain provider as there is currently
-    // no way to determine if the wallet is unlocked
-    if (window.BinanceChain) {
-      window.BinanceChain.isUnlocked = false
+    // Replace the provider as the BNB provider is readonly
+    let tempBNBProvider: BinanceProvider = {
+      ...window.BinanceChain
     }
+    window.BinanceChain = tempBNBProvider
 
     const addListener: SimpleEventEmitter['on'] = window.BinanceChain.on.bind(
       window.BinanceChain
@@ -78,31 +83,22 @@ const binance: InjectedWalletModule = {
     window.BinanceChain.on = (event, func) => {
       // intercept chainChanged event and format string
       if (event === 'chainChanged') {
-        addListener(event, (chainId: string) => {
+        addListener(event, (chainId: ChainId) => {
           const cb = func as ChainListener
-          cb(`0x${parseInt(chainId).toString(16)}`)
+          cb(`0x${parseInt(chainId as string).toString(16)}`)
         })
       } else {
         addListener(event, func)
       }
     }
 
     const provider = createEIP1193Provider(window.BinanceChain, {
-      // If the wallet is unlocked then we don't need to patch this request
-      ...(!window.BinanceChain.isUnlocked && {
-        eth_accounts: () => Promise.resolve([])
-      }),
-      eth_requestAccounts: ({ baseRequest }) =>
-        baseRequest({ method: 'eth_requestAccounts' }).then(accts => {
-          window.BinanceChain.isUnlocked = true
-          return accts
-        }),
-      eth_selectAccounts: UNSUPPORTED_METHOD,
       eth_chainId: ({ baseRequest }) =>
-        baseRequest({ method: 'eth_chainId' }).then(
-          id => `0x${parseInt(id).toString(16)}`
-        ),
+        baseRequest({ method: 'eth_chainId' }).then(id => {
+          return `0x${parseInt(id as string).toString(16)}`
+        }),
       // Unsupported method -- will throw error
+      eth_selectAccounts: UNSUPPORTED_METHOD,
       wallet_switchEthereumChain: UNSUPPORTED_METHOD
     })