Remove blockRetention config

packages/order-watcher/CHANGELOG.json

@@ -10,11 +10,6 @@
                 "note": "Do not stop subscription if error is encountered",
                 "pr": 825
             },
-            {
-                "note":
-                    "Add blockRetention config to OrderWatcher, so user can define how many blocks and they corresp. logs to store in-memory",
-                "pr": 875
-            },
             {
                 "note": "Fixed a bug that caused the incorrect block to be fetched via JSON-RPC within Blockstream",
                 "pr": 875

packages/order-watcher/src/order_watcher/event_watcher.ts

@@ -27,16 +27,13 @@ export class EventWatcher {
     private _pollingIntervalMs: number;
     private _stateLayer: BlockParamLiteral;
     private _isVerbose: boolean;
-    private _blockRetention: number;
     constructor(
         web3Wrapper: Web3Wrapper,
         pollingIntervalIfExistsMs: undefined | number,
         stateLayer: BlockParamLiteral = BlockParamLiteral.Latest,
-        blockRetention: number,
         isVerbose: boolean,
     ) {
         this._isVerbose = isVerbose;
-        this._blockRetention = blockRetention;
         this._web3Wrapper = web3Wrapper;
         this._stateLayer = stateLayer;
         this._pollingIntervalMs = _.isUndefined(pollingIntervalIfExistsMs)
@@ -68,9 +65,6 @@ export class EventWatcher {
             this._web3Wrapper.getBlockAsync.bind(this._web3Wrapper),
             this._web3Wrapper.getLogsAsync.bind(this._web3Wrapper),
             this._onBlockAndLogStreamerError.bind(this),
-            {
-                blockRetention: this._blockRetention,
-            },
         );
         const catchAllLogFilter = {};
         this._blockAndLogStreamerIfExists.addLogFilter(catchAllLogFilter);

packages/order-watcher/src/order_watcher/order_watcher.ts

@@ -61,7 +61,6 @@ interface OrderStateByOrderHash {
 
 // tslint:disable-next-line:custom-no-magic-numbers
 const DEFAULT_CLEANUP_JOB_INTERVAL_MS = 1000 * 60 * 60; // 1h
-const DEFAULT_BLOCK_RETENTION = 100;
 
 /**
  * This class includes all the functionality related to watching a set of orders
@@ -95,8 +94,7 @@ export class OrderWatcher {
         const stateLayer =
             _.isUndefined(config) || _.isUndefined(config.stateLayer) ? BlockParamLiteral.Latest : config.stateLayer;
         const isVerbose = !_.isUndefined(config) && !_.isUndefined(config.isVerbose) ? config.isVerbose : false;
-        const blockRetention = !_.isUndefined(config) && !_.isUndefined(config.blockRetention) ? config.blockRetention : DEFAULT_BLOCK_RETENTION;
-        this._eventWatcher = new EventWatcher(this._web3Wrapper, pollingIntervalIfExistsMs, stateLayer, blockRetention, isVerbose);
+        this._eventWatcher = new EventWatcher(this._web3Wrapper, pollingIntervalIfExistsMs, stateLayer, isVerbose);
         this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(
             this._contractWrappers.token,
             stateLayer,

packages/order-watcher/src/types.ts

@@ -14,7 +14,6 @@ export type EventWatcherCallback = (err: null | Error, log?: LogEntryEvent) => v
  * of an orders expiration. Default=0.
  * cleanupJobIntervalMs: How often to run a cleanup job which revalidates all the orders. Default=1hr.
  * stateLayer: Optional blockchain state layer OrderWatcher will monitor for new events. Default=latest.
- * blockRetention: The numbers of blocks to retain in-memory, in order to handle block-reorgs. Default=100.
  */
 export interface OrderWatcherConfig {
     stateLayer: BlockParamLiteral;
@@ -23,7 +22,6 @@ export interface OrderWatcherConfig {
     expirationMarginMs?: number;
     cleanupJobIntervalMs?: number;
     isVerbose?: boolean;
-    blockRetention?: number;
 }
 
 export type OnOrderStateChangeCallback = (err: Error | null, orderState?: OrderState) => void;