Use kredits-contracts from npm
This also configures the npm scripts to work with locally deployed contracts
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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') {
|
||||
|
||||
+4
-2
@@ -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"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user