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

Use correct properties as dependency

Browse Source
This commit is contained in:
Basti
2017-06-04 17:09:21 +02:00
parent 0a66c19b0a
commit 1de26004ab
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/kredits.js
+26 -13
View File
@@ -46,24 +46,37 @@ export default Service.extend({
currentUserAccounts: function() { currentUserAccounts: function() {
return (this.get('web3Provided') && this.get('web3').eth.accounts) || []; return (this.get('web3Provided') && this.get('web3').eth.accounts) || [];
}.property('web3', 'web3Provided'), }.property('web3Provided', 'web3'),
initializeKreditsContract() {
let contract = null;
while (contract === null) {
try {
if (isPresent(config.contractMetadata)) {
contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Kredits'];
} else {
contract = kreditsContracts(this.get('web3'))['Kredits'];
}
} catch(e) {
Ember.Logger.debug('[kredits] error initializing kredits contract', e);
}
}
return contract;
},
kreditsContract: function() { kreditsContract: function() {
if (this.get('kreditsContractInstance')) { if (this.get('kreditsContractInstance')) {
return this.get('kreditsContractInstance'); return this.get('kreditsContractInstance');
} }
let contract;
if (isPresent(config.contractMetadata)) { let contract = this.initializeKreditsContract();
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;
return contract; return contract;
}.property('web3'), }.property('kreditsContractInstance', 'web3'),
tokenContract: function() { tokenContract: function() {
if (this.get('tokenContractInstance')) { if (this.get('tokenContractInstance')) {
@@ -74,7 +87,7 @@ export default Service.extend({
this.set('tokenContractInstance', contract); this.set('tokenContractInstance', contract);
window.Token = contract; window.Token = contract;
return contract; return contract;
}.property('web3', 'kreditsContract', 'tokenContract'), }.property('tokenContractInstance', 'web3'),
getValueFromContract(contract, contractMethod, ...args) { getValueFromContract(contract, contractMethod, ...args) {
Ember.Logger.debug('[kredits] read from contract', contract); Ember.Logger.debug('[kredits] read from contract', contract);
@@ -207,8 +220,8 @@ export default Service.extend({
}); });
}, },
logKreditsContract: function() { // logKreditsContract: function() {
Ember.Logger.debug('[kredits] kreditsContract', this.get('kreditsContract')); // Ember.Logger.debug('[kredits] kreditsContract', this.get('kreditsContract'));
}.on('init') // }.on('init')
}); });