Merge pull request #1176 from blocknative/release/2.6.0

(main) Release: 2.6.0

.circleci/config.yml

@@ -285,6 +285,12 @@ jobs:
     working_directory: ~/web3-onboard-monorepo/packages/vue
     steps:
       - node-build-steps
+  build-gas:
+    docker:
+      - image: cimg/node:16.13.1
+    working_directory: ~/web3-onboard-monorepo/packages/gas
+    steps:
+      - node-build-steps
 
   # Build staging/Alpha releases
   build-staging-core:
@@ -407,6 +413,12 @@ jobs:
     working_directory: ~/web3-onboard-monorepo/packages/vue
     steps:
       - node-staging-build-steps
+  build-staging-gas:
+    docker:
+      - image: cimg/node:16.13.1
+    working_directory: ~/web3-onboard-monorepo/packages/gas
+    steps:
+      - node-staging-build-steps
 
 workflows:
   version: 2
@@ -531,3 +543,9 @@ workflows:
           <<: *deploy_production_filters
       - build-staging-vue:
           <<: *deploy_staging_filters
+  gas:
+    jobs:
+      - build-gas:
+          <<: *deploy_production_filters
+      - build-staging-gas:
+          <<: *deploy_staging_filters

package.json

@@ -1,6 +1,6 @@
 {
   "name": "web3-onboard-monorepo",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "private": true,
   "workspaces": [
     "./packages/*"

packages/coinbase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/coinbase",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "Coinbase SDK wallet module for connecting to Web3-Onboard. 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",
@@ -59,6 +59,6 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "^3.0.5",
-    "@web3-onboard/common": "^2.1.6"
+    "@web3-onboard/common": "^2.1.7"
   }
 }

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/common",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "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",
@@ -73,6 +73,7 @@
     "prettier-plugin-svelte": "^2.4.0",
     "rollup": "^2.3.4",
     "rollup-plugin-svelte": "^7.0.0",
+    "rollup-plugin-terser": "^7.0.2",
     "svelte": "^3.42.5",
     "svelte-check": "^2.2.6",
     "svelte-preprocess": "^4.9.4",
@@ -81,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

@@ -4,14 +4,16 @@ import replace from '@rollup/plugin-replace'
 import json from '@rollup/plugin-json'
 import sveltePreprocess from 'svelte-preprocess'
 import typescript from '@rollup/plugin-typescript'
+import { terser } from 'rollup-plugin-terser'
 
 const production = !process.env.ROLLUP_WATCH
 
 export default {
   input: 'src/index.ts',
   output: {
     format: 'esm',
-    dir: 'dist/'
+    dir: 'dist/',
+    sourcemap: true,
   },
   plugins: [
     json(),
@@ -33,7 +35,19 @@ export default {
     typescript({
       sourceMap: !production,
       inlineSources: !production
+    }),
+    production && terser({
+      ecma: 2017,
+      mangle: { toplevel: true },
+      compress: {
+        module: true,
+        toplevel: true,
+        unsafe_arrows: true,
+        drop_console: production,
+        drop_debugger: production
+      },
+      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.toString())}
               {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

@@ -1,62 +1,3 @@
-import type {
-  RequestPatch,
-  AccountSelectAPI,
-  SelectAccountOptions,
-  BasePath,
-  DerivationPath,
-  Asset,
-  ScanAccounts,
-  ScanAccountsOptions,
-  AccountAddress,
-  Account,
-  AccountsList,
-  AppMetadata,
-  RecommendedInjectedWallets,
-  WalletInit,
-  WalletHelpers,
-  APIKey,
-  Device,
-  WalletModule,
-  GetInterfaceHelpers,
-  Platform,
-  DeviceOS,
-  DeviceBrowser,
-  DeviceOSName,
-  DeviceBrowserName,
-  DeviceType,
-  ChainId,
-  RpcUrl,
-  WalletInterface,
-  ProviderMessage,
-  ProviderInfo,
-  ProviderAccounts,
-  ProviderEvent,
-  SimpleEventEmitter,
-  ConnectListener,
-  DisconnectListener,
-  MessageListener,
-  ChainListener,
-  AccountsListener,
-  Balance,
-  EthAccountsRequest,
-  EthBalanceRequest,
-  EIP1102Request,
-  SelectAccountsRequest,
-  EIP3326Request,
-  EIP3085Request,
-  EthChainIdRequest,
-  EthSignTransactionRequest,
-  EthSignMessageRequest,
-  EIP712Request,
-  AddChainParams,
-  EIP1193Provider,
-  Chain,
-  TokenSymbol,
-  CustomNetwork,
-  TransactionObject,
-  RPCResponse
-} from './types'
-
 export { ProviderRpcErrorCode } from './types'
 export { ProviderRpcError } from './errors'
 export { createEIP1193Provider } from './eip-1193'
@@ -68,62 +9,6 @@ export {
   bigNumberFieldsToStrings,
   getHardwareWalletProvider
 } from './hdwallets'
+export { weiToEth } from './utils'
 
-export type {
-  RequestPatch,
-  AccountSelectAPI,
-  SelectAccountOptions,
-  BasePath,
-  DerivationPath,
-  Asset,
-  ScanAccounts,
-  ScanAccountsOptions,
-  AccountAddress,
-  Account,
-  AccountsList,
-  AppMetadata,
-  RecommendedInjectedWallets,
-  WalletInit,
-  WalletHelpers,
-  APIKey,
-  Device,
-  WalletModule,
-  GetInterfaceHelpers,
-  Platform,
-  DeviceOS,
-  DeviceBrowser,
-  DeviceOSName,
-  DeviceBrowserName,
-  DeviceType,
-  ChainId,
-  RpcUrl,
-  WalletInterface,
-  ProviderMessage,
-  ProviderInfo,
-  ProviderAccounts,
-  ProviderEvent,
-  SimpleEventEmitter,
-  ConnectListener,
-  DisconnectListener,
-  MessageListener,
-  ChainListener,
-  AccountsListener,
-  Balance,
-  EthAccountsRequest,
-  EthBalanceRequest,
-  EIP1102Request,
-  SelectAccountsRequest,
-  EIP3326Request,
-  EIP3085Request,
-  EthChainIdRequest,
-  EthSignTransactionRequest,
-  EthSignMessageRequest,
-  EIP712Request,
-  AddChainParams,
-  EIP1193Provider,
-  Chain,
-  TokenSymbol,
-  CustomNetwork,
-  TransactionObject,
-  RPCResponse
-}
+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 { ethers } from 'ethers'
 export type { TypedData as EIP712TypedData } from 'eip-712'
 
 /**
@@ -116,7 +116,7 @@ export type Account = {
   derivationPath: DerivationPath
   balance: {
     asset: Asset['label']
-    value: BigNumber
+    value: ethers.BigNumber
   }
 }
 
@@ -238,6 +238,8 @@ export type GetInterfaceHelpers = {
 
 export type ChainId = string
 
+export type DecimalChainId = number
+
 export type RpcUrl = string
 
 export type WalletInterface = {
@@ -434,6 +436,8 @@ export interface Chain {
   blockExplorerUrl?: string
 }
 
+export type ChainWithDecimalId = Omit<Chain, 'id'> & { id: DecimalChainId }
+
 export type TokenSymbol = string // eg ETH
 
 export interface CustomNetwork {

packages/common/src/utils.ts

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

packages/common/src/validation.ts

@@ -9,7 +9,9 @@ const basePaths = Joi.array().items(basePath)
 
 const chain = Joi.object({
   namespace: Joi.string(),
-  id: Joi.string().required(),
+  id: Joi.string()
+    .pattern(/^0x[0-9a-fA-F]+$/)
+    .required(),
   rpcUrl: Joi.string().required(),
   label: Joi.string().required(),
   token: Joi.string().required(),

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.toString())) > 0
         })
       }
       loadingAccounts = false