@certik/skynet 0.23.0 → 0.25.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.25.0
+
+- Added support for GraphQL v2 with `version` parameter to `gql` function
+- Removed `executeSql` function in `databricks` library
+
+## 0.24.0
+
+- BREAKING: `slack` `postMessageToConversation` no longer accepts `ChatPostMessageArguments` when `conversationId` is provided; pass a full `ChatPostMessageArguments` payload with `conversationId` omitted instead
+- `slack`: improve type-safety for `postMessageToConversation` and post the payload directly
+- Remove unused `md5` dependency and `@types/md5`
+
 ## 0.23.0
 
 - Added `goalert` module with `sendGoAlertAlert` helper

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "description": "Skynet Shared JS library",
   "type": "module",
   "exports": {
@@ -32,10 +32,6 @@
       "import": "./dist/const.js",
       "types": "./dist/const.d.ts"
     },
-    "./databricks": {
-      "import": "./dist/databricks.js",
-      "types": "./dist/databricks.d.ts"
-    },
     "./date": {
       "import": "./dist/date.js",
       "types": "./dist/date.d.ts"
@@ -114,14 +110,12 @@
     "@aws-sdk/client-s3": "^3.975.0",
     "@aws-sdk/client-sqs": "^3.975.0",
     "@aws-sdk/lib-dynamodb": "^3.975.0",
-    "@databricks/sql": "^1.12.0",
     "@elastic/elasticsearch": "^8.19.1",
     "@node-rs/xxhash": "^1.7.6",
     "@slack/web-api": "^7.13.0",
     "chalk": "^5.6.2",
     "execa": "^9.6.1",
     "express": "^5.2.1",
-    "md5": "^2.3.0",
     "meow": "^14.0.0",
     "p-memoize": "^8.0.0",
     "p-throttle": "^8.1.0",
@@ -133,7 +127,6 @@
     "@eslint/js": "^9.39.2",
     "@types/bun": "^1.3.6",
     "@types/express": "^5.0.6",
-    "@types/md5": "^2.3.6",
     "@types/which": "^3.0.4",
     "eslint": "^9.39.2",
     "eslint-plugin-import": "^2.32.0",
@@ -147,9 +140,5 @@
   "license": "MIT",
   "publishConfig": {
     "access": "public"
-  },
-  "patchedDependencies": {
-    "@databricks/sql@1.9.0": "patches/@databricks%2Fsql@1.9.0.patch",
-    "@databricks/sql@1.12.0": "patches/@databricks%2Fsql@1.12.0.patch"
   }
 }

package/src/graphql.ts

@@ -12,12 +12,22 @@ type GraphQLResponse<TData> = {
   errors?: GraphQLError[];
 };
 
-export async function gql<T>(query: string, variables: GraphqlVariables = {}) {
-  const endpoint = process.env["SKYNET_GRAPHQL_ENDPOINT"];
-  const apiKey = process.env["SKYNET_GRAPHQL_API_KEY"];
+type GraphQLVersion = "v1" | "v2";
+
+export async function gql<T>(query: string, variables: GraphqlVariables = {}, version: GraphQLVersion = "v1") {
+  if (!["v1", "v2"].includes(version)) {
+    throw new Error(`Invalid GraphQL version: ${version}`);
+  }
+
+  let endpoint = process.env["SKYNET_GRAPHQL_ENDPOINT"];
+  let apiKey = process.env["SKYNET_GRAPHQL_API_KEY"];
+  if (version === "v2") {
+    endpoint = process.env["SKYNET_GRAPHQL_ENDPOINT_V2"];
+    apiKey = process.env["SKYNET_GRAPHQL_API_KEY_V2"];
+  }
 
   if (!endpoint || !apiKey) {
-    throw new Error("SKYNET_GRAPHQL_ENDPOINT or SKYNET_GRAPHQL_API_KEY is not set");
+    throw new Error(`Missing GraphQL ${version} endpoint or API key`);
   }
 
   const res = await fetch(endpoint, {

package/src/por.ts

@@ -1,4 +1,4 @@
-import { CryptoHasher }  from "bun";
+import { CryptoHasher } from "bun";
 
 export interface UserLiability {
   userHash: string;
@@ -11,7 +11,7 @@ export interface MerkleProof {
   balance: number;
   token?: string;
   proof: string[];
-  positions: ('left' | 'right')[];
+  positions: ("left" | "right")[];
   rootHash: string;
   leafIndex: number;
   hashFunction?: (data: string) => string;
@@ -53,28 +53,27 @@ export class MerkleTreePoR {
     return this.hashFunction(data);
   }
 
-
   // hash user data
   private createLeafHash(user: UserLiability): string {
-    const leafData = `${user.userHash}:${user.balance}:${user.token || ''}`;
+    const leafData = `${user.userHash}:${user.balance}:${user.token || ""}`;
     return this.hash(leafData);
   }
 
   private buildTree(): void {
     if (this.userData.length === 0) {
-      throw new Error('Cannot build tree with empty user data');
+      throw new Error("Cannot build tree with empty user data");
     }
 
     // Create leaf hashes and store user mapping
     this.leaves = this.userData.map((user, index) => {
       const leafHash = this.createLeafHash(user);
-      this.userMap.set(`${user.userHash}:${user.token || ''}`, index);
+      this.userMap.set(`${user.userHash}:${user.token || ""}`, index);
       return leafHash;
     });
 
     // Start with leaf level
     let currentLevel = this.leaves;
-    this.tree.push(currentLevel.map(hash => ({ hash })));
+    this.tree.push(currentLevel.map((hash) => ({ hash })));
 
     // Build tree bottom-up
     while (currentLevel.length > 1) {
@@ -83,22 +82,18 @@ export class MerkleTreePoR {
 
       for (let i = 0; i < currentLevel.length; i += 2) {
         const left = currentLevel[i];
-        const right = i + 1 < currentLevel.length 
-          ? currentLevel[i + 1] 
-          : left; // Duplicate if odd number
+        const right = i + 1 < currentLevel.length ? currentLevel[i + 1] : left; // Duplicate if odd number
 
         const parentHash = this.hash(left + right);
         nextLevel.push(parentHash);
 
         const leftNode = this.tree[this.tree.length - 1][i];
-        const rightNode = i + 1 < currentLevel.length 
-          ? this.tree[this.tree.length - 1][i + 1] 
-          : leftNode;
+        const rightNode = i + 1 < currentLevel.length ? this.tree[this.tree.length - 1][i + 1] : leftNode;
 
         nextLevelNodes.push({
           hash: parentHash,
           left: leftNode,
-          right: rightNode
+          right: rightNode,
         });
       }
 
@@ -110,14 +105,14 @@ export class MerkleTreePoR {
   // get root hash of created tree
   getRootHash(): string {
     if (this.tree.length === 0) {
-      throw new Error('Merkle tree not built');
+      throw new Error("Merkle tree not built");
     }
     return this.tree[this.tree.length - 1][0].hash;
   }
 
   // generate merkle proof
   generateProof(userHash: string, token?: string): MerkleProof {
-    const key = `${userHash}:${token || ''}`;
+    const key = `${userHash}:${token || ""}`;
     const leafIndex = this.userMap.get(key);
     if (leafIndex === undefined) {
       throw new Error(`${userHash} not found in merkle tree for token ${token}`);
@@ -125,7 +120,7 @@ export class MerkleTreePoR {
 
     const user = this.userData[leafIndex];
     const proof: string[] = [];
-    const positions: ('left' | 'right')[] = [];
+    const positions: ("left" | "right")[] = [];
 
     let currentIndex = leafIndex;
 
@@ -137,11 +132,11 @@ export class MerkleTreePoR {
 
       if (siblingIndex < currentLevelSize) {
         proof.push(this.tree[level][siblingIndex].hash);
-        positions.push(isRightNode ? 'left' : 'right');
+        positions.push(isRightNode ? "left" : "right");
       } else {
         // When odd number, the last node is duplicated
         proof.push(this.tree[level][currentIndex].hash);
-        positions.push(isRightNode ? 'left' : 'right');
+        positions.push(isRightNode ? "left" : "right");
       }
 
       currentIndex = Math.floor(currentIndex / 2);
@@ -155,21 +150,21 @@ export class MerkleTreePoR {
       positions,
       rootHash: this.getRootHash(),
       leafIndex,
-      hashFunction: this.hashFunction !== this.defaultSHA256Hash ? this.hashFunction : undefined
+      hashFunction: this.hashFunction !== this.defaultSHA256Hash ? this.hashFunction : undefined,
     };
   }
 
   // verify inclusion using proof
   static verifyProof(merkleProof: MerkleProof): boolean {
-    const leafData = `${merkleProof.userHash}:${merkleProof.balance}:${merkleProof.token || ''}`;
+    const leafData = `${merkleProof.userHash}:${merkleProof.balance}:${merkleProof.token || ""}`;
     const hashFunction = merkleProof.hashFunction || MerkleTreePoR.defaultSHA256Hash;
     let currentHash = hashFunction(leafData);
-    
+
     for (let i = 0; i < merkleProof.proof.length; i++) {
       const siblingHash = merkleProof.proof[i];
       const position = merkleProof.positions[i];
 
-      if (position === 'left') {
+      if (position === "left") {
         currentHash = hashFunction(siblingHash + currentHash);
       } else {
         currentHash = hashFunction(currentHash + siblingHash);

package/src/slack.ts

@@ -11,12 +11,19 @@ async function postMessageToConversation({
   message,
   token,
   verbose,
-}: {
-  conversationId: string;
-  message: string | ChatPostMessageArguments;
-  token?: string;
-  verbose?: boolean;
-}) {
+}:
+  | {
+      conversationId: string;
+      message: string;
+      token?: string;
+      verbose?: boolean;
+    }
+  | {
+      conversationId?: undefined;
+      message: ChatPostMessageArguments;
+      token?: string;
+      verbose?: boolean;
+    }) {
   if (!token) {
     throw new Error("missing slack token");
   }
@@ -24,16 +31,13 @@ async function postMessageToConversation({
   try {
     const client = getClient(token);
 
-    const post = typeof message === "string" ? { text: message } : message;
+    const post = typeof conversationId === "string" ? { channel: conversationId, text: message } : message;
 
     if (verbose) {
-      console.log(`posting to slack conversation ${conversationId}:`, JSON.stringify(post, null, 2));
+      console.log(`posting to slack:`, JSON.stringify(post, null, 2));
     }
 
-    await client.chat.postMessage({
-      channel: conversationId,
-      ...post,
-    });
+    await client.chat.postMessage(post);
   } catch (error) {
     console.error("failed to post slack message", error);
 

package/.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "conventionalCommits.scopes": [
-        "lib-skynet"
-    ]
-}

package/dist/abi.d.ts

@@ -1,111 +0,0 @@
-export declare const ERC20: ({
-    constant: boolean;
-    inputs: {
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        name: string;
-        type: string;
-    }[];
-    payable: boolean;
-    stateMutability: string;
-    type: string;
-} | {
-    name: string;
-    payable: boolean;
-    stateMutability: string;
-    type: string;
-    constant?: undefined;
-    inputs?: undefined;
-    outputs?: undefined;
-} | {
-    inputs: {
-        indexed: boolean;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    type: string;
-    constant?: undefined;
-    outputs?: undefined;
-    payable?: undefined;
-    stateMutability?: undefined;
-})[];
-export declare const ERC721: ({
-    inputs: {
-        indexed: boolean;
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    type: string;
-    constant?: undefined;
-    outputs?: undefined;
-    payable?: undefined;
-    stateMutability?: undefined;
-} | {
-    constant: boolean;
-    inputs: never[];
-    name: string;
-    outputs: {
-        name: string;
-        type: string;
-    }[];
-    payable: boolean;
-    stateMutability: string;
-    type: string;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    constant?: undefined;
-    payable?: undefined;
-})[];
-export declare const BEP20: ({
-    constant: boolean;
-    inputs: {
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        name: string;
-        type: string;
-    }[];
-    payable: boolean;
-    stateMutability: string;
-    type: string;
-} | {
-    name: string;
-    payable: boolean;
-    stateMutability: string;
-    type: string;
-    constant?: undefined;
-    inputs?: undefined;
-    outputs?: undefined;
-} | {
-    inputs: {
-        indexed: boolean;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    type: string;
-    constant?: undefined;
-    outputs?: undefined;
-    payable?: undefined;
-    stateMutability?: undefined;
-})[];