Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Smarter Tokens fetching #3546

Merged
merged 13 commits into from
Nov 23, 2016
Merged

Smarter Tokens fetching #3546

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e53f7d
Don't auto-subscribe for contracts #3240
ngotchac Nov 18, 2016
601e9ec
Smarter Balance : don't re-instantiate contracts, fetch tokens #3240
ngotchac Nov 18, 2016
9ebe84a
Smarter Balance Tokens fetching (update image when needed) #3240
ngotchac Nov 19, 2016
3f332a0
Attaching to TokenReg Events instead of fetching for each block #3240
ngotchac Nov 21, 2016
34524e9
Merge branch 'master' into ng-smarter-contracts
ngotchac Nov 21, 2016
7db0ad1
Unsubscribe from shapeshit... #3240
ngotchac Nov 21, 2016
2ec182a
Unsubscribe from EthFilter if used once (resolved) #3240
ngotchac Nov 21, 2016
54e2844
Remove warning
ngotchac Nov 21, 2016
ef2c170
PR review fix
ngotchac Nov 21, 2016
5b5dc9b
Typo
ngotchac Nov 22, 2016
dc69e5d
Merge branch 'master' into ng-smarter-contracts
ngotchac Nov 22, 2016
7f36600
Better contract JS API : one subscribe for all #3546
ngotchac Nov 22, 2016
f4f2c5e
Fixed test
ngotchac Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions js/src/api/contract/contract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ export default class Contract {
this._instance[fn.signature] = fn;
});

this._sendSubscriptionChanges();
this._subscribedToChanges = false;
this._subscribedToChangesId = null;
}

get address () {
Expand Down Expand Up @@ -271,12 +272,14 @@ export default class Contract {
.getFilterLogs(filterId)
.then((logs) => {
callback(null, this.parseEventLogs(logs));

this._subscriptions[subscriptionId] = {
options,
callback,
filterId
};

this._subscribeToChanges();
return subscriptionId;
});
});
Expand All @@ -287,12 +290,30 @@ export default class Contract {
.uninstallFilter(this._subscriptions[subscriptionId].filterId)
.then(() => {
delete this._subscriptions[subscriptionId];

if (Object.keys(this._subscriptions).length === 0) {
this._unsubscribeToChanges();
}
})
.catch((error) => {
console.error('unsubscribe', error);
});
}

_subscribeToChanges = () => {
if (this._subscribedToChanges) {
return;
}

this._subscribedToChanges = true;
this._sendSubscriptionChanges();
}

_unsubscribeToChanges = () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unsubscribeFromChanges? (;

this._subscribedToChanges = false;
clearTimeout(this._subscribedToChangesId);
}

_sendSubscriptionChanges = () => {
const subscriptions = Object.values(this._subscriptions);
const timeout = () => setTimeout(this._sendSubscriptionChanges, 1000);
Expand All @@ -316,11 +337,11 @@ export default class Contract {
}
});

timeout();
this._subscribedToChangesId = timeout();
})
.catch((error) => {
console.error('_sendSubscriptionChanges', error);
timeout();
this._subscribedToChangesId = timeout();
});
}
}