[common-v2.1.7-alpha.1, core-v2.6.0-alpha.1, react-v2.2.5-alpha.1, vue-2.1.5-alpha.1, demo-v2.0.6]: Enhancement - Convert Wei to Eth

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/common",
-  "version": "2.1.6",
+  "version": "2.1.7-alpha.1",
   "description": "Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -81,6 +81,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

@@ -35,5 +35,5 @@ export default {
       inlineSources: !production
     })
   ],
-  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 'bignumber.js'
 
 /**
  * Creates the common instance used for signing
@@ -71,11 +71,11 @@ export const bigNumberFieldsToStrings = (
     (transaction, txnProperty) => ({
       ...transaction,
       ...((transaction[txnProperty as keyof TransactionRequest] as BigNumber)
-        .toHexString
+        instanceof BigNumber
         ? {
             [txnProperty]: (
               transaction[txnProperty as keyof TransactionRequest] as BigNumber
-            ).toHexString()
+            ).toString(16)
           }
         : {})
     }),

packages/common/src/index.ts

@@ -69,6 +69,8 @@ export {
   getHardwareWalletProvider
 } from './hdwallets'
 
+export { weiToEth } from './utils'
+
 export type {
   RequestPatch,
   AccountSelectAPI,
@@ -126,4 +128,4 @@ export type {
   CustomNetwork,
   TransactionObject,
   RPCResponse
-}
+}

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

@@ -640,14 +640,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 {
@@ -678,8 +679,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())
@@ -811,7 +811,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.5.0",
+  "version": "2.6.0-alpha.1",
   "description": "Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -81,7 +81,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7-alpha.1",
     "bignumber.js": "^9.0.0",
     "bnc-sdk": "^4.4.1",
     "bowser": "^2.11.0",

packages/core/src/provider.ts

@@ -1,17 +1,18 @@
 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 {
+import {
   ChainId,
   EIP1102Request,
   EIP1193Provider,
   ProviderAccounts,
   Chain,
   AccountsListener,
   ChainListener,
-  SelectAccountsRequest
+  SelectAccountsRequest,
+  weiToEth
 } from '@web3-onboard/common'
 
 import { disconnectWallet$ } from './streams'
@@ -21,6 +22,7 @@ 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.label)
+    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).slice(0,6) }
       : null
   } catch (error) {
     console.error(error)

packages/core/src/update-balances.ts

@@ -19,7 +19,6 @@ async function updateBalances(addresses?: string[]): Promise<void> {
             )
           ) {
             const updatedBalance = await getBalance(account.address, chain)
-
             return { ...account, balance: updatedBalance }
           }
           return account

packages/core/src/views/connect/Index.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import { ProviderRpcErrorCode, WalletModule } from '@web3-onboard/common'
-  import { BigNumber } from 'ethers'
   import { BehaviorSubject, takeUntil } from 'rxjs'
   import EventEmitter from 'eventemitter3'
   import { _ } from 'svelte-i18n'
@@ -20,7 +19,7 @@
   import Sidebar from './Sidebar.svelte'
   import { configuration } from '../../configuration'
   import { getBlocknativeSdk } from '../../services'
-
+  import BigNumber from 'bignumber.js'
   import {
     getChainId,
     requestAccounts,

packages/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "demo",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "devDependencies": {
     "assert": "^2.0.0",
     "buffer": "^6.0.3",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@web3-onboard/coinbase": "^2.0.8",
-    "@web3-onboard/core": "^2.4.1-alpha.1",
+    "@web3-onboard/core": "^2.6.0-alpha.1",
     "@web3-onboard/dcent": "^2.0.5",
     "@web3-onboard/fortmatic": "^2.0.6",
     "@web3-onboard/gnosis": "^2.0.5",

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/react",
-  "version": "2.2.4",
+  "version": "2.2.5-alpha.1",
   "description": "A collection of React hooks for integrating Web3-Onboard in to React and Next.js projects. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -62,8 +62,8 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
-    "@web3-onboard/core": "^2.5.0",
+    "@web3-onboard/common": "^2.1.7-alpha.1",
+    "@web3-onboard/core": "^2.6.0-alpha.1",
     "use-sync-external-store": "1.0.0"
   },
   "peerDependencies": {

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/vue",
-  "version": "2.1.4",
+  "version": "2.1.5-alpha.1",
   "description": "A collection of Vue Composables for integrating Web3-Onboard in to a Vue or Nuxt project. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -62,8 +62,8 @@
   "dependencies": {
     "@vueuse/core": "^8.4.2",
     "@vueuse/rxjs": "^8.2.0",
-    "@web3-onboard/common": "^2.1.6",
-    "@web3-onboard/core": "^2.5.0",
+    "@web3-onboard/common": "^2.1.7-alpha.1",
+    "@web3-onboard/core": "^2.6.0-alpha.1",
     "vue-demi": "^0.12.4"
   },
   "peerDependencies": {