feat: check for confirmed transaction when pushing changes

Chia-Network · Feb 14, 2022 · b975c7d · b975c7d
1 parent 9695551
commit b975c7d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/datalayer/persistance.js b/src/datalayer/persistance.js
@@ -108,7 +108,7 @@ export const getRoot = async (storeId) => {
   try {
     const data = JSON.parse(response);
 
-    if (data.success) {
+    if (data.status === 1) {
       return data;
     }
 

diff --git a/src/datalayer/simulator.js b/src/datalayer/simulator.js
@@ -78,6 +78,7 @@ export const getRoot = async (storeId) => {
     );
     return Promise.resolve({
       hash: null,
+      status: 1,
       success: false,
     });
   }
@@ -90,6 +91,7 @@ export const getRoot = async (storeId) => {
 
   return Promise.resolve({
     hash,
+    status: 1,
     success: true,
   });
 };
@@ -122,13 +124,15 @@ export const getRoots = async (storeIds) => {
             .update(JSON.stringify(simulatorTable))
             .digest('hex')}`,
           id: storeId,
+          status: 1,
         };
       }
 
       // no hash for simulated external org tables (they dont exist in simulator)
       return {
         hash: 0,
         id: storeId,
+        status: 1,
       };
     }),
     success: true,

diff --git a/src/datalayer/syncService.js b/src/datalayer/syncService.js
@@ -125,7 +125,8 @@ export const dataLayerWasUpdated = async () => {
     );
 
     if (org) {
-      return org.registryHash != rootHash.hash;
+      // store has been updated if its confirmed and the hash has changed
+      return rootHash.status === 1 && org.registryHash != rootHash.hash;
     }
 
     return false;

diff --git a/src/datalayer/writeService.js b/src/datalayer/writeService.js
@@ -33,11 +33,12 @@ const pushChangesWhenStoreIsAvailable = async (storeId, changeList) => {
       await pushChangesWhenStoreIsAvailable(storeId, changeList);
     }, 5000);
   };
+
   if (process.env.USE_SIMULATOR === 'true') {
     return simulator.pushChangeListToDataLayer(storeId, changeList);
   } else {
-    const storeExists = await dataLayer.getRoot(storeId);
-    if (storeExists) {
+    const storeExistAndIsConfirmed = await dataLayer.getRoot(storeId);
+    if (storeExistAndIsConfirmed) {
       const success = await dataLayer.pushChangeListToDataLayer(
         storeId,
         changeList,