Skip to content

I
interface
Commit 72b96877 authored by Hayden Adams's avatar Hayden Adams
Browse files
Options

display user balances, minor changes

parent 93ab10c9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 355 additions and 221 deletions
package-lock.json
View file @ 72b96877
This diff is collapsed.
package.json
View file @ 72b96877
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"redux": "^3.7.2", "redux": "^3.7.2",
"redux-subscriber": "^1.1.0", "redux-subscriber": "^1.1.0",
"redux-thunk": "^2.2.0", "redux-thunk": "^2.2.0",
"web3": "1.0.0-beta.22" "web3": "1.0.0-beta.33"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
......
src/App.js
View file @ 72b96877
...@@ -52,7 +52,7 @@ class App extends Component { ...@@ -52,7 +52,7 @@ class App extends Component {
// TODO: get rid of redundant localweb3 === 'undefined' checks in componentWill/DidMount // TODO: get rid of redundant localweb3 === 'undefined' checks in componentWill/DidMount
// STATUS: kind of done // STATUS: kind of done
componentWillMount() { componentWillMount() {
console.log('props', this.props); //console.log('props', this.props);
if(localweb3 === 'undefined') { if(localweb3 === 'undefined') {
this.props.setWeb3ConnectionStatus(false); this.props.setWeb3ConnectionStatus(false);
} else { } else {
...@@ -73,7 +73,7 @@ class App extends Component { ...@@ -73,7 +73,7 @@ class App extends Component {
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
const web3Subscriber = subscribe('web3Store.connected', state => { const web3Subscriber = subscribe('web3Store.connected', state => {
if(state.web3Store.connected === true && !state.web3Store.metamaskLocked) { if(state.web3Store.connected === true && !state.web3Store.metamaskLocked) {
console.log('successfully connected to metamask', state.web3Store.currentMaskAddress); //console.log('successfully connected to metamask', state.web3Store.currentMaskAddress);
this.marketInterval = setInterval(this.getMarketInfo, 15000); this.marketInterval = setInterval(this.getMarketInfo, 15000);
this.accountInterval = setInterval(this.getAccountInfo, 15000); this.accountInterval = setInterval(this.getAccountInfo, 15000);
this.userInterval = setInterval(this.getUserAddress, 500); this.userInterval = setInterval(this.getUserAddress, 500);
...@@ -128,6 +128,10 @@ class App extends Component { ...@@ -128,6 +128,10 @@ class App extends Component {
// could possibly use refactoring // could possibly use refactoring
getContracts = () => { getContracts = () => {
const factoryAddress = this.props.web3Store.factoryAddress;
const factoryContract = new localweb3.eth.Contract(factoryABI, factoryAddress);
this.props.factoryContractReady(factoryContract);
this.props.web3Store.exchangeAddresses.addresses.map(async exchangeAddress => { this.props.web3Store.exchangeAddresses.addresses.map(async exchangeAddress => {
// receive the exchange address, create the exchange contract // receive the exchange address, create the exchange contract
let exchangeContract = await new localweb3.eth.Contract(exchangeABI, exchangeAddress[1]); let exchangeContract = await new localweb3.eth.Contract(exchangeABI, exchangeAddress[1]);
...@@ -142,11 +146,6 @@ class App extends Component { ...@@ -142,11 +146,6 @@ class App extends Component {
await this.props.tokenContractReady(tokenAddress[0], tokenContract); await this.props.tokenContractReady(tokenAddress[0], tokenContract);
}) })
// happens only once
const factoryAddress = this.props.web3Store.factoryAddress;
const factoryContract = new localweb3.eth.Contract(factoryABI, factoryAddress);
this.props.factoryContractReady(factoryContract);
// this.getAccountInfo(); // this.getAccountInfo();
// this.getMarketInfo(); // this.getMarketInfo();
} }
...@@ -212,9 +211,18 @@ class App extends Component { ...@@ -212,9 +211,18 @@ class App extends Component {
this.getTokenBalance('output'); this.getTokenBalance('output');
this.getAllowance(); this.getAllowance();
break; break;
case 'ETH to ETH':
this.getEthBalance('input');
this.getEthBalance('output');
break;
case 'Token to itself':
this.getTokenBalance('input');
this.getTokenBalance('output');
this.getAllowance();
break;
default: default:
} }
console.log("Getting account info"); // console.log("Getting account info");
} }
getExchangeState = (type) => { getExchangeState = (type) => {
...@@ -321,11 +329,26 @@ class App extends Component { ...@@ -321,11 +329,26 @@ class App extends Component {
} }
tokenToExchangeFactoryLookup = (tokenAddress) => { tokenToExchangeFactoryLookup = (tokenAddress) => {
this.props.web3Store.factoryContract.methods.tokenToExchangeLookup(tokenAddress).call((error, exchangeAddress) => { console.log('looking up exchange for token: ', tokenAddress)
console.log(exchangeAddress) this.props.web3Store.factoryContract.methods.tokenToExchangeLookup(tokenAddress).call().then((result, error) => {
if(error) {
console.log(error);
} else {
console.log('exchange address: ', result);
}
}); });
} }
launchExchange = (tokenAddress) => {
this.props.web3Store.factoryContract.methods.launchExchange(tokenAddress).send({from: this.props.web3Store.currentMaskAddress})
.on('transactionHash', console.log('Transaction Hash created'))
.on('receipt', (receipt) => {
console.log(receipt)
}) //Transaction Submitted to blockchain
.on('confirmation', (confirmationNumber, receipt) => {console.log("Block Confirmations: " + confirmationNumber)}) //Transaction Mined
.on('error', console.error);
}
onCloseHelper = () => { onCloseHelper = () => {
if(this.props.exchange.outputToken.value === 'UNI'){ if(this.props.exchange.outputToken.value === 'UNI'){
this.setState({ uniAdded: true }) // cookie stuff this.setState({ uniAdded: true }) // cookie stuff
......
src/components/Exchange.js
View file @ 72b96877
...@@ -39,7 +39,7 @@ class Exchange extends Component { ...@@ -39,7 +39,7 @@ class Exchange extends Component {
var inputValue = this.props.exchange.inputValue; var inputValue = this.props.exchange.inputValue;
console.log(inputValue, 'from setExchangeOutput') console.log(inputValue, 'from setExchangeOutput')
console.log('outputToken', this.props.exchange.outputToken); console.log('outputToken', this.props.exchange.outputToken);
if (this.props.web3Store.exchangeType === 'Invalid'){ if (this.props.web3Store.exchangeType === 'ETH to ETH' || this.props.web3Store.exchangeType === 'Token to itself'){
this.props.setExchangeOutputValue(0); this.props.setExchangeOutputValue(0);
this.props.setInteractionState('error1'); this.props.setInteractionState('error1');
} else if(inputValue && inputValue !== 0 && inputValue !== '0'){ } else if(inputValue && inputValue !== 0 && inputValue !== '0'){
...@@ -55,9 +55,11 @@ class Exchange extends Component { ...@@ -55,9 +55,11 @@ class Exchange extends Component {
// TODO: change this to use the redux-subscribe pattern // TODO: change this to use the redux-subscribe pattern
getMarketType = () => { getMarketType = () => {
var marketType = ''; var marketType = '';
if (this.props.exchange.inputToken.value === this.props.exchange.outputToken.value) { if (this.props.exchange.inputToken.value === 'ETH' && this.props.exchange.outputToken.value === 'ETH') {
marketType = 'Invalid'; marketType = 'ETH to ETH';
this.props.setInteractionState('error1'); this.props.setInteractionState('error1');
} else if (this.props.exchange.inputToken.value === this.props.exchange.outputToken.value){
marketType = 'Token to itself';
} else if (this.props.exchange.inputToken.value === 'ETH'){ } else if (this.props.exchange.inputToken.value === 'ETH'){
marketType = 'ETH to Token'; marketType = 'ETH to Token';
} else if (this.props.exchange.outputToken.value === 'ETH'){ } else if (this.props.exchange.outputToken.value === 'ETH'){
......
src/components/NetworkStatus.js
View file @ 72b96877
...@@ -9,7 +9,7 @@ class NetworkStatus extends Component { ...@@ -9,7 +9,7 @@ class NetworkStatus extends Component {
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
const interactionStateSubscriber = subscribe('web3Store.currentMaskAddress', state => { const interactionStateSubscriber = subscribe('web3Store.currentMaskAddress', state => {
if (state.web3Store.currentMaskAddress !== undefined) { if (state.web3Store.currentMaskAddress !== undefined) {
console.log('METAMASK UNLOCKED FROM NETWORK STATUS') // console.log('METAMASK UNLOCKED FROM NETWORK STATUS')
this.checkNetwork(); this.checkNetwork();
} else { console.log('METAMASK LOCKED FROM NETWORK STATUS') } } else { console.log('METAMASK LOCKED FROM NETWORK STATUS') }
}) })
...@@ -31,6 +31,8 @@ class NetworkStatus extends Component { ...@@ -31,6 +31,8 @@ class NetworkStatus extends Component {
return ( return (
<div className="connection border pa2 green"> <div className="connection border pa2 green">
<a target="_blank" rel="noopener noreferrer" href={'https://rinkeby.etherscan.io/search?q=' + this.props.web3Store.currentMaskAddress}>{this.props.web3Store.currentMaskAddress}</a> <a target="_blank" rel="noopener noreferrer" href={'https://rinkeby.etherscan.io/search?q=' + this.props.web3Store.currentMaskAddress}>{this.props.web3Store.currentMaskAddress}</a>
<p>{this.props.exchange.inputToken.value + ": " + (this.props.exchange.inputBalance/10**18).toFixed(2)}</p>
<p>{this.props.exchange.outputToken.value + ": " + (this.props.exchange.outputBalance/10**18).toFixed(2)}</p>
<p>●</p> <p>●</p>
</div> </div>
) )
......
src/components/Purchase.js
View file @ 72b96877
...@@ -18,8 +18,8 @@ class Purchase extends Component { ...@@ -18,8 +18,8 @@ class Purchase extends Component {
ethToTokenPurchase = () => { ethToTokenPurchase = () => {
var exchange = this.props.symbolToExchangeContract(this.props.exchange.outputToken.value); var exchange = this.props.symbolToExchangeContract(this.props.exchange.outputToken.value);
var minTokens = (this.props.exchange.outputValue/10**18).toString(); var minTokens = this.props.exchange.outputValue.toString();
var minTokensInt = this.props.web3Store.web3.utils.toWei(minTokens); var minTokensInt = parseInt(minTokens, 10).toString();
var ethSold = this.props.exchange.inputValue; var ethSold = this.props.exchange.inputValue;
var weiSold = this.props.web3Store.web3.utils.toWei(ethSold); var weiSold = this.props.web3Store.web3.utils.toWei(ethSold);
var timeout = this.props.web3Store.blockTimestamp + 300; //current block time + 5mins var timeout = this.props.web3Store.blockTimestamp + 300; //current block time + 5mins
...@@ -42,19 +42,20 @@ class Purchase extends Component { ...@@ -42,19 +42,20 @@ class Purchase extends Component {
console.log(receipt) console.log(receipt)
}) //Transaction Submitted to blockchain }) //Transaction Submitted to blockchain
.on('confirmation', (confirmationNumber, receipt) => { .on('confirmation', (confirmationNumber, receipt) => {
console.log("Block Confirmations: " + confirmationNumber) console.log("Block Confirmations: " + confirmationNumber);
if(confirmationNumber === 1) { // if(confirmationNumber === 1) {
this.getAccountInfo(); // this.getAccountInfo();
} // }
}) //Transaction Mined }) //Transaction Mined
.on('error', console.error); .on('error', console.error);
} }
tokenToEthPurchase = () => { tokenToEthPurchase = () => {
var exchange = this.props.symbolToExchangeContract(this.props.exchange.inputToken.value); var exchange = this.props.symbolToExchangeContract(this.props.exchange.inputToken.value);
var minEth = (this.props.exchange.outputValue/10**18).toString(); var minEth = this.props.exchange.outputValue.toString();
var minEthInt = this.props.web3Store.web3.utils.toWei(minEth); var minEthInt = parseInt(minEth, 10).toString();
var tokensSold = this.props.exchange.inputValue; var tokensSold = this.props.exchange.inputValue;
// toWei needs to be replaced with *decimals
var tokensSoldInt = this.props.web3Store.web3.utils.toWei(tokensSold); var tokensSoldInt = this.props.web3Store.web3.utils.toWei(tokensSold);
var timeout = this.props.web3Store.blockTimestamp + 300; //current block time + 5mins var timeout = this.props.web3Store.blockTimestamp + 300; //current block time + 5mins
...@@ -77,15 +78,15 @@ class Purchase extends Component { ...@@ -77,15 +78,15 @@ class Purchase extends Component {
tokenToTokenPurchase = () => { tokenToTokenPurchase = () => {
var exchange = this.props.symbolToExchangeContract(this.props.exchange.inputToken.value); var exchange = this.props.symbolToExchangeContract(this.props.exchange.inputToken.value);
var tokenOutAddress = this.props.symbolToTokenAddress(this.props.exchange.outputToken.value); var tokenOutAddress = this.props.symbolToTokenAddress(this.props.exchange.outputToken.value);
var minTokens = (this.props.exchange.outputValue/10**18).toString(); var minTokens = this.props.exchange.outputValue.toString();
var minTokensInt = this.props.web3Store.web3.utils.toWei(minTokens); var minTokensInt = parseInt(minTokens, 10).toString();
var tokensSold = this.props.exchange.inputValue; var tokensSold = this.props.exchange.inputValue;
var tokensSoldInt = this.props.web3Store.web3.utils.toWei(tokensSold); var tokensSoldInt = this.props.web3Store.web3.utils.toWei(tokensSold);
var timeout = this.props.web3Store.blockTimestamp + 300; //current block time + 5mins var timeout = this.props.web3Store.blockTimestamp + 300; //current block time + 5mins
console.log('tokenOutAddress', tokenOutAddress); // console.log('tokenOutAddress', tokenOutAddress);
console.log('minTokensInt', minTokensInt); // console.log('minTokensInt', minTokensInt);
console.log('tokensSoldInt', tokensSoldInt); // console.log('tokensSoldInt', tokensSoldInt);
console.log('timeout', timeout); // console.log('timeout', timeout);
exchange.methods.tokenToTokenSwap(tokenOutAddress, tokensSoldInt, minTokensInt, timeout).send({from: this.props.web3Store.currentMaskAddress}) exchange.methods.tokenToTokenSwap(tokenOutAddress, tokensSoldInt, minTokensInt, timeout).send({from: this.props.web3Store.currentMaskAddress})
.on('transactionHash', (result) => { .on('transactionHash', (result) => {
......
src/helpers/factoryABI.js
View file @ 72b96877
module.exports.factoryABI = module.exports.factoryABI =
[{"constant":true,"inputs":[],"name":"getExchangeCount","outputs":[{"name":"exchangeCount","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_token","type":"address"}],"name":"launchExchange","outputs":[{"name":"exchange","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"tokenList","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_token","type":"address"}],"name":"tokenToExchangeLookup","outputs":[{"name":"exchange","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_exchange","type":"address"}],"name":"exchangeToTokenLookup","outputs":[{"name":"token","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"exchange","type":"address"},{"indexed":true,"name":"token","type":"address"}],"name":"ExchangeLaunch","type":"event"}] [
{
"constant": true,
"inputs": [],
"name": "getExchangeCount",
"outputs": [
{
"name": "exchangeCount",
"type": "uint256"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "_token",
"type": "address"
}
],
"name": "launchExchange",
"outputs": [
{
"name": "exchange",
"type": "address"
}
],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "",
"type": "uint256"
}
],
"name": "tokenList",
"outputs": [
{
"name": "",
"type": "address"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "_token",
"type": "address"
}
],
"name": "tokenToExchangeLookup",
"outputs": [
{
"name": "exchange",
"type": "address"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "_exchange",
"type": "address"
}
],
"name": "exchangeToTokenLookup",
"outputs": [
{
"name": "token",
"type": "address"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "exchange",
"type": "address"
},
{
"indexed": true,
"name": "token",
"type": "address"
}
],
"name": "ExchangeLaunch",
"type": "event"
}
]
src/store/initial-state.js
View file @ 72b96877
...@@ -7,7 +7,7 @@ export default { ...@@ -7,7 +7,7 @@ export default {
metamaskLocked: true, metamaskLocked: true,
interaction: '', interaction: '',
networkMessage: '', networkMessage: '',
factoryAddress: '0xD6D22d102A4237F3D35361BC022a78789E6174Aa', factoryAddress: '0x1dCcdeD9c35C0dd22dfC644BC17011Eb8e61ad91',
factoryContract: '', factoryContract: '',
blockTimestamp: '', blockTimestamp: '',
exchangeType: 'ETH to Token', exchangeType: 'ETH to Token',
......
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