diff --git a/CHANGELOG.md b/CHANGELOG.md index 248a2feef..0c494e51d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Current Master +- [#372](https://github.com/poanetwork/nifty-wallet/pull/372) - (Chore) Update RSK contracts metadata repo - [#369](https://github.com/poanetwork/nifty-wallet/pull/369) - (Fix) RSK: fix GasPrice calculation (changed interface of minimumGasPrice - hex instead of integer) - [#368](https://github.com/poanetwork/nifty-wallet/pull/368) - (Fix) Ability to import Keystore file if it is not secured by password - [#366](https://github.com/poanetwork/nifty-wallet/pull/366) - (Fix) Increase max token symbol length up to 12 diff --git a/app/scripts/controllers/detect-tokens.js b/app/scripts/controllers/detect-tokens.js index 80381f402..f468213fb 100644 --- a/app/scripts/controllers/detect-tokens.js +++ b/app/scripts/controllers/detect-tokens.js @@ -1,8 +1,8 @@ import Web3 from 'web3' import contractsETH from 'eth-contract-metadata' import contractsPOA from 'poa-contract-metadata' -import contractsRSK from 'rsk-contract-metadata' -import contractsRSKTest from 'rsk-test-contract-metadata' +import contractsRSK from '@rsksmart/rsk-contract-metadata' +import contractsRSKTest from '@rsksmart/rsk-testnet-contract-metadata' import { warn } from 'loglevel' const { MAINNET, POA, RSK, RSK_TESTNET } = require('./network/enums') // By default, poll every 3 minutes diff --git a/gulpfile.js b/gulpfile.js index d4508336b..9e5326c2a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -73,11 +73,11 @@ createCopyTasks('contractImagesPOA', { destinations: commonPlatforms.map(platform => `./dist/${platform}/images/contractPOA`), }) createCopyTasks('contractImagesRSK', { - source: './node_modules/rsk-contract-metadata/images/', + source: './node_modules/@rsksmart/rsk-contract-metadata/images/', destinations: commonPlatforms.map(platform => `./dist/${platform}/images/contractRSK`), }) createCopyTasks('contractImagesRSKTest', { - source: './node_modules/rsk-test-contract-metadata/images/', + source: './node_modules/@rsksmart/rsk-testnet-contract-metadata/images/', destinations: commonPlatforms.map(platform => `./dist/${platform}/images/contractRSKTest`), }) createCopyTasks('fonts', { diff --git a/old-ui/app/components/add-token/token-search/token-search.component.js b/old-ui/app/components/add-token/token-search/token-search.component.js index e3a36b8b9..c17828655 100644 --- a/old-ui/app/components/add-token/token-search/token-search.component.js +++ b/old-ui/app/components/add-token/token-search/token-search.component.js @@ -2,8 +2,8 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import contractMapETH from 'eth-contract-metadata' import contractMapPOA from 'poa-contract-metadata' -import contractMapRSK from 'rsk-contract-metadata' -import contractMapRSKTest from 'rsk-test-contract-metadata' +import contractMapRSK from '@rsksmart/rsk-contract-metadata' +import contractMapRSKTest from '@rsksmart/rsk-testnet-contract-metadata' import Fuse from 'fuse.js' import InputAdornment from '@material-ui/core/InputAdornment' import TextField from '../../../../../ui/app/components/text-field' diff --git a/old-ui/app/components/token-list.js b/old-ui/app/components/token-list.js index 95550b545..eee577044 100644 --- a/old-ui/app/components/token-list.js +++ b/old-ui/app/components/token-list.js @@ -19,8 +19,8 @@ const defaultTokens = [] const contractsETH = require('eth-contract-metadata') const contractsPOA = require('poa-contract-metadata') -const contractsRSK = require('rsk-contract-metadata') -const contractsRSKTest = require('rsk-test-contract-metadata') +const contractsRSK = require('@rsksmart/rsk-contract-metadata') +const contractsRSKTest = require('@rsksmart/rsk-testnet-contract-metadata') for (const address in contractsETH) { const contract = contractsETH[address] if (contract.erc20) { diff --git a/old-ui/lib/icon-factory.js b/old-ui/lib/icon-factory.js index 74ef65e56..9db318f6f 100644 --- a/old-ui/lib/icon-factory.js +++ b/old-ui/lib/icon-factory.js @@ -1,8 +1,8 @@ import { isValidAddress } from 'ethereumjs-util' import contractMapETH from 'eth-contract-metadata' import contractMapPOA from 'poa-contract-metadata' -import contractMapRSK from 'rsk-contract-metadata' -import contractMapRSKTest from 'rsk-test-contract-metadata' +import contractMapRSK from '@rsksmart/rsk-contract-metadata' +import contractMapRSKTest from '@rsksmart/rsk-testnet-contract-metadata' import { MAINNET_CODE, POA_CODE, RSK_CODE, RSK_TESTNET_CODE } from '../../app/scripts/controllers/network/enums' const colors = require('../../colors') const { toChecksumAddress, getTokenImageFolder } = require('../app/util') diff --git a/package-lock.json b/package-lock.json index cece4756e..e3f52d9e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1966,6 +1966,14 @@ "react-lifecycles-compat": "^3.0.4" } }, + "@rsksmart/rsk-contract-metadata": { + "version": "github:rsksmart/rsk-contract-metadata#d7913739e5ee93dac8667043e2c17b0ef339c206", + "from": "github:rsksmart/rsk-contract-metadata#master" + }, + "@rsksmart/rsk-testnet-contract-metadata": { + "version": "github:rsksmart/rsk-testnet-contract-metadata#2b89e70d36d2aa58cae68ac817debbf3c451690a", + "from": "github:rsksmart/rsk-testnet-contract-metadata#master" + }, "@sentry/cli": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-1.52.0.tgz", @@ -49791,10 +49799,6 @@ "uuid": "^3.3.2" } }, - "rsk-contract-metadata": { - "version": "github:rsksmart/rsk-contract-metadata#262495abfa6ff83fb9cd46c7fb9f85690e4e5d4b", - "from": "github:rsksmart/rsk-contract-metadata#master" - }, "rsk-test-contract-metadata": { "version": "github:rsksmart/rsk-testnet-contract-metadata#69ff2d652b286648e9264e2689009e940ec7ccad", "from": "github:rsksmart/rsk-testnet-contract-metadata#master" diff --git a/package.json b/package.json index d29ed6c0b..e7d4a39c4 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,8 @@ "dependencies": { "@babel/runtime": "^7.5.5", "@material-ui/core": "^4.1.1", + "@rsksmart/rsk-contract-metadata": "github:rsksmart/rsk-contract-metadata#master", + "@rsksmart/rsk-testnet-contract-metadata": "github:rsksmart/rsk-testnet-contract-metadata#master", "@zxing/library": "^0.8.0", "abi-decoder": "^1.2.0", "asmcrypto.js": "0.22.0", @@ -198,8 +200,6 @@ "reselect": "^3.0.1", "rockicon": "^1.0.0", "rpc-cap": "^2.0.0", - "rsk-contract-metadata": "github:rsksmart/rsk-contract-metadata#master", - "rsk-test-contract-metadata": "github:rsksmart/rsk-testnet-contract-metadata#master", "sandwich-expando": "^1.1.3", "semaphore": "^1.0.5", "semver": "^5.4.1", diff --git a/ui/app/token-util.js b/ui/app/token-util.js index 2e516bf4d..d72f042e8 100644 --- a/ui/app/token-util.js +++ b/ui/app/token-util.js @@ -2,8 +2,8 @@ import log from 'loglevel' import BigNumber from 'bignumber.js' import contractMapETH from 'eth-contract-metadata' import contractMapPOA from 'poa-contract-metadata' -import contractMapRSK from 'rsk-contract-metadata' -import contractMapRSKTest from 'rsk-test-contract-metadata' +import contractMapRSK from '@rsksmart/rsk-contract-metadata' +import contractMapRSKTest from '@rsksmart/rsk-testnet-contract-metadata' const util = require('./util') const casedContractMapETH = Object.keys(contractMapETH).reduce((acc, base) => {