Browse Source

Merge pull request #1398 from LedgerHQ/master

Master
master
Meriadec Pillet 7 years ago
committed by GitHub
parent
commit
726f40f3e4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      package.json
  2. 7
      src/bridge/EthereumJSBridge.js

2
package.json

@ -3,7 +3,7 @@
"productName": "Ledger Live",
"description": "Ledger Live - Desktop",
"repository": "https://github.com/LedgerHQ/ledger-live-desktop",
"version": "1.1.3",
"version": "1.1.4",
"author": "Ledger",
"license": "MIT",
"scripts": {

7
src/bridge/EthereumJSBridge.js

@ -9,6 +9,7 @@ import throttle from 'lodash/throttle'
import flatMap from 'lodash/flatMap'
import uniqBy from 'lodash/uniqBy'
import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
import eip55 from 'eip55'
import { apiForCurrency } from 'api/Ethereum'
import type { Tx } from 'api/Ethereum'
import { getDerivations } from 'helpers/derivations'
@ -98,7 +99,11 @@ const txToOps = (account: Account) => (tx: Tx): Operation[] => {
}
function isRecipientValid(currency, recipient) {
return !!recipient.match(/^0x[0-9a-fA-F]{40}$/)
try {
return eip55.verify(recipient)
} catch (error) {
return false
}
}
function mergeOps(existing: Operation[], newFetched: Operation[]) {

Loading…
Cancel
Save