Fixes and new packages

blocknative · Feb 10, 2022 · 94a2923 · 94a2923
1 parent 4095953
commit 94a2923
Show file tree

Hide file tree

Showing 35 changed files with 76 additions and 43 deletions.
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/common",
-  "version": "2.0.0-alpha.12",
+  "version": "2.0.0-alpha.13",
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",

diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -60,7 +60,8 @@ import type {
   InjectedProvider,
   Chain,
   TokenSymbol,
-  CustomNetwork
+  CustomNetwork,
+  TransactionObject
 } from './types'
 
 export {
@@ -138,5 +139,6 @@ export type {
   InjectedProvider,
   Chain,
   TokenSymbol,
-  CustomNetwork
+  CustomNetwork,
+  TransactionObject
 }
diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
@@ -325,6 +325,7 @@ export interface TransactionObject {
   gasLimit?: string
   gasPrice?: string
   to: string
+  chainId: number
   value?: string
   maxFeePerGas?: string
   maxPriorityFeePerGas?: string

diff --git a/packages/core/circle.yml b/packages/core/circle.yml
@@ -45,3 +45,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/core",
-  "version": "2.0.0-alpha.17",
+  "version": "2.0.0-alpha.18",
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",

diff --git a/packages/fortmatic/circle.yml b/packages/fortmatic/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/fortmatic/package.json b/packages/fortmatic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/fortmatic",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "Fortmatic module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/gnosis/circle.yml b/packages/gnosis/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/gnosis/package.json b/packages/gnosis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/gnosis",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "Gnosis module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/injected/circle.yml b/packages/injected/circle.yml
@@ -43,3 +43,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/injected/package.json b/packages/injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/injected-wallets",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "description": "Injected wallets module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/injected/tsconfig.json b/packages/injected/tsconfig.json
@@ -1,11 +1,12 @@
 {
   "extends": "../../tsconfig.json",
   "include": ["src/**/*"],
-  
+
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": "src",
     "declarationDir": "dist",
+    "allowSyntheticDefaultImports": true,
     "paths": {
       "*": ["./src/*", "./node_modules/*"]
     },

diff --git a/packages/keepkey/circle.yml b/packages/keepkey/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/keepkey/package.json b/packages/keepkey/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/keepkey",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.0-alpha.9",
   "description": "KeepKey module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/keystone/circle.yml b/packages/keystone/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/keystone/package.json b/packages/keystone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/keystone",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.7",
   "description": "Keystone module for Onboard.js",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",

diff --git a/packages/keystone/src/index.ts b/packages/keystone/src/index.ts
@@ -5,7 +5,6 @@ import {
   createEIP1193Provider,
   CustomNetwork,
   ProviderRpcErrorCode,
-  GetInterfaceHelpers,
   ProviderRpcError,
   ScanAccountsOptions,
   WalletInit
@@ -78,7 +77,7 @@ function keystone({
     return {
       label: 'Keystone',
       getIcon,
-      getInterface: async ({ EventEmitter, chains }: GetInterfaceHelpers) => {
+      getInterface: async ({ EventEmitter, chains }) => {
         const { JsonRpcProvider } = await import('@ethersproject/providers')
         const { default: Common, Hardfork } = await import('@ethereumjs/common')
 
@@ -170,6 +169,9 @@ function keystone({
             // Set the `from` field to the currently selected account
             transactionObject = { ...transactionObject, from }
 
+            // @ts-ignore -- Due to weird commonjs exports
+            const CommonConstructor = Common.default || Common
+
             const common = new Common({
               chain: customNetwork || Number.parseInt(currentChain.id) || 1,
               // Berlin is the minimum hardfork that will allow for EIP1559

diff --git a/packages/ledger/circle.yml b/packages/ledger/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/ledger",
-  "version": "2.0.0-alpha.12",
+  "version": "2.0.0-alpha.13",
   "description": "Ledger module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/ledger/src/index.ts b/packages/ledger/src/index.ts
@@ -8,6 +8,10 @@ import type {
   GetInterfaceHelpers
 } from '@bn-onboard/common'
 
+// these cannot be dynamically imported
+import { TypedDataUtils } from '@metamask/eth-sig-util'
+import { Buffer } from 'buffer'
+
 import type Transport from '@ledgerhq/hw-transport'
 import type { providers } from 'ethers'
 
@@ -64,7 +68,6 @@ const getAccount = async (
 ): Promise<Account> => {
   //@ts-ignore
   const { default: HDKey } = await import('hdkey')
-  const { Buffer } = await import('buffer')
   const { publicToAddress, toChecksumAddress } = await import('ethereumjs-util')
 
   const hdk = new HDKey()
@@ -132,11 +135,7 @@ function ledger({
         const { compress } = (await import('eth-crypto')).publicKey
         const ethUtil = await import('ethereumjs-util')
 
-        const {
-          TypedDataUtils: { hashStruct },
-          SignTypedDataVersion
-        } = await import('@metamask/eth-sig-util')
-
+        const { SignTypedDataVersion } = await import('@metamask/eth-sig-util')
         const { JsonRpcProvider } = await import('@ethersproject/providers')
 
         const { accountSelect, createEIP1193Provider, ProviderRpcError } =
@@ -275,8 +274,7 @@ function ledger({
             transactionObject = { ...transactionObject, from }
 
             // @ts-ignore
-            const CommonConstructor = Common.default
-
+            const CommonConstructor = Common.default || Common
             const common = new CommonConstructor({
               chain:
                 customNetwork || currentChain.hasOwnProperty('id')
@@ -358,14 +356,14 @@ function ledger({
               accounts.find(account => account.address === address) ||
               accounts[0]
 
-            const domainHash = hashStruct(
+            const domainHash = TypedDataUtils.hashStruct(
               'EIP712Domain',
               typedData.domain,
               typedData.types,
               SignTypedDataVersion.V3
             ).toString('hex')
 
-            const messageHash = hashStruct(
+            const messageHash = TypedDataUtils.hashStruct(
               typedData.primaryType,
               typedData.message,
               typedData.types,

diff --git a/packages/mew/circle.yml b/packages/mew/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/mew/package.json b/packages/mew/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/mew",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.7",
   "description": "MEW module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/portis/circle.yml b/packages/portis/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/portis/package.json b/packages/portis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/portis",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "Portis module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/torus/circle.yml b/packages/torus/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/torus/package.json b/packages/torus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/torus",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "Torus module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/trezor/circle.yml b/packages/trezor/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/trezor/package.json b/packages/trezor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/trezor",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "description": "Trezor module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",

diff --git a/packages/trezor/src/index.ts b/packages/trezor/src/index.ts
@@ -6,10 +6,17 @@ import {
   ScanAccountsOptions,
   TransactionObject,
   WalletInit
-} from '@bn-onboard/common/src/types'
-import type { providers } from 'ethers'
-import type { BIP32Interface } from 'bip32'
-import { EthereumTransaction, EthereumTransactionEIP1559 } from 'trezor-connect'
+} from '@bn-onboard/common'
+
+// cannot be dynamically imported
+import { Buffer } from 'buffer'
+
+import type { JsonRpcProvider } from '@ethersproject/providers'
+
+import type {
+  EthereumTransaction,
+  EthereumTransactionEIP1559
+} from 'trezor-connect'
 
 interface TrezorOptions {
   email: string
@@ -42,11 +49,10 @@ const getAccount = async (
   { publicKey, chainCode, path }: AccountData,
   asset: Asset,
   index: number,
-  provider: providers.JsonRpcProvider
+  provider: JsonRpcProvider
 ): Promise<Account> => {
   //@ts-ignore
   const { default: HDKey } = await import('hdkey')
-  const { Buffer } = await import('buffer')
   const { publicToAddress, toChecksumAddress } = await import('ethereumjs-util')
 
   const hdk = new HDKey()
@@ -73,7 +79,7 @@ const getAccount = async (
 const getAddresses = async (
   account: AccountData,
   asset: Asset,
-  provider: providers.JsonRpcProvider
+  provider: JsonRpcProvider
 ): Promise<Account[]> => {
   const accounts = []
   let index = 0
@@ -324,8 +330,8 @@ function trezor(options: TrezorOptions): WalletInit {
           const transactionData =
             createTrezorTransactionObject(transactionObject)
 
-          // @ts-ignore
-          const CommonConstructor = Common.default
+          // @ts-ignore -- Due to weird commonjs exports
+          const CommonConstructor = Common.default || Common
 
           const common = new CommonConstructor({
             chain: customNetwork || Number.parseInt(currentChain.id) || 1,

diff --git a/packages/walletconnect/circle.yml b/packages/walletconnect/circle.yml
@@ -25,3 +25,4 @@ workflows:
             branches:
               only:
                 - main
+                - feature/v2
diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bn-onboard/walletconnect",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "description": "WalletConnect module for Onboard.js",
   "module": "dist/index.js",
   "browser": "dist/index.js",
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,3 +45,4 @@ workflows: @@
                 branches:
                   only:
                     - main
+                    - feature/v2