From 6baac21a5b9cce4da3c6af60c1403ae89ca61101 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 11:24:54 +0000
Subject: [PATCH 1/2] Bump axios from 1.5.1 to 1.6.0 (#113)

---
 packages/e2e/package.json    |  2 +-
 packages/pusher/package.json |  2 +-
 pnpm-lock.yaml               | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/e2e/package.json b/packages/e2e/package.json
index a867455a..f2353e65 100644
--- a/packages/e2e/package.json
+++ b/packages/e2e/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@api3/commons": "^0.3.0",
     "@api3/promise-utils": "^0.4.0",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "ethers": "^5.7.2",
     "express": "^4.18.2",
     "lodash": "^4.17.21",
diff --git a/packages/pusher/package.json b/packages/pusher/package.json
index c476e1e7..ebd0aec9 100644
--- a/packages/pusher/package.json
+++ b/packages/pusher/package.json
@@ -28,7 +28,7 @@
     "@api3/commons": "^0.3.0",
     "@api3/ois": "^2.2.1",
     "@api3/promise-utils": "^0.4.0",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "dotenv": "^16.3.1",
     "ethers": "^5.7.2",
     "express": "^4.18.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a38eb31b..1ba7a2e3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -100,8 +100,8 @@ importers:
         specifier: ^0.4.0
         version: 0.4.0
       axios:
-        specifier: ^1.5.1
-        version: 1.5.1
+        specifier: ^1.6.0
+        version: 1.6.0
       ethers:
         specifier: ^5.7.2
         version: 5.7.2
@@ -146,8 +146,8 @@ importers:
         specifier: ^0.4.0
         version: 0.4.0
       axios:
-        specifier: ^1.5.1
-        version: 1.5.1
+        specifier: ^1.6.0
+        version: 1.6.0
       dotenv:
         specifier: ^16.3.1
         version: 16.3.1
@@ -202,7 +202,7 @@ packages:
     dependencies:
       '@api3/ois': 2.1.0
       '@api3/promise-utils': 0.4.0
-      axios: 1.5.1
+      axios: 1.6.0
       bignumber.js: 9.1.2
       ethers: 5.7.2
       lodash: 4.17.21
@@ -2925,8 +2925,8 @@ packages:
     resolution: {integrity: sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==}
     engines: {node: '>=4'}
 
-  /axios@1.5.1:
-    resolution: {integrity: sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==}
+  /axios@1.6.0:
+    resolution: {integrity: sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==}
     dependencies:
       follow-redirects: 1.15.3
       form-data: 4.0.0

From 5af2da44bd66e1e032af709009108e101dd64160 Mon Sep 17 00:00:00 2001
From: Aaron Scheiner <blue@aquarat.co.uk>
Date: Tue, 21 Nov 2023 11:46:45 +0000
Subject: [PATCH 2/2] Update SignedApiResponse schema (#120)

* Update SignedApiResponse schema
---
 packages/api/src/handlers.ts             | 5 ++++-
 packages/pusher/src/validation/schema.ts | 1 +
 packages/pusher/test/fixtures.ts         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/handlers.ts b/packages/api/src/handlers.ts
index 688c2b97..66d7e6e9 100644
--- a/packages/api/src/handlers.ts
+++ b/packages/api/src/handlers.ts
@@ -113,7 +113,10 @@ export const batchInsertData = async (requestBody: unknown): Promise<ApiResponse
   return {
     statusCode: 201,
     headers: COMMON_HEADERS,
-    body: JSON.stringify({ count: newSignedData.length, skipped: batchSignedData.length - newSignedData.length }),
+    body: JSON.stringify({
+      count: newSignedData.length,
+      skipped: batchSignedData.length - newSignedData.length,
+    }),
   };
 };
 
diff --git a/packages/pusher/src/validation/schema.ts b/packages/pusher/src/validation/schema.ts
index 64273ccd..b597564a 100644
--- a/packages/pusher/src/validation/schema.ts
+++ b/packages/pusher/src/validation/schema.ts
@@ -285,6 +285,7 @@ export const secretsSchema = z.record(z.string());
 
 export const signedApiResponseSchema = z.strictObject({
   count: z.number(),
+  skipped: z.number(),
 });
 
 export type SignedApiResponse = z.infer<typeof signedApiResponseSchema>;
diff --git a/packages/pusher/test/fixtures.ts b/packages/pusher/test/fixtures.ts
index 2b45b09a..17ac17ce 100644
--- a/packages/pusher/test/fixtures.ts
+++ b/packages/pusher/test/fixtures.ts
@@ -184,7 +184,7 @@ export const signedApiResponse: Partial<AxiosResponse> = {
     'access-control-allow-origin': '*',
     'access-control-allow-methods': '*',
   },
-  data: { count: 3 },
+  data: { count: 3, skipped: 1 },
 };
 
 export const verifyHeartbeatLog = (heartbeatPayload: HeartbeatPayload, rawConfig: string) => {