From 3be14b945aad3d954bf7cad38d38ca0a9c5e3883 Mon Sep 17 00:00:00 2001
From: Michael Bumann <hello@michaelbumann.com>
Date: Mon, 8 May 2017 13:00:33 +0200
Subject: [PATCH] Use kredits-contracts from npm

This also configures the npm scripts to work with locally deployed
contracts
---
 app/services/kredits.js | 4 ++--
 config/environment.js   | 7 +++++++
 package.json            | 6 ++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/services/kredits.js b/app/services/kredits.js
index adc2bfa..a3c4147 100644
--- a/app/services/kredits.js
+++ b/app/services/kredits.js
@@ -44,7 +44,7 @@ export default Ember.Service.extend({
       return this.get('kreditsContractInstance');
     }
 
-    let contract = kreditsContracts(this.get('web3'))['Kredits'];
+    let contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Kredits'];
 
     this.set('kreditsContractInstance', contract);
     window.Kredits = contract;
@@ -56,7 +56,7 @@ export default Ember.Service.extend({
       return this.get('tokenContractInstance');
     }
 
-    let contract = kreditsContracts(this.get('web3'), config.ethereumChain)['Token'];
+    let contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Token'];
     this.set('tokenContractInstance', contract);
     window.Token = contract;
     return contract;
diff --git a/config/environment.js b/config/environment.js
index 2a65fce..2d63e5a 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -46,6 +46,13 @@ module.exports = function(environment) {
     // 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') {
diff --git a/package.json b/package.json
index 890b068..9eb6a22 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   "repository": "",
   "scripts": {
     "start": "ember server",
+    "start-local": "KREDITS_CONTRACT_ADDR=`kredits-inspect -c Kredits -r -w address` TOKEN_CONTRACT_ADDR=`kredits-inspect -c Token -r -w address` npm start",
     "test": "ember test",
     "postinstall": "bower install",
     "build": "ember build",
@@ -25,7 +26,8 @@
     "kredits-console": "kredits-console",
     "kredits-parity": "kredits-parity",
     "kredits-deploy": "kredits-deploy",
-    "kredits-inspect": "kredits-inspect"
+    "kredits-inspect": "kredits-inspect",
+    "kredits-seed": "kredits-seed"
   },
   "devDependencies": {
     "babel-preset-es2015": "^6.22.0",
@@ -51,7 +53,7 @@
     "ember-load-initializers": "^0.5.1",
     "ember-resolver": "^2.0.3",
     "ipfs-api": "^12.1.7",
-    "kredits-contracts": "67p/kredits-contracts",
+    "kredits-contracts": "^2.0.4",
     "loader.js": "^4.0.10",
     "web3": "^0.18.2"
   },