@waku/enr 0.0.27 → 0.0.28-9f1d8ca.0

package/package.json

@@ -1,99 +1 @@
-{
-  "name": "@waku/enr",
-  "version": "0.0.27",
-  "description": "ENR (EIP-778) for Waku",
-  "types": "./dist/index.d.ts",
-  "module": "./dist/index.js",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    }
-  },
-  "type": "module",
-  "author": "Waku Team",
-  "homepage": "https://github.com/waku-org/js-waku/tree/master/packages/enr#readme",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/waku-org/js-waku.git"
-  },
-  "bugs": {
-    "url": "https://github.com/waku-org/js-waku/issues"
-  },
-  "license": "MIT OR Apache-2.0",
-  "keywords": [
-    "waku",
-    "decentralized",
-    "secure",
-    "communication",
-    "web3",
-    "ethereum",
-    "dapps",
-    "privacy"
-  ],
-  "scripts": {
-    "build": "run-s build:**",
-    "build:esm": "tsc",
-    "build:bundle": "rollup --config rollup.config.js",
-    "fix": "run-s fix:*",
-    "fix:lint": "eslint src *.js --fix",
-    "check": "run-s check:*",
-    "check:lint": "eslint src --ext .ts",
-    "check:spelling": "cspell \"{README.md,src/**/*.ts}\"",
-    "check:tsc": "tsc -p tsconfig.dev.json",
-    "test": "NODE_ENV=test run-s test:*",
-    "test:node": "NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha",
-    "test:browser": "NODE_ENV=test karma start karma.conf.cjs",
-    "prepublish": "npm run build",
-    "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build"
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "dependencies": {
-    "@ethersproject/rlp": "^5.7.0",
-    "@libp2p/crypto": "^4.1.6",
-    "@libp2p/peer-id": "^4.2.1",
-    "@multiformats/multiaddr": "^12.0.0",
-    "@noble/secp256k1": "^1.7.1",
-    "@waku/utils": "0.0.21",
-    "debug": "^4.3.4",
-    "js-sha3": "^0.9.2"
-  },
-  "devDependencies": {
-    "@libp2p/peer-id-factory": "^4.2.1",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@types/chai": "^4.3.11",
-    "@types/mocha": "^10.0.6",
-    "@waku/build-utils": "*",
-    "@waku/interfaces": "0.0.28",
-    "chai": "^4.3.10",
-    "cspell": "^8.6.1",
-    "fast-check": "^3.19.0",
-    "mocha": "^10.3.0",
-    "npm-run-all": "^4.1.5",
-    "process": "^0.11.10",
-    "rollup": "^4.12.0",
-    "uint8arrays": "^5.0.1"
-  },
-  "peerDependencies": {
-    "@multiformats/multiaddr": "^12.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@multiformats/multiaddr": {
-      "optional": true
-    }
-  },
-  "files": [
-    "dist",
-    "bundle",
-    "src/**/*.ts",
-    "!**/*.spec.*",
-    "!**/*.json",
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md"
-  ]
-}
+{"name":"@waku/enr","version":"0.0.28-9f1d8ca.0","description":"ENR (EIP-778) for Waku","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"}},"type":"module","author":"Waku Team","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/enr#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralized","secure","communication","web3","ethereum","dapps","privacy"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:lint":"eslint src --ext .ts","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","check:tsc":"tsc -p tsconfig.dev.json","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha","test:browser":"NODE_ENV=test karma start karma.conf.cjs","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"dependencies":{"@ethersproject/rlp":"^5.7.0","@libp2p/crypto":"^5.0.1","@libp2p/peer-id":"^5.0.1","@multiformats/multiaddr":"^12.0.0","@noble/secp256k1":"^1.7.1","@waku/utils":"0.0.22-9f1d8ca.0","debug":"^4.3.4","js-sha3":"^0.9.2"},"devDependencies":{"@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/mocha":"^10.0.6","@waku/build-utils":"*","@waku/interfaces":"0.0.29-9f1d8ca.0","chai":"^4.3.10","cspell":"^8.6.1","fast-check":"^3.19.0","mocha":"^10.3.0","npm-run-all":"^4.1.5","process":"^0.11.10","rollup":"^4.12.0","uint8arrays":"^5.0.1"},"peerDependencies":{"@multiformats/multiaddr":"^12.0.0"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}

package/src/creator.ts

@@ -4,13 +4,12 @@ import { utf8ToBytes } from "@waku/utils/bytes";
 
 import { compressPublicKey } from "./crypto.js";
 import { ENR } from "./enr.js";
-import { getPublicKeyFromPeerId } from "./peer_id.js";
 
 export class EnrCreator {
   public static fromPublicKey(
     publicKey: Uint8Array,
     kvs: Record<ENRKey, ENRValue> = {}
-  ): Promise<ENR> {
+  ): ENR {
     // EIP-778 specifies that the key must be in compressed format, 33 bytes
     if (publicKey.length !== 33) {
       publicKey = compressPublicKey(publicKey);
@@ -28,7 +27,7 @@ export class EnrCreator {
   ): Promise<ENR> {
     switch (peerId.type) {
       case "secp256k1":
-        return EnrCreator.fromPublicKey(getPublicKeyFromPeerId(peerId), kvs);
+        return EnrCreator.fromPublicKey(peerId.publicKey.raw, kvs);
       default:
         throw new Error();
     }

package/src/decoder.ts

@@ -37,7 +37,7 @@ async function fromValues(values: Uint8Array[]): Promise<ENR> {
   }
   const _seq = decodeSeq(seq);
 
-  const enr = await ENR.create(obj, _seq, signature);
+  const enr = ENR.create(obj, _seq, signature);
   checkSignature(seq, kvs, enr, signature);
   return enr;
 }

package/src/enr.ts

@@ -34,16 +34,16 @@ export class ENR extends RawEnr implements IEnr {
   public static readonly RECORD_PREFIX = "enr:";
   public peerId?: PeerId;
 
-  public static async create(
+  public static create(
     kvs: Record<ENRKey, ENRValue> = {},
     seq: SequenceNumber = BigInt(1),
     signature?: Uint8Array
-  ): Promise<ENR> {
+  ): ENR {
     const enr = new ENR(kvs, seq, signature);
     try {
       const publicKey = enr.publicKey;
       if (publicKey) {
-        enr.peerId = await createPeerIdFromPublicKey(publicKey);
+        enr.peerId = createPeerIdFromPublicKey(publicKey);
       }
     } catch (e) {
       log.error("Could not calculate peer id for ENR", e);

package/src/peer_id.ts

@@ -1,38 +1,13 @@
-import { unmarshalPrivateKey, unmarshalPublicKey } from "@libp2p/crypto/keys";
-import { supportedKeys } from "@libp2p/crypto/keys";
-import type { PeerId } from "@libp2p/interface";
-import { peerIdFromKeys } from "@libp2p/peer-id";
+import { publicKeyFromRaw } from "@libp2p/crypto/keys";
+import { type PeerId } from "@libp2p/interface";
+import { peerIdFromPublicKey } from "@libp2p/peer-id";
 
-export function createPeerIdFromPublicKey(
-  publicKey: Uint8Array
-): Promise<PeerId> {
-  const _publicKey = new supportedKeys.secp256k1.Secp256k1PublicKey(publicKey);
-  return peerIdFromKeys(_publicKey.bytes, undefined);
-}
-
-export function getPublicKeyFromPeerId(peerId: PeerId): Uint8Array {
-  if (peerId.type !== "secp256k1") {
-    throw new Error("Unsupported peer id type");
-  }
+export const ERR_TYPE_NOT_IMPLEMENTED = "Keypair type not implemented";
 
-  if (!peerId.publicKey) {
-    throw new Error("Public key not present on peer id");
+export function createPeerIdFromPublicKey(publicKey: Uint8Array): PeerId {
+  const pubKey = publicKeyFromRaw(publicKey);
+  if (pubKey.type !== "secp256k1") {
+    throw new Error(ERR_TYPE_NOT_IMPLEMENTED);
   }
-
-  return unmarshalPublicKey(peerId.publicKey).marshal();
-}
-
-// Only used in tests
-export async function getPrivateKeyFromPeerId(
-  peerId: PeerId
-): Promise<Uint8Array> {
-  if (peerId.type !== "secp256k1") {
-    throw new Error("Unsupported peer id type");
-  }
-  if (!peerId.privateKey) {
-    throw new Error("Private key not present on peer id");
-  }
-
-  const privateKey = await unmarshalPrivateKey(peerId.privateKey);
-  return privateKey.marshal();
+  return peerIdFromPublicKey(pubKey);
 }