Add list tenant block watchers endpoint (#169)

OpenZeppelin · Nov 16, 2023 · 173fa83 · 173fa83
1 parent 5eec5b0
commit 173fa83
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/packages/monitor/src/__mocks__/@openzeppelin/defender-sdk-base-client.ts b/packages/monitor/src/__mocks__/@openzeppelin/defender-sdk-base-client.ts
@@ -26,4 +26,5 @@ module.exports = {
     delete: jest.fn(),
   })),
   BaseApiClient: MockBaseApiClient,
+  isValidNetwork: jest.fn((network: string) => network !== 'invalid'),
 };
diff --git a/packages/monitor/src/api/index.test.ts b/packages/monitor/src/api/index.test.ts
@@ -121,6 +121,7 @@ describe('MonitorClient', () => {
   beforeEach(() => {
     monitor = (new MonitorClient({ apiKey: 'key', apiSecret: 'secret' }) as unknown) as TestMonitorClient;
     createAuthenticatedApi.mockClear();
+
     listBlockwatchersSpy = jest.spyOn(monitor, 'listBlockwatchers').mockImplementation(async () => [
       {
         blockWatcherId: 'i-am-the-watcher',
@@ -559,6 +560,15 @@ describe('MonitorClient', () => {
     });
   });
 
+  describe('listTenantBlockwatchers', () => {
+    it('calls API correctly', async () => {
+      listBlockwatchersSpy.mockRestore();
+      await monitor.listTenantBlockwatchers();
+      expect(monitor.api.get).toBeCalledWith('/blockwatchers/tenant');
+      expect(createAuthenticatedApi).toBeCalled();
+    });
+  });
+
   describe('getBlockwatcherIdByNetwork', () => {
     it('finds blockwatchers for network when there are available', async () => {
       // Make sure the network provided is the network mocked above

diff --git a/packages/monitor/src/api/index.ts b/packages/monitor/src/api/index.ts
@@ -1,4 +1,4 @@
-import { BaseApiClient, Network } from '@openzeppelin/defender-sdk-base-client';
+import { BaseApiClient, Network, isValidNetwork } from '@openzeppelin/defender-sdk-base-client';
 import {
   ConditionSet,
   CreateMonitorRequest,
@@ -129,6 +129,12 @@ export class MonitorClient extends BaseApiClient {
     });
   }
 
+  public async listTenantBlockwatchers(): Promise<BlockWatcher[]> {
+    return this.apiCall(async (api) => {
+      return await api.get(`/blockwatchers/tenant`);
+    });
+  }
+
   public async createNotificationChannel(notification: CreateNotificationRequest): Promise<NotificationResponse> {
     return this.apiCall(async (api) => {
       return await api.post(`/notifications/${notification.type}`, notification);
@@ -185,7 +191,14 @@ export class MonitorClient extends BaseApiClient {
   }
 
   private async constructBlockMonitor(monitor: CreateBlockMonitorRequest): Promise<PartialCreateBlockMonitorRequest> {
-    const blockWatchers = await this.getBlockwatcherIdByNetwork(monitor.network);
+    let blockWatchers: BlockWatcher[] = [];
+    if (!isValidNetwork(monitor.network)) {
+      blockWatchers = (await this.listTenantBlockwatchers()).filter(
+        (blockwatcher) => blockwatcher.network === monitor.network,
+      );
+    } else {
+      blockWatchers = await this.getBlockwatcherIdByNetwork(monitor.network);
+    }
 
     let blockWatcherId;