Update kredits-contracts and ethers.js #90

Merged
bumi merged 3 commits from update-kredits-contracts into master 2019-04-03 09:02:16 +00:00
2 changed files with 9 additions and 6 deletions
Showing only changes of commit 7da7de1edc - Show all commits
+3 -4
View File
@@ -11,7 +11,6 @@ import config from 'kredits-web/config/environment';
import Contributor from 'kredits-web/models/contributor'
import Proposal from 'kredits-web/models/proposal'
export default Service.extend({
currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
@@ -36,7 +35,6 @@ export default Service.extend({
getEthProvider: function() {
return new RSVP.Promise((resolve) => {
let ethProvider;
let networkId;
if (typeof window.web3 !== 'undefined') {
console.debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
ethProvider = new ethers.providers.Web3Provider(window.web3.currentProvider);
@@ -50,8 +48,7 @@ export default Service.extend({
});
} else {
console.debug('[kredits] Creating new instance from npm module class');
networkId = parseInt(config.contractMetadata.networkId);
console.debug(`[kredits] networkId=${networkId} providerURL: ${config.web3ProviderUrl}`);
console.debug(`[kredits] providerURL: ${config.web3ProviderUrl}`);
ethProvider = new ethers.providers.JsonRpcProvider(config.web3ProviderUrl);
resolve({
ethProvider: ethProvider,
@@ -65,6 +62,8 @@ export default Service.extend({
return this.getEthProvider().then((providerAndSigner) => {
let kredits = new Kredits(providerAndSigner.ethProvider, providerAndSigner.ethSigner, {
addresses: { Kernel: config.kreditsKernelAddress },
apm: config.kreditsApmDomain,
ipfsConfig: config.ipfs
});
return kredits
+6 -2
View File
@@ -35,8 +35,6 @@ module.exports = function(environment) {
]
},
contractMetadata: { networkId: '42' },
web3ProviderUrl: 'https://kovan.infura.io/keUVk6OMaAvpmRF3m57n',
ipfs: {
@@ -80,6 +78,12 @@ module.exports = function(environment) {
if (process.env.WEB3_PROVIDER_URL) {
ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL;
}
if (process.env.KREDITS_KERNEL_ADDRESS) {
ENV.kreditsKernelAddress = process.env.KREDITS_KERNEL_ADDRESS;
}
if (process.env.KREDITS_APM_DOMAIN) {
ENV.kreditsApmDomain = process.env.KREDITS_APM_DOMAIN;
}
return ENV;
};