diff --git a/lerna.json b/lerna.json
index 859cb91..7ce7b3e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -3,6 +3,6 @@
     "packages/*"
   ],
   "useWorkspaces": true,
-  "version": "0.1.3",
+  "version": "0.1.4",
   "npmClient": "yarn"
 }
diff --git a/packages/azimuth-watcher/environments/local.toml b/packages/azimuth-watcher/environments/local.toml
index e80f204..d5cbbc2 100644
--- a/packages/azimuth-watcher/environments/local.toml
+++ b/packages/azimuth-watcher/environments/local.toml
@@ -50,7 +50,9 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
@@ -87,3 +89,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/azimuth-watcher/package.json b/packages/azimuth-watcher/package.json
index 0f7e427..aad5f8e 100644
--- a/packages/azimuth-watcher/package.json
+++ b/packages/azimuth-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/azimuth-watcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "azimuth-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,10 +38,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.79",
-    "@cerc-io/ipld-eth-client": "^0.2.79",
-    "@cerc-io/solidity-mapper": "^0.2.79",
-    "@cerc-io/util": "^0.2.79",
+    "@cerc-io/cli": "^0.2.88",
+    "@cerc-io/ipld-eth-client": "^0.2.88",
+    "@cerc-io/solidity-mapper": "^0.2.88",
+    "@cerc-io/util": "^0.2.88",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/azimuth-watcher/src/database.ts b/packages/azimuth-watcher/src/database.ts
index c201fc8..11a2f46 100644
--- a/packages/azimuth-watcher/src/database.ts
+++ b/packages/azimuth-watcher/src/database.ts
@@ -983,8 +983,8 @@ export class Database implements DatabaseInterface {
     await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseDatabase.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
   }
 
   _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
diff --git a/packages/azimuth-watcher/src/indexer.ts b/packages/azimuth-watcher/src/indexer.ts
index 7242b0e..aa9381b 100644
--- a/packages/azimuth-watcher/src/indexer.ts
+++ b/packages/azimuth-watcher/src/indexer.ts
@@ -117,6 +117,12 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+  }
+
   getResultEvent (event: Event): ResultEvent {
     return getResultEvent(event);
   }
@@ -1596,20 +1602,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlock-init_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 
@@ -1804,8 +1824,8 @@ export class Indexer implements IndexerInterface {
     return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
   }
 
   async resetWatcherToBlock (blockNumber: number): Promise<void> {
@@ -1857,4 +1877,8 @@ export class Indexer implements IndexerInterface {
       await dbTx.release();
     }
   }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
 }
diff --git a/packages/censures-watcher/environments/local.toml b/packages/censures-watcher/environments/local.toml
index 2210ef6..87732b1 100644
--- a/packages/censures-watcher/environments/local.toml
+++ b/packages/censures-watcher/environments/local.toml
@@ -50,7 +50,9 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
@@ -87,3 +89,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/censures-watcher/package.json b/packages/censures-watcher/package.json
index 2267a5f..8a01dc8 100644
--- a/packages/censures-watcher/package.json
+++ b/packages/censures-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/censures-watcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "censures-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,10 +38,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.79",
-    "@cerc-io/ipld-eth-client": "^0.2.79",
-    "@cerc-io/solidity-mapper": "^0.2.79",
-    "@cerc-io/util": "^0.2.79",
+    "@cerc-io/cli": "^0.2.88",
+    "@cerc-io/ipld-eth-client": "^0.2.88",
+    "@cerc-io/solidity-mapper": "^0.2.88",
+    "@cerc-io/util": "^0.2.88",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/censures-watcher/src/database.ts b/packages/censures-watcher/src/database.ts
index f666d57..af6adae 100644
--- a/packages/censures-watcher/src/database.ts
+++ b/packages/censures-watcher/src/database.ts
@@ -330,8 +330,8 @@ export class Database implements DatabaseInterface {
     await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseDatabase.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
   }
 
   _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
diff --git a/packages/censures-watcher/src/indexer.ts b/packages/censures-watcher/src/indexer.ts
index c56a691..7589554 100644
--- a/packages/censures-watcher/src/indexer.ts
+++ b/packages/censures-watcher/src/indexer.ts
@@ -117,6 +117,12 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+  }
+
   getResultEvent (event: Event): ResultEvent {
     return getResultEvent(event);
   }
@@ -374,20 +380,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlock-init_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 
@@ -582,8 +602,8 @@ export class Indexer implements IndexerInterface {
     return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
   }
 
   async resetWatcherToBlock (blockNumber: number): Promise<void> {
@@ -635,4 +655,8 @@ export class Indexer implements IndexerInterface {
       await dbTx.release();
     }
   }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
 }
diff --git a/packages/claims-watcher/environments/local.toml b/packages/claims-watcher/environments/local.toml
index d01a9b3..fd2b169 100644
--- a/packages/claims-watcher/environments/local.toml
+++ b/packages/claims-watcher/environments/local.toml
@@ -50,7 +50,9 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
@@ -87,3 +89,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/claims-watcher/package.json b/packages/claims-watcher/package.json
index a23fa43..777a448 100644
--- a/packages/claims-watcher/package.json
+++ b/packages/claims-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/claims-watcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "claims-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,10 +38,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.79",
-    "@cerc-io/ipld-eth-client": "^0.2.79",
-    "@cerc-io/solidity-mapper": "^0.2.79",
-    "@cerc-io/util": "^0.2.79",
+    "@cerc-io/cli": "^0.2.88",
+    "@cerc-io/ipld-eth-client": "^0.2.88",
+    "@cerc-io/solidity-mapper": "^0.2.88",
+    "@cerc-io/util": "^0.2.88",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/claims-watcher/src/database.ts b/packages/claims-watcher/src/database.ts
index e3ceb5f..a7290c5 100644
--- a/packages/claims-watcher/src/database.ts
+++ b/packages/claims-watcher/src/database.ts
@@ -284,8 +284,8 @@ export class Database implements DatabaseInterface {
     await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseDatabase.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
   }
 
   _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
diff --git a/packages/claims-watcher/src/indexer.ts b/packages/claims-watcher/src/indexer.ts
index 6e1afe5..46e3e9b 100644
--- a/packages/claims-watcher/src/indexer.ts
+++ b/packages/claims-watcher/src/indexer.ts
@@ -117,6 +117,12 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+  }
+
   getResultEvent (event: Event): ResultEvent {
     return getResultEvent(event);
   }
@@ -282,20 +288,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlock-init_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 
@@ -490,8 +510,8 @@ export class Indexer implements IndexerInterface {
     return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
   }
 
   async resetWatcherToBlock (blockNumber: number): Promise<void> {
@@ -543,4 +563,8 @@ export class Indexer implements IndexerInterface {
       await dbTx.release();
     }
   }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
 }
diff --git a/packages/conditional-star-release-watcher/environments/local.toml b/packages/conditional-star-release-watcher/environments/local.toml
index afe2a7b..8f573e9 100644
--- a/packages/conditional-star-release-watcher/environments/local.toml
+++ b/packages/conditional-star-release-watcher/environments/local.toml
@@ -50,7 +50,9 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
@@ -87,3 +89,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/conditional-star-release-watcher/package.json b/packages/conditional-star-release-watcher/package.json
index ce6068b..4a1bf42 100644
--- a/packages/conditional-star-release-watcher/package.json
+++ b/packages/conditional-star-release-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/conditional-star-release-watcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "conditional-star-release-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,10 +38,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.79",
-    "@cerc-io/ipld-eth-client": "^0.2.79",
-    "@cerc-io/solidity-mapper": "^0.2.79",
-    "@cerc-io/util": "^0.2.79",
+    "@cerc-io/cli": "^0.2.88",
+    "@cerc-io/ipld-eth-client": "^0.2.88",
+    "@cerc-io/solidity-mapper": "^0.2.88",
+    "@cerc-io/util": "^0.2.88",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/conditional-star-release-watcher/src/database.ts b/packages/conditional-star-release-watcher/src/database.ts
index 25eb459..23e5630 100644
--- a/packages/conditional-star-release-watcher/src/database.ts
+++ b/packages/conditional-star-release-watcher/src/database.ts
@@ -429,8 +429,8 @@ export class Database implements DatabaseInterface {
     await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseDatabase.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
   }
 
   _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
diff --git a/packages/conditional-star-release-watcher/src/indexer.ts b/packages/conditional-star-release-watcher/src/indexer.ts
index 67e0f40..ef1850b 100644
--- a/packages/conditional-star-release-watcher/src/indexer.ts
+++ b/packages/conditional-star-release-watcher/src/indexer.ts
@@ -117,6 +117,12 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+  }
+
   getResultEvent (event: Event): ResultEvent {
     return getResultEvent(event);
   }
@@ -563,20 +569,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlock-init_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 
@@ -771,8 +791,8 @@ export class Indexer implements IndexerInterface {
     return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
   }
 
   async resetWatcherToBlock (blockNumber: number): Promise<void> {
@@ -824,4 +844,8 @@ export class Indexer implements IndexerInterface {
       await dbTx.release();
     }
   }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
 }
diff --git a/packages/delegated-sending-watcher/environments/local.toml b/packages/delegated-sending-watcher/environments/local.toml
index 52a4a7e..c6de7a8 100644
--- a/packages/delegated-sending-watcher/environments/local.toml
+++ b/packages/delegated-sending-watcher/environments/local.toml
@@ -50,7 +50,9 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
@@ -87,3 +89,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/delegated-sending-watcher/package.json b/packages/delegated-sending-watcher/package.json
index 5c7ed3b..fac50d5 100644
--- a/packages/delegated-sending-watcher/package.json
+++ b/packages/delegated-sending-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/delegated-sending-watcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "delegated-sending-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,10 +38,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.79",
-    "@cerc-io/ipld-eth-client": "^0.2.79",
-    "@cerc-io/solidity-mapper": "^0.2.79",
-    "@cerc-io/util": "^0.2.79",
+    "@cerc-io/cli": "^0.2.88",
+    "@cerc-io/ipld-eth-client": "^0.2.88",
+    "@cerc-io/solidity-mapper": "^0.2.88",
+    "@cerc-io/util": "^0.2.88",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/delegated-sending-watcher/src/database.ts b/packages/delegated-sending-watcher/src/database.ts
index 364e660..0ede748 100644
--- a/packages/delegated-sending-watcher/src/database.ts
+++ b/packages/delegated-sending-watcher/src/database.ts
@@ -299,8 +299,8 @@ export class Database implements DatabaseInterface {
     await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseDatabase.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
   }
 
   _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
diff --git a/packages/delegated-sending-watcher/src/indexer.ts b/packages/delegated-sending-watcher/src/indexer.ts
index 3c448d4..d1f43ca 100644
--- a/packages/delegated-sending-watcher/src/indexer.ts
+++ b/packages/delegated-sending-watcher/src/indexer.ts
@@ -117,6 +117,12 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+  }
+
   getResultEvent (event: Event): ResultEvent {
     return getResultEvent(event);
   }
@@ -312,20 +318,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlock-init_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 
@@ -520,8 +540,8 @@ export class Indexer implements IndexerInterface {
     return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
   }
 
   async resetWatcherToBlock (blockNumber: number): Promise<void> {
@@ -573,4 +593,8 @@ export class Indexer implements IndexerInterface {
       await dbTx.release();
     }
   }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
 }
diff --git a/packages/ecliptic-watcher/environments/local.toml b/packages/ecliptic-watcher/environments/local.toml
index 210abd4..801d889 100644
--- a/packages/ecliptic-watcher/environments/local.toml
+++ b/packages/ecliptic-watcher/environments/local.toml
@@ -50,7 +50,9 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
@@ -87,3 +89,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/ecliptic-watcher/package.json b/packages/ecliptic-watcher/package.json
index 8b562ab..8aafba7 100644
--- a/packages/ecliptic-watcher/package.json
+++ b/packages/ecliptic-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/ecliptic-watcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "ecliptic-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,10 +38,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.79",
-    "@cerc-io/ipld-eth-client": "^0.2.79",
-    "@cerc-io/solidity-mapper": "^0.2.79",
-    "@cerc-io/util": "^0.2.79",
+    "@cerc-io/cli": "^0.2.88",
+    "@cerc-io/ipld-eth-client": "^0.2.88",
+    "@cerc-io/solidity-mapper": "^0.2.88",
+    "@cerc-io/util": "^0.2.88",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/ecliptic-watcher/src/database.ts b/packages/ecliptic-watcher/src/database.ts
index db8c5ea..67a52cd 100644
--- a/packages/ecliptic-watcher/src/database.ts
+++ b/packages/ecliptic-watcher/src/database.ts
@@ -445,8 +445,8 @@ export class Database implements DatabaseInterface {
     await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseDatabase.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
   }
 
   _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
diff --git a/packages/ecliptic-watcher/src/indexer.ts b/packages/ecliptic-watcher/src/indexer.ts
index 7439b05..8c8d1cd 100644
--- a/packages/ecliptic-watcher/src/indexer.ts
+++ b/packages/ecliptic-watcher/src/indexer.ts
@@ -117,6 +117,12 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+  }
+
   getResultEvent (event: Event): ResultEvent {
     return getResultEvent(event);
   }
@@ -584,20 +590,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlock-init_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 
@@ -792,8 +812,8 @@ export class Indexer implements IndexerInterface {
     return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
   }
 
   async resetWatcherToBlock (blockNumber: number): Promise<void> {
@@ -845,4 +865,8 @@ export class Indexer implements IndexerInterface {
       await dbTx.release();
     }
   }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
 }
diff --git a/packages/gateway-server/package.json b/packages/gateway-server/package.json
index 736e5d9..f823b4b 100644
--- a/packages/gateway-server/package.json
+++ b/packages/gateway-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/gateway-server",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "index.js",
   "license": "AGPL-3.0",
   "private": true,
diff --git a/packages/linear-star-release-watcher/environments/local.toml b/packages/linear-star-release-watcher/environments/local.toml
index 0faab99..c104bed 100644
--- a/packages/linear-star-release-watcher/environments/local.toml
+++ b/packages/linear-star-release-watcher/environments/local.toml
@@ -50,7 +50,9 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
@@ -87,3 +89,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/linear-star-release-watcher/package.json b/packages/linear-star-release-watcher/package.json
index 527feaa..10f263d 100644
--- a/packages/linear-star-release-watcher/package.json
+++ b/packages/linear-star-release-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/linear-star-release-watcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "linear-star-release-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,10 +38,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.79",
-    "@cerc-io/ipld-eth-client": "^0.2.79",
-    "@cerc-io/solidity-mapper": "^0.2.79",
-    "@cerc-io/util": "^0.2.79",
+    "@cerc-io/cli": "^0.2.88",
+    "@cerc-io/ipld-eth-client": "^0.2.88",
+    "@cerc-io/solidity-mapper": "^0.2.88",
+    "@cerc-io/util": "^0.2.88",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/linear-star-release-watcher/src/database.ts b/packages/linear-star-release-watcher/src/database.ts
index 09cbca9..5851be0 100644
--- a/packages/linear-star-release-watcher/src/database.ts
+++ b/packages/linear-star-release-watcher/src/database.ts
@@ -314,8 +314,8 @@ export class Database implements DatabaseInterface {
     await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseDatabase.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
   }
 
   _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
diff --git a/packages/linear-star-release-watcher/src/indexer.ts b/packages/linear-star-release-watcher/src/indexer.ts
index 31f39ec..06151a2 100644
--- a/packages/linear-star-release-watcher/src/indexer.ts
+++ b/packages/linear-star-release-watcher/src/indexer.ts
@@ -117,6 +117,12 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+  }
+
   getResultEvent (event: Event): ResultEvent {
     return getResultEvent(event);
   }
@@ -342,20 +348,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlock-init_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 
@@ -550,8 +570,8 @@ export class Indexer implements IndexerInterface {
     return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
   }
 
   async resetWatcherToBlock (blockNumber: number): Promise<void> {
@@ -603,4 +623,8 @@ export class Indexer implements IndexerInterface {
       await dbTx.release();
     }
   }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
 }
diff --git a/packages/polls-watcher/environments/local.toml b/packages/polls-watcher/environments/local.toml
index c87e5d2..4c43448 100644
--- a/packages/polls-watcher/environments/local.toml
+++ b/packages/polls-watcher/environments/local.toml
@@ -50,7 +50,9 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
@@ -87,3 +89,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/polls-watcher/package.json b/packages/polls-watcher/package.json
index 8594207..a0b51c7 100644
--- a/packages/polls-watcher/package.json
+++ b/packages/polls-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/polls-watcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "polls-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,10 +38,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.79",
-    "@cerc-io/ipld-eth-client": "^0.2.79",
-    "@cerc-io/solidity-mapper": "^0.2.79",
-    "@cerc-io/util": "^0.2.79",
+    "@cerc-io/cli": "^0.2.88",
+    "@cerc-io/ipld-eth-client": "^0.2.88",
+    "@cerc-io/solidity-mapper": "^0.2.88",
+    "@cerc-io/util": "^0.2.88",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/polls-watcher/src/database.ts b/packages/polls-watcher/src/database.ts
index f55dbf0..37ef21f 100644
--- a/packages/polls-watcher/src/database.ts
+++ b/packages/polls-watcher/src/database.ts
@@ -375,8 +375,8 @@ export class Database implements DatabaseInterface {
     await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseDatabase.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
   }
 
   _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
diff --git a/packages/polls-watcher/src/indexer.ts b/packages/polls-watcher/src/indexer.ts
index 5cd7993..81ab658 100644
--- a/packages/polls-watcher/src/indexer.ts
+++ b/packages/polls-watcher/src/indexer.ts
@@ -117,6 +117,12 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+  }
+
   getResultEvent (event: Event): ResultEvent {
     return getResultEvent(event);
   }
@@ -464,20 +470,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlock-init_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 
@@ -672,8 +692,8 @@ export class Indexer implements IndexerInterface {
     return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
   }
 
-  async getAncestorAtDepth (blockHash: string, depth: number): Promise<string> {
-    return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
   }
 
   async resetWatcherToBlock (blockNumber: number): Promise<void> {
@@ -725,4 +745,8 @@ export class Indexer implements IndexerInterface {
       await dbTx.release();
     }
   }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index 8d36f08..3c32cdc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -183,10 +183,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@cerc-io/cache@^0.2.79":
-  version "0.2.79"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.79/cache-0.2.79.tgz#15a3af632bad86e140a30268eb43e6847324ecc3"
-  integrity sha512-hPA7GWjMmn/3u7m9wW3Z7n578WruVt2py93UHXSPH9/sVX+upcQsjusmEx17I+ustqW/XFbAi6hsqiNYGa4JHQ==
+"@cerc-io/cache@^0.2.88":
+  version "0.2.88"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.88/cache-0.2.88.tgz#93a2b201541d5912d550739a9e4a295e491edc6d"
+  integrity sha512-OiEXcegdUlXSXHF+iWWAQFXwRQq1CJ9RJ4xn9a0oNTKcJH2PHt9DsCwSp4VE7PwFzOr7Luzw3RnloGOpjqxhng==
   dependencies:
     canonical-json "^0.0.4"
     debug "^4.3.1"
@@ -194,19 +194,19 @@
     fs-extra "^10.0.0"
     level "^7.0.0"
 
-"@cerc-io/cli@^0.2.79":
-  version "0.2.79"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.79/cli-0.2.79.tgz#29436f57aaaea556ab6e84910b7193bfdfd8b651"
-  integrity sha512-A8ttmf78d3dZRsM5a6wqhFbejFMwQ8BeQcNsQgcHasKmYHmKFHG4ujT25jnHHFidodGlPHI+KpI5DhdDC/YWEA==
+"@cerc-io/cli@^0.2.88":
+  version "0.2.88"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.88/cli-0.2.88.tgz#6a4e58499730db5f96431ac6825791dce1f418ce"
+  integrity sha512-/ctrqTNX8nV1FZEivjbUqFfnifWOUffn7XdfSPs3HHSF2vaflsn8pnRk9nK3P2g0xc5dpxP5ZrhvHuHLcQE6tw==
   dependencies:
     "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.79"
-    "@cerc-io/ipld-eth-client" "^0.2.79"
+    "@cerc-io/cache" "^0.2.88"
+    "@cerc-io/ipld-eth-client" "^0.2.88"
     "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
     "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.79"
-    "@cerc-io/rpc-eth-client" "^0.2.79"
-    "@cerc-io/util" "^0.2.79"
+    "@cerc-io/peer" "^0.2.88"
+    "@cerc-io/rpc-eth-client" "^0.2.88"
+    "@cerc-io/util" "^0.2.88"
     "@ethersproject/providers" "^5.4.4"
     "@graphql-tools/utils" "^9.1.1"
     "@ipld/dag-cbor" "^8.0.0"
@@ -227,14 +227,14 @@
     typeorm "0.2.37"
     yargs "^17.0.1"
 
-"@cerc-io/ipld-eth-client@^0.2.79":
-  version "0.2.79"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.79/ipld-eth-client-0.2.79.tgz#1e171212931b554aeabcbe3c046d3fe896ffa631"
-  integrity sha512-TJR7blk9TxU/XBHX8t5Rla9fWE2+0SIt4f+/ymWhQJa35vkGSA+mvnO5rtmvuQMc0sGJmEN90k9/uWhT94P+1A==
+"@cerc-io/ipld-eth-client@^0.2.88":
+  version "0.2.88"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.88/ipld-eth-client-0.2.88.tgz#274b144dabe3a65651cd5b4126e8d176ea7e3171"
+  integrity sha512-fe1wtx4GBDSyF/zgqJLWuBEkj8S8aD2c64YxABlhK+zqxRZRIQ+KOqKnAwlMNcTKKIzy7AR4i6zp/N4z1yU9rA==
   dependencies:
     "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.79"
-    "@cerc-io/util" "^0.2.79"
+    "@cerc-io/cache" "^0.2.88"
+    "@cerc-io/util" "^0.2.88"
     cross-fetch "^3.1.4"
     debug "^4.3.1"
     ethers "^5.4.4"
@@ -387,10 +387,10 @@
     unique-names-generator "^4.7.1"
     yargs "^17.0.1"
 
-"@cerc-io/peer@^0.2.79":
-  version "0.2.79"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.79/peer-0.2.79.tgz#a2e6129a53e8a43ecbf0f1e4f0dd823bd685639e"
-  integrity sha512-J1f9pp3A1++Q1N9R05MOnmOLCejmF4tBQbOu9ZIgL2+nHyITaxQ8ktqt+L7v33aCas9zG+koDMq0tukGxoB3sw==
+"@cerc-io/peer@^0.2.88":
+  version "0.2.88"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.88/peer-0.2.88.tgz#3a7efb9d3db9b7b91542a1319f80c2f23ed5ad30"
+  integrity sha512-MycvZSIu81SGPn1Z/8ZQd+rxshcl403MRjq8rgEnGyzVPhQw5X05lm4ZHJqRVOwr7h7fEpgutUHI7BVXtkkxyA==
   dependencies:
     "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
     "@cerc-io/prometheus-metrics" "1.1.4"
@@ -429,23 +429,23 @@
     it-stream-types "^1.0.4"
     promjs "^0.4.2"
 
-"@cerc-io/rpc-eth-client@^0.2.79":
-  version "0.2.79"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.79/rpc-eth-client-0.2.79.tgz#5797e713593626897f625247bc93b852d8ac83c8"
-  integrity sha512-pjyLTjp8h9zMG/nojV7FAJSvtuAADVu+6W9fPsHM1K44UhQqWCGYDP3ZSFlc9/7Es1f3JW4W85bH5zUWIL1+wA==
+"@cerc-io/rpc-eth-client@^0.2.88":
+  version "0.2.88"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.88/rpc-eth-client-0.2.88.tgz#de1a342c5e1061f138356e597891ff0aee3f169d"
+  integrity sha512-KbSGTnG4bIPC01P8YK7F/M/yEMw6KcF4DDhA4vOTC/KYoXQ/UN7PjiOCq4GVNxbWGnyqhQjNc4n83dMfGG1r+A==
   dependencies:
-    "@cerc-io/cache" "^0.2.79"
-    "@cerc-io/ipld-eth-client" "^0.2.79"
-    "@cerc-io/util" "^0.2.79"
+    "@cerc-io/cache" "^0.2.88"
+    "@cerc-io/ipld-eth-client" "^0.2.88"
+    "@cerc-io/util" "^0.2.88"
     chai "^4.3.4"
     ethers "^5.4.4"
     left-pad "^1.3.0"
     mocha "^8.4.0"
 
-"@cerc-io/solidity-mapper@^0.2.79":
-  version "0.2.79"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.79/solidity-mapper-0.2.79.tgz#58fa0ef20a365218f1b4653dad2fd9cb42eb4cdc"
-  integrity sha512-YG9eR2TpnEX2VBRXzMYkdP7XrbULBZboeZ+AUD5vWr5d7GvTYYL0PDSorEnVwrJGUmJ4ea5oqsjmCn+2etW3eA==
+"@cerc-io/solidity-mapper@^0.2.88":
+  version "0.2.88"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.88/solidity-mapper-0.2.88.tgz#34bdef4ba47f364434b7330cb908d83b387cf11b"
+  integrity sha512-Qvez8TKs+xmeox9zqoj3nHOe2SCDsJQGbFfclptAyT3ofRMTEj362+6Yqia8tU8UoGnfFM9EEWbz3lt1x/OQbA==
   dependencies:
     dotenv "^10.0.0"
 
@@ -454,15 +454,15 @@
   resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fts-channel/-/1.0.3-ts-nitro-0.1.1/ts-channel-1.0.3-ts-nitro-0.1.1.tgz#0768781313a167295c0bf21307f47e02dc17e936"
   integrity sha512-2jFICUSyffuZ+8+qRhXuLSJq4GJ6Y02wxiXoubH0Kzv2lIKkJtWICY1ZQQhtXAvP0ncAQB85WJHqtqwH8l7J3Q==
 
-"@cerc-io/util@^0.2.79":
-  version "0.2.79"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.79/util-0.2.79.tgz#f4c1aa85fc97202097bc5ef605da6cb3ef1ce102"
-  integrity sha512-Nbb4ff9/ozOxPKswaUifDhj3heWdk2nKqTPUGUPVnVm7pMEpCCJPq1C/oW128Jw3J+EJxTbBvWifpLBbPePasw==
+"@cerc-io/util@^0.2.88":
+  version "0.2.88"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.88/util-0.2.88.tgz#d053e53db6bf58f165e8b134a2ecab4d07c040f3"
+  integrity sha512-g9gylT3Igg+hA6OpprXI+niPMGUDCmpBtygim9svXj+iwZCtDZQoLuzlPetcm6wiQMhK0Ai5ReTDAnd0IrrZWw==
   dependencies:
     "@apollo/utils.keyvaluecache" "^1.0.1"
     "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.79"
-    "@cerc-io/solidity-mapper" "^0.2.79"
+    "@cerc-io/peer" "^0.2.88"
+    "@cerc-io/solidity-mapper" "^0.2.88"
     "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
     "@ethersproject/properties" "^5.7.0"
     "@ethersproject/providers" "^5.4.4"