Skip to content

Commit 2c1c435

Browse files
author
himanshu
committed
resolve merge conflicts
2 parents 3b36f35 + 46c9248 commit 2c1c435

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

‎src/helpers/keyUtils.ts

-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { keccak256 as keccakHash } from "ethereum-cryptography/keccak";
66
import stringify from "json-stable-stringify";
77

88
import { CurveType, ImportedShare } from "../interfaces";
9-
import log from "../loglevel";
109
import { encParamsBufToHex } from "./common";
1110
import { generateRandomPolynomial } from "./langrangeInterpolatePoly";
1211
import { generateNonceMetadataParams } from "./metadataUtils";
@@ -47,15 +46,13 @@ export function toChecksumAddress(hexAddress: string): string {
4746
export function generateAddressFromPrivKey(ecCurve: EC, privateKey: BN): string {
4847
const key = ecCurve.keyFromPrivate(privateKey.toString("hex", 64), "hex");
4948
const publicKey = key.getPublic().encode("hex", false).slice(2);
50-
log.info(publicKey, "public key");
5149
const evmAddressLower = `0x${keccak256(Buffer.from(publicKey, "hex")).slice(64 - 38)}`;
5250
return toChecksumAddress(evmAddressLower);
5351
}
5452

5553
export function generateAddressFromPubKey(ecCurve: EC, publicKeyX: BN, publicKeyY: BN): string {
5654
const key = ecCurve.keyFromPublic({ x: publicKeyX.toString("hex", 64), y: publicKeyY.toString("hex", 64) });
5755
const publicKey = key.getPublic().encode("hex", false).slice(2);
58-
log.info(key.getPublic().encode("hex", false), "public key");
5956
const evmAddressLower = `0x${keccak256(Buffer.from(publicKey, "hex")).slice(64 - 38)}`;
6057
return toChecksumAddress(evmAddressLower);
6158
}

‎src/helpers/nodeUtils.ts

+4-7
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ export async function retrieveOrImportShare(params: {
489489
if (sessionTokenSigMetadata && sessionTokenSigMetadata[0]?.ephemPublicKey) {
490490
sessionTokenSigPromises.push(
491491
decryptNodeData(sessionTokenSigMetadata[0], sessionTokenSigs[0], sessionAuthKey).catch((err) =>
492-
log.debug("session sig decryption", err)
492+
log.error("session sig decryption", err)
493493
)
494494
);
495495
} else {
@@ -504,7 +504,7 @@ export async function retrieveOrImportShare(params: {
504504
if (sessionTokenMetadata && sessionTokenMetadata[0]?.ephemPublicKey) {
505505
sessionTokenPromises.push(
506506
decryptNodeData(sessionTokenMetadata[0], sessionTokens[0], sessionAuthKey).catch((err) =>
507-
log.debug("session token sig decryption", err)
507+
log.error("session token sig decryption", err)
508508
)
509509
);
510510
} else {
@@ -524,9 +524,7 @@ export async function retrieveOrImportShare(params: {
524524
latestKey.share_metadata,
525525
Buffer.from(latestKey.share, "base64").toString("binary").padStart(64, "0"),
526526
sessionAuthKey
527-
).catch((err) => {
528-
log.debug("share decryption", err);
529-
})
527+
).catch((err) => log.error("share decryption", err))
530528
);
531529
}
532530
} else {
@@ -682,7 +680,7 @@ export async function retrieveOrImportShare(params: {
682680
// deriving address from pub key coz pubkey is always available
683681
// but finalPrivKey won't be available for v2 user upgraded to 2/n
684682
const finalEvmAddress = generateAddressFromPubKey(ecCurve, finalPubKey.getX(), finalPubKey.getY());
685-
log.debug("> torus.js/retrieveShares", { finalEvmAddress });
683+
686684
let finalPrivKey = ""; // it is empty for v2 user upgraded to 2/n
687685
if (typeOfUser === "v1" || (typeOfUser === "v2" && metadataNonce.gt(new BN(0)))) {
688686
const privateKeyWithNonce = oAuthKey.add(metadataNonce).umod(ecCurve.curve.n);
@@ -776,7 +774,6 @@ export const legacyKeyAssign = async ({
776774
if (lastPoint === undefined) {
777775
nodeNum = Math.floor(Math.random() * endpoints.length);
778776
// nodeNum = endpoints.indexOf("https://torus-node.binancex.dev/jrpc");
779-
log.info("keyassign", nodeNum, endpoints[nodeNum]);
780777
initialPoint = nodeNum;
781778
} else {
782779
nodeNum = lastPoint % endpoints.length;

‎src/torus.ts

+1-9
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ class Torus {
401401
decrypt(tmpKey, {
402402
...metadata,
403403
ciphertext: Buffer.from(Buffer.from(firstKey.Share, "base64").toString("binary").padStart(64, "0"), "hex"),
404-
}).catch((err) => log.debug("share decryption", err))
404+
}).catch((err) => log.error("share decryption", err))
405405
);
406406
} else {
407407
sharePromises.push(Promise.resolve(Buffer.from(firstKey.Share.padStart(64, "0"), "hex")));
@@ -506,7 +506,6 @@ class Torus {
506506
let finalEvmAddress = "";
507507
if (finalPubKey) {
508508
finalEvmAddress = generateAddressFromPubKey(this.ec, finalPubKey.getX(), finalPubKey.getY());
509-
log.debug("> torus.js/retrieveShares", { finalEvmAddress });
510509
} else {
511510
throw new Error("Invalid public key, this might be a bug, please report this to web3auth team");
512511
}
@@ -547,8 +546,6 @@ class Torus {
547546
{ verifier, verifierId }: { verifier: string; verifierId: string },
548547
enableOneKey: boolean
549548
): Promise<TorusPublicKey> {
550-
log.debug("> torus.js/getPublicAddress", { endpoints, torusNodePubs, verifier, verifierId });
551-
552549
let finalKeyResult: LegacyVerifierLookupResponse | undefined;
553550
let isNewKey = false;
554551

@@ -579,7 +576,6 @@ class Torus {
579576
} else {
580577
throw new Error(`node results do not match at first lookup ${JSON.stringify(keyResult || {})}, ${JSON.stringify(errorResult || {})}`);
581578
}
582-
log.debug("> torus.js/getPublicAddress", { finalKeyResult, isNewKey });
583579

584580
if (finalKeyResult) {
585581
return this.formatLegacyPublicKeyData({
@@ -596,7 +592,6 @@ class Torus {
596592
{ verifier, verifierId, extendedVerifierId }: { verifier: string; verifierId: string; extendedVerifierId?: string },
597593
enableOneKey: boolean
598594
): Promise<TorusPublicKey> {
599-
log.debug("> torus.js/getPublicAddress", { endpoints, verifier, verifierId });
600595
const keyAssignResult = await GetPubKeyOrKeyAssign({
601596
endpoints,
602597
network: this.network,
@@ -616,7 +611,6 @@ class Torus {
616611
if (errorResult) {
617612
throw new Error(`node results do not match at first lookup ${JSON.stringify(keyResult || {})}, ${JSON.stringify(errorResult || {})}`);
618613
}
619-
log.debug("> torus.js/getPublicAddress", { keyResult });
620614
if (!keyResult?.keys) {
621615
throw new Error(`node results do not match at final lookup ${JSON.stringify(keyResult || {})}, ${JSON.stringify(errorResult || {})}`);
622616
}
@@ -659,7 +653,6 @@ class Torus {
659653
const oAuthX = oAuthPubKey.getX().toString(16, 64);
660654
const oAuthY = oAuthPubKey.getY().toString(16, 64);
661655
const oAuthAddress = generateAddressFromPubKey(this.ec, oAuthPubKey.getX(), oAuthPubKey.getY());
662-
log.debug("> torus.js/getPublicAddress, oAuthKeyData", { X: oAuthX, Y: oAuthY, oAuthAddress, nonce: nonce?.toString(16), pubNonce });
663656

664657
if (!finalPubKey) {
665658
throw new Error("Unable to derive finalPubKey");
@@ -743,7 +736,6 @@ class Torus {
743736
const oAuthX = oAuthPubKey.getX().toString(16, 64);
744737
const oAuthY = oAuthPubKey.getY().toString(16, 64);
745738
const oAuthAddress = generateAddressFromPubKey(this.ec, oAuthPubKey.getX(), oAuthPubKey.getY());
746-
log.debug("> torus.js/getPublicAddress, oAuthKeyData", { X: oAuthX, Y: oAuthY, oAuthAddress, nonce: nonce?.toString(16), pubNonce });
747739

748740
if (typeOfUser === "v2" && !finalPubKey) {
749741
throw new Error("Unable to derive finalPubKey");

0 commit comments

Comments
 (0)