thirdweb-dev · Adamj1232 · May 16, 2023 · May 11, 2023 · May 11, 2023 · May 12, 2023
diff --git a/packages/dcent/package.json b/packages/dcent/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@web3-onboard/dcent",
- "version": "2.2.6",
+ "version": "2.2.7-alpha.1",
  "description": "D'CENT 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",
@@ -57,7 +57,7 @@
  },
  "dependencies": {
  "@web3-onboard/common": "^2.3.2",
- "@web3-onboard/hw-common": "^2.2.2",
+ "@web3-onboard/hw-common": "^2.3.0-alpha.1",
  "@ethereumjs/tx": "^3.4.0",
  "@ethersproject/providers": "^5.5.0",
  "eth-dcent-keyring": "^0.2.2"

diff --git a/packages/dcent/src/index.ts b/packages/dcent/src/index.ts
@@ -5,8 +5,6 @@ import type {
  Platform
 } from '@web3-onboard/common'
 
-import type { providers } from 'ethers'
-
 import type {
  CustomNetwork,
  Account,

diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -27,22 +27,22 @@
  "@web3-onboard/core": "^2.18.1-alpha.2",
  "@web3-onboard/coinbase": "^2.2.3",
  "@web3-onboard/transaction-preview": "^2.0.7",
- "@web3-onboard/dcent": "^2.2.6",
+ "@web3-onboard/dcent": "^2.2.7-alpha.1",
  "@web3-onboard/frontier": "^2.0.3",
  "@web3-onboard/fortmatic": "^2.0.18",
  "@web3-onboard/frame": "2.0.0",
  "@web3-onboard/gas": "^2.1.7",
  "@web3-onboard/gnosis": "^2.1.9",
- "@web3-onboard/keepkey": "^2.3.6",
- "@web3-onboard/keystone": "^2.3.6",
+ "@web3-onboard/keepkey": "^2.3.7-alpha.1",
+ "@web3-onboard/keystone": "^2.3.7-alpha.1",
  "@web3-onboard/ledger": "^2.4.5",
  "@web3-onboard/infinity-wallet": "^2.0.3",
  "@web3-onboard/injected-wallets": "^2.8.5",
  "@web3-onboard/magic": "^2.1.6",
  "@web3-onboard/phantom": "^2.0.1",
  "@web3-onboard/portis": "^2.1.6",
  "@web3-onboard/sequence": "^2.0.7",
- "@web3-onboard/trezor": "^2.4.1",
+ "@web3-onboard/trezor": "^2.4.2-alpha.1",
  "@web3-onboard/trust": "^2.0.3",
  "@web3-onboard/torus": "^2.2.4",
  "@web3-onboard/taho": "^2.0.3",

diff --git a/packages/demo/src/App.svelte b/packages/demo/src/App.svelte
@@ -150,7 +150,8 @@
 
  const trezorOptions = {
  email: 'test@test.com',
- appUrl: 'https://www.blocknative.com'
+ appUrl: 'https://www.blocknative.com',
+ consecutiveEmptyAccountThreshold: 10
  // containerElement: '#sample-container-el'
  }
  const trezor = trezorModule(trezorOptions)

diff --git a/packages/hw-common/package.json b/packages/hw-common/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@web3-onboard/hw-common",
- "version": "2.2.2",
+ "version": "2.3.0-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",

diff --git a/packages/hw-common/src/types.ts b/packages/hw-common/src/types.ts
@@ -44,6 +44,11 @@ export type SelectAccountOptions = {
  scanAccounts: ScanAccounts
  supportsCustomPath?: boolean
  containerElement?: string
+ /**
+ * A number that defines the amount of consecutive empty addresses displayed
+ * within the Account Select modal. Default is 5 
+ */
+ consecutiveEmptyAccountThreshold?: number
 }
 
 export type BasePath = {

diff --git a/packages/hw-common/src/validation.ts b/packages/hw-common/src/validation.ts
@@ -29,6 +29,7 @@ const selectAccountOptions = Joi.object({
  chains: chains,
  scanAccounts: Joi.function().arity(1).required(),
  supportsCustomPath: Joi.bool(),
+ consecutiveEmptyAccountThreshold: Joi.number(),
  containerElement: Joi.string()
 })
 

diff --git a/packages/keepkey/README.md b/packages/keepkey/README.md
@@ -49,17 +49,23 @@ console.log(connectedWallets)
 ```
 
 Initialization options:
+
 ```typescript
 type keepkeyInitOptions = {
  containerElement?: string
  filter?: Platform
+ /**
+ * A number that defines the amount of consecutive empty addresses displayed
+ * within the Account Select modal. Default is 5
+ */
+ consecutiveEmptyAccountThreshold?: number
 }
 ```
 
 The following is a list of the platforms that can be filtered:
 
 ```typescript
-type Platform = DeviceOSName | DeviceBrowserName | DeviceType | 'all';
+type Platform = DeviceOSName | DeviceBrowserName | DeviceType | 'all'
 
 type Platform =
  | 'Windows Phone'

diff --git a/packages/keepkey/package.json b/packages/keepkey/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@web3-onboard/keepkey",
- "version": "2.3.6",
+ "version": "2.3.7-alpha.1",
  "description": "KeepKey hardware 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",
@@ -64,7 +64,7 @@
  "@shapeshiftoss/hdwallet-core": "^1.15.2",
  "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.15.2",
  "@web3-onboard/common": "^2.3.2",
- "@web3-onboard/hw-common": "^2.2.2",
+ "@web3-onboard/hw-common": "^2.3.0-alpha.1",
  "ethereumjs-util": "^7.1.3"
  }
 }
diff --git a/packages/keepkey/src/index.ts b/packages/keepkey/src/index.ts
@@ -38,8 +38,17 @@ type ErrorCode = 'busy' | 'pairing'
 
 function keepkey({
  filter,
- containerElement
-}: { filter?: Platform[]; containerElement?: string } = {}): WalletInit {
+ containerElement,
+ consecutiveEmptyAccountThreshold
+}: {
+ filter?: Platform[]
+ containerElement?: string
+ /**
+ * A number that defines the amount of consecutive empty addresses displayed
+ * within the Account Select modal. Default is 5
+ */
+ consecutiveEmptyAccountThreshold?: number
+} = {}): WalletInit {
  const getIcon = async () => (await import('./icon.js')).default
 
  return ({ device }) => {
@@ -88,6 +97,7 @@ function keepkey({
  const keyring = new Keyring()
  const keepKeyAdapter = WebUSBKeepKeyAdapter.useKeyring(keyring)
  const eventEmitter = new EventEmitter()
+ const consecutiveEmptyAccounts = consecutiveEmptyAccountThreshold || 5
 
  let keepKeyWallet: KeepKeyHDWallet
  let currentChain: Chain = chains[0]
@@ -184,7 +194,7 @@ function keepkey({
 
  // Iterates until a 0 balance account is found
  // Then adds 4 more 0 balance accounts to the array
- while (zeroBalanceAccounts < 5) {
+ while (zeroBalanceAccounts < consecutiveEmptyAccounts) {
  const acc = await getAccount({
  accountIdx: index,
  provider,

diff --git a/packages/keystone/README.md b/packages/keystone/README.md
@@ -13,6 +13,11 @@ type KeystoneOptions = {
  customNetwork?: CustomNetwork
  filter?: Platform[]
  containerElement?: string
+ /**
+ * A number that defines the amount of consecutive empty addresses displayed
+ * within the Account Select modal. Default is 5
+ */
+ consecutiveEmptyAccountThreshold?: number
 }
 
 interface CustomNetwork {

diff --git a/packages/keystone/package.json b/packages/keystone/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@web3-onboard/keystone",
- "version": "2.3.6",
+ "version": "2.3.7-alpha.1",
  "description": "Keystone hardware 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 @@
  "@ethersproject/providers": "^5.5.0",
  "@keystonehq/eth-keyring": "^0.14.00.3",
  "@web3-onboard/common": "^2.3.2",
- "@web3-onboard/hw-common": "^2.2.0"
+ "@web3-onboard/hw-common": "^2.3.0-alpha.1"
  }
 }
diff --git a/packages/keystone/src/index.ts b/packages/keystone/src/index.ts
@@ -42,13 +42,14 @@ const getAccount = async (
 
 const generateAccounts = async (
  keyring: any,
- provider: StaticJsonRpcProvider
+ provider: StaticJsonRpcProvider,
+ consecutiveEmptyAccounts: number
 ): Promise<Account[]> => {
  const accounts = []
  let zeroBalanceAccounts = 0,
  index = 0
 
- while (zeroBalanceAccounts < 5) {
+ while (zeroBalanceAccounts < consecutiveEmptyAccounts) {
  const account = await getAccount(keyring, provider, index)
  if (account.balance.value.isZero()) {
  zeroBalanceAccounts++
@@ -66,11 +67,17 @@ const generateAccounts = async (
 function keystone({
  customNetwork,
  filter,
- containerElement
+ containerElement,
+ consecutiveEmptyAccountThreshold
 }: {
  customNetwork?: CustomNetwork
  filter?: Platform[]
  containerElement?: string
+ /**
+ * A number that defines the amount of consecutive empty addresses displayed
+ * within the Account Select modal. Default is 5
+ */
+ consecutiveEmptyAccountThreshold?: number
 } = {}): WalletInit {
  const getIcon = async () => (await import('./icon.js')).default
 
@@ -121,6 +128,7 @@ function keystone({
  getHardwareWalletProvider
  } = await import('@web3-onboard/hw-common')
 
+ const consecutiveEmptyAccounts = consecutiveEmptyAccountThreshold || 5
  const keyring = AirGappedKeyring.getEmptyKeyring()
  await keyring.readKeyring()
 
@@ -136,7 +144,11 @@ function keystone({
  chains.find(({ id }: Chain) => id === chainId) || currentChain
 
  ethersProvider = new StaticJsonRpcProvider(currentChain.rpcUrl)
- return generateAccounts(keyring, ethersProvider)
+ return generateAccounts(
+ keyring,
+ ethersProvider,
+ consecutiveEmptyAccounts
+ )
  }
 
  const getAccounts = async () => {

diff --git a/packages/trezor/README.md b/packages/trezor/README.md
@@ -15,6 +15,11 @@ type TrezorOptions = {
  customNetwork?: CustomNetwork
  filter?: Platform[]
  containerElement?: string
+ /**
+ * A number that defines the amount of consecutive empty addresses displayed
+ * within the Account Select modal. Default is 5
+ */
+ consecutiveEmptyAccountThreshold?: number
 }
 
 interface CustomNetwork {
@@ -49,7 +54,7 @@ interface BootstrapNode {
  comment: string
 }
 
-type Platform = DeviceOSName | DeviceBrowserName | DeviceType | 'all';
+type Platform = DeviceOSName | DeviceBrowserName | DeviceType | 'all'
 ```
 
 ### Usage

diff --git a/packages/trezor/package.json b/packages/trezor/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@web3-onboard/trezor",
- "version": "2.4.1",
+ "version": "2.4.2-alpha.2",
  "description": "Trezor hardware 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",
@@ -61,7 +61,7 @@
  "@ethereumjs/tx": "^3.4.0",
  "@ethersproject/providers": "^5.5.0",
  "@web3-onboard/common": "^2.3.2",
- "@web3-onboard/hw-common": "^2.2.2",
+ "@web3-onboard/hw-common": "^2.3.0-alpha.1",
  "buffer": "^6.0.3",
  "eth-crypto": "^2.1.0",
  "ethereumjs-util": "^7.1.3",

diff --git a/packages/trezor/src/index.ts b/packages/trezor/src/index.ts
@@ -25,6 +25,11 @@ interface TrezorOptions {
  customNetwork?: CustomNetwork
  filter?: Platform[]
  containerElement?: string
+ /**
+ * A number that defines the amount of consecutive empty addresses displayed
+ * within the Account Select modal. Default is 5
+ */
+ consecutiveEmptyAccountThreshold?: number
 }
 
 const TREZOR_DEFAULT_PATH = "m/44'/60'/0'/0"
@@ -85,15 +90,17 @@ const getAccount = async (
 const getAddresses = async (
  account: AccountData,
  asset: Asset,
- provider: StaticJsonRpcProvider
+ provider: StaticJsonRpcProvider,
+ consecutiveEmptyAccounts: number
 ): Promise<Account[]> => {
  const accounts = []
  let index = 0
  let zeroBalanceAccounts = 0
 
  // Iterates until a 0 balance account is found
- // Then adds 4 more 0 balance accounts to the array
- while (zeroBalanceAccounts < 5) {
+ // Then adds 4 (whatever consecutiveEmptyAccountThreshold is set to) more
+ // 0 balance accounts to the array
+ while (zeroBalanceAccounts < consecutiveEmptyAccounts) {
  const acc = await getAccount(account, asset, index, provider)
  if (
  acc &&
@@ -118,14 +125,21 @@ function trezor(options: TrezorOptions): WalletInit {
  const getIcon = async () => (await import('./icon.js')).default
 
  return ({ device }) => {
- const { email, appUrl, customNetwork, filter, containerElement } =
- options || {}
+ const {
+ email,
+ appUrl,
+ customNetwork,
+ filter,
+ containerElement,
+ consecutiveEmptyAccountThreshold
+ } = options || {}
 
  if (!email || !appUrl) {
  throw new Error(
  'Email and AppUrl required in Trezor options for Trezor Wallet Connection'
  )
  }
+ const consecutiveEmptyAccounts = consecutiveEmptyAccountThreshold || 5
 
  const filtered =
  Array.isArray(filter) &&
@@ -212,7 +226,8 @@ function trezor(options: TrezorOptions): WalletInit {
  path: derivationPath
  },
  asset,
- ethersProvider
+ ethersProvider,
+ consecutiveEmptyAccounts
  )
  }