SnapbackSM - Phase 1 - Recurring Sync

creator-node/compose/docker-compose.yml

@@ -26,6 +26,7 @@ services:
       - delegateOwnerWallet=${delegateOwnerWallet}
       - delegatePrivateKey=${delegatePrivateKey}
       - creatorNodeEndpoint=${creatorNodeEndpoint}
+      - triggerSyncOnWrite=${triggerSyncOnWrite}
     env_file:
       - ./env/base.env
     ports:

creator-node/src/config.js

@@ -378,6 +378,12 @@ const config = convict({
     format: 'nat',
     env: 'rehydrateMaxConcurrency',
     default: 10
+  },
+  triggerSyncOnWrite: {
+    doc: 'TEST ONLY. DO NOT CONFIGURE MANUALLY. Disables automatic secondary sync issuing in order to test SnapbackSM.',
+    format: Boolean,
+    env: 'triggerSyncOnWrite',
+    default: true
   }
 
   // unsupported options at the moment

creator-node/src/middlewares.js

@@ -95,7 +95,7 @@ async function ensurePrimaryMiddleware (req, res, next) {
  * @dev - Is not a middleware so it can be run before responding to client.
  */
 async function triggerSecondarySyncs (req) {
-  if (config.get('isUserMetadataNode')) return
+  if (config.get('isUserMetadataNode') || !config.get('triggerSyncOnWrite')) return
   try {
     if (!req.session.nodeIsPrimary || !req.session.creatorNodeEndpoints || !Array.isArray(req.session.creatorNodeEndpoints)) return
     const [primary, ...secondaries] = req.session.creatorNodeEndpoints

creator-node/src/routes/nodeSync.js

@@ -308,19 +308,21 @@ async function _nodesync (req, walletPublicKeys, creatorNodeEndpoint, dbOnlySync
           transaction
         })
         const fetchedLatestBlockNumber = fetchedCNodeUser.latestBlockNumber
+        const fetchedLatestClockVal = fetchedCNodeUser.clock
 
         // Delete any previously stored data for cnodeUser in reverse table dependency order (cannot be parallelized).
         if (cnodeUser) {
           // Ensure imported data has higher blocknumber than already stored.
-          // TODO - replace this check with a clock check (!!!)
           const latestBlockNumber = cnodeUser.latestBlockNumber
+          const latestClockValue = cnodeUser.clock
 
           if (!dbOnlySync) {
             if ((fetchedLatestBlockNumber === -1 && latestBlockNumber !== -1) ||
-              (fetchedLatestBlockNumber !== -1 && fetchedLatestBlockNumber <= latestBlockNumber)
+              (latestClockValue >= fetchedLatestClockVal)
             ) {
               throw new Error(`Imported data is outdated, will not sync. Imported latestBlockNumber \
-                ${fetchedLatestBlockNumber} Self latestBlockNumber ${latestBlockNumber}`)
+                ${fetchedLatestBlockNumber} Self latestBlockNumber ${latestBlockNumber}. \
+                fetched latestClockVal: ${fetchedLatestClockVal}, self latestClockVal: ${latestClockValue}`)
             }
           }
 

creator-node/src/routes/users.js

@@ -170,4 +170,24 @@ module.exports = function (app) {
 
     return successResponse({ clockValue })
   }))
+  /**
+   * Returns latest clock value stored in CNodeUsers entry given wallet, or -1 if no entry found
+   */
+  app.post('/users/batch_clock_status', handleResponse(async (req, res) => {
+    // TODO: Limit max size
+    const { walletPublicKeys } = req.body
+    const cnodeUsers = await models.CNodeUser.findAll({
+      where: {
+        walletPublicKey: {
+          [models.Sequelize.Op.in]: walletPublicKeys
+        }
+      }
+    })
+    return successResponse({
+      users: cnodeUsers.map(cnodeUser => ({
+        walletPublicKey: cnodeUser.walletPublicKey,
+        clock: cnodeUser.clock
+      }))
+    })
+  }))
 }