Update web3-eth-abi package
This commit is contained in:
commit
16dae915df
|
@ -92,7 +92,7 @@ workflows:
|
|||
jobs:
|
||||
prep-deps-npm:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -108,7 +108,7 @@ jobs:
|
|||
|
||||
prep-build:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -127,7 +127,7 @@ jobs:
|
|||
|
||||
prep-docs:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -142,7 +142,7 @@ jobs:
|
|||
|
||||
prep-scss:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -161,7 +161,7 @@ jobs:
|
|||
|
||||
test-lint:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -172,7 +172,7 @@ jobs:
|
|||
|
||||
# test-deps:
|
||||
# docker:
|
||||
# - image: circleci/node:10.15.3-browsers
|
||||
# - image: circleci/node:10.16.0-browsers
|
||||
# steps:
|
||||
# - checkout
|
||||
# - restore_cache:
|
||||
|
@ -183,7 +183,7 @@ jobs:
|
|||
|
||||
test-e2e-chrome:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -208,7 +208,7 @@ jobs:
|
|||
|
||||
test-e2e-firefox:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -229,7 +229,7 @@ jobs:
|
|||
|
||||
test-e2e-beta-chrome:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -245,7 +245,7 @@ jobs:
|
|||
|
||||
test-e2e-beta-firefox:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -266,7 +266,7 @@ jobs:
|
|||
|
||||
job-screens:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -283,7 +283,7 @@ jobs:
|
|||
|
||||
job-publish-prerelease:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -310,7 +310,7 @@ jobs:
|
|||
|
||||
job-publish-release:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -323,7 +323,7 @@ jobs:
|
|||
|
||||
job-publish-postrelease:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -346,7 +346,7 @@ jobs:
|
|||
|
||||
test-unit:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -359,7 +359,7 @@ jobs:
|
|||
environment:
|
||||
browsers: '["Firefox"]'
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -383,7 +383,7 @@ jobs:
|
|||
environment:
|
||||
browsers: '["Chrome"]'
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -402,7 +402,7 @@ jobs:
|
|||
environment:
|
||||
browsers: '["Firefox"]'
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -426,7 +426,7 @@ jobs:
|
|||
environment:
|
||||
browsers: '["Chrome"]'
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
@ -443,7 +443,7 @@ jobs:
|
|||
|
||||
all-tests-pass:
|
||||
docker:
|
||||
- image: circleci/node:10.15.3-browsers
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
steps:
|
||||
- run:
|
||||
name: All Tests Passed
|
||||
|
|
|
@ -2,6 +2,15 @@
|
|||
|
||||
## Current Master
|
||||
|
||||
## 4.11.7 Tue Jun 25 2019
|
||||
|
||||
- [#294](https://github.com/poanetwork/nifty-wallet/pull/294): Address checksum for RSK chains. RSKIP60
|
||||
- [#293](https://github.com/poanetwork/nifty-wallet/pull/293): RSK tx status fix
|
||||
- [#292](https://github.com/poanetwork/nifty-wallet/pull/292): Fix gas price for RSK
|
||||
- [#291](https://github.com/poanetwork/nifty-wallet/pull/291): Fix fiat value for RSK
|
||||
- [#290](https://github.com/poanetwork/nifty-wallet/pull/290): gas limit fix for RSK chain
|
||||
- [#289](https://github.com/poanetwork/nifty-wallet/pull/289): RSK testnet support
|
||||
|
||||
## 4.11.6 Thu Jun 06 2019
|
||||
|
||||
- [#285](https://github.com/poanetwork/nifty-wallet/pull/285): (Feature) Add RSK mainnet support
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "__MSG_appName__",
|
||||
"short_name": "__MSG_appName__",
|
||||
"version": "4.11.6",
|
||||
"version": "4.11.7",
|
||||
"manifest_version": 2,
|
||||
"author": "POA Network",
|
||||
"description": "__MSG_appDescription__",
|
||||
|
|
|
@ -4,7 +4,7 @@ require('web3/dist/web3.min.js')
|
|||
const log = require('loglevel')
|
||||
const LocalMessageDuplexStream = require('post-message-stream')
|
||||
const setupDappAutoReload = require('./lib/auto-reload.js')
|
||||
const MetamaskInpageProvider = require('metamask-inpage-provider')
|
||||
const MetamaskInpageProvider = require('nifty-wallet-inpage-provider')
|
||||
|
||||
restoreContextAfterImports()
|
||||
|
||||
|
|
|
@ -475,12 +475,12 @@ export default class AddTokenScreen extends Component {
|
|||
autoFilled: false,
|
||||
})
|
||||
|
||||
const isValidAddress = isValidAddress(customAddress, network)
|
||||
const validAddress = isValidAddress(customAddress, network)
|
||||
const standardAddress = ethUtil.addHexPrefix(customAddress).toLowerCase()
|
||||
|
||||
let warning
|
||||
switch (true) {
|
||||
case !isValidAddress:
|
||||
case !validAddress:
|
||||
warning = 'Invalid address'
|
||||
this.setState({
|
||||
warning,
|
||||
|
|
|
@ -8,10 +8,11 @@ import ErrorComponent from '../error'
|
|||
import ToastComponent from '../toast'
|
||||
import Select from 'react-select'
|
||||
import actions from '../../../../ui/app/actions'
|
||||
import abiEncoder from 'web3-eth-abi'
|
||||
import { AbiCoder } from 'web3-eth-abi'
|
||||
import Web3 from 'web3'
|
||||
import copyToClipboard from 'copy-to-clipboard'
|
||||
import CopyButton from '../copy/copy-button'
|
||||
const abiEncoder = new AbiCoder()
|
||||
|
||||
class SendTransactionField extends Component {
|
||||
constructor (props) {
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -154,9 +154,9 @@
|
|||
"lodash.uniqby": "^4.7.0",
|
||||
"loglevel": "^1.4.1",
|
||||
"metamascara": "^2.0.0",
|
||||
"metamask-inpage-provider": "^1.2.2",
|
||||
"mkdirp": "^0.5.1",
|
||||
"multihashes": "^0.4.12",
|
||||
"nifty-wallet-inpage-provider": "git+ssh://git@github.com/poanetwork/nifty-wallet-inpage-provider.git#1.2.3",
|
||||
"number-to-bn": "^1.7.0",
|
||||
"obj-multiplex": "^1.0.0",
|
||||
"obs-store": "^3.0.2",
|
||||
|
@ -208,7 +208,7 @@
|
|||
"valid-url": "^1.0.9",
|
||||
"vreme": "^3.0.2",
|
||||
"web3": "^0.20.1",
|
||||
"web3-eth-abi": "^1.0.0-beta.36",
|
||||
"web3-eth-abi": "^1.0.0-beta.55",
|
||||
"web3-stream-provider": "^3.0.1",
|
||||
"xtend": "^4.0.1"
|
||||
},
|
||||
|
@ -252,7 +252,7 @@
|
|||
"file-loader": "^1.1.11",
|
||||
"fs-extra": "^6.0.1",
|
||||
"fs-promise": "^2.0.3",
|
||||
"ganache-cli": "^6.1.0",
|
||||
"ganache-cli": "^6.4.4",
|
||||
"ganache-core": "^2.5.6",
|
||||
"geckodriver": "^1.12.2",
|
||||
"gh-pages": "^1.2.0",
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -124,6 +124,7 @@ describe('Metamask popup page', async function () {
|
|||
await checkEmittedEvents(f, account1, account2)
|
||||
})
|
||||
|
||||
// todo: it works locally, but doesn't work in CI
|
||||
// describe('Add Token: Custom', async () => {
|
||||
// await addCustomToken(f, account1, account2)
|
||||
// })
|
||||
|
|
Loading…
Reference in New Issue