Browse Source

Merge pull request #419 from gre/fix-posw

Fixes
master
Gaëtan Renaudeau 7 years ago
committed by GitHub
parent
commit
edacca64cb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      package.json
  2. 2
      src/helpers/SettingsDefaults.js
  3. 2
      src/helpers/explorers.js
  4. 2
      src/helpers/getAddressForCurrency/index.js
  5. 8
      src/helpers/libcore.js
  6. 6
      yarn.lock

2
package.json

@ -42,7 +42,7 @@
"@ledgerhq/hw-transport": "^4.12.0", "@ledgerhq/hw-transport": "^4.12.0",
"@ledgerhq/hw-transport-node-hid": "^4.12.0", "@ledgerhq/hw-transport-node-hid": "^4.12.0",
"@ledgerhq/ledger-core": "1.4.1", "@ledgerhq/ledger-core": "1.4.1",
"@ledgerhq/live-common": "2.17.0", "@ledgerhq/live-common": "2.19.0",
"axios": "^0.18.0", "axios": "^0.18.0",
"babel-runtime": "^6.26.0", "babel-runtime": "^6.26.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",

2
src/helpers/SettingsDefaults.js

@ -28,7 +28,7 @@ const confirmationsNbPerCoin: CryptoCurrencyConfig<number> = {
litecoin: 6, litecoin: 6,
peercoin: 4, peercoin: 4,
pivx: 12, // FIXME can't grab the block time info anywhere... pivx: 12, // FIXME can't grab the block time info anywhere...
posw: 28, poswallet: 28,
qtum: 15, qtum: 15,
ripple: 0, ripple: 0,
stealthcoin: 12, // FIXME can't grab the block time info anywhere... stealthcoin: 12, // FIXME can't grab the block time info anywhere...

2
src/helpers/explorers.js

@ -19,7 +19,7 @@ const txExplorers: CryptoCurrencyConfig<Explorer> = {
litecoin: op => `http://explorer.litecoin.net/tx/${op.hash}`, litecoin: op => `http://explorer.litecoin.net/tx/${op.hash}`,
peercoin: op => `https://explorer.peercoin.net/tx/${op.hash}`, peercoin: op => `https://explorer.peercoin.net/tx/${op.hash}`,
pivx: () => null, // FIXME can't find a reliable/official explorer pivx: () => null, // FIXME can't find a reliable/official explorer
posw: () => null, // FIXME can't find a reliable/official explorer poswallet: () => null, // FIXME can't find a reliable/official explorer
qtum: op => `https://explorer.qtum.org/tx/${op.hash}`, qtum: op => `https://explorer.qtum.org/tx/${op.hash}`,
ripple: op => `https://bithomp.com/explorer/${op.hash}`, ripple: op => `https://bithomp.com/explorer/${op.hash}`,
stealthcoin: () => null, // FIXME can't find a reliable/official explorer stealthcoin: () => null, // FIXME can't find a reliable/official explorer

2
src/helpers/getAddressForCurrency/index.js

@ -34,7 +34,7 @@ const all: CryptoCurrencyConfig<Resolver> = {
litecoin: btc, litecoin: btc,
peercoin: btc, peercoin: btc,
pivx: btc, pivx: btc,
posw: btc, poswallet: btc,
qtum: btc, qtum: btc,
ripple, ripple,
stealthcoin: btc, stealthcoin: btc,

8
src/helpers/libcore.js

@ -266,10 +266,10 @@ async function buildAccountRaw({
const operations = ops.map(op => buildOperationRaw({ core, op, xpub })) const operations = ops.map(op => buildOperationRaw({ core, op, xpub }))
const currency = getCryptoCurrencyById(currencyId) const currency = getCryptoCurrencyById(currencyId)
const name = let name = operations.length === 0 ? `New Account` : `Account ${accountIndex}`
operations.length === 0 if (currency.supportsSegwit && !isSegwit) {
? `New Account ${currency.supportsSegwit && !isSegwit ? ' (legacy)' : ''}` name += ' (legacy)'
: `Account ${accountIndex}` }
const rawAccount: AccountRaw = { const rawAccount: AccountRaw = {
id: xpub, // FIXME for account id you might want to prepend the crypto currency id to this because it's not gonna be unique. id: xpub, // FIXME for account id you might want to prepend the crypto currency id to this because it's not gonna be unique.

6
yarn.lock

@ -1495,9 +1495,9 @@
npm "^5.7.1" npm "^5.7.1"
prebuild-install "^2.2.2" prebuild-install "^2.2.2"
"@ledgerhq/live-common@2.17.0": "@ledgerhq/live-common@2.19.0":
version "2.17.0" version "2.19.0"
resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.17.0.tgz#3d220a4f690842d7c5a8532ba979ac4510291f42" resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.19.0.tgz#bc0e12cbf1a9742a5c6497513d0269fdc6a90b95"
dependencies: dependencies:
axios "^0.18.0" axios "^0.18.0"
invariant "^2.2.2" invariant "^2.2.2"

Loading…
Cancel
Save