Fix blocknumber bug

creator-node/src/apiHelpers.js

@@ -12,6 +12,7 @@ module.exports.handleResponse = (func) => {
       sendResponse(req, res, resp)
       next()
     } catch (error) {
+      console.error('HandleResponse', error)
       next(error)
     }
   }

creator-node/src/fileManager.js

@@ -63,6 +63,8 @@ async function saveFileToIPFSFromFS (req, srcPath, fileType, t) {
 
   const ipfs = req.app.get('ipfsAPI')
 
+  req.logger.info(`beginning saveFileToIPFSFromFS for srcPath ${srcPath}`)
+
   const multihash = (await ipfs.addFromFs(srcPath))[0].hash
   const dstPath = path.join(req.app.get('storagePath'), multihash)
 

creator-node/src/middlewares.js

@@ -20,7 +20,7 @@ async function authMiddleware (req, res, next) {
   }
 
   // Ensure cnodeUser exists for session
-  const cnodeUser = await models.CNodeUser.findOne({ where: { cnodeUserUUID: cnodeUserUUID } })
+  const cnodeUser = await models.CNodeUser.findOne({ where: { cnodeUserUUID } })
   if (!cnodeUser) {
     return sendResponse(req, res, errorResponseUnauthorized('No node user exists for provided authentication token'))
   }

creator-node/src/routes/nodeSync.js

@@ -186,7 +186,8 @@ async function _nodesync (req, walletPublicKeys, creatorNodeEndpoint) {
         if ((fetchedLatestBlockNumber === -1 && latestBlockNumber !== -1) ||
           (fetchedLatestBlockNumber !== -1 && fetchedLatestBlockNumber <= latestBlockNumber)
         ) {
-          throw new Error(`Imported data is outdated, will not sync.`)
+          throw new Error(`Imported data is outdated, will not sync. Imported latestBlockNumber \
+            ${fetchedLatestBlockNumber} Self latestBlockNumber ${latestBlockNumber}`)
         }
 
         const cnodeUserUUID = cnodeUser.cnodeUserUUID

creator-node/src/routes/tracks.js

@@ -121,7 +121,7 @@ module.exports = function (app) {
 
     // Error on outdated blocknumber.
     const cnodeUser = req.session.cnodeUser
-    if (!cnodeUser.latestBlockNumber || cnodeUser.latestBlockNumber >= blockNumber) {
+    if (!cnodeUser.latestBlockNumber || cnodeUser.latestBlockNumber > blockNumber) {
       return errorResponseBadRequest(`Invalid blockNumber param. Must be higher than previously processed blocknumber.`)
     }
     const cnodeUserUUID = req.session.cnodeUserUUID
@@ -178,8 +178,15 @@ module.exports = function (app) {
       }
     }))
 
-    // Update cnodeUser's latestBlockNumber.
-    await cnodeUser.update({ latestBlockNumber: blockNumber }, { transaction: t })
+    // Update cnodeUser's latestBlockNumber if higher than previous latestBlockNumber.
+    // TODO - move to subquery to guarantee atomicity.
+    const updatedCNodeUser = await models.CNodeUser.findOne({ where: { cnodeUserUUID }, transaction: t })
+    if (!updatedCNodeUser || !updatedCNodeUser.latestBlockNumber) { return errorResponseServerError('no') }
+    req.logger.info(`cnodeuser ${cnodeUserUUID} first latestBlockNumber ${cnodeUser.latestBlockNumber} || \
+      current latestBlockNumber ${updatedCNodeUser.latestBlockNumber} || given blockNumber ${blockNumber}`)
+    if (blockNumber > updatedCNodeUser.latestBlockNumber) {
+      await cnodeUser.update({ latestBlockNumber: blockNumber }, { transaction: t })
+    }
 
     try {
       await t.commit()