ed25519 keys support and import keys new flow

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "editor.codeActionsOnSave": {
-    "source.fixAll": true
+    "source.fixAll": "explicit"
   },
   "cSpell.words": ["Mutex", "Mutexes", "toruslabs"]
 }

src/constants.ts

@@ -1,6 +1,6 @@
 export const JRPC_METHODS = {
   GET_OR_SET_KEY: "GetPubKeyOrKeyAssign",
   COMMITMENT_REQUEST: "CommitmentRequest",
-  IMPORT_SHARE: "ImportShare",
+  IMPORT_SHARES: "ImportShares",
   GET_SHARE_OR_KEY_ASSIGN: "GetShareOrKeyAssign",
 };

src/helpers/common.ts

@@ -13,13 +13,14 @@ export const normalizeKeysResult = (result: VerifierLookupResponse) => {
     is_new_key: result.is_new_key,
   };
   if (result && result.keys && result.keys.length > 0) {
-    finalResult.keys = result.keys.map((key) => {
-      return {
-        pub_key_X: key.pub_key_X,
-        pub_key_Y: key.pub_key_Y,
-        address: key.address,
-      };
-    });
+    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;
 };

src/helpers/keyUtils.ts

@@ -1,5 +1,5 @@
 import BN from "bn.js";
-import { ec } from "elliptic";
+import { curve, ec as EC } from "elliptic";
 import { keccak256 as keccakHash } from "ethereum-cryptography/keccak";
 
 import log from "../loglevel";
@@ -31,24 +31,31 @@ export function toChecksumAddress(hexAddress: string): string {
   return ret;
 }
 
-export function generateAddressFromPrivKey(ecCurve: ec, privateKey: BN): string {
+export function generateAddressFromPrivKey(ecCurve: EC, privateKey: BN): string {
   const key = ecCurve.keyFromPrivate(privateKey.toString("hex", 64), "hex");
   const publicKey = key.getPublic().encode("hex", false).slice(2);
   log.info(publicKey, "public key");
   const evmAddressLower = `0x${keccak256(Buffer.from(publicKey, "hex")).slice(64 - 38)}`;
   return toChecksumAddress(evmAddressLower);
 }
 
-export function generateAddressFromPubKey(ecCurve: ec, publicKeyX: BN, publicKeyY: BN): string {
+export function generateAddressFromPubKey(ecCurve: EC, publicKeyX: BN, publicKeyY: BN): string {
   const key = ecCurve.keyFromPublic({ x: publicKeyX.toString("hex", 64), y: publicKeyY.toString("hex", 64) });
   const publicKey = key.getPublic().encode("hex", false).slice(2);
   log.info(key.getPublic().encode("hex", false), "public key");
   const evmAddressLower = `0x${keccak256(Buffer.from(publicKey, "hex")).slice(64 - 38)}`;
   return toChecksumAddress(evmAddressLower);
 }
 
-export function getPostboxKeyFrom1OutOf1(ecCurve: ec, privKey: string, nonce: string): string {
+export function getPostboxKeyFrom1OutOf1(ecCurve: EC, privKey: string, nonce: string): string {
   const privKeyBN = new BN(privKey, 16);
   const nonceBN = new BN(nonce, 16);
   return privKeyBN.sub(nonceBN).umod(ecCurve.curve.n).toString("hex");
 }
+
+export function derivePubKey(ecCurve: EC, sk: BN): curve.base.BasePoint {
+  const skHex = sk.toString(16, 64);
+  return ecCurve.keyFromPrivate(skHex).getPublic();
+}
+
+export const encryptionEC = new EC("secp256k1");

src/helpers/langrangeInterpolatePoly.ts

@@ -137,7 +137,7 @@ export function generateRandomPolynomial(ecCurve: EC, degree: number, secret?: B
     while (points[shareIndex.toString("hex", 64)] !== undefined) {
       shareIndex = generatePrivateExcludingIndexes([new BN(0)]);
     }
-    points[shareIndex.toString("hex", 64)] = new Point(shareIndex, new BN(generatePrivate()), ecCurve);
+    points[shareIndex.toString("hex", 64)] = new Point(shareIndex, new BN(generatePrivate()).umod(ecCurve.curve.n), ecCurve);
   }
   points["0"] = new Point(new BN(0), actualS, ecCurve);
   return lagrangeInterpolatePolynomial(ecCurve, Object.values(points));

src/helpers/metadataUtils.ts

@@ -5,7 +5,7 @@ import { ec } from "elliptic";
 import stringify from "json-stable-stringify";
 import log from "loglevel";
 
-import { EciesHex, GetOrSetNonceResult, MetadataParams } from "../interfaces";
+import { EciesHex, GetOrSetNonceResult, KeyType, MetadataParams } from "../interfaces";
 import { encParamsHexToBuf } from "./common";
 import { keccak256 } from "./keyUtils";
 
@@ -25,7 +25,7 @@ export async function decryptNodeData(eciesData: EciesHex, ciphertextHex: string
   return decryptedSigBuffer;
 }
 
-export function generateMetadataParams(ecCurve: ec, serverTimeOffset: number, message: string, privateKey: BN): MetadataParams {
+export function generateMetadataParams(ecCurve: ec, serverTimeOffset: number, message: string, privateKey: BN, keyType: KeyType): MetadataParams {
   const key = ecCurve.keyFromPrivate(privateKey.toString("hex", 64));
   const setData = {
     data: message,
@@ -36,6 +36,7 @@ export function generateMetadataParams(ecCurve: ec, serverTimeOffset: number, me
     pub_key_X: key.getPublic().getX().toString("hex"), // DO NOT PAD THIS. BACKEND DOESN'T
     pub_key_Y: key.getPublic().getY().toString("hex"), // DO NOT PAD THIS. BACKEND DOESN'T
     set_data: setData,
+    key_type: keyType,
     signature: Buffer.from(sig.r.toString(16, 64) + sig.s.toString(16, 64) + new BN("").toString(16, 2), "hex").toString("base64"),
   };
 }
@@ -60,6 +61,7 @@ export async function getMetadata(
 export async function getOrSetNonce(
   legacyMetadataHost: string,
   ecCurve: ec,
+  keyType: KeyType,
   serverTimeOffset: number,
   X: string,
   Y: string,
@@ -69,7 +71,7 @@ export async function getOrSetNonce(
   let data: Data;
   const msg = getOnly ? "getNonce" : "getOrSetNonce";
   if (privKey) {
-    data = generateMetadataParams(ecCurve, serverTimeOffset, msg, privKey);
+    data = generateMetadataParams(ecCurve, serverTimeOffset, msg, privKey, keyType);
   } else {
     data = {
       pub_key_X: X,
@@ -83,10 +85,11 @@ export async function getOrSetNonce(
 export async function getNonce(
   legacyMetadataHost: string,
   ecCurve: ec,
+  keyType: KeyType,
   serverTimeOffset: number,
   X: string,
   Y: string,
   privKey?: BN
 ): Promise<GetOrSetNonceResult> {
-  return getOrSetNonce(legacyMetadataHost, ecCurve, serverTimeOffset, X, Y, privKey, true);
+  return getOrSetNonce(legacyMetadataHost, ecCurve, keyType, serverTimeOffset, X, Y, privKey, true);
 }