Merge pull request #41 from pinto-org/exchange-sg-sunrise

disable waiting for bean/basin sg before processing apys

Author: PintoPirate

src/scheduled/tasks/deposits.js

@@ -17,6 +17,7 @@ const MAX_BLOCKS = 2000;
 
 class DepositsTask {
   // Set by SunriseTask when a new season is encountered. Indicates that all deposits should be updated.
+  // This approach would not work if also taking deposit snapshots (this flag/behavior is only triggered in real-time).
   static __seasonUpdate = false;
 
   // Returns true if the task can be called again immediately
@@ -29,6 +30,9 @@ class DepositsTask {
     }
     Log.info(`Updating deposits for block range [${lastUpdate}, ${updateBlock}]`);
 
+    // FIXME: there is an issue here when whitelisting or pausing (and their inverse) occurs.
+    // Should assign the updateBlock to the block right before one of those events.
+    // When paused, the indexer should auto advance (since there can be no deposit activity)
     const tokenInfos = await SiloService.getWhitelistedTokenInfo({ block: updateBlock, chain: C().CHAIN });
 
     await AsyncContext.sequelizeTransaction(async () => {

src/scheduled/util/on-sunrise.js

@@ -46,8 +46,14 @@ class OnSunriseUtil {
       const newSeasonBlock = parseInt(beanstalkSeason.sunriseBlock);
       // See if bean, basin subgraphs are ready also
       const [beanMeta, basinMeta] = await Promise.all([
-        CommonSubgraphRepository.getMeta(C().SG.BEAN),
-        CommonSubgraphRepository.getMeta(C().SG.BASIN)
+        /// Currently we don't need either of these subgraphs to be ready for downstream use cases.
+        /// Test cases were modified to not test bean/basin anymore.
+        /// This is a temporary measure that was added due to this subgraph crashign and being unavailable for a long period.
+        /// A more robust solution would allow upstream callers to specify which subgraphs they expect to be ready.
+        Promise.resolve({ block: Number.MAX_SAFE_INTEGER.toString() }),
+        Promise.resolve({ block: Number.MAX_SAFE_INTEGER.toString() })
+        /// CommonSubgraphRepository.getMeta(C().SG.BEAN),
+        /// CommonSubgraphRepository.getMeta(C().SG.BASIN)
       ]);
       return Math.min(parseInt(beanMeta.block), parseInt(basinMeta.block)) >= newSeasonBlock;
     }

test/scheduled/sunrise.test.js

@@ -38,16 +38,17 @@ describe('OnSunrise', () => {
     // Fast-forward timers and continue
     jest.advanceTimersByTime(5000);
     jest.runAllTimers();
-    await checkLastPromiseResult(checkSpy, false);
+    await checkLastPromiseResult(checkSpy, true);
 
-    // Now, bean/basin are ready also
-    const metaReady = require('../mock-responses/subgraph/scheduled/sunrise/metaReady.json');
-    beanSGSpy.mockResolvedValueOnce(metaReady);
-    basinSGSpy.mockResolvedValueOnce(metaReady);
+    /// Disabled due to not checking for these in the waiting function anymore
+    // // Now, bean/basin are ready also
+    // const metaReady = require('../mock-responses/subgraph/scheduled/sunrise/metaReady.json');
+    // beanSGSpy.mockResolvedValueOnce(metaReady);
+    // basinSGSpy.mockResolvedValueOnce(metaReady);
 
-    jest.advanceTimersByTime(5000);
-    jest.runAllTimers();
-    await checkLastPromiseResult(checkSpy, true);
+    // jest.advanceTimersByTime(5000);
+    // jest.runAllTimers();
+    // await checkLastPromiseResult(checkSpy, true);
 
     await expect(waitPromise).resolves.toBeUndefined();
   });