Bump @api3/ois to 1.4.0 and zod to 3.20 (#1597)

* Bump zod from 3.19.1 to 3.20.0 * Bump @api3/ois from 1.3.0 to 1.4.0 * fix: zod 3.20.0 issues - recursive type definition - exact flag for too_big and too_small: colinhacks/zod#1620 - options property of ZodDiscriminatedUnion was renamed to optionsMap: colinhacks/zod#1290 (comment)
api3dao · Dec 19, 2022 · 8844aa9 · 8844aa9
1 parent 524b47d
commit 8844aa9
Show file tree

Hide file tree

Showing 41 changed files with 80 additions and 72 deletions.
diff --git a/.changeset/strange-fishes-retire.md b/.changeset/strange-fishes-retire.md
@@ -0,0 +1,9 @@
+---
+'@api3/airnode-adapter': minor
+'@api3/airnode-deployer': minor
+'@api3/airnode-examples': minor
+'@api3/airnode-node': minor
+'@api3/airnode-validator': minor
+---
+
+Bump @api3/ois to 1.4.0 with necessary zod version bump to 3.20
diff --git a/packages/airnode-adapter/package.json b/packages/airnode-adapter/package.json
@@ -19,7 +19,7 @@
     "test:watch": "yarn test:ts --watch"
   },
   "dependencies": {
-    "@api3/ois": "1.3.0",
+    "@api3/ois": "1.4.0",
     "@api3/promise-utils": "^0.3.0",
     "axios": "1.1.3",
     "bignumber.js": "^9.1.0",

diff --git a/packages/airnode-adapter/test/fixtures/ois.ts b/packages/airnode-adapter/test/fixtures/ois.ts
@@ -2,7 +2,7 @@ import { OIS } from '@api3/ois';
 
 export function buildOIS(overrides?: Partial<OIS>): OIS {
   return {
-    oisFormat: '1.3.0',
+    oisFormat: '1.4.0',
     version: '1.2.3',
     title: 'Currency Converter API',
     apiSpecifications: {

diff --git a/packages/airnode-deployer/config/config.example.json b/packages/airnode-deployer/config/config.example.json
@@ -87,7 +87,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko basic request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-deployer/package.json b/packages/airnode-deployer/package.json
@@ -41,7 +41,7 @@
     "lodash": "^4.17.21",
     "ora": "^5.4.1",
     "yargs": "^17.6.0",
-    "zod": "^3.19.1"
+    "zod": "^3.20.0"
   },
   "devDependencies": {
     "@google-cloud/functions-framework": "^3.1.2",

diff --git a/packages/airnode-deployer/test/fixtures/config.aws.valid.json b/packages/airnode-deployer/test/fixtures/config.aws.valid.json
@@ -90,7 +90,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko basic request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-deployer/test/fixtures/config.gcp.valid.json b/packages/airnode-deployer/test/fixtures/config.gcp.valid.json
@@ -90,7 +90,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko basic request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/authenticated-coinmarketcap/config.example.json b/packages/airnode-examples/integrations/authenticated-coinmarketcap/config.example.json
@@ -78,7 +78,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinMarketCap Basic Authenticated Request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/authenticated-coinmarketcap/create-config.ts b/packages/airnode-examples/integrations/authenticated-coinmarketcap/create-config.ts
@@ -85,7 +85,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'CoinMarketCap Basic Authenticated Request',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/coingecko-cross-chain-authorizer/config.example.json b/packages/airnode-examples/integrations/coingecko-cross-chain-authorizer/config.example.json
@@ -90,7 +90,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko basic request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/coingecko-cross-chain-authorizer/create-config.ts b/packages/airnode-examples/integrations/coingecko-cross-chain-authorizer/create-config.ts
@@ -98,7 +98,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'CoinGecko basic request',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/coingecko-post-processing/config.example.json b/packages/airnode-examples/integrations/coingecko-post-processing/config.example.json
@@ -78,7 +78,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko coins markets request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/coingecko-post-processing/create-config.ts b/packages/airnode-examples/integrations/coingecko-post-processing/create-config.ts
@@ -85,7 +85,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'CoinGecko coins markets request',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/coingecko-pre-processing/config.example.json b/packages/airnode-examples/integrations/coingecko-pre-processing/config.example.json
@@ -78,7 +78,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko history data request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/coingecko-pre-processing/create-config.ts b/packages/airnode-examples/integrations/coingecko-pre-processing/create-config.ts
@@ -85,7 +85,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'CoinGecko history data request',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/coingecko-signed-data/config.example.json b/packages/airnode-examples/integrations/coingecko-signed-data/config.example.json
@@ -86,7 +86,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko basic request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/coingecko-signed-data/create-config.ts b/packages/airnode-examples/integrations/coingecko-signed-data/create-config.ts
@@ -93,7 +93,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'CoinGecko basic request',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/coingecko-template/config.example.json b/packages/airnode-examples/integrations/coingecko-template/config.example.json
@@ -84,7 +84,7 @@
   ],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko basic request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/coingecko-template/create-config.ts b/packages/airnode-examples/integrations/coingecko-template/create-config.ts
@@ -93,7 +93,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   ],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'CoinGecko basic request',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/coingecko-testable/config.example.json b/packages/airnode-examples/integrations/coingecko-testable/config.example.json
@@ -86,7 +86,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko basic request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/coingecko-testable/create-config.ts b/packages/airnode-examples/integrations/coingecko-testable/create-config.ts
@@ -93,7 +93,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'CoinGecko basic request',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/coingecko/config.example.json b/packages/airnode-examples/integrations/coingecko/config.example.json
@@ -78,7 +78,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "CoinGecko basic request",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/coingecko/create-config.ts b/packages/airnode-examples/integrations/coingecko/create-config.ts
@@ -85,7 +85,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'CoinGecko basic request',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/failing-example/config.example.json b/packages/airnode-examples/integrations/failing-example/config.example.json
@@ -78,7 +78,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "Failure Example",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/failing-example/create-config.ts b/packages/airnode-examples/integrations/failing-example/create-config.ts
@@ -85,7 +85,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'Failure Example',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/relay-security-schemes/config.example.json b/packages/airnode-examples/integrations/relay-security-schemes/config.example.json
@@ -78,7 +78,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "Relay Security Schemes via httpbin",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/relay-security-schemes/create-config.ts b/packages/airnode-examples/integrations/relay-security-schemes/create-config.ts
@@ -85,7 +85,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'Relay Security Schemes via httpbin',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-examples/integrations/weather-multi-value/config.example.json b/packages/airnode-examples/integrations/weather-multi-value/config.example.json
@@ -78,7 +78,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "title": "OpenWeather Multiple Encoded Values",
       "version": "1.0.0",
       "apiSpecifications": {

diff --git a/packages/airnode-examples/integrations/weather-multi-value/create-config.ts b/packages/airnode-examples/integrations/weather-multi-value/create-config.ts
@@ -85,7 +85,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
   templates: [],
   ois: [
     {
-      oisFormat: '1.3.0',
+      oisFormat: '1.4.0',
       title: 'OpenWeather Multiple Encoded Values',
       version: '1.0.0',
       apiSpecifications: {

diff --git a/packages/airnode-node/config/config.example.json b/packages/airnode-node/config/config.example.json
@@ -79,7 +79,7 @@
   "templates": [],
   "ois": [
     {
-      "oisFormat": "1.3.0",
+      "oisFormat": "1.4.0",
       "version": "1.2.3",
       "title": "Currency Converter API",
       "apiSpecifications": {

diff --git a/packages/airnode-node/package.json b/packages/airnode-node/package.json
@@ -29,7 +29,7 @@
     "@api3/airnode-protocol": "^0.9.0",
     "@api3/airnode-utilities": "^0.9.0",
     "@api3/airnode-validator": "^0.9.0",
-    "@api3/ois": "1.3.0",
+    "@api3/ois": "1.4.0",
     "@api3/promise-utils": "^0.3.0",
     "aws-sdk": "^2.1243.0",
     "dotenv": "^16.0.3",
@@ -38,7 +38,7 @@
     "google-auth-library": "^8.6.0",
     "lodash": "^4.17.21",
     "yargs": "^17.6.0",
-    "zod": "^3.19.1"
+    "zod": "^3.20.0"
   },
   "devDependencies": {
     "@api3/airnode-operation": "^0.9.0",

diff --git a/packages/airnode-node/test/fixtures/config/ois.ts b/packages/airnode-node/test/fixtures/config/ois.ts
@@ -2,7 +2,7 @@ import { OIS } from '@api3/ois';
 
 export function buildOIS(ois?: Partial<OIS>): OIS {
   return {
-    oisFormat: '1.3.0',
+    oisFormat: '1.4.0',
     version: '1.2.3',
     title: 'Currency Converter API',
     apiSpecifications: {

diff --git a/packages/airnode-validator/package.json b/packages/airnode-validator/package.json
@@ -21,14 +21,14 @@
     "test:e2e:update-snapshot": "yarn test:e2e --updateSnapshot"
   },
   "dependencies": {
-    "@api3/ois": "1.3.0",
+    "@api3/ois": "1.4.0",
     "@api3/promise-utils": "^0.3.0",
     "dotenv": "^16.0.3",
     "ethers": "^5.7.2",
     "lodash": "^4.17.21",
     "ora": "^5.4.1",
     "yargs": "^17.6.0",
-    "zod": "^3.19.1"
+    "zod": "^3.20.0"
   },
   "devDependencies": {
     "@types/yargs": "^17.0.13",

diff --git a/packages/airnode-validator/src/api/api.test.ts b/packages/airnode-validator/src/api/api.test.ts
@@ -74,6 +74,7 @@ describe('parseConfigWithSecrets', () => {
         minimum: 1,
         type: 'string',
         inclusive: true,
+        exact: false,
         message: 'Secret cannot be empty',
         path: ['AIRNODE_WALLET_MNEMONIC'],
       },

diff --git a/packages/airnode-validator/src/config/config.test.ts b/packages/airnode-validator/src/config/config.test.ts
@@ -96,6 +96,7 @@ describe('gasPriceOracleSchema', () => {
           minimum: 1,
           type: 'array',
           inclusive: true,
+          exact: false,
           message: 'Array must contain at least 1 element(s)',
           path: [],
         },
@@ -379,6 +380,7 @@ describe('apiKey schemas', () => {
             minimum: 30,
             type: 'string',
             inclusive: true,
+            exact: false,
             message: 'String must contain at least 30 character(s)',
             path: ['apiKey'],
           },
@@ -393,6 +395,7 @@ describe('apiKey schemas', () => {
             maximum: 120,
             type: 'string',
             inclusive: true,
+            exact: false,
             message: 'String must contain at most 120 character(s)',
             path: ['apiKey'],
           },