Merge pull request #289 from blocknative/develop

Release 1.7.1

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",

src/modules/select/wallets/ledger.ts

@@ -12,6 +12,7 @@ import { generateAddresses, isValidPath } from './hd-wallet'
 import TransportU2F from '@ledgerhq/hw-transport-u2f'
 import Eth from '@ledgerhq/hw-app-eth'
 import * as EthereumTx from 'ethereumjs-tx'
+import * as ethUtil from 'ethereumjs-util'
 
 import buffer from 'buffer'
 
@@ -102,6 +103,26 @@ async function ledgerProvider(options: {
         .then((res: string) => callback(null, res))
         .catch(err => callback(err, null))
     },
+    processMessage: (messageData: any, callback: any) => {
+      signMessage(messageData)
+        .then((res: string) => callback(null, res))
+        .catch(err => callback(err, null))
+    },
+    processPersonalMessage: (messageData: any, callback: any) => {
+      signMessage(messageData)
+        .then((res: string) => callback(null, res))
+        .catch(err => callback(err, null))
+    },
+    signMessage: (messageData: any, callback: any) => {
+      signMessage(messageData)
+        .then((res: string) => callback(null, res))
+        .catch(err => callback(err, null))
+    },
+    signPersonalMessage: (messageData: any, callback: any) => {
+      signMessage(messageData)
+        .then((res: string) => callback(null, res))
+        .catch(err => callback(err, null))
+    },
     rpcUrl
   })
 
@@ -336,14 +357,25 @@ async function ledgerProvider(options: {
     }
   }
 
-  return provider
-}
+  async function signMessage(message: { data: string }): Promise<string> {
+    if (addressToPath.size === 0) {
+      await enable()
+    }
+
+    const path = [...addressToPath.values()][0]
 
-function networkIdToDerivationPath(networkId: number) {
-  switch (networkId) {
-    default:
-      return `m/44'/60'`
+    return eth
+      .signPersonalMessage(path, ethUtil.stripHexPrefix(message.data))
+      .then((result: any) => {
+        let v = (result['v'] - 27).toString(16)
+        if (v.length < 2) {
+          v = '0' + v
+        }
+        return `0x${result['r']}${result['s']}${v}`
+      })
   }
+
+  return provider
 }
 
 export default ledger

src/modules/select/wallets/providerEngine.ts

@@ -5,13 +5,29 @@ import SubscriptionSubprovider from 'web3-provider-engine/subproviders/subscript
 import FilterSubprovider from 'web3-provider-engine/subproviders/filters'
 
 function createProvider(config: any) {
-  const { getAccounts, signTransaction, rpcUrl } = config
+  const {
+    getAccounts,
+    signTransaction,
+    rpcUrl,
+    processMessage,
+    processPersonalMessage,
+    signMessage,
+    signPersonalMessage
+  } = config
 
   const idMgmt =
-    getAccounts && new HookedWalletSubprovider({ getAccounts, signTransaction })
+    getAccounts &&
+    new HookedWalletSubprovider({
+      getAccounts,
+      signTransaction,
+      processMessage,
+      processPersonalMessage,
+      signMessage,
+      signPersonalMessage
+    })
 
   const rpcSubProvider = new RpcSource({
-    rpcUrl: rpcUrl.includes('http') ? rpcUrl : `https://${rpcUrl}`,
+    rpcUrl: rpcUrl.includes('http') ? rpcUrl : `https://${rpcUrl}`
   })
 
   const provider = new Web3ProviderEngine()

src/modules/select/wallets/trezor.ts

@@ -11,6 +11,7 @@ import { generateAddresses, isValidPath } from './hd-wallet'
 
 import * as TrezorConnectLibrary from 'trezor-connect'
 import * as EthereumTx from 'ethereumjs-tx'
+import * as ethUtil from 'ethereumjs-util'
 
 const { default: TrezorConnect, DEVICE_EVENT, DEVICE } = TrezorConnectLibrary
 
@@ -115,6 +116,26 @@ async function trezorProvider(options: {
         .then((res: string) => callback(null, res))
         .catch(err => callback(err, null))
     },
+    processMessage: (messageData: any, callback: any) => {
+      signMessage(messageData)
+        .then((res: string) => callback(null, res))
+        .catch(err => callback(err, null))
+    },
+    processPersonalMessage: (messageData: any, callback: any) => {
+      signMessage(messageData)
+        .then((res: string) => callback(null, res))
+        .catch(err => callback(err, null))
+    },
+    signMessage: (messageData: any, callback: any) => {
+      signMessage(messageData)
+        .then((res: string) => callback(null, res))
+        .catch(err => callback(err, null))
+    },
+    signPersonalMessage: (messageData: any, callback: any) => {
+      signMessage(messageData)
+        .then((res: string) => callback(null, res))
+        .catch(err => callback(err, null))
+    },
     rpcUrl
   })
 
@@ -332,6 +353,10 @@ async function trezorProvider(options: {
   }
 
   async function signTransaction(transactionData: any) {
+    if (addressToPath.size === 0) {
+      await enable()
+    }
+
     const path = [...addressToPath.values()][0]
 
     const transaction = new EthereumTx.Transaction(transactionData, {
@@ -352,6 +377,37 @@ async function trezorProvider(options: {
     return `0x${transaction.serialize().toString('hex')}`
   }
 
+  async function signMessage(message: { data: string }): Promise<string> {
+    if (addressToPath.size === 0) {
+      await enable()
+    }
+
+    const [address, path] = [...addressToPath.entries()][0]
+
+    return new Promise((resolve, reject) => {
+      TrezorConnect.ethereumSignMessage({
+        path,
+        message: ethUtil.stripHexPrefix(message.data),
+        hex: true
+      }).then((response: any) => {
+        if (response.success) {
+          if (response.payload.address !== ethUtil.toChecksumAddress(address)) {
+            reject(new Error('signature doesnt match the right address'))
+          }
+          const signature = `0x${response.payload.signature}`
+          resolve(signature)
+        } else {
+          reject(
+            new Error(
+              (response.payload && response.payload.error) ||
+                'There was an error signing a message'
+            )
+          )
+        }
+      })
+    })
+  }
+
   return provider
 }