From a9299a09e41422cc9caf861476335028594102d0 Mon Sep 17 00:00:00 2001 From: bdrhn9 Date: Mon, 10 Aug 2026 15:50:39 +0300 Subject: [PATCH] Replace @api3/promise-utils with @api3/commons --- package.json | 2 +- packages/airnode-feed/package.json | 3 +- .../src/api-requests/data-provider.ts | 3 +- .../src/heartbeat/heartbeat.test.ts | 6 ++-- .../airnode-feed/src/heartbeat/heartbeat.ts | 3 +- .../airnode-feed/src/sign-template-data.ts | 2 +- .../airnode-feed/src/validation/config.ts | 2 +- .../airnode-feed/src/validation/schema.ts | 3 +- packages/e2e/package.json | 3 +- packages/e2e/src/utils.ts | 3 +- packages/signed-api/package.json | 3 +- packages/signed-api/src/config/config.ts | 3 +- packages/signed-api/src/handlers.ts | 3 +- packages/signed-api/src/index.ts | 2 +- packages/signed-api/src/schema.ts | 3 +- packages/signed-api/src/server.ts | 2 +- .../signed-api/src/signed-data-verifier.ts | 2 +- pnpm-lock.yaml | 34 +++++++------------ 18 files changed, 33 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index d540df61..702fad4f 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "keywords": [], "license": "MIT", "devDependencies": { - "@api3/commons": "1.2.0", + "@api3/commons": "1.3.0", "@api3/eslint-plugin-commons": "^3.1.1", "eslint": "^8.57.1", "@types/jest": "^30.0.0", diff --git a/packages/airnode-feed/package.json b/packages/airnode-feed/package.json index 35355bb2..4ddb405b 100644 --- a/packages/airnode-feed/package.json +++ b/packages/airnode-feed/package.json @@ -33,9 +33,8 @@ "@api3/airnode-adapter": "^0.15.0", "@api3/airnode-node": "^0.15.0", "@api3/airnode-validator": "^0.15.0", - "@api3/commons": "^1.2.0", + "@api3/commons": "^1.3.0", "@api3/ois": "^3.0.0", - "@api3/promise-utils": "^0.4.0", "axios": "^1.18.1", "dotenv": "^17.4.2", "ethers": "^5.8.0", diff --git a/packages/airnode-feed/src/api-requests/data-provider.ts b/packages/airnode-feed/src/api-requests/data-provider.ts index 4e4b363c..ddaec543 100644 --- a/packages/airnode-feed/src/api-requests/data-provider.ts +++ b/packages/airnode-feed/src/api-requests/data-provider.ts @@ -1,9 +1,8 @@ import { buildAndExecuteRequest, extractAndEncodeResponse } from '@api3/airnode-adapter'; import type * as node from '@api3/airnode-node'; import { getReservedParameters } from '@api3/airnode-node/dist/src/adapters/http/parameters'; -import { preProcessEndpointParameters, type EndpointParameters, postProcessResponse } from '@api3/commons'; +import { go, goSync, preProcessEndpointParameters, type EndpointParameters, postProcessResponse } from '@api3/commons'; import type { Endpoint, OIS, Endpoint as OisEndpoint } from '@api3/ois'; -import { go, goSync } from '@api3/promise-utils'; import { isEmpty, isNil } from 'lodash'; import { logger } from '../logger'; diff --git a/packages/airnode-feed/src/heartbeat/heartbeat.test.ts b/packages/airnode-feed/src/heartbeat/heartbeat.test.ts index 19276e55..248363f9 100644 --- a/packages/airnode-feed/src/heartbeat/heartbeat.test.ts +++ b/packages/airnode-feed/src/heartbeat/heartbeat.test.ts @@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs'; import { join } from 'node:path'; import { createSha256Hash, serializePlainObject } from '@api3/commons'; -import * as promiseUtilsModule from '@api3/promise-utils'; +import * as commonsModule from '@api3/commons'; import { ethers } from 'ethers'; import { config, verifyHeartbeatLog } from '../../test/fixtures'; @@ -92,10 +92,10 @@ test('sends heartbeat payload every minute', async () => { // from the same module is annoying. See: https://jestjs.io/docs/mock-functions#mocking-partials. // // Instead we spyOn the "go" which is a third party module that wraps the logHeartbeat call. - jest.spyOn(promiseUtilsModule, 'go'); + jest.spyOn(commonsModule, 'go'); initiateHeartbeatLoop(); await jest.advanceTimersByTimeAsync(1000 * 60 * 8); - expect(promiseUtilsModule.go).toHaveBeenCalledTimes(8); + expect(commonsModule.go).toHaveBeenCalledTimes(8); }); diff --git a/packages/airnode-feed/src/heartbeat/heartbeat.ts b/packages/airnode-feed/src/heartbeat/heartbeat.ts index 0c3b0d07..e6d2efb2 100644 --- a/packages/airnode-feed/src/heartbeat/heartbeat.ts +++ b/packages/airnode-feed/src/heartbeat/heartbeat.ts @@ -1,5 +1,4 @@ -import { createSha256Hash, serializePlainObject } from '@api3/commons'; -import { go } from '@api3/promise-utils'; +import { createSha256Hash, go, serializePlainObject } from '@api3/commons'; import { logger } from '../logger'; import { getState } from '../state'; diff --git a/packages/airnode-feed/src/sign-template-data.ts b/packages/airnode-feed/src/sign-template-data.ts index b49b5a88..04eb11b7 100644 --- a/packages/airnode-feed/src/sign-template-data.ts +++ b/packages/airnode-feed/src/sign-template-data.ts @@ -1,5 +1,5 @@ import type { ExtractedAndEncodedResponse } from '@api3/airnode-adapter'; -import { go } from '@api3/promise-utils'; +import { go } from '@api3/commons'; import { isNil } from 'lodash'; import { logger } from './logger'; diff --git a/packages/airnode-feed/src/validation/config.ts b/packages/airnode-feed/src/validation/config.ts index c9caa017..972e3f83 100644 --- a/packages/airnode-feed/src/validation/config.ts +++ b/packages/airnode-feed/src/validation/config.ts @@ -2,11 +2,11 @@ import { join } from 'node:path'; import { cwd } from 'node:process'; import { + go, interpolateSecretsIntoConfig, loadConfig as loadRawConfigFromFilesystem, loadSecrets as loadRawSecretsFromFilesystem, } from '@api3/commons'; -import { go } from '@api3/promise-utils'; import { logger } from '../logger'; diff --git a/packages/airnode-feed/src/validation/schema.ts b/packages/airnode-feed/src/validation/schema.ts index 462304d9..9a89a00d 100644 --- a/packages/airnode-feed/src/validation/schema.ts +++ b/packages/airnode-feed/src/validation/schema.ts @@ -1,5 +1,7 @@ import * as abi from '@api3/airnode-abi'; import { + go, + goSync, type LogFormat, type LogLevel, logFormatOptions, @@ -7,7 +9,6 @@ import { preProcessEndpointParameters, } from '@api3/commons'; import { oisSchema, type OIS, type Endpoint as oisEndpoint } from '@api3/ois'; -import { go, goSync } from '@api3/promise-utils'; import { ethers } from 'ethers'; import { isNil, uniqWith, isEqual, isEmpty, uniq } from 'lodash'; import { z } from 'zod'; diff --git a/packages/e2e/package.json b/packages/e2e/package.json index 7d642ba5..e9d91d73 100644 --- a/packages/e2e/package.json +++ b/packages/e2e/package.json @@ -18,9 +18,8 @@ }, "license": "MIT", "dependencies": { - "@api3/commons": "^1.2.0", + "@api3/commons": "^1.3.0", "@api3/airnode-feed": "workspace:*", - "@api3/promise-utils": "^0.4.0", "@api3/signed-api": "workspace:*", "axios": "^1.18.1", "ethers": "^5.8.0", diff --git a/packages/e2e/src/utils.ts b/packages/e2e/src/utils.ts index 35ba566e..35fde39f 100644 --- a/packages/e2e/src/utils.ts +++ b/packages/e2e/src/utils.ts @@ -1,5 +1,4 @@ -import { deriveBeaconId, type Hex } from '@api3/commons'; -import { goSync } from '@api3/promise-utils'; +import { deriveBeaconId, goSync, type Hex } from '@api3/commons'; import { ethers } from 'ethers'; export const formatData = (networkResponse: any) => { diff --git a/packages/signed-api/package.json b/packages/signed-api/package.json index 94263109..aa505df2 100644 --- a/packages/signed-api/package.json +++ b/packages/signed-api/package.json @@ -36,8 +36,7 @@ }, "dependencies": { "@api3/airnode-feed": "workspace:*", - "@api3/commons": "^1.2.0", - "@api3/promise-utils": "^0.4.0", + "@api3/commons": "^1.3.0", "@aws-sdk/client-s3": "^3.1095.0", "dotenv": "^17.4.2", "ethers": "^5.8.0", diff --git a/packages/signed-api/src/config/config.ts b/packages/signed-api/src/config/config.ts index 9c45071c..a8d8e4af 100644 --- a/packages/signed-api/src/config/config.ts +++ b/packages/signed-api/src/config/config.ts @@ -2,11 +2,12 @@ import { join } from 'node:path'; import { cwd } from 'node:process'; import { + go, + goSync, interpolateSecretsIntoConfig, loadConfig as loadRawConfigFromFilesystem, loadSecrets as loadRawSecretsFromFilesystem, } from '@api3/commons'; -import { go, goSync } from '@api3/promise-utils'; import { S3 } from '@aws-sdk/client-s3'; import { loadEnv } from '../env'; diff --git a/packages/signed-api/src/handlers.ts b/packages/signed-api/src/handlers.ts index c086a925..51daed46 100644 --- a/packages/signed-api/src/handlers.ts +++ b/packages/signed-api/src/handlers.ts @@ -1,6 +1,5 @@ import { signedApiBatchPayloadV1Schema, signedApiBatchPayloadV2Schema } from '@api3/airnode-feed'; -import { createSha256Hash, serializePlainObject } from '@api3/commons'; -import { go, goSync } from '@api3/promise-utils'; +import { createSha256Hash, go, goSync, serializePlainObject } from '@api3/commons'; import { isEmpty, omit, pick } from 'lodash'; import { getConfig } from './config/config'; diff --git a/packages/signed-api/src/index.ts b/packages/signed-api/src/index.ts index 9232951b..b10a3da4 100644 --- a/packages/signed-api/src/index.ts +++ b/packages/signed-api/src/index.ts @@ -1,4 +1,4 @@ -import { go } from '@api3/promise-utils'; +import { go } from '@api3/commons'; import z from 'zod'; import { loadConfig } from './config/config'; diff --git a/packages/signed-api/src/schema.ts b/packages/signed-api/src/schema.ts index 7610d2a8..a682bbdb 100644 --- a/packages/signed-api/src/schema.ts +++ b/packages/signed-api/src/schema.ts @@ -1,5 +1,4 @@ -import { type LogFormat, logFormatOptions, logLevelOptions, type LogLevel } from '@api3/commons'; -import { goSync } from '@api3/promise-utils'; +import { goSync, type LogFormat, logFormatOptions, logLevelOptions, type LogLevel } from '@api3/commons'; import { ethers } from 'ethers'; import { uniqBy } from 'lodash'; import { z } from 'zod'; diff --git a/packages/signed-api/src/server.ts b/packages/signed-api/src/server.ts index c7a08182..bc9f23d7 100644 --- a/packages/signed-api/src/server.ts +++ b/packages/signed-api/src/server.ts @@ -1,4 +1,4 @@ -import { go } from '@api3/promise-utils'; +import { go } from '@api3/commons'; import express from 'express'; import { getData, getStatus, listAirnodeAddresses, batchInsertData } from './handlers'; diff --git a/packages/signed-api/src/signed-data-verifier.ts b/packages/signed-api/src/signed-data-verifier.ts index 0e714e7f..bbd9a4b5 100644 --- a/packages/signed-api/src/signed-data-verifier.ts +++ b/packages/signed-api/src/signed-data-verifier.ts @@ -1,4 +1,4 @@ -import { goSync } from '@api3/promise-utils'; +import { goSync } from '@api3/commons'; import workerpool from 'workerpool'; import { type InternalSignedData } from './types'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a827fe8..587626a5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@api3/commons': - specifier: 1.2.0 - version: 1.2.0 + specifier: 1.3.0 + version: 1.3.0 '@api3/eslint-plugin-commons': specifier: ^3.1.1 version: 3.1.1(eslint@8.57.1)(jest@30.4.2(@types/node@24.13.3)(ts-node@10.9.2(@types/node@24.13.3)(typescript@5.9.3)))(prettier@3.9.6)(typescript@5.9.3) @@ -63,14 +63,11 @@ importers: specifier: ^0.15.0 version: 0.15.0(eslint@8.57.1)(jest@30.4.2(@types/node@24.13.3)(ts-node@10.9.2(@types/node@24.13.3)(typescript@5.9.3)))(typescript@5.9.3) '@api3/commons': - specifier: ^1.2.0 - version: 1.2.0 + specifier: ^1.3.0 + version: 1.3.0 '@api3/ois': specifier: ^3.0.0 version: 3.0.0 - '@api3/promise-utils': - specifier: ^0.4.0 - version: 0.4.0 axios: specifier: ^1.18.1 version: 1.18.1 @@ -106,11 +103,8 @@ importers: specifier: workspace:* version: link:../airnode-feed '@api3/commons': - specifier: ^1.2.0 - version: 1.2.0 - '@api3/promise-utils': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^1.3.0 + version: 1.3.0 '@api3/signed-api': specifier: workspace:* version: link:../signed-api @@ -152,11 +146,8 @@ importers: specifier: workspace:* version: link:../airnode-feed '@api3/commons': - specifier: ^1.2.0 - version: 1.2.0 - '@api3/promise-utils': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^1.3.0 + version: 1.3.0 '@aws-sdk/client-s3': specifier: ^3.1095.0 version: 3.1095.0 @@ -228,9 +219,9 @@ packages: peerDependencies: eslint: ^8.57.0 - '@api3/commons@1.2.0': - resolution: {integrity: sha512-9Bovi9tWpGVXxgkXC7YOeBXpiyWo2l8RmkHgfA9GAB4G3vZny+a8WHSQeWLNnJ4Zig7W9JTf2peExEAhhjsLjA==} - engines: {node: '>=18.14.0'} + '@api3/commons@1.3.0': + resolution: {integrity: sha512-2LqiFSa4l+1LwyfJSTpHRrRWBfDCL9xYlcRGO+RlAoRQz9/2Ym55iwuLpsvO2jQt4npNvsEUaOfFIpAohXjJIg==} + engines: {node: '>=18.20.8'} '@api3/eslint-plugin-commons@3.1.1': resolution: {integrity: sha512-W4S++YGgTBTPBRMJgJXO31EbWLYnFbPQZREvLrgJOLt/AxFjtYtkosbLViNTVkztH3EHWPaDUvuYD786kV4Nhw==} @@ -4387,10 +4378,9 @@ snapshots: - typescript - utf-8-validate - '@api3/commons@1.2.0': + '@api3/commons@1.3.0': dependencies: '@api3/ois': 3.0.0 - '@api3/promise-utils': 0.4.0 '@octokit/rest': 20.1.2 axios: 1.18.1 dotenv: 17.4.2