Fixes misc validation and types. (#988)

* Fixes outdate validtion and types for injected wallets.
* Fix missing account validation

Author: taylorjdawson

packages/common/package.json

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

packages/common/src/types.ts

@@ -225,7 +225,7 @@ export interface WalletModule {
   /**
    * @returns the wallet interface associated with the module
    */
-  getInterface: (helpers: GetInterfaceHelpers) => Promise<WalletInterface>
+  getInterface: (helpers?: GetInterfaceHelpers) => Promise<WalletInterface>
 }
 
 export type GetInterfaceHelpers = {

packages/core/src/validation.ts

@@ -47,11 +47,11 @@ const balance = Joi.any().allow(
   null
 )
 
-const account = {
+const account = Joi.object({
   address: Joi.string().required(),
   ens,
   balance
-}
+})
 
 const chains = Joi.array().items(chain)
 const accounts = Joi.array().items(account)

packages/injected/README.md

@@ -111,10 +111,15 @@ const equal = {
   // The property on the window where the injected provider is defined
   // Example: window.ethereum
   injectedNamespace: 'ethereum',
-  // A unique property on the provider that is used to identify the provider
+ // A function that returns a bool indicating whether or not the provider is
+  // of a certain identity. In this case, a unique property on the provider
+  // is used to identify the provider.
   // In most cases this is in the format: `is<provider-name>`.
-  // Example: window.ethereum.isEQLWallet
-  providerIdentityFlag: 'isEQLWallet',
+  // You may also include custom logic here if checking for the property
+  // isn't sufficient.
+  checkProviderIdentity: ({ provider }) =>
+    !!provider && !!provider[ProviderIdentityFlag.MetaMask],
+
   // A method that returns a string of the wallet icon which will be displayed
   getIcon: async () => (await import('<PATH_TO_ICON>')).default,
   // Returns a valid EIP1193 provider. In some cases the provider will need to be patched to satisfy the EIP1193 Provider interface

packages/injected/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/injected-wallets",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Injected wallets module for web3-onboard",
   "module": "dist/index.js",
   "browser": "dist/index.js",

packages/injected/src/validation.ts

@@ -4,10 +4,10 @@ import Joi from 'joi'
 
 const walletModule = Joi.object({
   label: Joi.string().required(),
-  getIcon: Joi.function().arity(1).required(),
-  getInterface: Joi.function().arity(1).required(),
+  getIcon: Joi.function().arity(0).required(),
+  getInterface: Joi.function().maxArity(1).required(),
   injectedNamespace: Joi.string().required(),
-  checkProviderIdentity: Joi.function().arity(1).required().required(),
+  checkProviderIdentity: Joi.function().arity(1).required(),
   platforms: Joi.array().items(Joi.string())
 })