From ba1cd1cd49685fad41d161d903c8e18f344635fc Mon Sep 17 00:00:00 2001 From: bumi Date: Fri, 12 May 2017 17:17:20 +0200 Subject: [PATCH 1/2] Make web3 provider URL configurable; default to infura This uses infura (kovan network) as the default web3 provider URL --- app/services/kredits.js | 4 ++-- config/environment.js | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/services/kredits.js b/app/services/kredits.js index a3c4147..9a506d1 100644 --- a/app/services/kredits.js +++ b/app/services/kredits.js @@ -77,7 +77,7 @@ export default Ember.Service.extend({ this.getValueFromContract('kreditsContract', 'contributorAddresses', i).then(address => { this.getValueFromContract('kreditsContract', 'contributors', address).then(person => { this.getValueFromContract('tokenContract', 'balanceOf', address).then(balance => { - console.debug('person', person); + Ember.Logger.debug('person', person); let contributor = Contributor.create({ address: address, github_username: person[1], @@ -166,7 +166,7 @@ export default Ember.Service.extend({ return new Ember.RSVP.Promise((resolve, reject) => { this.get('ipfs').storeFile(contributor.serialize()).then(ipfsHash => { contributor.set('ipfsHash', ipfsHash); - console.debug('ADD', address, name, ipfsHash, isCore, id); + Ember.Logger.debug('ADD', address, name, ipfsHash, isCore, id); this.get('kreditsContract').addContributor(address, name, ipfsHash, isCore, id, (err, data) => { if (err) { reject(err); } Ember.Logger.debug('[kredits] add contributor response', data); diff --git a/config/environment.js b/config/environment.js index 2d63e5a..4771775 100644 --- a/config/environment.js +++ b/config/environment.js @@ -29,15 +29,24 @@ module.exports = function(environment) { }] ] }, - - web3ProviderUrl: "https://parity.kosmos.org:8545", - ethereumChain: "testnet", + contractMetadata: {}, ipfs: { host: 'localhost', port: '5001', protocol: 'http' } }; + if (process.env.KREDITS_CONTRACT_ADDR) { + ENV.contractMetadata['Kredits'] = { address: process.env.KREDITS_CONTRACT_ADDR }; + } + if (process.env.TOKEN_CONTRACT_ADDR) { + ENV.contractMetadata['Token'] = { address: process.env.TOKEN_CONTRACT_ADDR }; + } + if (process.env.WEB3_PROVIDER_URL) { + ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL; + } else { + ENV.web3ProviderUrl = 'https://kovan.infura.io'; + } if (environment === 'development') { // ENV.APP.LOG_RESOLVER = true; @@ -45,14 +54,6 @@ module.exports = function(environment) { // ENV.APP.LOG_TRANSITIONS = true; // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; // ENV.APP.LOG_VIEW_LOOKUPS = true; - ENV.ethereumChain = 'dev'; - ENV.contractMetadata = {}; - if (process.env.KREDITS_CONTRACT_ADDR) { - ENV.contractMetadata['Kredits'] = { address: process.env.KREDITS_CONTRACT_ADDR }; - } - if (process.env.TOKEN_CONTRACT_ADDR) { - ENV.contractMetadata['Token'] = { address: process.env.TOKEN_CONTRACT_ADDR }; - } } if (environment === 'test') { @@ -67,8 +68,7 @@ module.exports = function(environment) { } if (environment === 'production') { - ENV.ethereumChain = 'testnet'; - ENV.web3ProviderUrl = 'https://ropsten.infura.io'; + // production conifig } return ENV; From be6c5574ffcedb3c392b78bcd4d3079195f72c27 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Sat, 13 May 2017 17:00:04 +0200 Subject: [PATCH 2/2] Change default Ethereum RPC provider Use our own Parity node. --- config/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environment.js b/config/environment.js index 4771775..5798bc4 100644 --- a/config/environment.js +++ b/config/environment.js @@ -45,7 +45,7 @@ module.exports = function(environment) { if (process.env.WEB3_PROVIDER_URL) { ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL; } else { - ENV.web3ProviderUrl = 'https://kovan.infura.io'; + ENV.web3ProviderUrl = 'https://parity.kosmos.org:8545'; } if (environment === 'development') {