Skip to content

I
interface
Commit c51eae9f authored by Chi Kei Chan's avatar Chi Kei Chan
Browse files
Options

Connect to Web3 and get current wallet address

parent f2c9e5ac
Hide whitespace changes
Inline Side-by-side
Showing with 406 additions and 366 deletions
package.json
View file @ c51eae9f
......@@ -25,7 +25,7 @@
"redux": "^3.7.2",
"redux-subscriber": "^1.1.0",
"redux-thunk": "^2.2.0",
"web3": "1.0.0-beta.22"
"web3": "^1.0.0-beta.36"
},
"scripts": {
"start": "react-scripts start",
......
src/components/CurrencyInputPanel/index.js
View file @ c51eae9f
......@@ -10,7 +10,6 @@ import SearchIcon from '../../assets/images/magnifying-glass.svg';
import './currency-panel.scss';
const TOKEN_ICON_API = 'https://raw.githubusercontent.com/TrustWallet/tokens/master/images';
const FUSE_OPTIONS = {
includeMatches: false,
threshold: 0.0,
......@@ -41,7 +40,7 @@ class CurrencyInputPanel extends Component {
};
createTokenList = () => {
let tokens = this.props.web3Store.tokenAddresses.addresses;
let tokens = this.props.web3.tokenAddresses.addresses;
let tokenList = [ { value: 'ETH', label: 'ETH', address: 'ETH', clearableValue: false } ];
for (let i = 0; i < tokens.length; i++) {
......@@ -170,5 +169,7 @@ class CurrencyInputPanel extends Component {
}
export default connect(
state => ({ web3Store: state.web3Store })
state => ({
web3: state.web3,
}),
)(CurrencyInputPanel);
src/components/Web3Status/index.js
View file @ c51eae9f
......@@ -56,4 +56,9 @@ Web3Status.defaultProps = {
address: 'Disconnected',
};
export default connect()(Web3Status);
export default connect(
({ web3: { web3, currentAddress } }) => ({
address: currentAddress,
isConnected: !!(web3 && currentAddress),
})
)(Web3Status);
src/components/Web3Status/web3-status.scss
View file @ c51eae9f
......@@ -26,5 +26,6 @@
overflow: hidden;
text-align: right;
margin-left: 1rem;
font-size: .85rem;
}
}
\ No newline at end of file
src/ducks/index.js
View file @ c51eae9f
import { combineReducers } from 'redux';
// import global from './global-reducer';
import web3Store from './web3';
import web3 from './web3';
import exchangeContracts from './exchange-contract';
import tokenContracts from './token-contract';
import exchange from './exchange';
export default combineReducers({
web3Store,
web3,
exchangeContracts,
tokenContracts,
exchange
......
src/ducks/web3.js
View file @ c51eae9f
// these will take in an action, have a default state set in the arguments and return a new state
import {
SET_WEB3_CONNECTION_STATUS,
SET_CURRENT_MASK_ADDRESS,
METAMASK_LOCKED,
METAMASK_UNLOCKED,
SET_INTERACTION_STATE,
FACTORY_CONTRACT_READY,
SET_NETWORK_MESSAGE,
SET_BLOCK_TIMESTAMP,
SET_EXCHANGE_TYPE,
INITIALIZE_GLOBAL_WEB3,
TOGGLE_ABOUT,
TOGGLE_INVEST
} from '../constants';
// this actions folder is actually full of action creators
// your asynchronous calls are going to be in redux-thunk style action creators
export const setWeb3ConnectionStatus = (connected) => ({
type: SET_WEB3_CONNECTION_STATUS,
connected
})
export const setCurrentMaskAddress = (currentMaskAddress) => ({
type: SET_CURRENT_MASK_ADDRESS,
currentMaskAddress
});
export const metamaskLocked = () => ({
type: METAMASK_LOCKED,
metamaskLocked: true
});
export const metamaskUnlocked = () => ({
type: METAMASK_UNLOCKED,
metamaskLocked: false
});
export const setInteractionState = (interaction) => ({
type: SET_INTERACTION_STATE,
interaction
})
export const factoryContractReady = (factoryContract) => ({
type: FACTORY_CONTRACT_READY,
factoryContract
});
export const setNetworkMessage = (networkMessage) => {
return async (dispatch) => {
let networkName;
switch (networkMessage) {
case "main":
networkName = 'Ethereum Mainet'
break;
case "morden":
networkName = 'Morden testnet'
break;
case "ropsten":
networkName = 'Ropsten testnet'
break;
case "rinkeby":
networkName = 'Rinkeby testnet'
break;
case "kovan":
networkName = 'Kovan testnet'
break;
default:
networkName = 'an unknown network'
}
dispatch ({
type: SET_NETWORK_MESSAGE,
networkMessage: networkName
})
}
};
export const setBlockTimestamp = () => {
return async (dispatch, getState) => {
const { web3 } = getState().web3Store;
await web3.eth.getBlock('latest', (error, blockInfo) => {
dispatch({
type: SET_BLOCK_TIMESTAMP,
timestamp: blockInfo.timestamp
})
import Web3 from "web3";
const INITIALIZE = 'app/web3/initialize';
const UPDATE_CURRENT_ADDRESS = 'app/web3/updateCurrentAddress';
// export const setWeb3ConnectionStatus = (connected) => ({
// type: SET_WEB3_CONNECTION_STATUS,
// connected
// })
//
// export const setCurrentMaskAddress = (currentMaskAddress) => ({
// type: SET_CURRENT_MASK_ADDRESS,
// currentMaskAddress
// });
//
// export const metamaskLocked = () => ({
// type: METAMASK_LOCKED,
// metamaskLocked: true
// });
//
// export const metamaskUnlocked = () => ({
// type: METAMASK_UNLOCKED,
// metamaskLocked: false
// });
//
// export const setInteractionState = (interaction) => ({
// type: SET_INTERACTION_STATE,
// interaction
// })
//
// export const factoryContractReady = (factoryContract) => ({
// type: FACTORY_CONTRACT_READY,
// factoryContract
// });
//
// export const setNetworkMessage = (networkMessage) => {
// return async (dispatch) => {
// let networkName;
// switch (networkMessage) {
// case "main":
// networkName = 'Ethereum Mainet'
// break;
// case "morden":
// networkName = 'Morden testnet'
// break;
// case "ropsten":
// networkName = 'Ropsten testnet'
// break;
// case "rinkeby":
// networkName = 'Rinkeby testnet'
// break;
// case "kovan":
// networkName = 'Kovan testnet'
// break;
// default:
// networkName = 'an unknown network'
// }
// dispatch ({
// type: SET_NETWORK_MESSAGE,
// networkMessage: networkName
// })
// }
// };
//
// export const setBlockTimestamp = () => {
// return async (dispatch, getState) => {
// const { web3 } = getState().web3Store;
// await web3.eth.getBlock('latest', (error, blockInfo) => {
// dispatch({
// type: SET_BLOCK_TIMESTAMP,
// timestamp: blockInfo.timestamp
// })
// });
// }
// }
//
// export const setExchangeType = (exchangeType) => ({
// type: SET_EXCHANGE_TYPE,
// exchangeType
// });
//
// export const toggleAbout = (toggle) => ({
// type: TOGGLE_ABOUT,
// aboutToggle: toggle
// });
//
// export const toggleInvest = (toggle) => ({
// type: TOGGLE_INVEST,
// investToggle: toggle
// });
export const initialize = () => dispatch => {
if (typeof window.web3 !== 'undefined') {
const web3 = new Web3(window.web3.currentProvider);
dispatch({
type: INITIALIZE,
payload: web3,
});
dispatch(updateCurrentAddress());
}
}
};
export const setExchangeType = (exchangeType) => ({
type: SET_EXCHANGE_TYPE,
exchangeType
});
export const updateCurrentAddress = () => (dispatch, getState) => {
const { web3: { web3 } } = getState();
export const toggleAbout = (toggle) => ({
type: TOGGLE_ABOUT,
aboutToggle: toggle
});
if (!web3) {
return;
}
export const toggleInvest = (toggle) => ({
type: TOGGLE_INVEST,
investToggle: toggle
});
web3.eth.getAccounts((err, accounts) => {
if (err) {
return;
}
export const initializeGlobalWeb3 = (web3) => ({
type: INITIALIZE_GLOBAL_WEB3,
web3
});
dispatch({
type: UPDATE_CURRENT_ADDRESS,
payload: accounts[0],
});
})
};
export default (state = {}, action) => {
const { connected, currentMaskAddress, metamaskLocked, interaction, factoryContract, networkMessage, timestamp, exchangeType, web3, aboutToggle, investToggle } = action
switch (action.type) {
case INITIALIZE_GLOBAL_WEB3:
return Object.assign({}, state, { web3: web3 });
case SET_WEB3_CONNECTION_STATUS:
return Object.assign({}, state, { connected: connected });
case SET_CURRENT_MASK_ADDRESS:
return Object.assign({}, state, { currentMaskAddress: currentMaskAddress });
case METAMASK_LOCKED:
return Object.assign({}, state, { metamaskLocked: metamaskLocked });
case METAMASK_UNLOCKED:
return Object.assign({}, state, { metamaskLocked: metamaskLocked });
case SET_INTERACTION_STATE:
return Object.assign({}, state, { interaction: interaction });
case FACTORY_CONTRACT_READY:
return Object.assign({}, state, { factoryContract: factoryContract});
case SET_NETWORK_MESSAGE:
return Object.assign({}, state, { networkMessage: networkMessage });
case SET_BLOCK_TIMESTAMP:
return Object.assign({}, state, { blockTimestamp: timestamp });
case SET_EXCHANGE_TYPE:
return Object.assign({}, state, { exchangeType: exchangeType });
case TOGGLE_ABOUT:
return Object.assign({}, state, { aboutToggle: aboutToggle })
case TOGGLE_INVEST:
return Object.assign({}, state, { investToggle: investToggle })
export default (state = {}, { type, payload }) => {
switch (type) {
case INITIALIZE:
return { ...state, web3: payload };
case UPDATE_CURRENT_ADDRESS:
return { ...state, currentAddress: payload };
// case SET_WEB3_CONNECTION_STATUS:
// return Object.assign({}, state, { connected: connected });
// case SET_CURRENT_MASK_ADDRESS:
// return Object.assign({}, state, { currentMaskAddress: currentMaskAddress });
// case METAMASK_LOCKED:
// return Object.assign({}, state, { metamaskLocked: metamaskLocked });
// case METAMASK_UNLOCKED:
// return Object.assign({}, state, { metamaskLocked: metamaskLocked });
// case SET_INTERACTION_STATE:
// return Object.assign({}, state, { interaction: interaction });
// case FACTORY_CONTRACT_READY:
// return Object.assign({}, state, { factoryContract: factoryContract});
// case SET_NETWORK_MESSAGE:
// return Object.assign({}, state, { networkMessage: networkMessage });
// case SET_BLOCK_TIMESTAMP:
// return Object.assign({}, state, { blockTimestamp: timestamp });
// case SET_EXCHANGE_TYPE:
// return Object.assign({}, state, { exchangeType: exchangeType });
// case TOGGLE_ABOUT:
// return Object.assign({}, state, { aboutToggle: aboutToggle })
// case TOGGLE_INVEST:
// return Object.assign({}, state, { investToggle: investToggle })
default: return state;
}
}
src/index.js
View file @ c51eae9f
import React from 'react';
import ReactDOM from 'react-dom';
// import { BrowserRouter } from 'react-router-dom'
import Web3 from 'web3';
import App from './pages/App';
import { Provider } from 'react-redux';
......@@ -9,12 +9,15 @@ import store from './store';
import './index.scss';
import registerServiceWorker from './registerServiceWorker';
// provider is going to need a store object passed into it
ReactDOM.render(
<Provider store={store}>
<App metamask={window.web3} />
</Provider>
, document.getElementById('root')
);
registerServiceWorker();
window.addEventListener('load', function() {
ReactDOM.render(
<Provider store={store}>
<App />
</Provider>
, document.getElementById('root')
);
registerServiceWorker();
});
src/pages/App.js
View file @ c51eae9f
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { BrowserRouter, Switch, Route } from 'react-router-dom';
// import UniHead from '../components/UniHead'
// import Header from '../components/Header';
// import ConnectionHelper from '../components/ConnectionHelper'
// import Exchange from '../components/Exchange';
// import RateAndFee from '../components/RateAndFee';
// import Purchase from '../components/Purchase';
// import About from '../components/About';
// import Links from '../components/Links';
// import SharePurchase from '../components/SharePurchase';
import { initialize } from '../ducks/web3'
import Swap from './Swap';
import Send from './Send';
import Pool from './Pool';
......@@ -17,50 +9,9 @@ import Pool from './Pool';
import './App.scss';
class App extends Component {
// renderMain() {
// return (
// <div className="app">
// <UniHead />
// <Header metamask={this.props.metamask}/>
// <ConnectionHelper
// metamask={this.props.metamask}
// approveAllowance={this.approveAllowance}
// toggleAbout={this.toggleAbout}
// />
// <Exchange
// getAccountInfo={this.getAccountInfo}
// getMarketInfo={this.getMarketInfo}
// symbolToTokenContract={this.symbolToTokenContract}
// symbolToExchangeAddress={this.symbolToExchangeAddress}
// />
// <RateAndFee
// exchangeRate={this.props.exchange.rate}
// outputTokenValue={this.props.exchange.outputToken.value}
// inputTokenValue={this.props.exchange.inputToken.value}
// exchangeFee={this.props.exchange.fee}
// />
// <Purchase
// symbolToExchangeContract={this.symbolToExchangeContract}
// symbolToTokenAddress={this.symbolToTokenAddress}
// />
// {/* <Visualization /> */}
// <Links
// toggleInvest={this.toggleInvest}
// location={this}
// symbolToTokenContract={this.symbolToTokenContract}
// symbolToExchangeContract={this.symbolToExchangeContract}
// symbolToExchangeAddress={this.symbolToExchangeAddress}
// />
// <SharePurchase
// symbolToTokenContract={this.symbolToTokenContract}
// symbolToExchangeContract={this.symbolToExchangeContract}
// symbolToTokenAddress={this.symbolToTokenAddress}
// symbolToExchangeAddress={this.symbolToExchangeAddress}
// />
// <About toggleAbout={this.toggleAbout} location={this}/>
// </div>
// )
// }
componentWillMount() {
this.props.initializeWeb3();
}
render() {
return (
......@@ -77,9 +28,12 @@ class App extends Component {
export default connect(
state => ({
web3Store: state.web3Store,
web3: state.web3.web3,
exchangeContracts: state.exchangeContracts,
tokenContracts: state.tokenContracts,
exchange: state.exchange,
}),
dispatch => ({
initializeWeb3: () => dispatch(initialize()),
})
)(App);
src/store/initial-state.js
View file @ c51eae9f
export default {
web3Store: {
web3: {
web3: {},
connected: false,
aboutToggle: false,
investToggle: false,
currentMaskAddress: undefined,
metamaskLocked: true,
interaction: '',
networkMessage: '',
factoryAddress: '0x1dCcdeD9c35C0dd22dfC644BC17011Eb8e61ad91',
factoryContract: '',
blockTimestamp: '',
exchangeType: 'ETH to Token',
exchangeAddresses: {
addresses: [
['BAT','0x80f5C1beA2Ea4a9C21E4c6D7831ae2Dbce45674d'],
......
yarn.lock
View file @ c51eae9f
......@@ -755,6 +755,10 @@
"@svgr/core" "^2.4.1"
loader-utils "^1.1.0"
"@types/node@^10.3.2":
version "10.11.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.4.tgz#e8bd933c3f78795d580ae41d86590bfc1f4f389d"
"@types/tapable@1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
......@@ -964,6 +968,10 @@ address@1.0.3, address@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
aes-js@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
......@@ -1068,7 +1076,7 @@ ansistyles@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
any-promise@^1.0.0, any-promise@^1.3.0:
any-promise@1.3.0, any-promise@^1.0.0, any-promise@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
......@@ -1613,10 +1621,6 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
bluebird@3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.3.1.tgz#f97ae1970f41d85177283053e9a120160e66c61d"
bluebird@^2.9.34:
version "2.11.0"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
......@@ -2498,6 +2502,10 @@ cookie@0.3.1, cookie@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
cookiejar@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
copy-concurrently@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
......@@ -2617,7 +2625,7 @@ cryptiles@3.x.x:
dependencies:
boom "5.x.x"
crypto-browserify@^3.11.0, crypto-browserify@^3.12.0:
crypto-browserify@3.12.0, crypto-browserify@^3.11.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
dependencies:
......@@ -3538,6 +3546,15 @@ electron-to-chromium@^1.3.62, electron-to-chromium@^1.3.73:
version "1.3.74"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.74.tgz#443f60655e0de630491ca4e48e4436bc375debd1"
elliptic@6.3.3:
version "6.3.3"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f"
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.4.0:
version "6.4.0"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
......@@ -3854,15 +3871,14 @@ etag@~1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
eth-lib@0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.7.tgz#2f93f17b1e23aec3759cd4a3fe20c1286a3fc1ca"
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"
dependencies:
bn.js "^4.11.6"
elliptic "^6.4.0"
xhr-request-promise "^0.1.2"
idna-uts46-hx "^2.3.1"
js-sha3 "^0.5.7"
eth-lib@^0.1.26, eth-lib@^0.1.27:
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"
dependencies:
......@@ -3874,6 +3890,29 @@ eth-lib@^0.1.26, eth-lib@^0.1.27:
ws "^3.0.0"
xhr-request-promise "^0.1.2"
eth-lib@0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.7.tgz#2f93f17b1e23aec3759cd4a3fe20c1286a3fc1ca"
dependencies:
bn.js "^4.11.6"
elliptic "^6.4.0"
xhr-request-promise "^0.1.2"
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"
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"
......@@ -4918,7 +4957,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:
......@@ -5157,6 +5196,12 @@ identity-obj-proxy@3.0.0:
dependencies:
harmony-reflect "^1.4.6"
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"
dependencies:
punycode "2.1.0"
ieee754@^1.1.4:
version "1.1.8"
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
......@@ -6069,6 +6114,10 @@ js-levenshtein@^1.1.3:
version "1.1.4"
resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
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"
js-sha3@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.3.1.tgz#86122802142f0828502a0d1dee1d95e253bb0243"
......@@ -8743,6 +8792,10 @@ 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"
punycode@2.x.x, punycode@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
......@@ -9702,6 +9755,10 @@ scroll-to@0.0.2:
component-raf "1.2.0"
component-tween "1.2.0"
scrypt-js@2.0.3:
version "2.0.3"
resolved "http://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4"
scrypt.js@0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/scrypt.js/-/scrypt.js-0.2.0.tgz#af8d1465b71e9990110bedfc593b9479e03a8ada"
......@@ -9868,6 +9925,10 @@ 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"
setimmediate@^1.0.4, setimmediate@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
......@@ -11177,200 +11238,213 @@ wcwidth@^1.0.0:
dependencies:
defaults "^1.0.3"
web3-bzz@^1.0.0-beta.22:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.28.tgz#6320293457f653b1586bd26aa1d090854a7e5395"
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"
dependencies:
got "7.1.0"
swarm-js "0.1.37"
underscore "1.8.3"
web3-core-helpers@1.0.0-beta.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.28.tgz#84c9b0405823ae76c4bc18346ead14273be19e40"
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"
dependencies:
underscore "1.8.3"
web3-eth-iban "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
web3-eth-iban "1.0.0-beta.36"
web3-utils "1.0.0-beta.36"
web3-core-method@1.0.0-beta.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.28.tgz#3dbf86aa765749d6350021f45b894df6c015d31d"
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"
dependencies:
underscore "1.8.3"
web3-core-helpers "1.0.0-beta.28"
web3-core-promievent "1.0.0-beta.28"
web3-core-subscriptions "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
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.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.28.tgz#9c61c500985123b67c786088e778bfd7ff2388e4"
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"
dependencies:
bluebird "3.3.1"
any-promise "1.3.0"
eventemitter3 "1.1.1"
web3-core-requestmanager@1.0.0-beta.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.28.tgz#0cb7472cbb94a95158f2f3db456474526196b924"
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"
dependencies:
underscore "1.8.3"
web3-core-helpers "1.0.0-beta.28"
web3-providers-http "1.0.0-beta.28"
web3-providers-ipc "1.0.0-beta.28"
web3-providers-ws "1.0.0-beta.28"
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.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.28.tgz#c898133809906f85d849b13c713f12253caa46c7"
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"
dependencies:
eventemitter3 "1.1.1"
underscore "1.8.3"
web3-core-helpers "1.0.0-beta.28"
web3-core-helpers "1.0.0-beta.36"
web3-core@1.0.0-beta.28, web3-core@^1.0.0-beta.22:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.28.tgz#12151aa4acb47050d02f4164b61e6102bfc89de6"
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"
dependencies:
web3-core-helpers "1.0.0-beta.28"
web3-core-method "1.0.0-beta.28"
web3-core-requestmanager "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
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.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.28.tgz#96ac225ed9ea90305f85d7b778c6ec5cf6483594"
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"
dependencies:
bn.js "4.11.6"
ethers "4.0.0-beta.1"
underscore "1.8.3"
web3-core-helpers "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
web3-utils "1.0.0-beta.36"
web3-eth-accounts@1.0.0-beta.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.28.tgz#27d5b55f461282758dba11bf3508966f9eaf33ea"
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"
dependencies:
bluebird "3.3.1"
crypto-browserify "^3.12.0"
any-promise "1.3.0"
crypto-browserify "3.12.0"
eth-lib "0.2.7"
scrypt.js "0.2.0"
underscore "1.8.3"
uuid "2.0.1"
web3-core "1.0.0-beta.28"
web3-core-helpers "1.0.0-beta.28"
web3-core-method "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
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.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.28.tgz#a17f3914f61d2cb106859ca18ba5ec41c4bea1c5"
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"
dependencies:
underscore "1.8.3"
web3-core "1.0.0-beta.28"
web3-core-helpers "1.0.0-beta.28"
web3-core-method "1.0.0-beta.28"
web3-core-promievent "1.0.0-beta.28"
web3-core-subscriptions "1.0.0-beta.28"
web3-eth-abi "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
web3-eth-iban@1.0.0-beta.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.28.tgz#0ede69cdc627ec01d2705ab9e09c1bbddaadde02"
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"
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"
dependencies:
bn.js "^4.11.6"
web3-utils "1.0.0-beta.28"
bn.js "4.11.6"
web3-utils "1.0.0-beta.36"
web3-eth-personal@1.0.0-beta.28, web3-eth-personal@^1.0.0-beta.22:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.28.tgz#7301050730024919ba486e2e498084a47ac237c5"
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"
dependencies:
web3-core "1.0.0-beta.28"
web3-core-helpers "1.0.0-beta.28"
web3-core-method "1.0.0-beta.28"
web3-net "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
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.22:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.28.tgz#a8ec258a679958f59f58e8aa998f18aa9d96d191"
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"
dependencies:
underscore "1.8.3"
web3-core "1.0.0-beta.28"
web3-core-helpers "1.0.0-beta.28"
web3-core-method "1.0.0-beta.28"
web3-core-subscriptions "1.0.0-beta.28"
web3-eth-abi "1.0.0-beta.28"
web3-eth-accounts "1.0.0-beta.28"
web3-eth-contract "1.0.0-beta.28"
web3-eth-iban "1.0.0-beta.28"
web3-eth-personal "1.0.0-beta.28"
web3-net "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
web3-net@1.0.0-beta.28, web3-net@^1.0.0-beta.22:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.28.tgz#e2e625b1272cb476259da64614f55eb21333651f"
dependencies:
web3-core "1.0.0-beta.28"
web3-core-method "1.0.0-beta.28"
web3-utils "1.0.0-beta.28"
web3-providers-http@1.0.0-beta.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.28.tgz#ffb44ef995886009b2c7bed9fa23ac5db9576400"
dependencies:
web3-core-helpers "1.0.0-beta.28"
xhr2 "0.1.4"
web3-providers-ipc@1.0.0-beta.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.28.tgz#32aa39b7c83c33b48adedc54c6f1d57176f9c8d0"
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"
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"
dependencies:
web3-core-helpers "1.0.0-beta.36"
xhr2-cookies "1.1.0"
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"
dependencies:
oboe "2.1.3"
underscore "1.8.3"
web3-core-helpers "1.0.0-beta.28"
web3-core-helpers "1.0.0-beta.36"
web3-providers-ws@1.0.0-beta.28:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.28.tgz#2bcc7cfb65d5e443bad289bd14d03cd41fda3ccd"
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"
dependencies:
underscore "1.8.3"
web3-core-helpers "1.0.0-beta.28"
web3-core-helpers "1.0.0-beta.36"
websocket "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible"
web3-shh@^1.0.0-beta.22:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.28.tgz#4b718b2207f5deede8e6e276cbbf4029263b9bd2"
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"
dependencies:
web3-core "1.0.0-beta.28"
web3-core-method "1.0.0-beta.28"
web3-core-subscriptions "1.0.0-beta.28"
web3-net "1.0.0-beta.28"
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.28, web3-utils@^1.0.0-beta.22:
version "1.0.0-beta.28"
resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.28.tgz#44d48454fbb326a60f9409c882f027b8740f0ee6"
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"
dependencies:
bn.js "4.11.6"
eth-lib "^0.1.27"
eth-lib "0.1.27"
ethjs-unit "0.1.6"
number-to-bn "1.7.0"
randomhex "0.1.5"
underscore "1.8.3"
utf8 "2.1.1"
web3@1.0.0-beta.22:
version "1.0.0-beta.22"
resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.22.tgz#96eef37e7e017d4beedeeff91ba3343e8af7a9ff"
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"
dependencies:
web3-bzz "^1.0.0-beta.22"
web3-core "^1.0.0-beta.22"
web3-eth "^1.0.0-beta.22"
web3-eth-personal "^1.0.0-beta.22"
web3-net "^1.0.0-beta.22"
web3-shh "^1.0.0-beta.22"
web3-utils "^1.0.0-beta.22"
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"
......@@ -11762,9 +11836,11 @@ xhr-request@^1.0.1:
url-set-query "^1.0.0"
xhr "^2.0.4"
xhr2@0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
xhr2-cookies@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz#7d77449d0999197f155cb73b23df72505ed89d48"
dependencies:
cookiejar "^2.1.1"
xhr@^2.0.4, xhr@^2.3.3:
version "2.4.1"
......@@ -11787,7 +11863,7 @@ xmlchars@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-1.3.1.tgz#1dda035f833dbb4f86a0c28eaa6ca769214793cf"
xmlhttprequest@1:
xmlhttprequest@1, xmlhttprequest@1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment