Merge pull request #163 from torusresearch/feat/remove-commitments

make commitment request optional

Author: himanshuchawla009

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/torus.js",
-  "version": "15.0.0-alpha.1",
+  "version": "15.0.2",
   "description": "Handle communication with torus nodes",
   "main": "dist/lib.cjs/index.js",
   "module": "dist/lib.esm/index.js",
@@ -25,23 +25,23 @@
   },
   "dependencies": {
     "@toruslabs/constants": "^14.0.0",
+    "@toruslabs/bs58": "^1.0.0",
     "@toruslabs/eccrypto": "^5.0.4",
     "@toruslabs/http-helpers": "^7.0.0",
     "bn.js": "^5.2.1",
     "elliptic": "^6.5.6",
-    "bs58": "^6.0.0",
     "ethereum-cryptography": "^2.2.1",
     "json-stable-stringify": "^1.1.1",
     "loglevel": "^1.9.1"
   },
   "devDependencies": {
     "@babel/register": "^7.24.6",
     "@babel/runtime": "^7.25.0",
-    "@toruslabs/config": "^2.1.0",
-    "@toruslabs/eslint-config-typescript": "^3.3.1",
+    "@toruslabs/config": "^2.2.0",
+    "@toruslabs/eslint-config-typescript": "^3.3.3",
     "@toruslabs/fetch-node-details": "^14.0.1",
-    "@toruslabs/torus-scripts": "^6.0.1",
-    "@types/chai": "^4.3.16",
+    "@toruslabs/torus-scripts": "^6.1.1",
+    "@types/chai": "^4.3.17",
     "@types/elliptic": "^6.4.18",
     "@types/faker": "^5.5.3",
     "@types/json-stable-stringify": "^1.0.36",
@@ -55,7 +55,7 @@
     "faker": "^5.5.3",
     "husky": "^9.1.4",
     "jsonwebtoken": "^9.0.2",
-    "lint-staged": "^15.2.7",
+    "lint-staged": "^15.2.8",
     "mocha": "^10.7.0",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",

package.json

@@ -1,5 +1,6 @@
 export const JRPC_METHODS = {
   GET_OR_SET_KEY: "GetPubKeyOrKeyAssign",
+  VERIFIER_LOOKUP: "VerifierLookupRequest",
   COMMITMENT_REQUEST: "CommitmentRequest",
   IMPORT_SHARES: "ImportShares",
   GET_SHARE_OR_KEY_ASSIGN: "GetShareOrKeyAssign",

src/constants.ts

@@ -5,7 +5,7 @@ import { ec as EC } from "elliptic";
 import { keccak256 as keccakHash } from "ethereum-cryptography/keccak";
 import JsonStringify from "json-stable-stringify";
 
-import { CommitmentRequestResult, EciesHex, KeyType, VerifierLookupResponse } from "../interfaces";
+import { CommitmentRequestResult, EciesHex, GetORSetKeyResponse, KeyType, VerifierLookupResponse } from "../interfaces";
 
 export function keccak256(a: Buffer): string {
   const hash = Buffer.from(keccakHash(a)).toString("hex");
@@ -28,8 +28,8 @@ export const getKeyCurve = (keyType: KeyType) => {
 // For ex: some fields returns by nodes might be different from each other
 // like created_at field might vary and nonce_data might not be returned by all nodes because
 // of the metadata implementation in sapphire.
-export const normalizeKeysResult = (result: VerifierLookupResponse) => {
-  const finalResult: Pick<VerifierLookupResponse, "keys" | "is_new_key"> = {
+export const normalizeKeysResult = (result: GetORSetKeyResponse) => {
+  const finalResult: Pick<GetORSetKeyResponse, "keys" | "is_new_key"> = {
     keys: [],
     is_new_key: result.is_new_key,
   };
@@ -46,6 +46,23 @@ export const normalizeKeysResult = (result: VerifierLookupResponse) => {
   return finalResult;
 };
 
+export const normalizeLookUpResult = (result: VerifierLookupResponse) => {
+  const finalResult: Pick<VerifierLookupResponse, "keys"> = {
+    keys: [],
+  };
+  if (result && result.keys && result.keys.length > 0) {
+    const finalKey = result.keys[0];
+    finalResult.keys = [
+      {
+        pub_key_X: finalKey.pub_key_X,
+        pub_key_Y: finalKey.pub_key_Y,
+        address: finalKey.address,
+      },
+    ];
+  }
+  return finalResult;
+};
+
 export const kCombinations = (s: number | number[], k: number): number[][] => {
   let set = s;
   if (typeof set === "number") {

src/helpers/common.ts

@@ -1,7 +1,7 @@
+import { bs58 } from "@toruslabs/bs58";
 import { INodePub, KEY_TYPE } from "@toruslabs/constants";
 import { Ecies, encrypt } from "@toruslabs/eccrypto";
 import BN from "bn.js";
-import base58 from "bs58";
 import { curve, ec as EC } from "elliptic";
 import { keccak256 as keccakHash } from "ethereum-cryptography/keccak";
 import { sha512 } from "ethereum-cryptography/sha512";
@@ -142,7 +142,7 @@ function generateAddressFromEcKey(keyType: KeyType, key: EC.KeyPair): string {
     return toChecksumAddress(evmAddressLower);
   } else if (keyType === KEY_TYPE.ED25519) {
     const publicKey = encodeEd25519Point(key.getPublic());
-    const address = base58.encode(publicKey);
+    const address = bs58.encode(publicKey);
     return address;
   }
   throw new Error(`Invalid keyType: ${keyType}`);