kredits/kredits-web
9
0
Fork 0
Code Issues 23 Pull Requests 1 Actions 1 Releases 18 Activity

Use kredits-contracts from npm

Browse Source 
This also configures the npm scripts to work with locally deployed
contracts
This commit is contained in:
bumi
2017-05-08 13:00:33 +02:00
parent 675dff7314
commit 3be14b945a
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/kredits.js
+2 -2
View File
@@ -44,7 +44,7 @@ export default Ember.Service.extend({
return this.get('kreditsContractInstance'); return this.get('kreditsContractInstance');
} }
let contract = kreditsContracts(this.get('web3'))['Kredits']; let contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Kredits'];
this.set('kreditsContractInstance', contract); this.set('kreditsContractInstance', contract);
window.Kredits = contract; window.Kredits = contract;
@@ -56,7 +56,7 @@ export default Ember.Service.extend({
return this.get('tokenContractInstance'); 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); this.set('tokenContractInstance', contract);
window.Token = contract; window.Token = contract;
return contract; return contract;
config/environment.js
+7
View File
@@ -46,6 +46,13 @@ module.exports = function(environment) {
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true; // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
// ENV.APP.LOG_VIEW_LOOKUPS = true; // ENV.APP.LOG_VIEW_LOOKUPS = true;
ENV.ethereumChain = 'dev'; 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') { if (environment === 'test') {
package.json
+4 -2
View File
@@ -16,6 +16,7 @@
"repository": "", "repository": "",
"scripts": { "scripts": {
"start": "ember server", "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", "test": "ember test",
"postinstall": "bower install", "postinstall": "bower install",
"build": "ember build", "build": "ember build",
@@ -25,7 +26,8 @@
"kredits-console": "kredits-console", "kredits-console": "kredits-console",
"kredits-parity": "kredits-parity", "kredits-parity": "kredits-parity",
"kredits-deploy": "kredits-deploy", "kredits-deploy": "kredits-deploy",
"kredits-inspect": "kredits-inspect" "kredits-inspect": "kredits-inspect",
"kredits-seed": "kredits-seed"
}, },
"devDependencies": { "devDependencies": {
"babel-preset-es2015": "^6.22.0", "babel-preset-es2015": "^6.22.0",
@@ -51,7 +53,7 @@
"ember-load-initializers": "^0.5.1", "ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3", "ember-resolver": "^2.0.3",
"ipfs-api": "^12.1.7", "ipfs-api": "^12.1.7",
"kredits-contracts": "67p/kredits-contracts", "kredits-contracts": "^2.0.4",
"loader.js": "^4.0.10", "loader.js": "^4.0.10",
"web3": "^0.18.2" "web3": "^0.18.2"
}, },