remove js-client

fluencelabs · Dec 20, 2024 · d77b67c · d77b67c
1 parent 1e1cf9f
commit d77b67c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1,220 deletions.
diff --git a/packages/cli/package/package.json b/packages/cli/package/package.json
@@ -57,8 +57,9 @@
   },
   "dependencies": {
     "@fluencelabs/deal-ts-clients": "0.22.1",
-    "@fluencelabs/js-client": "0.9.0",
     "@kubernetes/client-node": "github:fluencelabs/kubernetes-client-javascript#e72ee00a52fec4eb4a8327632895d888ee504f4d",
+    "@libp2p/crypto": "4.0.1",
+    "@libp2p/peer-id-factory": "4.0.5",
     "@mswjs/interceptors": "0.29.1",
     "@oclif/color": "1.0.13",
     "@oclif/core": "4.0.29",

diff --git a/packages/cli/package/src/lib/helpers/getPeerIdFromSecretKey.ts b/packages/cli/package/src/lib/helpers/getPeerIdFromSecretKey.ts
@@ -18,7 +18,15 @@
 import { base64ToUint8Array } from "../keyPairs.js";
 
 export async function getPeerIdFromSecretKey(secretKey: string) {
-  const { KeyPair } = await import("@fluencelabs/js-client");
-  const keyPair = await KeyPair.fromEd25519SK(base64ToUint8Array(secretKey));
-  return keyPair.getPeerId();
+  const { generateKeyPairFromSeed } = await import("@libp2p/crypto/keys");
+  const { createFromPrivKey } = await import("@libp2p/peer-id-factory");
+
+  const key = await generateKeyPairFromSeed(
+    "Ed25519",
+    base64ToUint8Array(secretKey),
+    256,
+  );
+
+  // eslint-disable-next-line no-restricted-syntax
+  return (await createFromPrivKey(key)).toString();
 }
diff --git a/packages/cli/package/src/lib/keyPairs.ts b/packages/cli/package/src/lib/keyPairs.ts
@@ -41,10 +41,11 @@ export async function genSecretKeyOrReturnExisting(name: string) {
 }
 
 async function genSecretKeyString(): Promise<string> {
-  const { KeyPair } = await import("@fluencelabs/js-client");
-  const keyPair = await KeyPair.randomEd25519();
-  const privateKey = keyPair.toEd25519PrivateKey();
-  return bufferToBase64(Buffer.from(privateKey));
+  const { generateKeyPair } = await import("@libp2p/crypto/keys");
+
+  return bufferToBase64(
+    Buffer.from((await generateKeyPair("Ed25519")).marshal().subarray(0, 32)),
+  );
 }
 
 export function base64ToUint8Array(base64: string) {