Merge pull request #1065 from blocknative/release/06-14

Release: 06-14 (main)

Author: taylorjdawson

.circleci/config.yml

@@ -267,6 +267,12 @@ jobs:
     working_directory: ~/web3-onboard-monorepo/packages/coinbase
     steps:
       - node-build-steps
+  build-web3auth:
+    docker:
+      - image: cimg/node:16.13.1
+    working_directory: ~/web3-onboard-monorepo/packages/web3auth
+    steps:
+      - node-build-steps
   build-dcent:
     docker:
       - image: cimg/node:16.13.1
@@ -383,6 +389,12 @@ jobs:
     working_directory: ~/web3-onboard-monorepo/packages/coinbase
     steps:
       - node-staging-build-steps
+  build-staging-web3auth:
+    docker:
+      - image: cimg/node:16.13.1
+    working_directory: ~/web3-onboard-monorepo/packages/web3auth
+    steps:
+      - node-build-steps
   build-staging-dcent:
     docker:
       - image: cimg/node:16.13.1
@@ -501,6 +513,12 @@ workflows:
           <<: *deploy_production_filters
       - build-staging-coinbase:
           <<: *deploy_staging_filters
+  web3auth:
+    jobs:
+      - build-web3auth:
+          <<: *deploy_production_filters
+      - build-staging-web3auth:
+          <<: *deploy_staging_filters
   dcent:
     jobs:
       - build-dcent:

.gitignore

@@ -3,4 +3,4 @@ node_modules
 dist/
 package-lock.json
 .rpt2_cache
-.vscode
+.vscode

packages/coinbase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/coinbase",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Coinbase Wallet module for web3-onboard",
   "module": "dist/index.js",
   "browser": "dist/index.js",
@@ -21,6 +21,6 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "^3.0.5",
-    "@web3-onboard/common": "2.1.0"
+    "@web3-onboard/common": "2.1.1"
   }
 }

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/common",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",

packages/common/src/types.ts

@@ -1,4 +1,5 @@
 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'
 export type { TypedData as EIP712TypedData } from 'eip-712'
@@ -428,6 +429,7 @@ export interface Chain {
   token: TokenSymbol // eg ETH, BNB, MATIC
   color?: string
   icon?: string // svg string
+  providerConnectionInfo?: ConnectionInfo
 }
 
 export type TokenSymbol = string // eg ETH

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",
@@ -41,7 +41,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.0",
+    "@web3-onboard/common": "^2.1.1",
     "bowser": "^2.11.0",
     "ethers": "5.5.3",
     "eventemitter3": "^4.0.7",

packages/core/src/provider.ts

@@ -25,6 +25,20 @@ export const ethersProviders: {
   [key: string]: providers.StaticJsonRpcProvider
 } = {}
 
+export function getProvider(chain: Chain): providers.StaticJsonRpcProvider {
+  if (!chain) return null
+
+  if (!ethersProviders[chain.rpcUrl]) {
+    ethersProviders[chain.rpcUrl] = new providers.StaticJsonRpcProvider(
+      chain.providerConnectionInfo?.url
+        ? chain.providerConnectionInfo
+        : chain.rpcUrl
+    )
+  }
+
+  return ethersProviders[chain.rpcUrl]
+}
+
 export function requestAccounts(
   provider: EIP1193Provider
 ): Promise<ProviderAccounts> {
@@ -231,13 +245,7 @@ export async function getEns(
   // chain we don't recognize and don't have a rpcUrl for requests
   if (!chain) return null
 
-  if (!ethersProviders[chain.rpcUrl]) {
-    ethersProviders[chain.rpcUrl] = new providers.StaticJsonRpcProvider(
-      chain.rpcUrl
-    )
-  }
-
-  const provider = ethersProviders[chain.rpcUrl]
+  const provider = getProvider(chain);
 
   try {
     const name = await provider.lookupAddress(address)
@@ -277,13 +285,7 @@ export async function getBalance(
   // chain we don't recognize and don't have a rpcUrl for requests
   if (!chain) return null
 
-  if (!ethersProviders[chain.rpcUrl]) {
-    ethersProviders[chain.rpcUrl] = new providers.StaticJsonRpcProvider(
-      chain.rpcUrl
-    )
-  }
-
-  const provider = ethersProviders[chain.rpcUrl]
+  const provider = getProvider(chain);
 
   try {
     const balanceWei = await provider.getBalance(address)

packages/core/src/store/actions.ts

@@ -44,9 +44,10 @@ export function addChains(chains: Chain[]): void {
   // chains are validated on init
   const action = {
     type: ADD_CHAINS,
-    payload: chains.map(({ namespace = 'evm', ...rest }) => ({
+    payload: chains.map(({ namespace = 'evm', id, ...rest }) => ({
       ...rest,
-      namespace
+      namespace,
+      id : id.toLowerCase()
     }))
   }
 

packages/core/src/utils.ts

@@ -81,6 +81,7 @@ export const chainIdToLabel: Record<string, string> = {
   '0x89': 'Polygon',
   '0xfa': 'Fantom',
   '0xa': 'Optimism',
+  '0x45': 'Optimism Kovan',
   '0xa86a': 'Avalanche',
   '0xa4ec': 'Celo',
   '0x64': 'Gnosis',
@@ -125,6 +126,10 @@ export const chainStyles: Record<string, ChainStyle> = {
     icon: optimismIcon,
     color: '#FF0420'
   },
+  '0x45': {
+    icon: optimismIcon,
+    color: '#FF0420'
+  },
   '0xa86a': {
     icon: avalancheIcon,
     color: '#E84142'

packages/core/src/validation.ts

@@ -14,14 +14,29 @@ const chainId = Joi.string().pattern(/^0x[0-9a-fA-F]+$/)
 const chainNamespace = Joi.string().valid('evm')
 const unknownObject = Joi.object().unknown()
 
+/** Related to ConnectionInfo from 'ethers/lib/utils' */
+const providerConnectionInfo = Joi.object({
+  url: Joi.string().required(),
+  headers: Joi.object(),
+  user: Joi.string(),
+  password: Joi.string(),
+  allowInsecureAuthentication: Joi.boolean(),
+  allowGzip: Joi.boolean(),
+  throttleLimit: Joi.number(),
+  throttleSlotInterval: Joi.number(),
+  throttleCallback: Joi.function(),
+  timeout: Joi.number()
+})
+
 const chain = Joi.object({
   namespace: chainNamespace,
   id: chainId.required(),
   rpcUrl: Joi.string().required(),
   label: Joi.string().required(),
   token: Joi.string().required(),
   icon: Joi.string(),
-  color: Joi.string()
+  color: Joi.string(),
+  providerConnectionInfo: providerConnectionInfo
 })
 
 const connectedChain = Joi.object({
@@ -214,4 +229,4 @@ export function validateLocale(data: string): ValidateReturn {
 export function validateUpdateBalances(data: 
 WalletState[]): ValidateReturn {
   return validate(wallets, data)
-}
+}