address comments

Author: chaitanyapotti

src/helpers/common.ts

@@ -16,11 +16,11 @@ import { Ecies } from "@toruslabs/eccrypto";
 import { keccak256 as keccakHash } from "ethereum-cryptography/keccak";
 import JsonStringify from "json-stable-stringify";
 
-import { CommitmentRequestResult, EciesHex, GetORSetKeyResponse, KeyType, Point2D, VerifierLookupResponse } from "../interfaces";
+import { AffinePoint, CommitmentRequestResult, EciesHex, GetORSetKeyResponse, KeyType, VerifierLookupResponse } from "../interfaces";
 
 export type Curve = typeof secp256k1 | typeof ed25519;
 
-export function derivePubKey(ecCurve: Curve, sk: bigint): Point2D {
+export function derivePubKey(ecCurve: Curve, sk: bigint): AffinePoint {
   return ecCurve.Point.BASE.multiply(sk).toAffine();
 }
 

src/helpers/keyUtils.ts

@@ -7,7 +7,7 @@ import { sha512 } from "ethereum-cryptography/sha512";
 import stringify from "json-stable-stringify";
 import log from "loglevel";
 
-import { EncryptedSeed, GetOrSetNonceResult, ImportedShare, KeyType, Point2D, PrivateKeyData, ShareJSON, v2NonceResultType } from "../interfaces";
+import { AffinePoint, EncryptedSeed, GetOrSetNonceResult, ImportedShare, KeyType, PrivateKeyData, ShareJSON, v2NonceResultType } from "../interfaces";
 import {
   bigintToHex,
   bytesToBase64,
@@ -68,7 +68,7 @@ function adjustScalarBytes(bytes: Uint8Array): Uint8Array {
 /** Convenience method that creates public key and other stuff. RFC8032 5.1.5 */
 export function getEd25519ExtendedPublicKey(keyBytes: Uint8Array): {
   scalar: bigint;
-  point: Point2D;
+  point: AffinePoint;
 } {
   const ed25519Curve = getKeyCurve(KEY_TYPE.ED25519);
   const len = 32;
@@ -90,7 +90,7 @@ export function getEd25519ExtendedPublicKey(keyBytes: Uint8Array): {
   return { scalar, point };
 }
 
-export function encodeEd25519Point(point: Point2D): Uint8Array {
+export function encodeEd25519Point(point: AffinePoint): Uint8Array {
   const ed25519Curve = getKeyCurve(KEY_TYPE.ED25519);
   return ed25519Curve.Point.fromAffine(point).toBytes();
 }
@@ -152,10 +152,9 @@ export const generateSecp256k1KeyData = async (scalarBytes: Uint8Array): Promise
   };
 };
 
-function generateAddressFromPoint(keyType: KeyType, point: Point2D): string {
+function generateAddressFromPoint(keyType: KeyType, point: AffinePoint): string {
   if (keyType === KEY_TYPE.SECP256K1) {
-    const uncompressed = getSecp256k1().Point.fromAffine(point).toBytes(false);
-    const publicKey = uncompressed.slice(1); // remove 04 prefix
+    const publicKey = getSecp256k1PublicKeyFromAffinePoint(point);
     const evmAddressLower = `0x${keccak256(publicKey).slice(64 - 38)}`;
     return toChecksumAddress(evmAddressLower);
   } else if (keyType === KEY_TYPE.ED25519) {
@@ -182,6 +181,12 @@ export function getPostboxKeyFrom1OutOf1(ecCurve: Curve, privKey: string, nonce:
   return bigintToHex(mod(privKeyBI - nonceBI, ecCurve.Point.CURVE().n));
 }
 
+export function getSecp256k1PublicKeyFromAffinePoint(point: AffinePoint): Uint8Array {
+  const uncompressed = getSecp256k1().Point.fromAffine(point).toBytes(false);
+  const publicKey = uncompressed.slice(1); // remove 04 prefix
+  return publicKey;
+}
+
 export const generateShares = async (
   ecCurve: Curve,
   keyType: KeyType,

src/helpers/metadataUtils.ts

@@ -8,13 +8,13 @@ import log from "loglevel";
 
 import { SAPPHIRE_DEVNET_METADATA_URL, SAPPHIRE_METADATA_URL } from "../constants";
 import {
+  AffinePoint,
   EciesHex,
   EncryptedSeed,
   GetOrSetNonceResult,
   KeyType,
   MetadataParams,
   NonceMetadataParams,
-  Point2D,
   SapphireMetadataParams,
   SetNonceData,
 } from "../interfaces";
@@ -40,7 +40,7 @@ export const getSecpKeyFromEd25519 = (
   ed25519Scalar: bigint
 ): {
   scalar: bigint;
-  point: Point2D;
+  point: AffinePoint;
 } => {
   const secp256k1 = getSecp256k1();
   const N = secp256k1.Point.CURVE().n;

src/helpers/nodeUtils.ts

@@ -5,6 +5,7 @@ import { generateJsonRPCObject, get, post } from "@toruslabs/http-helpers";
 import { config } from "../config";
 import { JRPC_METHODS } from "../constants";
 import {
+  AffinePoint,
   CommitmentRequestResult,
   ExtendedPublicKey,
   GetORSetKeyResponse,
@@ -14,7 +15,6 @@ import {
   JRPCResponse,
   KeyLookupResult,
   KeyType,
-  Point2D,
   SessionToken,
   ShareRequestResult,
   TorusKey,
@@ -825,7 +825,7 @@ export async function retrieveOrImportShare(params: {
       }
     }
     let metadataNonce = nonceResult?.nonce ? toBigIntBE(nonceResult.nonce) : 0n;
-    let finalPubKey: Point2D;
+    let finalPubKey: AffinePoint;
     let pubNonce: { X: string; Y: string } | undefined;
     let typeOfUser: UserType = "v1";
     const N = ecCurve.Point.CURVE().n;

src/interfaces.ts

@@ -1,9 +1,10 @@
+import type { AffinePoint as AffinePointCurve } from "@noble/curves/abstract/curve.js";
 import type { INodePub, TORUS_NETWORK_TYPE } from "@toruslabs/constants";
 import { Ecies } from "@toruslabs/eccrypto";
 
 import { TorusUtilsExtraParams } from "./TorusUtilsExtraParams";
 
-export type Point2D = { x: bigint; y: bigint };
+export type AffinePoint = AffinePointCurve<bigint>;
 
 export interface KeyIndex {
   index: string;
@@ -152,7 +153,7 @@ export interface ShareRequestResult {
 export interface ImportedShare {
   oauth_pub_key_x: string;
   oauth_pub_key_y: string;
-  final_user_point: Point2D;
+  final_user_point: AffinePoint;
   signing_pub_key_x: string;
   signing_pub_key_y: string;
   encrypted_share: string;
@@ -254,7 +255,7 @@ export interface PrivateKeyData {
   SigningPubY: bigint;
   metadataNonce: bigint;
   metadataSigningKey: bigint;
-  finalUserPubKeyPoint: Point2D;
+  finalUserPubKeyPoint: AffinePoint;
   encryptedSeed?: string;
 }
 

src/torus.ts

@@ -22,11 +22,11 @@ import {
   toBigIntBE,
 } from "./helpers";
 import {
+  AffinePoint,
   GetOrSetNonceResult,
   ImportKeyParams,
   KeyType,
   LegacyVerifierLookupResponse,
-  Point2D,
   RetrieveSharesParams,
   TorusCtorOptions,
   TorusKey,
@@ -310,8 +310,8 @@ class Torus {
     const { pub_key_X: X, pub_key_Y: Y } = keyResult.keys[0];
     let pubNonce: { X: string; Y: string } | undefined;
     const nonce = toBigIntBE(nonceResult?.nonce || "0");
-    let oAuthPubKey: Point2D;
-    let finalPubKey: Point2D;
+    let oAuthPubKey: AffinePoint;
+    let finalPubKey: AffinePoint;
     if (extendedVerifierId) {
       // for tss key no need to add pub nonce
       finalPubKey = { x: toBigIntBE(X), y: toBigIntBE(Y) };
@@ -388,11 +388,11 @@ class Torus {
     const { pub_key_X: X, pub_key_Y: Y } = finalKeyResult.keys[0];
     let nonceResult: GetOrSetNonceResult;
     let nonce: bigint;
-    let finalPubKey: Point2D;
+    let finalPubKey: AffinePoint;
     let typeOfUser: GetOrSetNonceResult["typeOfUser"];
     let pubNonce: { X: string; Y: string } | undefined;
 
-    const oAuthPubKey: Point2D = { x: toBigIntBE(X), y: toBigIntBE(Y) };
+    const oAuthPubKey: AffinePoint = { x: toBigIntBE(X), y: toBigIntBE(Y) };
 
     const finalServerTimeOffset = this.serverTimeOffset || serverTimeOffset;
     if (enableOneKey) {