lint

ChainSafe · Jan 3, 2025 · 35682b2 · 35682b2
1 parent b301e41
commit 35682b2
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 45 deletions.
diff --git a/packages/discv5/src/session/crypto.ts b/packages/discv5/src/session/crypto.ts
@@ -40,7 +40,14 @@ export function generateSessionKeys(
 
 export function deriveKey(secret: Buffer, firstId: NodeId, secondId: NodeId, challengeData: Buffer): [Buffer, Buffer] {
   const info = Buffer.concat([Buffer.from(KEY_AGREEMENT_STRING), fromHex(firstId), fromHex(secondId)]);
-  const output = toBuffer(getDiscv5Crypto().hkdf.expand(getDiscv5Crypto().sha256, getDiscv5Crypto().hkdf.extract(getDiscv5Crypto().sha256, secret, challengeData), info, 2 * KEY_LENGTH));
+  const output = toBuffer(
+    getDiscv5Crypto().hkdf.expand(
+      getDiscv5Crypto().sha256,
+      getDiscv5Crypto().hkdf.extract(getDiscv5Crypto().sha256, secret, challengeData),
+      info,
+      2 * KEY_LENGTH
+    )
+  );
   return [output.slice(0, KEY_LENGTH), output.slice(KEY_LENGTH, 2 * KEY_LENGTH)];
 }
 
@@ -74,7 +81,9 @@ export function idVerify(
 }
 
 export function generateIdSignatureInput(challengeData: Buffer, ephemPK: Buffer, nodeId: NodeId): Buffer {
-  return toBuffer(getDiscv5Crypto().sha256(Buffer.concat([Buffer.from(ID_SIGNATURE_TEXT), challengeData, ephemPK, fromHex(nodeId)])));
+  return toBuffer(
+    getDiscv5Crypto().sha256(Buffer.concat([Buffer.from(ID_SIGNATURE_TEXT), challengeData, ephemPK, fromHex(nodeId)]))
+  );
 }
 
 export function decryptMessage(key: Buffer, nonce: Buffer, data: Buffer, aad: Buffer): Buffer {

diff --git a/packages/discv5/src/util/crypto.ts b/packages/discv5/src/util/crypto.ts
@@ -1,59 +1,64 @@
 import { sha256 } from "@noble/hashes/sha256";
-import { hmac } from '@noble/hashes/hmac';
+import { hmac } from "@noble/hashes/hmac";
 import { expand, extract } from "@noble/hashes/hkdf";
 import { sign, verify, ProjectivePoint as Point, getPublicKey, getSharedSecret, utils, etc } from "@noble/secp256k1";
 
 etc.hmacSha256Sync = (k, ...m) => hmac(sha256, k, etc.concatBytes(...m));
 export type discv5Crypto = {
-    sha256: (data: Uint8Array) => Uint8Array;
-    secp256k1: {
-        publicKeyVerify: (publicKey: Uint8Array) => boolean;
-        publicKeyCreate: (privateKey: Uint8Array) => Uint8Array;
-        publicKeyConvert: (publicKey: Uint8Array, compressed: boolean) => Uint8Array;
-        sign: (msg: Uint8Array, pk: Uint8Array) => Uint8Array;
-        verify: (publicKey: Uint8Array, message: Uint8Array, signature: Uint8Array) => boolean;
-        deriveSecret: (privateKey: Uint8Array, publicKey: Uint8Array) => Uint8Array;
-        generatePrivateKey: () => Uint8Array;
-        privateKeyVerify: (privateKey: Uint8Array) => boolean;
-    };
-    hkdf: {
-        extract: (hash: (data: Uint8Array) => Uint8Array, secret: Uint8Array, info: Uint8Array) => Uint8Array;
-        expand: (hash: (data: Uint8Array) => Uint8Array, secret: Uint8Array, info: Uint8Array, outputLen: number) => Uint8Array;
-    }
+  sha256: (data: Uint8Array) => Uint8Array;
+  secp256k1: {
+    publicKeyVerify: (publicKey: Uint8Array) => boolean;
+    publicKeyCreate: (privateKey: Uint8Array) => Uint8Array;
+    publicKeyConvert: (publicKey: Uint8Array, compressed: boolean) => Uint8Array;
+    sign: (msg: Uint8Array, pk: Uint8Array) => Uint8Array;
+    verify: (publicKey: Uint8Array, message: Uint8Array, signature: Uint8Array) => boolean;
+    deriveSecret: (privateKey: Uint8Array, publicKey: Uint8Array) => Uint8Array;
+    generatePrivateKey: () => Uint8Array;
+    privateKeyVerify: (privateKey: Uint8Array) => boolean;
+  };
+  hkdf: {
+    extract: (hash: (data: Uint8Array) => Uint8Array, secret: Uint8Array, info: Uint8Array) => Uint8Array;
+    expand: (
+      hash: (data: Uint8Array) => Uint8Array,
+      secret: Uint8Array,
+      info: Uint8Array,
+      outputLen: number
+    ) => Uint8Array;
+  };
 };
 
 export const defaultCrypto: discv5Crypto = {
-    sha256: sha256,
-    secp256k1: {
-        publicKeyVerify: (pk) => {
-            try {
-                Point.fromHex(pk).assertValidity();
-                return true;
-            } catch {
-                return false;
-            }
-        },
-        publicKeyCreate: (pk) => getPublicKey(pk),
-        publicKeyConvert: (pk, compress) => (Point.fromHex(pk).toRawBytes(compress)),
-        sign: (msg, pk) => sign(msg, pk).toCompactRawBytes(),
-        verify: (pk, msg, sig) => verify(sig, msg, pk),
-        deriveSecret: (privKey, pubKey) => getSharedSecret(privKey, pubKey, true),
-        generatePrivateKey: () => utils.randomPrivateKey(),
-        privateKeyVerify: (pk) => {
-            return utils.isValidPrivateKey(pk);
-        }
+  sha256: sha256,
+  secp256k1: {
+    publicKeyVerify: (pk) => {
+      try {
+        Point.fromHex(pk).assertValidity();
+        return true;
+      } catch {
+        return false;
+      }
     },
-    hkdf: {
-        extract: (hash, secret, info) => extract(hash as any, secret, info),
-        expand: (hash, key, info, outputLen) => expand(hash as any, key, info, outputLen),
-    }
+    publicKeyCreate: (pk) => getPublicKey(pk),
+    publicKeyConvert: (pk, compress) => Point.fromHex(pk).toRawBytes(compress),
+    sign: (msg, pk) => sign(msg, pk).toCompactRawBytes(),
+    verify: (pk, msg, sig) => verify(sig, msg, pk),
+    deriveSecret: (privKey, pubKey) => getSharedSecret(privKey, pubKey, true),
+    generatePrivateKey: () => utils.randomPrivateKey(),
+    privateKeyVerify: (pk) => {
+      return utils.isValidPrivateKey(pk);
+    },
+  },
+  hkdf: {
+    extract: (hash, secret, info) => extract(hash as never, secret, info),
+    expand: (hash, key, info, outputLen) => expand(hash as never, key, info, outputLen),
+  },
 };
 
 let crypto: discv5Crypto = defaultCrypto;
 export const getDiscv5Crypto = (): discv5Crypto => {
-    return crypto;
+  return crypto;
 };
 
-export const setDiscv5Crypto = (c: discv5Crypto) => {
-    crypto = c;
-};
+export const setDiscv5Crypto = (c: discv5Crypto): void => {
+  crypto = c;
+};