sdk/ccq: refine dependencies

sdk/js-query/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.0.3
+
+Explicitly import buffer
+
+## 0.0.2
+
+Switch out web3.utils.keccak256 for @ethersproject/keccak256
+
 ## 0.0.1
 
 Initial release

sdk/js-query/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wormhole-foundation/wormhole-query-sdk",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Wormhole cross-chain query SDK",
   "homepage": "https://wormhole.com",
   "main": "./lib/cjs/index.js",
@@ -28,12 +28,14 @@
     "prettier": "^2.3.2",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.3",
+    "web3": "^4.1.2"
   },
   "sideEffects": false,
   "dependencies": {
+    "@ethersproject/keccak256": "^5.7.0",
     "@types/elliptic": "^6.4.14",
-    "elliptic": "^6.5.4",
+    "buffer": "^6.0.3",
-    "web3": "^4.1.2"
+    "elliptic": "^6.5.4"
   }
 }

sdk/js-query/src/query/BinaryWriter.ts

@@ -1,3 +1,5 @@
+import { Buffer } from "buffer";
+
 // BinaryWriter appends data to the end of a buffer, resizing the buffer as needed
 // Numbers are encoded as big endian
 export class BinaryWriter {

sdk/js-query/src/query/ethCall.ts

@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { BinaryWriter } from "./BinaryWriter";
 import { HexString } from "./consts";
 import { ChainQueryType, ChainSpecificQuery } from "./request";

sdk/js-query/src/query/ethCallByTimestamp.ts

@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { BinaryWriter } from "./BinaryWriter";
 import { BlockTag, EthCallData } from "./ethCall";
 import { ChainQueryType, ChainSpecificQuery } from "./request";

sdk/js-query/src/query/request.ts

@@ -1,6 +1,7 @@
+import { keccak256 } from "@ethersproject/keccak256";
+import { Buffer } from "buffer";
 import { BinaryWriter } from "./BinaryWriter";
 import { Network } from "./consts";
-import { utils } from "web3";
 import { hexToUint8Array } from "./utils";
 
 export const MAINNET_QUERY_REQUEST_PREFIX =
@@ -41,7 +42,7 @@ export class QueryRequest {
   static digest(network: Network, bytes: Uint8Array): Uint8Array {
     const prefix = getPrefix(network);
     const data = Buffer.concat([Buffer.from(prefix), bytes]);
-    return hexToUint8Array(utils.keccak256(data).slice(2));
+    return hexToUint8Array(keccak256(data).slice(2));
   }
 }
 

sdk/js-query/src/query/utils.ts

@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import * as elliptic from "elliptic";
 
 export function isValidHexString(s: string): boolean {