Fix decryptDDO existing nonce issue

src/components/Indexer/processor.ts

@@ -59,6 +59,7 @@ import {
   VersionedDDO
 } from '@oceanprotocol/ddo-js'
 import { checkCredentialOnAccessList } from '../../utils/credentials.js'
+// import { getNonce } from '../core/utils/nonceHandler.js'
 class BaseEventProcessor {
   protected networkId: number
 
@@ -242,15 +243,17 @@ class BaseEventProcessor {
       INDEXER_LOGGER.logMessage(
         `Decrypting DDO  from network: ${this.networkId} created by: ${eventCreator} encrypted by: ${decryptorURL}`
       )
-      const nonce = Math.floor(Date.now() / 1000).toString()
+
+      const incrementedNonce = Date.now().toString()
+
       const config = await getConfiguration()
       const { keys } = config
       const nodeId = keys.peerId.toString()
 
       const wallet: ethers.Wallet = new ethers.Wallet(process.env.PRIVATE_KEY as string)
 
       const message = String(
-        txId + contractAddress + keys.ethAddress + chainId.toString() + nonce
+        txId + contractAddress + keys.ethAddress + chainId.toString() + incrementedNonce
       )
       const consumerMessage = ethers.solidityPackedKeccak256(
         ['bytes'],
@@ -266,7 +269,7 @@ class BaseEventProcessor {
             decrypterAddress: keys.ethAddress,
             dataNftAddress: contractAddress,
             signature,
-            nonce
+            nonce: incrementedNonce
           }
           const response = await axios({
             method: 'post',
@@ -309,7 +312,7 @@ class BaseEventProcessor {
             documentHash: metadataHash,
             dataNftAddress: contractAddress,
             signature,
-            nonce
+            nonce: incrementedNonce
           }
           try {
             const response = await node
@@ -370,7 +373,7 @@ class BaseEventProcessor {
               documentHash: metadataHash,
               dataNftAddress: contractAddress,
               signature,
-              nonce
+              nonce: incrementedNonce
             }
             const response = await p2pNode.sendTo(
               decryptorURL,

src/components/core/handler/ddoHandler.ts

@@ -105,7 +105,11 @@ export class DecryptDdoHandler extends CommandHandler {
       const existingNonce = await dbNonce.retrieve(decrypterAddress)
 
       if (existingNonce && existingNonce.nonce === nonce) {
-        CORE_LOGGER.logMessage(`Decrypt DDO: error ${task.nonce} duplicate nonce`, true)
+        CORE_LOGGER.log(
+          LOG_LEVELS_STR.LEVEL_ERROR,
+          `Decrypt DDO: duplicate nonce error decryptor addr ${decrypterAddress} nonce ${task.nonce} `,
+          true
+        )
         return {
           stream: null,
           status: {

src/components/core/utils/nonceHandler.ts

@@ -55,6 +55,7 @@ export async function getNonce(
   db: AbstractNonceDatabase,
   address: string
 ): Promise<P2PCommandResponse> {
+  DATABASE_LOGGER.logMessage('Retrieving nonce for address: ' + address, true)
   // get nonce from db
   try {
     const nonceResponse = await db.retrieve(address)
@@ -92,6 +93,7 @@ async function updateNonce(
   nonce: number
 ): Promise<NonceResponse> {
   try {
+    DATABASE_LOGGER.logMessage('Updating nonce for address: ' + address, true)
     // update nonce on db
     // it will create if none exists yet
     const resp = await db.update(address, nonce)