Skip to content

Commit 995fe18

Browse files
committed
cleanup debug logs and replace 'debug' with 'error' log levels in catch blocks
1 parent c8954c9 commit 995fe18

File tree

3 files changed

+5
-18
lines changed

3 files changed

+5
-18
lines changed

src/helpers/keyUtils.ts

-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import BN from "bn.js";
22
import { ec } from "elliptic";
33
import { keccak256 as keccakHash } from "ethereum-cryptography/keccak";
44

5-
import log from "../loglevel";
6-
75
export function keccak256(a: Buffer): string {
86
const hash = Buffer.from(keccakHash(a)).toString("hex");
97
return `0x${hash}`;
@@ -34,15 +32,13 @@ export function toChecksumAddress(hexAddress: string): string {
3432
export function generateAddressFromPrivKey(ecCurve: ec, privateKey: BN): string {
3533
const key = ecCurve.keyFromPrivate(privateKey.toString("hex", 64), "hex");
3634
const publicKey = key.getPublic().encode("hex", false).slice(2);
37-
log.info(publicKey, "public key");
3835
const evmAddressLower = `0x${keccak256(Buffer.from(publicKey, "hex")).slice(64 - 38)}`;
3936
return toChecksumAddress(evmAddressLower);
4037
}
4138

4239
export function generateAddressFromPubKey(ecCurve: ec, publicKeyX: BN, publicKeyY: BN): string {
4340
const key = ecCurve.keyFromPublic({ x: publicKeyX.toString("hex", 64), y: publicKeyY.toString("hex", 64) });
4441
const publicKey = key.getPublic().encode("hex", false).slice(2);
45-
log.info(key.getPublic().encode("hex", false), "public key");
4642
const evmAddressLower = `0x${keccak256(Buffer.from(publicKey, "hex")).slice(64 - 38)}`;
4743
return toChecksumAddress(evmAddressLower);
4844
}

src/helpers/nodeUtils.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ export async function retrieveOrImportShare(params: {
396396
if (sessionTokenSigMetadata && sessionTokenSigMetadata[0]?.ephemPublicKey) {
397397
sessionTokenSigPromises.push(
398398
decryptNodeData(sessionTokenSigMetadata[0], sessionTokenSigs[0], sessionAuthKey).catch((err) =>
399-
log.debug("session sig decryption", err)
399+
log.error("session sig decryption", err)
400400
)
401401
);
402402
} else {
@@ -411,7 +411,7 @@ export async function retrieveOrImportShare(params: {
411411
if (sessionTokenMetadata && sessionTokenMetadata[0]?.ephemPublicKey) {
412412
sessionTokenPromises.push(
413413
decryptNodeData(sessionTokenMetadata[0], sessionTokens[0], sessionAuthKey).catch((err) =>
414-
log.debug("session token sig decryption", err)
414+
log.error("session token sig decryption", err)
415415
)
416416
);
417417
} else {
@@ -431,7 +431,7 @@ export async function retrieveOrImportShare(params: {
431431
latestKey.share_metadata,
432432
Buffer.from(latestKey.share, "base64").toString("binary").padStart(64, "0"),
433433
sessionAuthKey
434-
).catch((err) => log.debug("share decryption", err))
434+
).catch((err) => log.error("share decryption", err))
435435
);
436436
}
437437
} else {
@@ -585,7 +585,7 @@ export async function retrieveOrImportShare(params: {
585585
// deriving address from pub key coz pubkey is always available
586586
// but finalPrivKey won't be available for v2 user upgraded to 2/n
587587
const finalEvmAddress = generateAddressFromPubKey(ecCurve, finalPubKey.getX(), finalPubKey.getY());
588-
log.debug("> torus.js/retrieveShares", { finalEvmAddress });
588+
589589
let finalPrivKey = ""; // it is empty for v2 user upgraded to 2/n
590590
if (typeOfUser === "v1" || (typeOfUser === "v2" && metadataNonce.gt(new BN(0)))) {
591591
const privateKeyWithNonce = oAuthKey.add(metadataNonce).umod(ecCurve.curve.n);
@@ -672,7 +672,6 @@ export const legacyKeyAssign = async ({
672672
if (lastPoint === undefined) {
673673
nodeNum = Math.floor(Math.random() * endpoints.length);
674674
// nodeNum = endpoints.indexOf("https://torus-node.binancex.dev/jrpc");
675-
log.info("keyassign", nodeNum, endpoints[nodeNum]);
676675
initialPoint = nodeNum;
677676
} else {
678677
nodeNum = lastPoint % endpoints.length;

src/torus.ts

+1-9
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ class Torus {
395395
decrypt(tmpKey, {
396396
...metadata,
397397
ciphertext: Buffer.from(Buffer.from(firstKey.Share, "base64").toString("binary").padStart(64, "0"), "hex"),
398-
}).catch((err) => log.debug("share decryption", err))
398+
}).catch((err) => log.error("share decryption", err))
399399
);
400400
} else {
401401
sharePromises.push(Promise.resolve(Buffer.from(firstKey.Share.padStart(64, "0"), "hex")));
@@ -501,7 +501,6 @@ class Torus {
501501
let finalEvmAddress = "";
502502
if (finalPubKey) {
503503
finalEvmAddress = generateAddressFromPubKey(this.ec, finalPubKey.getX(), finalPubKey.getY());
504-
log.debug("> torus.js/retrieveShares", { finalEvmAddress });
505504
} else {
506505
throw new Error("Invalid public key, this might be a bug, please report this to web3auth team");
507506
}
@@ -542,8 +541,6 @@ class Torus {
542541
{ verifier, verifierId }: { verifier: string; verifierId: string },
543542
enableOneKey: boolean
544543
): Promise<TorusPublicKey> {
545-
log.debug("> torus.js/getPublicAddress", { endpoints, torusNodePubs, verifier, verifierId });
546-
547544
let finalKeyResult: LegacyVerifierLookupResponse | undefined;
548545
let isNewKey = false;
549546

@@ -573,7 +570,6 @@ class Torus {
573570
} else {
574571
throw new Error(`node results do not match at first lookup ${JSON.stringify(keyResult || {})}, ${JSON.stringify(errorResult || {})}`);
575572
}
576-
log.debug("> torus.js/getPublicAddress", { finalKeyResult, isNewKey });
577573

578574
if (finalKeyResult) {
579575
return this.formatLegacyPublicKeyData({
@@ -609,7 +605,6 @@ class Torus {
609605
{ verifier, verifierId, extendedVerifierId }: { verifier: string; verifierId: string; extendedVerifierId?: string },
610606
enableOneKey: boolean
611607
): Promise<TorusPublicKey> {
612-
log.debug("> torus.js/getPublicAddress", { endpoints, verifier, verifierId });
613608
const keyAssignResult = await GetPubKeyOrKeyAssign({
614609
endpoints,
615610
network: this.network,
@@ -628,7 +623,6 @@ class Torus {
628623
if (errorResult) {
629624
throw new Error(`node results do not match at first lookup ${JSON.stringify(keyResult || {})}, ${JSON.stringify(errorResult || {})}`);
630625
}
631-
log.debug("> torus.js/getPublicAddress", { keyResult });
632626
if (!keyResult?.keys) {
633627
throw new Error(`node results do not match at final lookup ${JSON.stringify(keyResult || {})}, ${JSON.stringify(errorResult || {})}`);
634628
}
@@ -671,7 +665,6 @@ class Torus {
671665
const oAuthX = oAuthPubKey.getX().toString(16, 64);
672666
const oAuthY = oAuthPubKey.getY().toString(16, 64);
673667
const oAuthAddress = generateAddressFromPubKey(this.ec, oAuthPubKey.getX(), oAuthPubKey.getY());
674-
log.debug("> torus.js/getPublicAddress, oAuthKeyData", { X: oAuthX, Y: oAuthY, oAuthAddress, nonce: nonce?.toString(16), pubNonce });
675668

676669
if (!finalPubKey) {
677670
throw new Error("Unable to derive finalPubKey");
@@ -755,7 +748,6 @@ class Torus {
755748
const oAuthX = oAuthPubKey.getX().toString(16, 64);
756749
const oAuthY = oAuthPubKey.getY().toString(16, 64);
757750
const oAuthAddress = generateAddressFromPubKey(this.ec, oAuthPubKey.getX(), oAuthPubKey.getY());
758-
log.debug("> torus.js/getPublicAddress, oAuthKeyData", { X: oAuthX, Y: oAuthY, oAuthAddress, nonce: nonce?.toString(16), pubNonce });
759751

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

0 commit comments

Comments
 (0)