fix peer id key generation

Author: giurgiur99

src/components/P2P/index.ts

@@ -234,7 +234,7 @@ export class OceanP2P extends EventEmitter {
       P2P_LOGGER.info(`Starting P2P Node with peerID: ${this._publicAddress}`)
 
       this._publicKey = config.keys.publicKey
-      this._privateKey = config.keys.privateKey
+      this._privateKey = config.keys.privateKey.raw
       /** @type {import('libp2p').Libp2pOptions} */
       // start with some default, overwrite based on config later
       const bindInterfaces = []
@@ -341,7 +341,7 @@ export class OceanP2P extends EventEmitter {
 
       let options = {
         addresses,
-        peerId: config.keys.peerId,
+        privateKey: config.keys.privateKey,
         transports,
         streamMuxers: [yamux()],
         connectionEncryption: [

src/components/core/handler/downloadHandler.ts

@@ -108,7 +108,7 @@ export async function handleDownloadUrlCommand(
       // we parse the string into the object again
       const encryptedObject = ethCrypto.cipher.parse(task.aes_encrypted_key)
       // get the key from configuration
-      const nodePrivateKey = Buffer.from(config.keys.privateKey).toString('hex')
+      const nodePrivateKey = Buffer.from(config.keys.privateKey.raw).toString('hex')
       const decrypted = await ethCrypto.decryptWithPrivateKey(
         nodePrivateKey,
         encryptedObject

src/components/core/utils/feesHandler.ts

@@ -452,15 +452,15 @@ export async function checkFee(
  */
 export async function getProviderWallet(chainId?: string): Promise<ethers.Wallet> {
   return new ethers.Wallet(
-    Buffer.from((await getConfiguration()).keys.privateKey).toString('hex')
+    Buffer.from((await getConfiguration()).keys.privateKey.raw).toString('hex')
   )
 }
 export async function getProviderWalletAddress(): Promise<string> {
   return (await getProviderWallet()).address
 }
 
 export async function getProviderKey(): Promise<string> {
-  return Buffer.from((await getConfiguration()).keys.privateKey).toString('hex')
+  return Buffer.from((await getConfiguration()).keys.privateKey.raw).toString('hex')
 }
 
 /**

src/test/unit/oceanP2P.test.ts

@@ -9,12 +9,13 @@ import {
   setupEnvironment,
   tearDownEnvironment
 } from '../utils/utils.js'
+import { OceanNodeConfig } from '../../@types/OceanNode.js'
 
 describe('OceanP2P Test', () => {
   let node1: OceanP2P
   let node2: OceanP2P
-  let config1: any
-  let config2: any
+  let config1: OceanNodeConfig
+  let config2: OceanNodeConfig
   const mDNSInterval: number = 1
 
   const envOverrides = buildEnvOverrideConfig(
@@ -67,6 +68,10 @@ describe('OceanP2P Test', () => {
     assert(node2, 'Failed to create P2P Node instance')
   })
   it('Start check peerID of each node', () => {
+    console.log(config1.keys.peerId.toString())
+    console.log(node1._libp2p.peerId.toString())
+    console.log(config2.keys.peerId.toString())
+    console.log(node2._libp2p.peerId.toString())
     assert(
       config1.keys.peerId.toString() === node1._libp2p.peerId.toString(),
       'Peer missmatch for node1'

src/utils/config/builder.ts

@@ -90,7 +90,7 @@ export function getPeerIdFromPrivateKey(privateKey: string): OceanNodeKeys {
   return {
     peerId: peerIdFromPrivateKey(key),
     publicKey: key.publicKey.raw,
-    privateKey: key.raw,
+    privateKey: key,
     ethAddress: new Wallet(privateKey.substring(2)).address
   }
 }