Merge in latest develop

Author: Adamj1232

packages/common/package.json

@@ -82,6 +82,7 @@
   },
   "dependencies": {
     "@ethereumjs/common": "2.6.2",
+    "bignumber.js": "^9.0.0",
     "ethers": "5.5.4",
     "joi": "^17.4.2",
     "rxjs": "^7.5.2"

packages/common/rollup.config.js

@@ -49,5 +49,5 @@ export default {
       output: { quote_style: 1 }
     })
   ],
-  external: ['joi', 'rxjs', 'ethers', '@ethereumjs/common']
+  external: ['joi', 'rxjs', 'ethers', '@ethereumjs/common', 'bignumber.js']
 }

packages/common/src/elements/AddressTable.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { Account, AccountsList } from '../types'
-  import { utils } from 'ethers'
+  import { weiToEth } from '../utils'
 
   export let accountsListObject: AccountsList | undefined
   export let accountSelected: Account | undefined = undefined
@@ -120,7 +120,7 @@
             >
             <td>{account.derivationPath}</td>
             <td class="asset-td"
-              >{utils.formatEther(account.balance.value)}
+              >{weiToEth(account.balance.value)}
               {account.balance.asset}</td
             >
           </tr>

packages/common/src/hdwallets.ts

@@ -1,7 +1,7 @@
 import type Common from '@ethereumjs/common'
-import type { BigNumber } from 'ethers'
 import type { CustomNetwork, EIP1193Provider, RPCResponse } from './types'
 import type { TransactionRequest } from '@ethersproject/providers'
+import type { BigNumber } from 'ethers'
 
 /**
  * Creates the common instance used for signing

packages/common/src/index.ts

@@ -9,5 +9,6 @@ export {
   bigNumberFieldsToStrings,
   getHardwareWalletProvider
 } from './hdwallets'
+export { weiToEth } from './utils'
 
 export * from './types'

packages/common/src/types.ts

@@ -1,7 +1,7 @@
-import type { ethers, BigNumber } from 'ethers'
 import type { ConnectionInfo } from 'ethers/lib/utils'
 import type EventEmitter from 'eventemitter3'
 import type { TypedData as EIP712TypedData } from 'eip-712'
+import type BigNumber from 'bignumber.js'
 export type { TypedData as EIP712TypedData } from 'eip-712'
 
 /**
@@ -232,7 +232,7 @@ export interface WalletModule {
 export type GetInterfaceHelpers = {
   chains: Chain[]
   appMetadata: AppMetadata | null
-  BigNumber: typeof ethers.BigNumber
+  BigNumber: typeof BigNumber
   EventEmitter: typeof EventEmitter
 }
 

packages/common/src/utils.ts

@@ -0,0 +1,5 @@
+import type BigNumber from 'bignumber.js'
+
+export function weiToEth(wei: BigNumber): string {
+    return wei.div(1e18).toString(10)
+}

packages/common/src/views/AccountSelect.svelte

@@ -3,15 +3,14 @@
   import CloseButton from '../elements/CloseButton.svelte'
   import AddressTable from '../elements/AddressTable.svelte'
   import TableHeader from '../elements/TableHeader.svelte'
-  import { utils } from 'ethers'
-
   import type { Subject } from 'rxjs'
   import type {
     ScanAccountsOptions,
     SelectAccountOptions,
     Account,
     AccountsList
   } from '../types'
+  import { weiToEth } from '../utils'
 
   export let selectAccountOptions: SelectAccountOptions
   export let accounts$: Subject<Account[]>
@@ -61,7 +60,7 @@
       accountsListObject = {
         all: allAccounts,
         filtered: allAccounts.filter(account => {
-          return parseFloat(utils.formatEther(account.balance.value)) > 0
+          return parseFloat(weiToEth(account.balance.value)) > 0
         })
       }
       loadingAccounts = false

packages/core/README.md

@@ -641,14 +641,15 @@ setTimeout(
 **`preflightNotifications`**
 Notify can be used to deliver standard notifications along with preflight information by passing a `PreflightNotificationsOptions` object to the `preflightNotifications` action. This will return a a promise that resolves to the transaction hash (if `sendTransaction` resolves the transaction hash and is successful), the internal notification id (if no `sendTransaction` function is provided) or return nothing if an error occurs or `sendTransaction` is not provided or doesn't resolve to a string.
 
-Preflight event types include 
- - `txRequest` : Alert user there is a transaction request awaiting confirmation by their wallet
- - `txAwaitingApproval` : A previous transaction is awaiting confirmation
- - `txConfirmReminder` : Reminder to confirm a transaction to continue - configurable with the `txApproveReminderTimeout` property; defaults to 15 seconds
- - `nsfFail` : The user has insufficient funds for transaction (requires `gasPrice`, `estimateGas`, `balance`, `txDetails.value`)
- - `txError` : General transaction error (requires `sendTransaction`)
- - `txSendFail` : The user rejected the transaction (requires `sendTransaction`)
- - `txUnderpriced` : The gas price for the transaction is too low (requires `sendTransaction`)
+Preflight event types include
+
+- `txRequest` : Alert user there is a transaction request awaiting confirmation by their wallet
+- `txAwaitingApproval` : A previous transaction is awaiting confirmation
+- `txConfirmReminder` : Reminder to confirm a transaction to continue - configurable with the `txApproveReminderTimeout` property; defaults to 15 seconds
+- `nsfFail` : The user has insufficient funds for transaction (requires `gasPrice`, `estimateGas`, `balance`, `txDetails.value`)
+- `txError` : General transaction error (requires `sendTransaction`)
+- `txSendFail` : The user rejected the transaction (requires `sendTransaction`)
+- `txUnderpriced` : The gas price for the transaction is too low (requires `sendTransaction`)
 
 ```typescript
 interface PreflightNotificationsOptions {
@@ -679,8 +680,7 @@ const sendTransaction = () => {
   return signer.sendTransaction(txDetails).then(tx => tx.hash)
 }
 
-const gasPrice = () =>
-  ethersProvider.getGasPrice().then(res => res.toString())
+const gasPrice = () => ethersProvider.getGasPrice().then(res => res.toString())
 
 const estimateGas = () => {
   return ethersProvider.estimateGas(txDetails).then(res => res.toString())
@@ -812,7 +812,7 @@ The Onboard styles can customized via [CSS variables](https://developer.mozilla.
   --account-center-app-btn-text-color
   --account-center-app-btn-background
   --account-center-app-btn-font-family
-  
+
   /* CUSTOMIZE SECTIONS OF THE CONNECT MODAL */
   --onboard-connect-content-width
   --onboard-connect-content-height

packages/core/src/provider.ts

@@ -1,7 +1,7 @@
 import { fromEventPattern, Observable } from 'rxjs'
 import { filter, takeUntil, take, share, switchMap } from 'rxjs/operators'
 import partition from 'lodash.partition'
-import { utils, providers } from 'ethers'
+import { providers } from 'ethers'
 
 import type {
   ChainId,
@@ -14,13 +14,15 @@ import type {
   SelectAccountsRequest
 } from '@web3-onboard/common'
 
+import { weiToEth } from '@web3-onboard/common'
 import { disconnectWallet$ } from './streams'
 import type { Account, Address, Balances, Ens, WalletState } from './types'
 import { updateAccount, updateWallet } from './store/actions'
 import { validEnsChain } from './utils'
 import disconnect from './disconnect'
 import { state } from './store'
 import { getBlocknativeSdk } from './services'
+import BigNumber from 'bignumber.js'
 
 export const ethersProviders: {
   [key: string]: providers.StaticJsonRpcProvider
@@ -339,14 +341,16 @@ export async function getBalance(
 ): Promise<Balances | null> {
   // chain we don't recognize and don't have a rpcUrl for requests
   if (!chain) return null
-
-  const provider = getProvider(chain)
+  
+  const { wallets } = state.get()
 
   try {
-    const balanceWei = await provider.getBalance(address)
-
+    const wallet = wallets.find(wallet => !!wallet.provider)
+    const provider = wallet.provider
+    const balanceHex = await provider.request({ method: 'eth_getBalance', params:[address,'latest'] })
+    const balanceWei = new BigNumber(parseInt(balanceHex, 16))
     return balanceWei
-      ? { [chain.token || 'eth']: utils.formatEther(balanceWei) }
+      ? { [chain.token || 'eth']: weiToEth(balanceWei) }
       : null
   } catch (error) {
     console.error(error)