@certik/skynet 0.10.66 → 0.11.1

package/graphql.js

@@ -1,8 +1,6 @@
-const fetch = require("node-fetch");
-
 const GRAPHQL_API_KEY = process.env.SKYNET_GRAPHQL_API_KEY || process.env.GRAPHQL_API_KEY;
 
-async function gql(url, query, variables = {}) {
+export async function gql(url, query, variables = {}) {
   const res = await fetch(url, {
     method: "POST",
     headers: {
@@ -24,7 +22,3 @@ async function gql(url, query, variables = {}) {
     throw new Error(await res.text());
   }
 }
-
-module.exports = {
-  gql,
-};

package/indexer.js

@@ -1,12 +1,12 @@
-const meow = require("meow");
-const { createRecord, getRecordByKey } = require("./dynamodb");
-const { getEnvironment } = require("./env");
-const { exponentialRetry } = require("./availability");
-const { range: numberRange, fillRange: fillNumberRange } = require("./util");
-const { getSelectorFlags, getSelectorDesc, toSelectorString } = require("./selector");
-const { getBinaryName } = require("./cli");
-const { inline } = require("./log");
-const { findDateAfter, dateRange, daysInRange: fillDateRange } = require("./date");
+import meow from "meow";
+import { createRecord, getRecordByKey } from "./dynamodb.js";
+import { getEnvironment } from "./env.js";
+import { exponentialRetry } from "./availability.js";
+import { range as numberRange, fillRange as fillNumberRange } from "./util.js";
+import { getSelectorFlags, getSelectorDesc, toSelectorString } from "./selector.js";
+import { getBinaryName } from "./cli.js";
+import { inline } from "./log.js";
+import { findDateAfter, dateRange, daysInRange as fillDateRange } from "./date.js";
 
 const STATE_TABLE_NAME = "skynet-" + getEnvironment() + "-indexer-state";
 
@@ -506,6 +506,7 @@ ${getSelectorDesc(selector)}
           --verbose       Output debug messages
       `,
       {
+        importMeta: import.meta,
         description: false,
         version: false,
         flags: {
@@ -562,6 +563,7 @@ ${getSelectorDesc(selector)}
           --verbose       Output debug messages
       `,
       {
+        importMeta: import.meta,
         description: false,
         version: false,
         flags: {
@@ -623,7 +625,7 @@ ${getSelectorDesc(selector)}
   return { run };
 }
 
-module.exports = {
+export {
   increaseId,
   createModeIndexerApp,
   createIndexerApp,

package/kafka.js

@@ -1,13 +1,12 @@
-const meow = require("meow");
-const { getEnvironment, getEnvOrThrow } = require("./env");
-const { wait } = require("./availability");
-const { Kafka, logLevel } = require("kafkajs");
-const { getJobName, getSelectorFlags, getSelectorDesc, toSelectorString } = require("./selector");
-const { createRecord, getRecordByKey, deleteRecordsByHashKey } = require("./dynamodb");
-const { exponentialRetry } = require("./availability");
-const { useLock } = require("./distributed-lock");
-const { getBinaryName } = require("./cli");
-const { inline } = require("./log");
+import meow from "meow";
+import { Kafka, logLevel } from "kafkajs";
+import { getEnvironment, getEnvOrThrow } from "./env.js";
+import { getJobName, getSelectorFlags, getSelectorDesc, toSelectorString } from "./selector.js";
+import { createRecord, getRecordByKey, deleteRecordsByHashKey } from "./dynamodb.js";
+import { wait, exponentialRetry } from "./availability.js";
+import { useLock } from "./distributed-lock.js";
+import { getBinaryName } from "./cli.js";
+import { inline } from "./log.js";
 
 const STATE_TABLE_NAME = "skynet-" + getEnvironment() + "-indexer-state";
 
@@ -169,6 +168,7 @@ ${getSelectorDesc(selector)}
           --reset         restart producer
       `,
       {
+        importMeta: import.meta,
         description: false,
         version: false,
         flags: {
@@ -358,6 +358,7 @@ ${getSelectorDesc(selector)}
           --verbose       Output debug messages
       `,
       {
+        importMeta: import.meta,
         description: false,
         version: false,
         flags: {
@@ -438,7 +439,7 @@ ${getSelectorDesc(selector)}
   return { run };
 }
 
-module.exports = {
+export {
   createProducerApp,
   createConsumerApp,
   produceMessages,

package/log.js

@@ -40,7 +40,7 @@ const inline = {
   },
 };
 
-module.exports = {
+export {
   getLine,
   print,
   inline,

package/metric.js

@@ -1,8 +1,8 @@
-const { getDocClient } = require("./dynamodb");
+import { getDocClient } from "./dynamodb.js";
 
 /* Assume table has name/timestamp/value fields */
 
-async function getMetricAt(tableName, name, timestamp) {
+export async function getMetricAt(tableName, name, timestamp) {
   const docClient = getDocClient();
 
   const query = await docClient
@@ -31,7 +31,7 @@ async function getMetricAt(tableName, name, timestamp) {
   }
 }
 
-async function getMetricPreviousValue(tableName, name, timestamp) {
+export async function getMetricPreviousValue(tableName, name, timestamp) {
   const docClient = getDocClient();
 
   const query = await docClient
@@ -58,8 +58,3 @@ async function getMetricPreviousValue(tableName, name, timestamp) {
     return value;
   }
 }
-
-module.exports = {
-  getMetricAt,
-  getMetricPreviousValue
-}

package/monitor.js

@@ -1,10 +1,9 @@
-const meow = require("meow");
-const fetch = require("node-fetch");
-const { getSelectorFlags, getSelectorDesc, toSelectorString } = require("./selector");
-const { getBinaryName } = require("./cli");
-const { exponentialRetry } = require("./availability");
-const { postGenieMessage } = require("./opsgenie");
-const { getJobName } = require("./deploy");
+import meow from "meow";
+import { getSelectorFlags, getSelectorDesc, toSelectorString } from "./selector.js";
+import { getBinaryName } from "./cli.js";
+import { exponentialRetry } from "./availability.js";
+import { postGenieMessage } from "./opsgenie.js";
+import { getJobName } from "./deploy.js";
 
 const ERROR_LEVEL = {
   INFO: "Info",
@@ -49,6 +48,7 @@ async function getMostRecentJobLaunch(name) {
     const recentFinishedJob = jobs.reverse().find((job) => {
       // filter out monitor job
       return job.ID.indexOf("-monitor") === -1 && job.Status === "dead";
+
     });
 
     if (!recentFinishedJob) {
@@ -86,6 +86,7 @@ ${
           --verbose       Output debug messages
       `,
       {
+        importMeta: import.meta,
         description: false,
         version: false,
         flags: {
@@ -193,4 +194,4 @@ ${
   return { monitor };
 }
 
-module.exports = { createMonitor, ERROR_LEVEL, LEVEL_EMOJI };
+export { createMonitor, ERROR_LEVEL, LEVEL_EMOJI };

package/opensearch.js

@@ -1,7 +1,7 @@
-const { Client } = require("@opensearch-project/opensearch");
+import { Client } from "@opensearch-project/opensearch";
 
 // newOpensearchClient creates a new opensearch client with the given endpoint, key, secret and extra opensearch client options.
-function newOpensearchClient(endpoint, key, secret, options = {}) {
+export function newOpensearchClient(endpoint, key, secret, options = {}) {
   return new Client({
     node: endpoint,
     auth: {
@@ -18,7 +18,7 @@ function newOpensearchClient(endpoint, key, secret, options = {}) {
 // the index from growing too large.
 // Returns an object with status and result properties. The status is either "ok" or "error". The result is the response from opensearch
 // if the status is "ok" or the error message if the status is "error".
-async function sendToOpensearch(client, appName, index, record, indexSuffixes = []) {
+export async function sendToOpensearch(client, appName, index, record, indexSuffixes = []) {
   try {
     const result = await client.index({
       index: indexSuffixes ? [index, ...indexSuffixes].join("-") : index,
@@ -32,8 +32,3 @@ async function sendToOpensearch(client, appName, index, record, indexSuffixes =
     return { status: "error", result: err.stack ? err.stack : err };
   }
 }
-
-module.exports = {
-  newOpensearchClient,
-  sendToOpensearch,
-};

package/opsgenie.js

@@ -1,5 +1,4 @@
-const fetch = require("node-fetch");
-const md5 = require("md5");
+import md5 from "md5";
 
 function getGenieKey(key) {
   return key || process.env.OPSGENIE_API_KEY;
@@ -9,7 +8,7 @@ function getGenieEndPoint() {
   return process.env.OPSGENIE_END_POINT || "https://api.opsgenie.com/v2/alerts";
 }
 
-async function postGenieMessage(body, apiKey, verbose) {
+export async function postGenieMessage(body, apiKey, verbose) {
   try {
     const genieKey = apiKey || getGenieKey();
     const genieEndPoint = getGenieEndPoint(genieKey);
@@ -45,5 +44,3 @@ async function postGenieMessage(body, apiKey, verbose) {
     throw error;
   }
 }
-
-module.exports = { postGenieMessage };

package/package.json

@@ -1,42 +1,47 @@
 {
   "name": "@certik/skynet",
-  "version": "0.10.66",
+  "version": "0.11.1",
   "description": "Skynet Shared JS library",
+  "type": "module",
   "main": "index.js",
   "author": "CertiK Engineering",
   "scripts": {
     "lint": "eslint *.js test",
-    "test": "doppler run -- ava",
+    "test": "doppler run -- ava --timeout=1m",
     "format": "prettier --write '*.js' '**/*.js'",
     "pub": "npm publish --access public"
   },
   "engines": {
-    "node": ">= 14"
+    "node": ">= 18"
   },
   "dependencies": {
+    "@aws-sdk/client-dynamodb": "^3.409.0",
+    "@aws-sdk/client-s3": "^3.409.0",
+    "@aws-sdk/client-sqs": "^3.409.0",
+    "@aws-sdk/lib-dynamodb": "^3.409.0",
     "@opensearch-project/opensearch": "^2.3.1",
-    "@slack/web-api": "^6.4.0",
-    "ably": "^1.2.22",
-    "abort-controller": "^3.0.0",
-    "aws-sdk": "^2.1164.0",
+    "@slack/web-api": "^6.9.0",
+    "ably": "^1.2.44",
     "bottleneck": "^2.19.5",
-    "chalk": "^4.1.2",
-    "execa": "^5.1.1",
-    "express": "^4.18.1",
-    "kafkajs": "^2.1.0",
+    "chalk": "^5.3.0",
+    "execa": "^8.0.1",
+    "express": "^4.18.2",
+    "kafkajs": "^2.2.4",
     "md5": "^2.3.0",
-    "meow": "^9.0.0",
-    "node-fetch": "^2.6.7",
-    "snowflake-sdk": "^1.6.23",
-    "web3": "^1.3.5",
-    "which": "^2.0.2"
+    "meow": "^12.1.1",
+    "snowflake-sdk": "^1.8.0",
+    "web3": "^4.1.1",
+    "which": "^4.0.0"
   },
   "devDependencies": {
-    "ava": "^5.0.1",
-    "eslint": "^8.39.0",
-    "eslint-plugin-import": "^2.27.5",
+    "ava": "^5.3.1",
+    "eslint": "^8.49.0",
+    "eslint-plugin-import": "^2.28.1",
     "prettier": "^3.0.3",
-    "sinon": "^14.0.0"
+    "sinon": "^15.2.0"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/price.js

@@ -1,24 +1,25 @@
-const { getDocClient } = require("./dynamodb");
+import { QueryCommand } from "@aws-sdk/lib-dynamodb";
+import { getDocClient } from "./dynamodb.js";
 
 async function queryPrice(tableName, address, timestamp, op = "<") {
   const docClient = getDocClient();
 
-  return await docClient
-    .query({
+  return await docClient.send(
+    new QueryCommand({
       TableName: tableName,
       KeyConditionExpression: `#address = :address and #timestamp ${op} :timestamp`,
       ExpressionAttributeNames: {
         "#timestamp": "timestamp",
-        "#address": "address"
+        "#address": "address",
       },
       ExpressionAttributeValues: {
         ":timestamp": timestamp,
-        ":address": address
+        ":address": address,
       },
       Limit: 1,
-      ScanIndexForward: false
-    })
-    .promise();
+      ScanIndexForward: false,
+    }),
+  );
 }
 
 async function getPricePreviousRecord(tableName, address, timestamp) {
@@ -42,7 +43,4 @@ async function getPriceClosestTo(tableName, address, timestamp) {
   }
 }
 
-module.exports = {
-  getPriceClosestTo,
-  getPricePreviousRecord
-};
+export { getPriceClosestTo, getPricePreviousRecord };

package/primitive.js

@@ -71,7 +71,8 @@ async function overrideScoreAndIssues(
     issues,
   };
 }
-module.exports = {
+
+export {
   getOverrides,
   overrideScoreAndIssues,
 };

package/proxy.d.ts

@@ -1,5 +1,3 @@
-import { RequestInit, Response } from "node-fetch";
-
 type Options = {
     verbose: boolean;
     timeout: number;

package/proxy.js

@@ -1,6 +1,3 @@
-const fetch = require("node-fetch");
-const AbortController = require("abort-controller");
-
 const PROXY_INSTANCES = [
   "https://uer87capga.execute-api.us-east-1.amazonaws.com/", // 0
   "https://t7utq0a5hb.execute-api.us-east-1.amazonaws.com/",
@@ -154,4 +151,4 @@ async function proxyFetch(url, options = {}) {
   }
 }
 
-module.exports = proxyFetch;
+export default proxyFetch;

package/s3.js

@@ -1,10 +1,20 @@
-const { getAWSAccessKeyId, getAWSSecretAccessKey, getAWSRegion } = require("./env");
-const { S3 } = require("aws-sdk");
+import {
+  S3Client,
+  GetObjectCommand,
+  HeadObjectCommand,
+  PutObjectCommand,
+  DeleteObjectCommand,
+  ListObjectsV2Command,
+  NotFound,
+} from "@aws-sdk/client-s3";
+import { getAWSAccessKeyId, getAWSSecretAccessKey, getAWSRegion } from "./env.js";
 
 function getS3() {
-  return new S3({
-    accessKeyId: getAWSAccessKeyId(),
-    secretAccessKey: getAWSSecretAccessKey(),
+  return new S3Client({
+    credentials: {
+      accessKeyId: getAWSAccessKeyId(),
+      secretAccessKey: getAWSSecretAccessKey(),
+    },
     region: getAWSRegion(),
   });
 }
@@ -15,8 +25,8 @@ async function readFile(bucketName, key, verbose = false) {
   const params = { Bucket: bucketName, Key: key };
 
   try {
-    const result = await s3.getObject(params).promise();
-    return result.Body.toString("utf-8");
+    const result = await s3.send(new GetObjectCommand(params));
+    return result.Body.transformToString();
   } catch (noSuchKeyErr) {
     if (verbose) {
       console.log("no such bucket or key", bucketName, key);
@@ -30,11 +40,11 @@ async function hasFile(bucketName, key) {
   const s3 = getS3();
 
   try {
-    await s3.headObject({ Bucket: bucketName, Key: key }).promise();
+    await s3.send(new HeadObjectCommand({ Bucket: bucketName, Key: key }));
 
     return true;
   } catch (headErr) {
-    if (headErr.statusCode === 404) {
+    if (headErr instanceof NotFound) {
       return false;
     }
 
@@ -67,7 +77,7 @@ async function writeFile(bucketName, key, body, options = {}) {
     console.log("uploading", key);
   }
 
-  await s3.upload(params).promise();
+  await s3.send(new PutObjectCommand(params));
 }
 
 async function deleteFile(bucketName, key, verbose = false) {
@@ -76,7 +86,7 @@ async function deleteFile(bucketName, key, verbose = false) {
   const params = { Bucket: bucketName, Key: key };
 
   try {
-    await s3.deleteObject(params).promise();
+    await s3.send(new DeleteObjectCommand(params));
   } catch (noSuchKeyErr) {
     if (verbose) {
       console.log("no such bucket or key", bucketName, key);
@@ -95,7 +105,7 @@ async function listKeys(bucketname, prefix, continuationToken) {
 
   let data = null;
   try {
-    data = await s3.listObjectsV2(params).promise();
+    data = await s3.send(new ListObjectsV2Command(params));
   } catch (err) {
     if (err.statusCode && err.statusCode === 400) {
       return null;
@@ -112,11 +122,4 @@ async function listKeys(bucketname, prefix, continuationToken) {
   return res;
 }
 
-module.exports = {
-  getS3,
-  hasFile,
-  readFile,
-  writeFile,
-  deleteFile,
-  listKeys,
-};
+export { getS3, hasFile, readFile, writeFile, deleteFile, listKeys };

package/scan.js

@@ -1,6 +1,5 @@
-const { exponentialRetry, wait } = require("./availability");
-const { PROTOCOLS } = require("./const");
-const fetch = require("node-fetch");
+import { exponentialRetry, wait } from "./availability.js";
+import { PROTOCOLS } from "./const.js";
 
 const BATCH_SIZE = 10_000; // Max number of transactions fetched from scan api at once
 
@@ -72,4 +71,4 @@ async function streamTxs(address, since, to, callback, verbose) {
   }
 }
 
-module.exports = { streamTxs, fetchTxs, fetchTxsWithRetry };
+export { streamTxs, fetchTxs, fetchTxsWithRetry };

package/selector.js

@@ -68,7 +68,7 @@ function getJobName(name, selectorFlags, mode = null) {
   return jobName;
 }
 
-module.exports = {
+export {
   getJobName,
   getSelectorDesc,
   getSelectorFlags,

package/slack.js

@@ -1,4 +1,4 @@
-const { WebClient } = require("@slack/web-api");
+import { WebClient } from "@slack/web-api";
 
 function getToken() {
   return process.env.SKYNET_SLACK_TOKEN;
@@ -89,4 +89,4 @@ async function postMessage(channel, message, verbose) {
   }
 }
 
-module.exports = { getClient, findConversation, postMessage };
+export { getClient, findConversation, postMessage };

package/snowflake.js

@@ -1,6 +1,6 @@
-const snowflake = require("snowflake-sdk");
-const { promisify } = require("util");
-const { ensureAndGet } = require("./env");
+import snowflake from "snowflake-sdk";
+import { promisify } from "util";
+import { ensureAndGet } from "./env.js";
 
 async function getConnection(options) {
   const connection = snowflake.createConnection({
@@ -30,7 +30,7 @@ async function executeSql(options, sql, binds) {
   });
 }
 
-module.exports = {
+export {
   getConnection,
   executeSql,
 };

package/sqs.js

@@ -1,12 +1,10 @@
-const { SQS } = require("aws-sdk");
-const { getAWSAccessKeyId, getAWSSecretAccessKey, getAWSRegion } = require("./env");
+import { SQS } from "@aws-sdk/client-sqs";
+import { getAWSAccessKeyId, getAWSSecretAccessKey, getAWSRegion } from "./env.js";
 
-function getSQS() {
+export function getSQS() {
   return new SQS({
     accessKeyId: getAWSAccessKeyId(),
     secretAccessKey: getAWSSecretAccessKey(),
     region: getAWSRegion(),
   });
 }
-
-module.exports = { getSQS };

package/token.js

@@ -1,6 +1,6 @@
-const { getEnvironment } = require("./env");
-const { getPriceClosestTo } = require("./price");
-const BigNumber = require("bignumber.js");
+import { getEnvironment } from "./env.js";
+import { getPriceClosestTo } from "./price.js";
+import BigNumber from "bignumber.js";
 
 const TOKEN_PRICE_TABLE_NAME = `skynet-${getEnvironment()}-token-prices`;
 const TOKEN_PRICE_CACHE = {};
@@ -39,7 +39,7 @@ function toHumanDecimal(bigNumber, decimals) {
   return new BigNumber(bigNumber).dividedBy(dividend);
 }
 
-module.exports = {
+export {
   getTokenPriceAt,
   toNativeDecimal,
   toHumanDecimal,

package/transaction.js

@@ -1,6 +1,5 @@
-const fetch = require("node-fetch");
-const { PROTOCOLS } = require("./const");
-const { exponentialRetry } = require("./availability");
+import { PROTOCOLS } from "./const.js";
+import { exponentialRetry } from "./availability.js";
 
 async function getTxReceipt(protocol, txHash, verbose = false) {
   const { endpoint } = PROTOCOLS[protocol];
@@ -38,6 +37,6 @@ async function getTxReceipt(protocol, txHash, verbose = false) {
   return result;
 }
 
-module.exports = {
+export {
   getTxReceipt
 };

package/util.js

@@ -58,7 +58,7 @@ function chunk(array, count) {
   return result;
 }
 
-module.exports = {
+export {
   arrayGroup,
   partition,
   range,

package/web3.js

@@ -1,7 +1,7 @@
-const Web3 = require("web3");
-const { PROTOCOLS } = require("./const");
-const { MULTICALL } = require("./abi");
-const { chunk } = require("./util");
+import { Web3 } from "web3";
+import { PROTOCOLS } from "./const.js";
+import { MULTICALL } from "./abi.js";
+import { chunk } from "./util.js";
 const MULTICALL_CHUNK_SIZE = 400;
 
 function newWeb3ByProtocol(protocol) {
@@ -110,7 +110,7 @@ async function multiCall({ protocol, limiter = null, target, abi, calls }) {
   return { actualCallCount: callChunks.length, output: responses };
 }
 
-module.exports = {
+export {
   newWeb3ByProtocol,
   singleCall,
   multiCall,

package/.eslintrc.js

@@ -1,13 +0,0 @@
-module.exports = {
-  env: {
-    node: true,
-    browser: false,
-    commonjs: true,
-    es2021: true,
-  },
-  extends: ["eslint:recommended", "plugin:import/recommended"],
-  parserOptions: {
-    ecmaVersion: 12,
-  },
-  rules: {},
-};

package/.prettierrc.js

@@ -1,3 +0,0 @@
-module.exports = {
-  printWidth: 120,
-};