From 7da7de1edc4b28124a92c8a43f6726a4d91812f5 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Tue, 2 Apr 2019 17:56:27 +0200
Subject: [PATCH] Make some kredits params configurable

---
 app/services/kredits.js | 7 +++----
 config/environment.js   | 8 ++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/services/kredits.js b/app/services/kredits.js
index a91617d..cc057e7 100644
--- a/app/services/kredits.js
+++ b/app/services/kredits.js
@@ -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
diff --git a/config/environment.js b/config/environment.js
index 8dbce00..7ab6ff7 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -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;
 };