diff --git a/CHANGELOG.md b/CHANGELOG.md index ddde19f2..cea873a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,141 +1,185 @@ +## 1.3.4-beta + +**changed** + +- Explorer for ETC changed to etc1.trezor.io + +## 1.3.3-beta + +**fixed** + +- backend reconnection + ## 1.3.2-beta -__changed__ -- Message size for Sign&Verify, thanks to [brianddk](https://github.com/brianddk) -- Ripple -> XRP +**updated** + +- web3 dependency + +**changed** + +- Ripple -> XRP ## 1.3.1-beta -__fixed__ -- download bridge url +**fixed** + +- download bridge url ## 1.3.0-beta -__added__ -- Coin visibility settings -- Almost complete russian, ukrainian and spanish localization -- Auto reconnect to a backend after losing connection - -__changed__ -- static (without animation) active tab indicator -- input validation - mandatory leading 0 for float numbers -- regexps refactored to functions, added unit tests -- limit passphrase length to 50 bytes -- upgrade react-router and connected-react-router - -__fixed__ -- xrp accounts not updating in case of remembered device -- rounding in calculating total balance in local currency -- react hot loader -- minor l10n fixes + +**added** + +- Coin visibility settings +- Almost complete russian, ukrainian and spanish localization +- Auto reconnect to a backend after losing connection + +**changed** + +- static (without animation) active tab indicator +- input validation - mandatory leading 0 for float numbers +- regexps refactored to functions, added unit tests +- limit passphrase length to 50 bytes +- upgrade react-router and connected-react-router + +**fixed** + +- xrp accounts not updating in case of remembered device +- rounding in calculating total balance in local currency +- react hot loader +- minor l10n fixes ## 1.2.0-beta -__added__ -- Localization -- Ability to hide balances -- Fiat currency switcher -- Application settings -- Button to copy log to clipboard -- Import tool (for support) -- Prettier - -__updated__ -- flow-bin 0.9.0 - -__changed__ -- Ripple explorer to xrpscan -- Coins sorted by market cap -- Link to "Bitcoin wallet" opens in the same tab -- Most components are now from trezor-ui-components -- Limit max number of accounts to 10 -- Debounced validation in send forms - -__removed__ -- Text "you will be redirected" from coins menu - -__fixed__ -- Arrow animation in Send tab -- Sign and Verify columns size -- Sign and Verify validation for disabling submit buttons -- Token select shows all tokens options -- "Check for devices" button in device menu -- Close xlm, xem modals when opening external wallet -- Peding tx overflow -- Update account empty flag after receiving tx -- Width of inputs in xrp send form advanced settings -- Ripple destination tag validation + +**added** + +- Localization +- Ability to hide balances +- Fiat currency switcher +- Application settings +- Button to copy log to clipboard +- Import tool (for support) +- Prettier + +**updated** + +- flow-bin 0.9.0 + +**changed** + +- Ripple explorer to xrpscan +- Coins sorted by market cap +- Link to "Bitcoin wallet" opens in the same tab +- Most components are now from trezor-ui-components +- Limit max number of accounts to 10 +- Debounced validation in send forms + +**removed** + +- Text "you will be redirected" from coins menu + +**fixed** + +- Arrow animation in Send tab +- Sign and Verify columns size +- Sign and Verify validation for disabling submit buttons +- Token select shows all tokens options +- "Check for devices" button in device menu +- Close xlm, xem modals when opening external wallet +- Peding tx overflow +- Update account empty flag after receiving tx +- Width of inputs in xrp send form advanced settings +- Ripple destination tag validation ## 1.1.1-beta -__added__ -- Ripple destination tag option -- Tezos external wallet + +**added** + +- Ripple destination tag option +- Tezos external wallet ## 1.1.0-beta -__added__ -- Ripple support -- responsive sidebar -- QR code scanner in send form -- clear send form button -- backup notification modal - -__updated__ -- connect v7 -- babel v7 -- ethereum tokens list -- most of dependencies - -__changed__ -- icons for T1 and TT -- device header styles -- input styles -- sign and verify title - -__fixed__ -- beta disclaimer wrapper position -- sidebar scrollbar + +**added** + +- Ripple support +- responsive sidebar +- QR code scanner in send form +- clear send form button +- backup notification modal + +**updated** + +- connect v7 +- babel v7 +- ethereum tokens list +- most of dependencies + +**changed** + +- icons for T1 and TT +- device header styles +- input styles +- sign and verify title + +**fixed** + +- beta disclaimer wrapper position +- sidebar scrollbar ## 1.0.3-beta -__added__ -- Ethereum: sign & verify tab -- Stellar and Cardano external wallets -- UI: modal background fade in/ fade out -- UI: fonts refactoring -- Experimental Ripple support (disabled by default) -__changed__ -- Split code to coin specific types for components, actions and reducers (ripple/ethereum/...) -- Update -- Use TrezorConnect to communicate with trezor-blockchain-link +**added** + +- Ethereum: sign & verify tab +- Stellar and Cardano external wallets +- UI: modal background fade in/ fade out +- UI: fonts refactoring +- Experimental Ripple support (disabled by default) + +**changed** -__fixed__ -- validation of token existence in send tx draft (https://github.com/trezor/trezor-wallet/pull/252) +- Split code to coin specific types for components, actions and reducers (ripple/ethereum/...) +- Update +- Use TrezorConnect to communicate with trezor-blockchain-link + +**fixed** + +- validation of token existence in send tx draft (https://github.com/trezor/trezor-wallet/pull/252) ## 1.0.2-beta -__changed__ -- Fiat rates from coingecko (https://github.com/trezor/trezor-wallet/pull/242) -- firmware update link to beta-wallet (https://github.com/trezor/trezor-wallet/commit/b9b7d2d076f2d4c59ae2e055dc140cda6aaa5512) -- update list of ETH and ETC tokens -__added__ -- set default gas limit button (https://github.com/trezor/trezor-wallet/issues/184) -- added 1 click to select value in input (https://github.com/trezor/trezor-wallet/issues/251) -- added account loader (https://github.com/trezor/trezor-wallet/pull/225) -- added message how to add ERC20 tokens (https://github.com/trezor/trezor-wallet/issues/238) +**changed** + +- Fiat rates from coingecko (https://github.com/trezor/trezor-wallet/pull/242) +- firmware update link to beta-wallet (https://github.com/trezor/trezor-wallet/commit/b9b7d2d076f2d4c59ae2e055dc140cda6aaa5512) +- update list of ETH and ETC tokens -__fixed__ -- validation of token existence in send tx draft (https://github.com/trezor/trezor-wallet/pull/252) +**added** +- set default gas limit button (https://github.com/trezor/trezor-wallet/issues/184) +- added 1 click to select value in input (https://github.com/trezor/trezor-wallet/issues/251) +- added account loader (https://github.com/trezor/trezor-wallet/pull/225) +- added message how to add ERC20 tokens (https://github.com/trezor/trezor-wallet/issues/238) + +**fixed** + +- validation of token existence in send tx draft (https://github.com/trezor/trezor-wallet/pull/252) ## 1.0.1-beta -__added__ -- DigiByte in coin menu -- blocking device with seedless setup -__fixed__ -- token input in "Account/Summary" (https://github.com/trezor/trezor-wallet/issues/235) -- "Go to your standard wallet" button in passphrase modal (https://github.com/trezor/trezor-wallet/issues/222) -- Double click on "show passphrase" (https://github.com/trezor/trezor-wallet/issues/221) -- images preloader for offline status (https://github.com/trezor/trezor-wallet/issues/218) +**added** + +- DigiByte in coin menu +- blocking device with seedless setup +**fixed** + +- token input in "Account/Summary" (https://github.com/trezor/trezor-wallet/issues/235) +- "Go to your standard wallet" button in passphrase modal (https://github.com/trezor/trezor-wallet/issues/222) +- Double click on "show passphrase" (https://github.com/trezor/trezor-wallet/issues/221) +- images preloader for offline status (https://github.com/trezor/trezor-wallet/issues/218) ## 1.0.0-beta -- first release + +- first release diff --git a/package.json b/package.json index 837d09f3..e55673f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "trezor-wallet", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "author": "TREZOR ", "description": "", "bin": { @@ -84,7 +84,7 @@ "trezor-connect": "7.0.2", "trezor-ui-components": "^1.0.0-beta.20", "wallet-address-validator": "^0.2.4", - "web3": "1.0.0-beta.35", + "web3": "1.0.0-beta.36", "webpack": "^4.29.3", "webpack-build-notifier": "^0.1.30", "webpack-bundle-analyzer": "^3.3.2", @@ -142,4 +142,4 @@ "optionalDependencies": { "fsevents": "1.2.7" } -} +} \ No newline at end of file diff --git a/public/data/appConfig.json b/public/data/appConfig.json index c9641f3d..1703c331 100644 --- a/public/data/appConfig.json +++ b/public/data/appConfig.json @@ -48,8 +48,8 @@ "wss://etc2.trezor.io/geth" ], "explorer": { - "tx": "https://gastracker.io/tx/", - "address": "https://gastracker.io/addr/" + "tx": "https://etc1.trezor.io/tx/", + "address": "https://etc1.trezor.io/address/" }, "hasSignVerify": true }, @@ -128,8 +128,8 @@ ] }, "explorer": { - "tx": "https://sisyfos.trezor.io/ripple-testnet-explorer/tx/", - "address": "https://sisyfos.trezor.io/ripple-testnet-explorer/address/" + "tx": "https://test.bithomp.com/explorer/", + "address": "https://test.bithomp.com/explorer/" }, "hasSignVerify": false } diff --git a/src/actions/BlockchainActions.js b/src/actions/BlockchainActions.js index da2d9c66..1e5e12c7 100644 --- a/src/actions/BlockchainActions.js +++ b/src/actions/BlockchainActions.js @@ -1,9 +1,9 @@ /* @flow */ import * as BLOCKCHAIN from 'actions/constants/blockchain'; -import * as DiscoveryActions from 'actions/DiscoveryActions'; import * as EthereumBlockchainActions from 'actions/ethereum/BlockchainActions'; import * as RippleBlockchainActions from 'actions/ripple/BlockchainActions'; +import { resolveAfter } from 'utils/promiseUtils'; import type { Dispatch, GetState, PromiseAction, BlockchainFeeLevel } from 'flowtype'; import type { BlockchainBlock, BlockchainNotification, BlockchainError } from 'trezor-connect'; @@ -20,10 +20,6 @@ export type BlockchainAction = | { type: typeof BLOCKCHAIN.START_SUBSCRIBE, shortcut: string, - } - | { - type: typeof BLOCKCHAIN.FAIL_SUBSCRIBE, - shortcut: string, }; // Conditionally subscribe to blockchain backend @@ -153,23 +149,13 @@ const autoReconnect = (shortcut: string): PromiseAction => async ( dispatch: Dispatch, getState: GetState ): Promise => { - const MAX_ATTEMPTS = 4; let blockchain = getState().blockchain.find(b => b.shortcut === shortcut); - // try to automatically reconnect and wait after each attemp (5s * #attempt) untill max number of attemps is reached - for (let i = 0; i < MAX_ATTEMPTS; i++) { - const waitTime = 5000 * (i + 1); /// 5s * #attempt - if (!blockchain || blockchain.connected) { - break; - } + if (!blockchain || blockchain.reconnectionAttempts >= 5) return; - blockchain = getState().blockchain.find(b => b.shortcut === shortcut); + await resolveAfter(5000 * (blockchain.reconnectionAttempts + 1)); - // reconnect with 7s timeout - // eslint-disable-next-line no-await-in-loop - await dispatch(DiscoveryActions.reconnect(shortcut, 7000)); + blockchain = getState().blockchain.find(b => b.shortcut === shortcut); + if (!blockchain || blockchain.connected || blockchain.connecting) return; - // wait before next try - // eslint-disable-next-line no-await-in-loop - await new Promise(resolve => setTimeout(resolve, waitTime)); - } + await dispatch(subscribe(shortcut)); }; diff --git a/src/actions/DiscoveryActions.js b/src/actions/DiscoveryActions.js index 06ee9e3e..1c749ab0 100644 --- a/src/actions/DiscoveryActions.js +++ b/src/actions/DiscoveryActions.js @@ -2,7 +2,6 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import TrezorConnect, { UI } from 'trezor-connect'; -import * as BLOCKCHAIN_ACTION from 'actions/constants/blockchain'; import * as DISCOVERY from 'actions/constants/discovery'; import * as ACCOUNT from 'actions/constants/account'; import * as NOTIFICATION from 'actions/constants/notification'; @@ -10,7 +9,6 @@ import * as NOTIFICATION from 'actions/constants/notification'; import type { ThunkAction, AsyncAction, - PromiseAction, PayloadAction, GetState, Dispatch, @@ -331,30 +329,7 @@ const finish = (device: TrezorDevice, discoveryProcess: Discovery): AsyncAction }); }; -export const reconnect = (network: string, timeout: number = 30): PromiseAction => async ( - dispatch: Dispatch -): Promise => { - // Runs two promises. - // First promise is a subscribe action which will never resolve in case of completely lost connection to the backend - // That's why there is a second promise that rejects after the specified timeout. - return Promise.race([ - dispatch(BlockchainActions.subscribe(network)), - new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout)), - ]) - .catch(() => { - // catch error from first promises that rejects (most likely timeout) - dispatch({ - type: BLOCKCHAIN_ACTION.FAIL_SUBSCRIBE, - shortcut: network, - }); - }) - .then(() => { - // dispatch restore when subscribe promise resolves - dispatch(restore()); - }); -}; - -// Called after DEVICE.CONNECT ('trezor-connect') or CONNECT.AUTH_DEVICE actions in WalletService +// Called after DEVICE.CONNECT ('trezor-connect') or CONNECT.AUTH_DEVICE or BLOCKCHAIN.CONNECT actions in WalletService // OR after BlockchainSubscribe in this.reconnect export const restore = (): ThunkAction => (dispatch: Dispatch, getState: GetState): void => { // check if current url has "network" parameter diff --git a/src/actions/TrezorConnectActions.js b/src/actions/TrezorConnectActions.js index dd5ef604..b80ff891 100644 --- a/src/actions/TrezorConnectActions.js +++ b/src/actions/TrezorConnectActions.js @@ -160,7 +160,9 @@ export const init = (): AsyncAction => async ( if (buildUtils.isDev()) { // eslint-disable-next-line window.__TREZOR_CONNECT_SRC = - typeof LOCAL === 'string' ? LOCAL : 'https://sisyfos.sldev.cz/connect/'; // eslint-disable-line no-underscore-dangle + typeof LOCAL === 'string' + ? LOCAL + : 'https://connect.corp.sldev.cz/fix/v7-ripple-lib-error/'; // eslint-disable-line no-underscore-dangle // window.__TREZOR_CONNECT_SRC = typeof LOCAL === 'string' ? LOCAL : 'https://localhost:8088/'; // eslint-disable-line no-underscore-dangle window.TrezorConnect = TrezorConnect; } diff --git a/src/actions/constants/blockchain.js b/src/actions/constants/blockchain.js index 3cd6b50d..3cdd0a2e 100644 --- a/src/actions/constants/blockchain.js +++ b/src/actions/constants/blockchain.js @@ -1,6 +1,5 @@ /* @flow */ export const START_SUBSCRIBE: 'blockchain__start_subscribe' = 'blockchain__start_subscribe'; -export const FAIL_SUBSCRIBE: 'blockchain__fail_subscribe' = 'blockchain__fail_subscribe'; export const READY: 'blockchain__ready' = 'blockchain__ready'; export const UPDATE_FEE: 'blockchain__update_fee' = 'blockchain__update_fee'; diff --git a/src/actions/ripple/BlockchainActions.js b/src/actions/ripple/BlockchainActions.js index 2c42911b..8d19b9af 100644 --- a/src/actions/ripple/BlockchainActions.js +++ b/src/actions/ripple/BlockchainActions.js @@ -161,31 +161,47 @@ export const onNotification = ( }); } - const updatedAccount = await TrezorConnect.rippleGetAccountInfo({ - account: { - descriptor: account.descriptor, - from: account.block, - history: false, - }, - coin: account.network, - }); + // In case of tx sent between two Trezor accounts there is a possibility that only 1 notification will be received + // therefore we need to find target account and update data for it as well + const accountsToUpdate = [account]; + const targetAddress = + notification.type === 'send' + ? notification.outputs[0].addresses[0] + : notification.inputs[0].addresses[0]; + + const targetAccount = getState().accounts.find(a => a.descriptor === targetAddress); + if (targetAccount) { + accountsToUpdate.push(targetAccount); + } + + accountsToUpdate.forEach(async a => { + const response = await TrezorConnect.rippleGetAccountInfo({ + account: { + descriptor: a.descriptor, + from: a.block, + history: false, + }, + coin: a.network, + }); - if (!updatedAccount.success) return; - - const empty = updatedAccount.payload.sequence <= 0 && updatedAccount.payload.balance === '0'; - dispatch( - AccountsActions.update({ - networkType: 'ripple', - ...account, - balance: toDecimalAmount(updatedAccount.payload.balance, network.decimals), - availableBalance: toDecimalAmount( - updatedAccount.payload.availableBalance, - network.decimals - ), - block: updatedAccount.payload.block, - sequence: updatedAccount.payload.sequence, - reserve: '0', - empty, - }) - ); + if (response.success) { + const updatedAccount = response.payload; + const empty = updatedAccount.sequence <= 0 && updatedAccount.balance === '0'; + dispatch( + AccountsActions.update({ + networkType: 'ripple', + ...a, + balance: toDecimalAmount(updatedAccount.balance, network.decimals), + availableBalance: toDecimalAmount( + updatedAccount.availableBalance, + network.decimals + ), + block: updatedAccount.block, + sequence: updatedAccount.sequence, + reserve: toDecimalAmount(updatedAccount.reserve, network.decimals), + empty, + }) + ); + } + }); }; diff --git a/src/components/notifications/Context/components/Account/index.js b/src/components/notifications/Context/components/Account/index.js index 48ce722a..331e2b82 100644 --- a/src/components/notifications/Context/components/Account/index.js +++ b/src/components/notifications/Context/components/Account/index.js @@ -14,17 +14,21 @@ export default (props: Props) => { if (notification.type === 'backend') { // special case: backend is down // TODO: this is a different component with "auto resolve" button + const inProgress = blockchain && blockchain.connecting; + const status = inProgress + ? l10nMessages.TR_RECONNECTING + : l10nMessages.TR_CONNECT_TO_BACKEND; return ( { - await props.blockchainReconnect(network.shortcut); + if (!inProgress) props.blockchainReconnect(network.shortcut); }, }, ]} diff --git a/src/components/notifications/Context/components/Account/index.messages.js b/src/components/notifications/Context/components/Account/index.messages.js index 436faa00..e39b19f9 100644 --- a/src/components/notifications/Context/components/Account/index.messages.js +++ b/src/components/notifications/Context/components/Account/index.messages.js @@ -7,6 +7,10 @@ const definedMessages: Messages = defineMessages({ id: 'TR_CONNECT_TO_BACKEND', defaultMessage: 'Connect', }, + TR_RECONNECTING: { + id: 'TR_RECONNECTING', + defaultMessage: 'Reconnecting...', + }, }); export default definedMessages; diff --git a/src/components/notifications/Context/index.js b/src/components/notifications/Context/index.js index ff2de3a3..1480ac77 100644 --- a/src/components/notifications/Context/index.js +++ b/src/components/notifications/Context/index.js @@ -7,7 +7,7 @@ import type { IntlShape } from 'react-intl'; import type { State, Dispatch } from 'flowtype'; -import { reconnect } from 'actions/DiscoveryActions'; +import { subscribe } from 'actions/BlockchainActions'; import * as NotificationActions from 'actions/NotificationActions'; import StaticNotifications from './components/Static'; @@ -29,7 +29,7 @@ export type StateProps = {| export type DispatchProps = {| close: typeof NotificationActions.close, - blockchainReconnect: typeof reconnect, + blockchainReconnect: typeof subscribe, |}; export type Props = {| ...OwnProps, ...StateProps, ...DispatchProps |}; @@ -52,7 +52,7 @@ const mapStateToProps = (state: State): StateProps => ({ const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({ close: bindActionCreators(NotificationActions.close, dispatch), - blockchainReconnect: bindActionCreators(reconnect, dispatch), + blockchainReconnect: bindActionCreators(subscribe, dispatch), }); export default injectIntl( diff --git a/src/reducers/BlockchainReducer.js b/src/reducers/BlockchainReducer.js index 865f1f2f..d6a1e029 100644 --- a/src/reducers/BlockchainReducer.js +++ b/src/reducers/BlockchainReducer.js @@ -17,6 +17,7 @@ export type BlockchainNetwork = { feeLevels: Array, connected: boolean, connecting: boolean, + reconnectionAttempts: number, block: number, }; @@ -41,30 +42,7 @@ const onStartSubscribe = (state: State, shortcut: string): State => { shortcut, connected: false, connecting: true, - block: 0, - feeTimestamp: 0, - feeLevels: [], - }, - ]); -}; - -const onFailSubscribe = (state: State, shortcut: string): State => { - const network = state.find(b => b.shortcut === shortcut); - if (network) { - const others = state.filter(b => b !== network); - return others.concat([ - { - ...network, - connecting: false, - }, - ]); - } - - return state.concat([ - { - shortcut, - connected: false, - connecting: false, + reconnectionAttempts: 0, block: 0, feeTimestamp: 0, feeLevels: [], @@ -84,6 +62,7 @@ const onConnect = (state: State, action: BlockchainConnect): State => { block: info.block, connected: true, connecting: false, + reconnectionAttempts: 0, }, ]); } @@ -93,6 +72,7 @@ const onConnect = (state: State, action: BlockchainConnect): State => { shortcut, connected: true, connecting: false, + reconnectionAttempts: 0, block: info.block, feeTimestamp: 0, feeLevels: [], @@ -110,6 +90,7 @@ const onError = (state: State, action: BlockchainError): State => { ...network, connected: false, connecting: false, + reconnectionAttempts: network.reconnectionAttempts + 1, }, ]); } @@ -119,6 +100,7 @@ const onError = (state: State, action: BlockchainError): State => { shortcut, connected: false, connecting: false, + reconnectionAttempts: 0, block: 0, feeTimestamp: 0, feeLevels: [], @@ -160,8 +142,6 @@ export default (state: State = initialState, action: Action): State => { switch (action.type) { case BLOCKCHAIN_ACTION.START_SUBSCRIBE: return onStartSubscribe(state, action.shortcut); - case BLOCKCHAIN_ACTION.FAIL_SUBSCRIBE: - return onFailSubscribe(state, action.shortcut); case BLOCKCHAIN_EVENT.CONNECT: return onConnect(state, action); case BLOCKCHAIN_EVENT.ERROR: diff --git a/src/services/WalletService.js b/src/services/WalletService.js index 0578c84e..1e42ab55 100644 --- a/src/services/WalletService.js +++ b/src/services/WalletService.js @@ -1,5 +1,5 @@ /* @flow */ -import { DEVICE } from 'trezor-connect'; +import { DEVICE, BLOCKCHAIN } from 'trezor-connect'; import { LOCATION_CHANGE } from 'connected-react-router'; import * as WALLET from 'actions/constants/wallet'; import * as CONNECT from 'actions/constants/TrezorConnect'; @@ -132,6 +132,12 @@ const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa api.dispatch(DiscoveryActions.stop()); } + // try to restore discovery on BLOCKCHAIN.CONNECT event + // edge case when backend throws error during discovery + if (action.type === BLOCKCHAIN.CONNECT) { + api.dispatch(DiscoveryActions.restore()); + } + return action; }; diff --git a/src/views/Wallet/views/Account/Send/ripple/index.js b/src/views/Wallet/views/Account/Send/ripple/index.js index e7b1d427..c9aa699e 100644 --- a/src/views/Wallet/views/Account/Send/ripple/index.js +++ b/src/views/Wallet/views/Account/Send/ripple/index.js @@ -489,14 +489,13 @@ const AccountSend = (props: Props) => { )} - {props.selectedAccount.pending.length > 0 || - (account.imported && ( - - ))} + {props.selectedAccount.pending.length > 0 && ( + + )} ); }; diff --git a/src/views/Wallet/views/Account/SignVerify/index.js b/src/views/Wallet/views/Account/SignVerify/index.js index e679e2cc..f393a4b5 100644 --- a/src/views/Wallet/views/Account/SignVerify/index.js +++ b/src/views/Wallet/views/Account/SignVerify/index.js @@ -119,7 +119,7 @@ class SignVerify extends Component { onChange={this.handleInputChange} rows={4} maxRows={4} - maxLength={1024} + maxLength={255} /> @@ -172,7 +172,7 @@ class SignVerify extends Component { onChange={this.handleInputChange} rows={4} maxRows={4} - maxLength={1024} + maxLength={255} /> diff --git a/yarn.lock b/yarn.lock index e3330399..379727c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1332,6 +1332,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e" integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ== +"@types/node@^10.3.2": + version "10.14.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.17.tgz#b96d4dd3e427382482848948041d3754d40fd5ce" + integrity sha512-p/sGgiPaathCfOtqu2fx5Mu1bcjuP8ALFg4xpGgNkcin7LwRyzUKniEHBKdcE1RPsenq5JVPIpMTJSygLboygQ== + "@types/sinon-chai@3.2.2": version "3.2.2" resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-3.2.2.tgz#5cfdbda70bae30f79a9423334af9e490e4cce793" @@ -1649,6 +1654,11 @@ add-dom-event-listener@1.x: dependencies: object-assign "4.x" +aes-js@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" + integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0= + ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" @@ -4268,6 +4278,16 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= +elliptic@6.3.3: + version "6.3.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f" + integrity sha1-VILZZG1UvLif19mU/J4ulWiHbj8= + dependencies: + bn.js "^4.4.0" + brorand "^1.0.1" + hash.js "^1.0.0" + inherits "^2.0.1" + elliptic@^6.0.0, elliptic@^6.2.3: version "6.4.0" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" @@ -4715,9 +4735,18 @@ etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" +eth-ens-namehash@2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz#229ac46eca86d52e0c991e7cb2aef83ff0f68bcf" + integrity sha1-IprEbsqG1S4MmR58sq74P/D2i88= + dependencies: + idna-uts46-hx "^2.3.1" + js-sha3 "^0.5.7" + eth-lib@0.1.27, eth-lib@^0.1.26: version "0.1.27" resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.1.27.tgz#f0b0fd144f865d2d6bf8257a40004f2e75ca1dd6" + integrity sha512-B8czsfkJYzn2UIEMwjc7Mbj+Cy72V+/OXH/tb44LV8jhrjizQJJ325xMOMyk3+ETa6r6oi0jsUY14+om8mQMWA== dependencies: bn.js "^4.11.6" elliptic "^6.4.0" @@ -4780,6 +4809,22 @@ ethereumjs-util@^6.0.0: safe-buffer "^5.1.1" secp256k1 "^3.0.1" +ethers@4.0.0-beta.1: + version "4.0.0-beta.1" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.1.tgz#0648268b83e0e91a961b1af971c662cdf8cbab6d" + integrity sha512-SoYhktEbLxf+fiux5SfCEwdzWENMvgIbMZD90I62s4GZD9nEjgEWy8ZboI3hck193Vs0bDoTohDISx84f2H2tw== + dependencies: + "@types/node" "^10.3.2" + aes-js "3.0.0" + bn.js "^4.4.0" + elliptic "6.3.3" + hash.js "1.1.3" + js-sha3 "0.5.7" + scrypt-js "2.0.3" + setimmediate "1.0.4" + uuid "2.0.1" + xmlhttprequest "1.8.0" + ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -5451,10 +5496,10 @@ fsevents@^1.2.7: nan "^2.12.1" node-pre-gyp "^0.12.0" -fstream@^1.0.2, fstream@^1.0.8: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE= +fstream@^1.0.12, fstream@^1.0.8: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -5855,7 +5900,7 @@ hash-base@^3.0.0: inherits "^2.0.1" safe-buffer "^5.0.1" -hash.js@^1.0.0, hash.js@^1.0.3: +hash.js@1.1.3, hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.3" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" dependencies: @@ -6096,6 +6141,13 @@ iconv-lite@^0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +idna-uts46-hx@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz#a1dc5c4df37eee522bf66d969cc980e00e8711f9" + integrity sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA== + dependencies: + punycode "2.1.0" + ieee754@^1.1.4: version "1.1.12" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b" @@ -6192,7 +6244,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -6200,6 +6252,11 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" +inherits@~2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -7098,6 +7155,11 @@ js-levenshtein@^1.1.3: resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g== +js-sha3@0.5.7, js-sha3@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" + integrity sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc= + js-sha3@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.3.1.tgz#86122802142f0828502a0d1dee1d95e253bb0243" @@ -8067,11 +8129,7 @@ nan@2.10.0, nan@^2.9.2: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" -nan@^2.0.8, nan@^2.3.3: - version "2.11.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099" - -nan@^2.12.1: +nan@^2.0.8, nan@^2.12.1, nan@^2.3.3: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== @@ -9315,6 +9373,11 @@ punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" +punycode@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" + integrity sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0= + punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -10268,7 +10331,14 @@ ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" -rimraf@2, rimraf@2.6.3, rimraf@^2.6.1, rimraf@^2.6.3: +rimraf@2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@2.6.3, rimraf@^2.6.1, rimraf@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== @@ -10399,9 +10469,15 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +scrypt-js@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4" + integrity sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q= + scrypt.js@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/scrypt.js/-/scrypt.js-0.2.0.tgz#af8d1465b71e9990110bedfc593b9479e03a8ada" + integrity sha1-r40UZbcemZARC+38WTuUeeA6ito= dependencies: scrypt "^6.0.2" scryptsy "^1.2.1" @@ -10409,12 +10485,14 @@ scrypt.js@0.2.0: scrypt@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/scrypt/-/scrypt-6.0.3.tgz#04e014a5682b53fa50c2d5cce167d719c06d870d" + integrity sha1-BOAUpWgrU/pQwtXM4WfXGcBthw0= dependencies: nan "^2.0.8" scryptsy@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-1.2.1.tgz#a3225fa4b2524f802700761e2855bdf3b2d92163" + integrity sha1-oyJfpLJST4AnAHYeKFW987LZIWM= dependencies: pbkdf2 "^3.0.3" @@ -10553,6 +10631,11 @@ set-value@^2.0.0: is-plain-object "^2.0.3" split-string "^3.0.1" +setimmediate@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.4.tgz#20e81de622d4a02588ce0c8da8973cbcf1d3138f" + integrity sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48= + setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -11331,12 +11414,12 @@ tar.gz@^1.0.5: tar "^2.1.1" tar@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE= + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" - fstream "^1.0.2" + fstream "^1.0.12" inherits "2" tar@^4: @@ -11677,6 +11760,7 @@ type-is@~1.6.16: typedarray-to-buffer@^3.1.2: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== dependencies: is-typedarray "^1.0.0" @@ -11916,6 +12000,7 @@ use@^3.1.0: utf8@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" + integrity sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g= util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" @@ -12077,87 +12162,86 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web3-bzz@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.35.tgz#9d5e1362b3db2afd77d65619b7cd46dd5845c192" - integrity sha512-BhAU0qhlr8zltm4gs/+P1gki2VkxHJaM2Rrh4DGesDW0lzwufRoNvWFlwx1bKHoFPWNbSmm9PRkHOYOINL/Tgw== +web3-bzz@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.36.tgz#adb3fe7a70053eb7843e32b106792b01b482ef41" + integrity sha512-clDRS/ziboJ5ytnrfxq80YSu9HQsT0vggnT3BkoXadrauyEE/9JNLxRu016jjUxqdkfdv4MgIPDdOS3Bv2ghiw== dependencies: got "7.1.0" swarm-js "0.1.37" underscore "1.8.3" -web3-core-helpers@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.35.tgz#d681d218a0c6e3283ee1f99a078ab9d3eef037f1" - integrity sha512-APOu3sEsamyqWt//8o4yq9KF25/uqGm+pQShson/sC4gKzmfJB07fLo2ond0X30E8fIqAPeVCotPXQxGciGUmA== +web3-core-helpers@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.36.tgz#6f618e80f1a6588d846efbfdc28f92ae0477f8d2" + integrity sha512-gu74l0htiGWuxLQuMnZqKToFvkSM+UFPE7qUuy1ZosH/h2Jd+VBWg6k4CyNYVYfP0hL5x3CN8SBmB+HMowo55A== dependencies: underscore "1.8.3" - web3-eth-iban "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" + web3-eth-iban "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" -web3-core-method@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.35.tgz#fc10e2d546cf4886038e6130bd5726b0952a4e5f" - integrity sha512-jidImCide8q0GpfsO4L73qoHrbkeWgwU3uOH5DKtJtv0ccmG086knNMRgryb/o9ZgetDWLmDEsJnHjBSoIwcbA== +web3-core-method@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.36.tgz#855c0365ae7d0ead394d973ea9e28828602900e0" + integrity sha512-dJsP3KkGaqBBSdxfzvLsYPOmVaSs1lR/3oKob/gtUYG7UyTnwquwliAc7OXj+gqRA2E/FHZcM83cWdl31ltdSA== dependencies: underscore "1.8.3" - web3-core-helpers "1.0.0-beta.35" - web3-core-promievent "1.0.0-beta.35" - web3-core-subscriptions "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" + web3-core-helpers "1.0.0-beta.36" + web3-core-promievent "1.0.0-beta.36" + web3-core-subscriptions "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" -web3-core-promievent@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.35.tgz#4f1b24737520fa423fee3afee110fbe82bcb8691" - integrity sha512-GvqXqKq07OmHuVi5uNRg6k79a1/CI0ViCC+EtNv4CORHtDRmYEt5Bvdv6z6FJEiaaQkD0lKbFwNhLxutx7HItw== +web3-core-promievent@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.36.tgz#3a5127787fff751be6de272722cbc77dc9523fd5" + integrity sha512-RGIL6TjcOeJTullFLMurChPTsg94cPF6LI763y/sPYtXTDol1vVa+J5aGLp/4WW8v+s+1bSQO6zYq2ZtkbmtEQ== dependencies: any-promise "1.3.0" eventemitter3 "1.1.1" -web3-core-requestmanager@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.35.tgz#2b77cbf6303720ad68899b39fa7f584dc03dbc8f" - integrity sha512-S+zW2h17ZZQU9oe3yaCJE0E7aJS4C3Kf4kGPDv+nXjW0gKhQQhgVhw1Doq/aYQGqNSWJp7f1VHkz5gQWwg6RRg== +web3-core-requestmanager@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.36.tgz#70c8eead84da9ed1cf258e6dde3f137116d0691b" + integrity sha512-/CHuaMbiMDu1v8ANGYI7yFCnh1GaCWx5pKnUPJf+QTk2xAAw+Bvd97yZJIWPOK5AOPUIzxgwx9Ob/5ln6mTmYA== dependencies: underscore "1.8.3" - web3-core-helpers "1.0.0-beta.35" - web3-providers-http "1.0.0-beta.35" - web3-providers-ipc "1.0.0-beta.35" - web3-providers-ws "1.0.0-beta.35" + web3-core-helpers "1.0.0-beta.36" + web3-providers-http "1.0.0-beta.36" + web3-providers-ipc "1.0.0-beta.36" + web3-providers-ws "1.0.0-beta.36" -web3-core-subscriptions@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.35.tgz#c1b76a2ad3c6e80f5d40b8ba560f01e0f4628758" - integrity sha512-gXzLrWvcGkGiWq1y33Z4Y80XI8XMrwowiQJkrPSjQ81K5PBKquOGwcMffLaKcwdmEy/NpsOXDeFo3eLE1Ghvvw== +web3-core-subscriptions@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.36.tgz#20f1f20c85d5b40f1e5a49b070ba977a142621f3" + integrity sha512-/evyLQ8CMEYXC5aUCodDpmEnmGVYQxaIjiEIfA/85f9ifHkfzP1aOwCAjcsLsJWnwrWDagxSpjCYrDtnNabdEw== dependencies: eventemitter3 "1.1.1" underscore "1.8.3" - web3-core-helpers "1.0.0-beta.35" + web3-core-helpers "1.0.0-beta.36" -web3-core@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.35.tgz#0c44d3c50d23219b0b1531d145607a9bc7cd4b4f" - integrity sha512-ayGavbgVk4KL9Y88Uv411fBJ0SVgVfKhKEBweKYzmP0zOqneMzWt6YsyD1n6kRvjAbqA0AfUPEOKyMNjcx2tjw== +web3-core@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.36.tgz#86182f2456c2cf1cd6e7654d314e195eac211917" + integrity sha512-C2QW9CMMRZdYAiKiLkMrKRSp+gekSqTDgZTNvlxAdN1hXn4d9UmcmWSJXOmIHqr5N2ISbRod+bW+qChODxVE3Q== dependencies: - web3-core-helpers "1.0.0-beta.35" - web3-core-method "1.0.0-beta.35" - web3-core-requestmanager "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" + web3-core-helpers "1.0.0-beta.36" + web3-core-method "1.0.0-beta.36" + web3-core-requestmanager "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" -web3-eth-abi@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.35.tgz#2eb9c1c7c7233db04010defcb192293e0db250e6" - integrity sha512-KUDC+EtFFYG8z01ZleKrASdjj327/rtWHzEt6RWsEj7bBa0bGp9nEh+nqdZx/Sdgz1O8tnfFzJlrRcXpfr1vGg== +web3-eth-abi@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.36.tgz#21c0f222701db827a8a269accb9cd18bbd8f70f9" + integrity sha512-fBfW+7hvA0rxEMV45fO7JU+0R32ayT7aRwG9Cl6NW2/QvhFeME2qVbMIWw0q5MryPZGIN8A6366hKNuWvVidDg== dependencies: - bn.js "4.11.6" + ethers "4.0.0-beta.1" underscore "1.8.3" - web3-core-helpers "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" + web3-utils "1.0.0-beta.36" -web3-eth-accounts@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.35.tgz#7d0e5a69f510dc93874471599eb7abfa9ddf3e63" - integrity sha512-duIgRsfht/0kAW/eQ0X9lKtVIykbETrnM2H7EnvplCzPHtQLodpib4o9JXfh9n6ZDgdDC7cuJoiVB9QJg089ew== +web3-eth-accounts@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.36.tgz#8aea37df9b038ef2c6cda608856ffd861b39eeef" + integrity sha512-MmgIlBEZ0ILLWV4+wfMrbeVVMU/VmQnCpgSDcw7wHKOKu47bKncJ6rVqVsUbC6d9F613Rios+Yj2Ua6SCHtmrg== dependencies: any-promise "1.3.0" crypto-browserify "3.12.0" @@ -12165,111 +12249,126 @@ web3-eth-accounts@1.0.0-beta.35: scrypt.js "0.2.0" underscore "1.8.3" uuid "2.0.1" - web3-core "1.0.0-beta.35" - web3-core-helpers "1.0.0-beta.35" - web3-core-method "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" + web3-core "1.0.0-beta.36" + web3-core-helpers "1.0.0-beta.36" + web3-core-method "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" -web3-eth-contract@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.35.tgz#5276242d8a3358d9f1ce92b71575c74f9015935c" - integrity sha512-foPohOg5O1UCGKGZOIs+kQK5IZdV2QQ7pAWwNxH8WHplUA+fre1MurXNpoxknUmH6mYplFhXjqgYq2MsrBpHrA== +web3-eth-contract@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.36.tgz#c0c366c4e4016896142208cee758a2ff2a31be2a" + integrity sha512-cywqcIrUsCW4fyqsHdOb24OCC8AnBol8kNiptI+IHRylyCjTNgr53bUbjrXWjmEnear90rO0QhAVjLB1a4iEbQ== dependencies: underscore "1.8.3" - web3-core "1.0.0-beta.35" - web3-core-helpers "1.0.0-beta.35" - web3-core-method "1.0.0-beta.35" - web3-core-promievent "1.0.0-beta.35" - web3-core-subscriptions "1.0.0-beta.35" - web3-eth-abi "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" - -web3-eth-iban@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.35.tgz#5aa10327a9abb26bcfc4ba79d7bad18a002b332c" - integrity sha512-H5wkcNcAIc+h/WoDIKv7ZYmrM2Xqu3O7jBQl1IWo73EDVQji+AoB2i3J8tuwI1yZRInRwrfpI3Zuwuf54hXHmQ== + web3-core "1.0.0-beta.36" + web3-core-helpers "1.0.0-beta.36" + web3-core-method "1.0.0-beta.36" + web3-core-promievent "1.0.0-beta.36" + web3-core-subscriptions "1.0.0-beta.36" + web3-eth-abi "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" + +web3-eth-ens@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.36.tgz#c7440b42b597fd74f64bc402f03ad2e832f423d8" + integrity sha512-8ZdD7XoJfSX3jNlZHSLe4G837xQ0v5a8cHCcDcd1IoqoY855X9SrIQ0Xdqia9p4mR1YcH1vgmkXY9/3hsvxS7g== + dependencies: + eth-ens-namehash "2.0.8" + underscore "1.8.3" + web3-core "1.0.0-beta.36" + web3-core-helpers "1.0.0-beta.36" + web3-core-promievent "1.0.0-beta.36" + web3-eth-abi "1.0.0-beta.36" + web3-eth-contract "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" + +web3-eth-iban@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.36.tgz#00cb3aba7a5aeb15d02b07421042e263d7b2e01b" + integrity sha512-b5AEDjjhOLR4q47Hbzf65zYE+7U7JgCgrUb13RU4HMIGoMb1q4DXaJw1UH8VVHCZulevl2QBjpCyrntecMqqCQ== dependencies: bn.js "4.11.6" - web3-utils "1.0.0-beta.35" + web3-utils "1.0.0-beta.36" -web3-eth-personal@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.35.tgz#ecac95b7a53d04a567447062d5cae5f49879e89f" - integrity sha512-AcM9nnlxu7ZRRxPvkrFB9eLxMM4A2cPfj2aCg21Wb2EpMnhR+b/O1cT33k7ApRowoMpM+T9M8vx2oPNwXfaCOQ== +web3-eth-personal@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.36.tgz#95545998a8ee377e3bb71e27c8d1a5dc1d7d5a21" + integrity sha512-+oxvhojeWh4C/XtnlYURWRR3F5Cg7bQQNjtN1ZGnouKAZyBLoYDVVJ6OaPiveNtfC9RKnzLikn9/Uqc0xz410A== dependencies: - web3-core "1.0.0-beta.35" - web3-core-helpers "1.0.0-beta.35" - web3-core-method "1.0.0-beta.35" - web3-net "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" + web3-core "1.0.0-beta.36" + web3-core-helpers "1.0.0-beta.36" + web3-core-method "1.0.0-beta.36" + web3-net "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" -web3-eth@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.35.tgz#c52c804afb95e6624b6f5e72a9af90fbf5005b68" - integrity sha512-04mcb2nGPXThawuuYICPOxv0xOHofvQKsjZeIq+89nyOC8DQMGTAErDkGyMHQYtjpth5XDhic0wuEsA80AmFZA== +web3-eth@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.36.tgz#04a8c748d344c1accaa26d7d5d0eac0da7127f14" + integrity sha512-uEa0UnbnNHUB4N2O1U+LsvxzSPJ/w3azy5115IseaUdDaiz6IFFgFfFP3ssauayQNCf7v2F44GXLfPhrNeb/Sw== dependencies: underscore "1.8.3" - web3-core "1.0.0-beta.35" - web3-core-helpers "1.0.0-beta.35" - web3-core-method "1.0.0-beta.35" - web3-core-subscriptions "1.0.0-beta.35" - web3-eth-abi "1.0.0-beta.35" - web3-eth-accounts "1.0.0-beta.35" - web3-eth-contract "1.0.0-beta.35" - web3-eth-iban "1.0.0-beta.35" - web3-eth-personal "1.0.0-beta.35" - web3-net "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" - -web3-net@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.35.tgz#5c6688e0dea71fcd910ee9dc5437b94b7f6b3354" - integrity sha512-bbwaQ/KohGjIJ6HAKbZ6KrklCAaG6/B7hIbAbVLSFLxF+Yz9lmAgQYaDInpidpC/NLb3WOmcbRF+P77J4qMVIA== - dependencies: - web3-core "1.0.0-beta.35" - web3-core-method "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" - -web3-providers-http@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.35.tgz#92059d9d6de6e9f82f4fae30b743efd841afc1e1" - integrity sha512-DcIMFq52Fb08UpWyZ3ZlES6NsNqJnco4hBS/Ej6eOcASfuUayPI+GLkYVZsnF3cBYqlH+DOKuArcKSuIxK7jIA== - dependencies: - web3-core-helpers "1.0.0-beta.35" + web3-core "1.0.0-beta.36" + web3-core-helpers "1.0.0-beta.36" + web3-core-method "1.0.0-beta.36" + web3-core-subscriptions "1.0.0-beta.36" + web3-eth-abi "1.0.0-beta.36" + web3-eth-accounts "1.0.0-beta.36" + web3-eth-contract "1.0.0-beta.36" + web3-eth-ens "1.0.0-beta.36" + web3-eth-iban "1.0.0-beta.36" + web3-eth-personal "1.0.0-beta.36" + web3-net "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" + +web3-net@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.36.tgz#396cd35cb40934ed022a1f44a8a642d3908c41eb" + integrity sha512-BriXK0Pjr6Hc/VDq1Vn8vyOum4JB//wpCjgeGziFD6jC7Of8YaWC7AJYXje89OckzfcqX1aJyJlBwDpasNkAzQ== + dependencies: + web3-core "1.0.0-beta.36" + web3-core-method "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" + +web3-providers-http@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.36.tgz#c1937a2e64f8db7cd30f166794e37cf0fcca1131" + integrity sha512-KLSqMS59nRdpet9B0B64MKgtM3n9wAHTcAHJ03hv79avQNTjHxtjZm0ttcjcFUPpWDgTCtcYCa7tqaYo9Pbeog== + dependencies: + web3-core-helpers "1.0.0-beta.36" xhr2-cookies "1.1.0" -web3-providers-ipc@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.35.tgz#031afeb10fade2ebb0ef2fb82f5e58c04be842d9" - integrity sha512-iB0FG0HcpUnayfa8pn4guqEQ4Y1nrroi/jffdtQgFkrNt0sD3fMSwwC0AbmECqj3tDLl0e1slBR0RENll+ZF0g== +web3-providers-ipc@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.36.tgz#0c78efb4ed6b0305ec830e1e0b785e61217ee605" + integrity sha512-iEUrmdd2CzoWgp+75/ydom/1IaoLw95qkAzsgwjjZp1waDncHP/cvVGX74+fbUx4hRaPdchyzxCQfNpgLDmNjQ== dependencies: oboe "2.1.3" underscore "1.8.3" - web3-core-helpers "1.0.0-beta.35" + web3-core-helpers "1.0.0-beta.36" -web3-providers-ws@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.35.tgz#5d38603fd450243a26aae0ff7f680644e77fa240" - integrity sha512-Cx64NgDStynKaUGDIIOfaCd0fZusL8h5avKTkdTjUu2aHhFJhZoVBGVLhoDtUaqZGWIZGcBJOoVf2JkGUOjDRQ== +web3-providers-ws@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.36.tgz#27b74082c7adfa0cb5a65535eb312e49008c97c3" + integrity sha512-wAnENuZx75T5ZSrT2De2LOaUuPf2yRjq1VfcbD7+Zd79F3DZZLBJcPyCNVQ1U0fAXt0wfgCKl7sVw5pffqR9Bw== dependencies: underscore "1.8.3" - web3-core-helpers "1.0.0-beta.35" + web3-core-helpers "1.0.0-beta.36" websocket "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible" -web3-shh@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.35.tgz#7e4a585f8beee0c1927390937c6537748a5d1a58" - integrity sha512-8qSonk/x0xabERS9Sr6AIADN/Ty+5KwARkkGIfSYHKqFpdMDz+76F7cUCxtoCZoS8K04xgZlDKYe0TJXLYA0Fw== +web3-shh@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.36.tgz#6ff297594480edefc710d9d287765a0c4a5d5af1" + integrity sha512-bREGHS/WprYFSvGUhyIk8RSpT2Z5SvJOKGBrsUW2nDIMWO6z0Op8E7fzC6GXY2HZfZliAqq6LirbXLgcLRWuPw== dependencies: - web3-core "1.0.0-beta.35" - web3-core-method "1.0.0-beta.35" - web3-core-subscriptions "1.0.0-beta.35" - web3-net "1.0.0-beta.35" + web3-core "1.0.0-beta.36" + web3-core-method "1.0.0-beta.36" + web3-core-subscriptions "1.0.0-beta.36" + web3-net "1.0.0-beta.36" -web3-utils@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.35.tgz#ced9e1df47c65581c441c5f2af76b05a37a273d7" - integrity sha512-Dq6f0SOKj3BDFRgOPnE6ALbzBDCKVIW8mKWVf7tGVhTDHf+wQaWwQSC3aArFSqdExB75BPBPyDpuMTNszhljpA== +web3-utils@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.36.tgz#dc19c9aeec009b1816cc91ef64d7fe9f8ee344c9" + integrity sha512-7ri74lG5fS2Th0fhYvTtiEHMB1Pmf2p7dQx1COQ3OHNI/CHNEMjzoNMEbBU6FAENrywfoFur40K4m0AOmEUq5A== dependencies: bn.js "4.11.6" eth-lib "0.1.27" @@ -12279,18 +12378,18 @@ web3-utils@1.0.0-beta.35: underscore "1.8.3" utf8 "2.1.1" -web3@1.0.0-beta.35: - version "1.0.0-beta.35" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.35.tgz#6475095bd451a96e50a32b997ddee82279292f11" - integrity sha512-xwDmUhvTcHQvvNnOPcPZZgCxKUsI2e+GbHy7JkTK3/Rmnutazy8x7fsAXT9myw7V1qpi3GgLoZ3fkglSUbg1Mg== +web3@1.0.0-beta.36: + version "1.0.0-beta.36" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.36.tgz#2954da9e431124c88396025510d840ba731c8373" + integrity sha512-fZDunw1V0AQS27r5pUN3eOVP7u8YAvyo6vOapdgVRolAu5LgaweP7jncYyLINqIX9ZgWdS5A090bt+ymgaYHsw== dependencies: - web3-bzz "1.0.0-beta.35" - web3-core "1.0.0-beta.35" - web3-eth "1.0.0-beta.35" - web3-eth-personal "1.0.0-beta.35" - web3-net "1.0.0-beta.35" - web3-shh "1.0.0-beta.35" - web3-utils "1.0.0-beta.35" + web3-bzz "1.0.0-beta.36" + web3-core "1.0.0-beta.36" + web3-eth "1.0.0-beta.36" + web3-eth-personal "1.0.0-beta.36" + web3-net "1.0.0-beta.36" + web3-shh "1.0.0-beta.36" + web3-utils "1.0.0-beta.36" webidl-conversions@^4.0.2: version "4.0.2" @@ -12644,6 +12743,11 @@ xmldom@0.1.x: resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9" integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk= +xmlhttprequest@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" + integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw= + xregexp@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"