diff --git a/bin/cancel-pending-tx.js b/bin/cancel-pending-tx.js index b3d7e33e..d3d7c698 100644 --- a/bin/cancel-pending-tx.js +++ b/bin/cancel-pending-tx.js @@ -104,8 +104,8 @@ async function getMessagesInMempool (f4addr) { const res = await pRetry( () => fetch(`https://filfox.info/api/v1/message/mempool/filtered-list?address=${f4addr}&pageSize=1000`), { - async onFailedAttempt (error) { - console.warn(error) + async onFailedAttempt (ctx) { + console.warn(ctx) console.warn('Filfox request failed. Retrying...') } } diff --git a/lib/evaluate.js b/lib/evaluate.js index 3481d1ef..c3b97996 100644 --- a/lib/evaluate.js +++ b/lib/evaluate.js @@ -129,8 +129,8 @@ export const evaluate = async ({ await pRetry( () => prepareProviderRetrievalResultStats(round, committees), { - async onFailedAttempt (error) { - console.warn(error) + async onFailedAttempt (ctx) { + console.warn(ctx) console.warn( 'Preparing provider retrieval result stats failed. Retrying...' ) diff --git a/lib/platform-stats.js b/lib/platform-stats.js index 2d0d6305..2d5e11f7 100644 --- a/lib/platform-stats.js +++ b/lib/platform-stats.js @@ -254,7 +254,7 @@ export const updateTopMeasurementParticipants = async (pgClient) => { await pgClient.query('REFRESH MATERIALIZED VIEW top_measurement_participants_yesterday_mv') }, { retries: 3, - onFailedAttempt: (error) => { + onFailedAttempt: ({ error }) => { console.warn(`Attempt to refresh materialized view failed: ${error.message}. Retrying...`) } }) diff --git a/lib/preprocess.js b/lib/preprocess.js index 7d2e94b3..9ab9e85d 100644 --- a/lib/preprocess.js +++ b/lib/preprocess.js @@ -66,10 +66,10 @@ export const preprocess = async ({ attempt => fetchMeasurements(cid, { noCache: attempt > 1 }), { retries: fetchRetries, - onFailedAttempt: err => { + onFailedAttempt: ctx => { if (!fetchRetries) return - console.error(err) - console.error(`Retrying ${cid} ${err.retriesLeft} more times`) + console.error(ctx) + console.error(`Retrying ${cid} ${ctx.retriesLeft} more times`) } } ) diff --git a/package-lock.json b/package-lock.json index a105de2e..37691a75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "ms": "^2.1.3", "multiformats": "^13.4.0", "p-map": "^7.0.3", - "p-retry": "^6.2.1", + "p-retry": "^7.0.0", "pg": "^8.16.3", "postgrator": "^8.0.0" }, @@ -1230,11 +1230,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/retry": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz", - "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==" - }, "node_modules/@ucanto/client": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/@ucanto/client/-/client-9.0.1.tgz", @@ -5875,9 +5870,10 @@ } }, "node_modules/is-network-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.0.1.tgz", - "integrity": "sha512-OwQXkwBJeESyhFw+OumbJVD58BFBJJI5OM5S1+eyrDKlgDZPX2XNT5gXS56GSD3NPbbwUuMlR1Q71SRp5SobuQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz", + "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==", + "license": "MIT", "engines": { "node": ">=16" }, @@ -8163,16 +8159,15 @@ } }, "node_modules/p-retry": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz", - "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-7.0.0.tgz", + "integrity": "sha512-3BgO9rjULJYyr0Y0pcsG7FZ+7JB/hfOODO8kx9ppumiO5jprUF92WK/Y7Q0xppZtq4VhTcPiVq7qWLQfIV5aKQ==", + "license": "MIT", "dependencies": { - "@types/retry": "0.12.2", - "is-network-error": "^1.0.0", - "retry": "^0.13.1" + "is-network-error": "^1.1.0" }, "engines": { - "node": ">=16.17" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" diff --git a/package.json b/package.json index 2bd0dc51..0e3c6b2e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "ms": "^2.1.3", "multiformats": "^13.4.0", "p-map": "^7.0.3", - "p-retry": "^6.2.1", + "p-retry": "^7.0.0", "pg": "^8.16.3", "postgrator": "^8.0.0" },