Merge pull request #976 from Chia-Network/release/1.7.4

release 1.7.4 - fix: invalid generation handling
Chia-Network · Dec 7, 2023 · 2511591 · 2511591
2 parents c49bb88 + 59be263
commit 2511591
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 37 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cadt",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "_comment": "DONT CHANGE MAJOR UNLESS DATAMODEL CHANGES: The major version corresponds to the datamodel version your using, so 2.0.0 means it'll use datamodel v2",
   "private": true,
   "bin": "build/server.js",

diff --git a/src/tasks/sync-audit-table.js b/src/tasks/sync-audit-table.js
@@ -194,6 +194,14 @@ async function createTransaction(callback, afterCommitCallbacks) {
   }
 }
 
+const tryParseJSON = (jsonString, defaultValue) => {
+  try {
+    return JSON.parse(jsonString);
+  } catch (error) {
+    return defaultValue;
+  }
+};
+
 const syncOrganizationAudit = async (organization) => {
   try {
     let afterCommitCallbacks = [];
@@ -295,9 +303,7 @@ const syncOrganizationAudit = async (organization) => {
     logger.info(' ');
     logger.info(`Syncing Registry: ${_.get(organization, 'name')}`);
     logger.info(
-      `${organization.name} is ${
-        syncRemaining + 1
-      } DataLayer generations away from being fully synced.`,
+      `${organization.name} is ${syncRemaining} DataLayer generations away from being fully synced.`,
     );
 
     if (!CONFIG.USE_SIMULATOR) {
@@ -357,31 +363,31 @@ const syncOrganizationAudit = async (organization) => {
         const key = decodeHex(diff.key);
         const modelKey = key.split('|')[0];
 
-        if (!['comment', 'author'].includes(key)) {
-          const auditData = {
-            orgUid: organization.orgUid,
-            registryId: organization.registryId,
-            rootHash: root2.root_hash,
-            type: diff.type,
-            table: modelKey,
-            change: decodeHex(diff.value),
-            onchainConfirmationTimeStamp: root2.timestamp,
-            comment: _.get(
-              JSON.parse(
-                decodeHex(_.get(comment, '[0].value', encodeHex('{}'))),
-              ),
-              'comment',
-              '',
+        const auditData = {
+          orgUid: organization.orgUid,
+          registryId: organization.registryId,
+          rootHash: root2.root_hash,
+          type: diff.type,
+          table: modelKey,
+          change: decodeHex(diff.value),
+          onchainConfirmationTimeStamp: root2.timestamp,
+          comment: _.get(
+            tryParseJSON(
+              decodeHex(_.get(comment, '[0].value', encodeHex('{}'))),
             ),
-            author: _.get(
-              JSON.parse(
-                decodeHex(_.get(author, '[0].value', encodeHex('{}'))),
-              ),
-              'author',
-              '',
+            'comment',
+            '',
+          ),
+          author: _.get(
+            tryParseJSON(
+              decodeHex(_.get(author, '[0].value', encodeHex('{}'))),
             ),
-          };
+            'author',
+            '',
+          ),
+        };
 
+        if (Object.keys(ModelKeys).includes(modelKey)) {
           if (modelKey) {
             const record = JSON.parse(decodeHex(diff.value));
             const primaryKeyValue =
@@ -425,18 +431,18 @@ const syncOrganizationAudit = async (organization) => {
               }
             }
           }
-
-          // Create the Audit record
-          await Audit.create(auditData, { transaction, mirrorTransaction });
-          await Organization.update(
-            { registryHash: root2.root_hash },
-            {
-              where: { orgUid: organization.orgUid },
-              transaction,
-              mirrorTransaction,
-            },
-          );
         }
+
+        // Create the Audit record
+        await Audit.create(auditData, { transaction, mirrorTransaction });
+        await Organization.update(
+          { registryHash: root2.root_hash },
+          {
+            where: { orgUid: organization.orgUid },
+            transaction,
+            mirrorTransaction,
+          },
+        );
       }
     };