aboutsummaryrefslogtreecommitdiffstats
path: root/src/order_watcher
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-11-11 05:32:23 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-11-13 09:06:13 +0800
commit6bcd9adb9e41ccc45ef5e117df243526bbd281ec (patch)
tree2dbaad897aa6d8997fed17350d008c2df67cb882 /src/order_watcher
parent61e7b735dcae37195e4b306cab3e4c50cd9c3ba5 (diff)
downloaddexon-sol-tools-6bcd9adb9e41ccc45ef5e117df243526bbd281ec.tar
dexon-sol-tools-6bcd9adb9e41ccc45ef5e117df243526bbd281ec.tar.gz
dexon-sol-tools-6bcd9adb9e41ccc45ef5e117df243526bbd281ec.tar.bz2
dexon-sol-tools-6bcd9adb9e41ccc45ef5e117df243526bbd281ec.tar.lz
dexon-sol-tools-6bcd9adb9e41ccc45ef5e117df243526bbd281ec.tar.xz
dexon-sol-tools-6bcd9adb9e41ccc45ef5e117df243526bbd281ec.tar.zst
dexon-sol-tools-6bcd9adb9e41ccc45ef5e117df243526bbd281ec.zip
Make subscribe function async and make blockStore operational
Diffstat (limited to 'src/order_watcher')
-rw-r--r--src/order_watcher/order_state_watcher.ts51
1 files changed, 34 insertions, 17 deletions
diff --git a/src/order_watcher/order_state_watcher.ts b/src/order_watcher/order_state_watcher.ts
index 8e0b46eb0..affb350a3 100644
--- a/src/order_watcher/order_state_watcher.ts
+++ b/src/order_watcher/order_state_watcher.ts
@@ -50,11 +50,15 @@ export class OrderStateWatcher {
private _dependentOrderHashes: DependentOrderHashes = {};
private _callbackIfExistsAsync?: OnOrderStateChangeCallback;
private _eventWatcher: EventWatcher;
+ private _web3Wrapper: Web3Wrapper;
+ private _token: TokenWrapper;
+ private _exchange: ExchangeWrapper;
private _abiDecoder: AbiDecoder;
- private _orderStateUtils: OrderStateUtils;
+ private _orderStateUtils?: OrderStateUtils;
+ private _blockStore?: BlockStore;
private _numConfirmations: number;
- private _orderFilledCancelledLazyStore: OrderFilledCancelledLazyStore;
- private _balanceAndProxyAllowanceLazyStore: BalanceAndProxyAllowanceLazyStore;
+ private _orderFilledCancelledLazyStore?: OrderFilledCancelledLazyStore;
+ private _balanceAndProxyAllowanceLazyStore?: BalanceAndProxyAllowanceLazyStore;
constructor(
web3Wrapper: Web3Wrapper, abiDecoder: AbiDecoder, token: TokenWrapper, exchange: ExchangeWrapper,
config?: OrderStateWatcherConfig,
@@ -67,16 +71,8 @@ export class OrderStateWatcher {
web3Wrapper, eventPollingIntervalMs, this._numConfirmations,
);
this._abiDecoder = abiDecoder;
- const blockStore = new BlockStore(web3Wrapper);
- this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(
- token, blockStore, this._numConfirmations,
- );
- this._orderFilledCancelledLazyStore = new OrderFilledCancelledLazyStore(
- exchange, blockStore, this._numConfirmations,
- );
- this._orderStateUtils = new OrderStateUtils(
- this._balanceAndProxyAllowanceLazyStore, this._orderFilledCancelledLazyStore,
- );
+ this._token = token;
+ this._exchange = exchange;
}
/**
* Add an order to the orderStateWatcher. Before the order is added, it's
@@ -109,11 +105,22 @@ export class OrderStateWatcher {
* @param callback Receives the orderHash of the order that should be re-validated, together
* with all the order-relevant blockchain state needed to re-validate the order.
*/
- public subscribe(callback: OnOrderStateChangeCallback): void {
+ public async subscribeAsync(callback: OnOrderStateChangeCallback): Promise<void> {
assert.isFunction('callback', callback);
if (!_.isUndefined(this._callbackIfExistsAsync)) {
throw new Error(ZeroExError.SubscriptionAlreadyPresent);
}
+ this._blockStore = new BlockStore(this._web3Wrapper);
+ await this._blockStore.startAsync();
+ this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(
+ this._token, this._blockStore, this._numConfirmations,
+ );
+ this._orderFilledCancelledLazyStore = new OrderFilledCancelledLazyStore(
+ this._exchange, this._blockStore, this._numConfirmations,
+ );
+ this._orderStateUtils = new OrderStateUtils(
+ this._balanceAndProxyAllowanceLazyStore, this._orderFilledCancelledLazyStore,
+ );
this._callbackIfExistsAsync = callback;
this._eventWatcher.subscribe(this._onEventWatcherCallbackAsync.bind(this));
}
@@ -121,7 +128,15 @@ export class OrderStateWatcher {
* Ends an orderStateWatcher subscription.
*/
public unsubscribe(): void {
+ if (_.isUndefined(this._blockStore)) {
+ throw new Error(ZeroExError.SubscriptionNotFound);
+ }
+ this._blockStore.stop();
+ delete this._blockStore;
delete this._callbackIfExistsAsync;
+ delete this._balanceAndProxyAllowanceLazyStore;
+ delete this._orderFilledCancelledLazyStore;
+ delete this._orderStateUtils;
this._eventWatcher.unsubscribe();
}
private async _onEventWatcherCallbackAsync(log: LogEvent): Promise<void> {
@@ -174,12 +189,14 @@ export class OrderStateWatcher {
private async _emitRevalidateOrdersAsync(orderHashes: string[]): Promise<void> {
for (const orderHash of orderHashes) {
const signedOrder = this._orderByOrderHash[orderHash] as SignedOrder;
+ if (_.isUndefined(this._orderStateUtils)) {
+ break; // Unsubscribe was called
+ }
const orderState = await this._orderStateUtils.getOrderStateAsync(signedOrder);
- if (!_.isUndefined(this._callbackIfExistsAsync)) {
- await this._callbackIfExistsAsync(orderState);
- } else {
+ if (_.isUndefined(this._callbackIfExistsAsync)) {
break; // Unsubscribe was called
}
+ await this._callbackIfExistsAsync(orderState);
}
}
private addToDependentOrderHashes(signedOrder: SignedOrder, orderHash: string) {