Update kredits, be expressive about contract options

This commit is contained in:
2017-05-14 01:09:53 +02:00
parent f57e90941c
commit 0b7afc0dd5
2 changed files with 15 additions and 3 deletions
+14 -2
View File
@@ -5,9 +5,16 @@ import Contributor from 'kredits-web/models/contributor';
import Proposal from 'kredits-web/models/proposal'; import Proposal from 'kredits-web/models/proposal';
import kreditsContracts from 'npm:kredits-contracts'; import kreditsContracts from 'npm:kredits-contracts';
const {
isPresent,
inject: {
service
}
} = Ember;
export default Ember.Service.extend({ export default Ember.Service.extend({
ipfs: Ember.inject.service(), ipfs: service(),
web3Instance: null, web3Instance: null,
web3Provided: false, // Web3 provided (using Mist Browser, Metamask et al.) web3Provided: false, // Web3 provided (using Mist Browser, Metamask et al.)
@@ -43,8 +50,13 @@ export default Ember.Service.extend({
if (this.get('kreditsContractInstance')) { if (this.get('kreditsContractInstance')) {
return this.get('kreditsContractInstance'); return this.get('kreditsContractInstance');
} }
let contract;
let contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Kredits']; if (isPresent(config.contractMetadata)) {
contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Kredits'];
} else {
contract = kreditsContracts(this.get('web3'))['Kredits'];
}
this.set('kreditsContractInstance', contract); this.set('kreditsContractInstance', contract);
window.Kredits = contract; window.Kredits = contract;
+1 -1
View File
@@ -54,7 +54,7 @@
"ember-parachute": "0.1.0", "ember-parachute": "0.1.0",
"ember-resolver": "^2.0.3", "ember-resolver": "^2.0.3",
"ipfs-api": "^12.1.7", "ipfs-api": "^12.1.7",
"kredits-contracts": "^2.0.4", "kredits-contracts": "^2.4.0",
"loader.js": "^4.0.10", "loader.js": "^4.0.10",
"web3": "^0.18.2" "web3": "^0.18.2"
}, },