Break everything

Author: DZakh

codegenerator/cli/npm/envio/src/InternalConfig.res

@@ -30,7 +30,7 @@ type chain = {
   id: int,
   startBlock: int,
   endBlock?: int,
-  confirmedBlockThreshold: int,
+  maxReorgDepth: int,
   contracts: array<contract>,
   sources: array<Source.t>,
 }

codegenerator/cli/npm/envio/src/PgStorage.res

@@ -65,7 +65,7 @@ let makeInitializeTransaction = (
   let generalTables = [
     InternalTable.Chains.table,
     InternalTable.PersistedState.table,
-    InternalTable.Blocks.table,
+    InternalTable.ReorgCheckpoints.table,
     InternalTable.RawEvents.table,
   ]
 

codegenerator/cli/npm/envio/src/ReorgDetection.res

@@ -43,14 +43,10 @@ type validBlockResult = result<blockDataWithTimestamp, validBlockError>
 module LastBlockScannedHashes: {
   type t
   /**Instantiat t with existing data*/
-  let makeWithData: (
-    array<blockData>,
-    ~confirmedBlockThreshold: int,
-    ~detectedReorgBlock: blockData=?,
-  ) => t
+  let makeWithData: (array<blockData>, ~maxReorgDepth: int, ~detectedReorgBlock: blockData=?) => t
 
   /**Instantiat empty t with no block data*/
-  let empty: (~confirmedBlockThreshold: int) => t
+  let empty: (~maxReorgDepth: int) => t
 
   /** Registers a new reorg guard, prunes unneeded data, and returns the updated state.
    * Resets internal state if shouldRollbackOnReorg is false (detect-only mode)
@@ -82,7 +78,7 @@ module LastBlockScannedHashes: {
     // as a threshold for reorgs. If for eg. this is 200,
     // it means we are accounting for reorgs up to 200 blocks
     // behind the head
-    confirmedBlockThreshold: int,
+    maxReorgDepth: int,
     // A hash map of recent blockdata by block number to make comparison checks
     // for reorgs.
     dataByBlockNumber: dict<blockData>,
@@ -93,33 +89,33 @@ module LastBlockScannedHashes: {
     detectedReorgBlock: option<blockData>,
   }
 
-  let makeWithData = (blocks, ~confirmedBlockThreshold, ~detectedReorgBlock=?) => {
+  let makeWithData = (blocks, ~maxReorgDepth, ~detectedReorgBlock=?) => {
     let dataByBlockNumber = Js.Dict.empty()
 
     blocks->Belt.Array.forEach(block => {
       dataByBlockNumber->Js.Dict.set(block.blockNumber->Js.Int.toString, block)
     })
 
     {
-      confirmedBlockThreshold,
+      maxReorgDepth,
       dataByBlockNumber,
       detectedReorgBlock,
     }
   }
   //Instantiates empty LastBlockHashes
-  let empty = (~confirmedBlockThreshold) => {
-    confirmedBlockThreshold,
+  let empty = (~maxReorgDepth) => {
+    maxReorgDepth,
     dataByBlockNumber: Js.Dict.empty(),
     detectedReorgBlock: None,
   }
 
   let getDataByBlockNumberCopyInThreshold = (
-    {dataByBlockNumber, confirmedBlockThreshold}: t,
+    {dataByBlockNumber, maxReorgDepth}: t,
     ~currentBlockHeight,
   ) => {
     // Js engine automatically orders numeric object keys
     let ascBlockNumberKeys = dataByBlockNumber->Js.Dict.keys
-    let thresholdBlockNumber = currentBlockHeight - confirmedBlockThreshold
+    let thresholdBlockNumber = currentBlockHeight - maxReorgDepth
 
     let copy = Js.Dict.empty()
 
@@ -136,7 +132,7 @@ module LastBlockScannedHashes: {
   }
 
   let registerReorgGuard = (
-    {confirmedBlockThreshold} as self: t,
+    {maxReorgDepth} as self: t,
     ~reorgGuard: reorgGuard,
     ~currentBlockHeight,
     ~shouldRollbackOnReorg,
@@ -180,7 +176,7 @@ module LastBlockScannedHashes: {
               ...self,
               detectedReorgBlock: Some(reorgDetected.scannedBlock),
             }
-          : empty(~confirmedBlockThreshold),
+          : empty(~maxReorgDepth),
         ReorgDetected(reorgDetected),
       )
     | None => {
@@ -199,7 +195,7 @@ module LastBlockScannedHashes: {
 
         (
           {
-            confirmedBlockThreshold,
+            maxReorgDepth,
             dataByBlockNumber: dataByBlockNumberCopyInThreshold,
             detectedReorgBlock: None,
           },
@@ -289,10 +285,7 @@ module LastBlockScannedHashes: {
   Return a BlockNumbersAndHashes.t rolled back to where blockData is less
   than the provided blockNumber
   */
-  let rollbackToValidBlockNumber = (
-    {dataByBlockNumber, confirmedBlockThreshold}: t,
-    ~blockNumber: int,
-  ) => {
+  let rollbackToValidBlockNumber = ({dataByBlockNumber, maxReorgDepth}: t, ~blockNumber: int) => {
     // Js engine automatically orders numeric object keys
     let ascBlockNumberKeys = dataByBlockNumber->Js.Dict.keys
 
@@ -316,7 +309,7 @@ module LastBlockScannedHashes: {
     loop(0)
 
     {
-      confirmedBlockThreshold,
+      maxReorgDepth,
       dataByBlockNumber: newDataByBlockNumber,
       detectedReorgBlock: None,
     }

codegenerator/cli/npm/envio/src/db/InternalTable.res

@@ -16,6 +16,7 @@ module Chains = {
     | #id
     | #start_block
     | #end_block
+    | #max_reorg_depth
     | #source_block
     | #first_event_block
     | #buffer_block
@@ -28,6 +29,7 @@ module Chains = {
     #id,
     #start_block,
     #end_block,
+    #max_reorg_depth,
     #source_block,
     #first_event_block,
     #buffer_block,
@@ -52,6 +54,7 @@ module Chains = {
     @as("id") id: int,
     @as("start_block") startBlock: int,
     @as("end_block") endBlock: Js.null<int>,
+    @as("max_reorg_depth") maxReorgDepth: int,
     @as("progress_block") progressBlockNumber: int,
     @as("events_processed") numEventsProcessed: int,
     ...metaFields,
@@ -64,6 +67,7 @@ module Chains = {
       // Values populated from config
       mkField((#start_block: field :> string), Integer, ~fieldSchema=S.int),
       mkField((#end_block: field :> string), Integer, ~fieldSchema=S.null(S.int), ~isNullable),
+      mkField((#max_reorg_depth: field :> string), Integer, ~fieldSchema=S.int),
       // Block number of the latest block that was fetched from the source
       mkField((#buffer_block: field :> string), Integer, ~fieldSchema=S.int),
       // Block number of the currently active source
@@ -98,6 +102,7 @@ module Chains = {
       id: chainConfig.id,
       startBlock: chainConfig.startBlock,
       endBlock: chainConfig.endBlock->Js.Null.fromOption,
+      maxReorgDepth: chainConfig.maxReorgDepth,
       blockHeight: 0,
       firstEventBlockNumber: Js.Null.empty,
       latestFetchedBlockNumber: -1,
@@ -254,22 +259,24 @@ module PersistedState = {
   )
 }
 
-module Blocks = {
+module ReorgCheckpoints = {
   type t = {
     id: bigint,
     @as("chain_id")
     chainId: int,
-    number: int,
-    hash: string,
+    @as("block_number")
+    blockNumber: int,
+    @as("block_hash")
+    blockHash: string,
   }
 
   let table = mkTable(
-    "envio_blocks",
+    "envio_reorg_checkpoints",
     ~fields=[
       mkField("id", Numeric, ~fieldSchema=S.bigint, ~isPrimaryKey),
       mkField("chain_id", Integer, ~fieldSchema=S.int),
-      mkField("number", Integer, ~fieldSchema=S.int),
-      mkField("hash", Text, ~fieldSchema=S.string),
+      mkField("block_number", Integer, ~fieldSchema=S.int),
+      mkField("block_hash", Text, ~fieldSchema=S.string),
     ],
   )
 }

codegenerator/cli/templates/dynamic/codegen/src/ConfigYAML.res.hbs

@@ -25,7 +25,7 @@ type contract = {
 type configYaml = {
   syncSource,
   startBlock: int,
-  confirmedBlockThreshold: int,
+  maxReorgDepth: int,
   contracts: dict<contract>,
   lowercaseAddresses: bool,
 }
@@ -58,7 +58,7 @@ let publicConfig = ChainMap.fromArrayUnsafe([
     (
       chain,
       {
-        confirmedBlockThreshold: {{chain_config.network_config.confirmed_block_threshold}},
+        maxReorgDepth: {{chain_config.network_config.confirmed_block_threshold}},
         syncSource: {{chain_config.deprecated_sync_source_code}},
         startBlock: {{chain_config.network_config.start_block}},
         contracts,

codegenerator/cli/templates/dynamic/codegen/src/RegisterHandlers.res.hbs

@@ -56,7 +56,7 @@ let registerContractHandlers = (
         ]
         let chain = ChainMap.Chain.makeUnsafe(~chainId={{chain_config.network_config.id}})
         {
-          InternalConfig.confirmedBlockThreshold: {{chain_config.network_config.confirmed_block_threshold}},
+          InternalConfig.maxReorgDepth: {{chain_config.network_config.confirmed_block_threshold}},
           startBlock: {{chain_config.network_config.start_block}},
           {{#if chain_config.network_config.end_block}}
           endBlock: {{chain_config.network_config.end_block}},

codegenerator/cli/templates/static/codegen/src/IO.res

@@ -224,19 +224,20 @@ let executeBatch = async (
   | Some(eventIdentifier) =>
     Some(
       sql =>
-        Promise.all2((
+        Promise.all([
           sql->DbFunctions.EntityHistory.deleteAllEntityHistoryAfterEventIdentifier(
             ~isUnorderedMultichainMode=switch config.multichain {
             | Unordered => true
             | Ordered => false
             },
             ~eventIdentifier,
           ),
-          sql->DbFunctions.EndOfBlockRangeScannedData.rollbackEndOfBlockRangeScannedDataForChain(
-            ~chainId=eventIdentifier.chainId,
-            ~knownBlockNumber=eventIdentifier.blockNumber,
-          ),
-        )),
+          // FIXME: Add rollback for blocks table
+          // sql->DbFunctions.EndOfBlockRangeScannedData.rollbackEndOfBlockRangeScannedDataForChain(
+          //   ~chainId=eventIdentifier.chainId,
+          //   ~knownBlockNumber=eventIdentifier.blockNumber,
+          // ),
+        ]),
     )
   | None => None
   }

codegenerator/cli/templates/static/codegen/src/db/DbFunctions.res

@@ -13,43 +13,6 @@ module General = {
   }
 }
 
-module EndOfBlockRangeScannedData = {
-  type endOfBlockRangeScannedData = {
-    @as("chain_id") chainId: int,
-    @as("block_number") blockNumber: int,
-    @as("block_hash") blockHash: string,
-  }
-
-  @module("./DbFunctionsImplementation.js")
-  external batchSet: (Postgres.sql, array<endOfBlockRangeScannedData>) => promise<unit> =
-    "batchSetEndOfBlockRangeScannedData"
-
-  let setEndOfBlockRangeScannedData = (sql, endOfBlockRangeScannedData) =>
-    batchSet(sql, [endOfBlockRangeScannedData])
-
-  @module("./DbFunctionsImplementation.js")
-  external readEndOfBlockRangeScannedDataForChain: (
-    Postgres.sql,
-    ~chainId: int,
-  ) => promise<array<endOfBlockRangeScannedData>> = "readEndOfBlockRangeScannedDataForChain"
-
-  @module("./DbFunctionsImplementation.js")
-  external deleteStaleEndOfBlockRangeScannedDataForChain: (
-    Postgres.sql,
-    ~chainId: int,
-    //minimum blockNumber that should be kept in db
-    ~blockNumberThreshold: int,
-  ) => promise<unit> = "deleteStaleEndOfBlockRangeScannedDataForChain"
-
-  @module("./DbFunctionsImplementation.js")
-  external rollbackEndOfBlockRangeScannedDataForChain: (
-    Postgres.sql,
-    ~chainId: int,
-    //The known block number we are rollbacking to
-    ~knownBlockNumber: int,
-  ) => promise<unit> = "rollbackEndOfBlockRangeScannedDataForChain"
-}
-
 module DynamicContractRegistry = {
   @module("./DbFunctionsImplementation.js")
   external readAllDynamicContractsRaw: (Postgres.sql, ~chainId: chainId) => promise<Js.Json.t> =

codegenerator/cli/templates/static/codegen/src/db/DbFunctionsImplementation.js

@@ -31,53 +31,6 @@ module.exports.batchDeleteItemsInTable = (table, sql, pkArray) => {
   }
 };
 
-const batchSetEndOfBlockRangeScannedDataCore = (sql, rowDataArray) => {
-  return sql`
-    INSERT INTO ${sql(publicSchema)}."end_of_block_range_scanned_data"
-  ${sql(rowDataArray, "chain_id", "block_number", "block_hash")}
-    ON CONFLICT(chain_id, block_number) DO UPDATE
-    SET
-    "chain_id" = EXCLUDED."chain_id",
-    "block_number" = EXCLUDED."block_number",
-    "block_hash" = EXCLUDED."block_hash";`;
-};
-
-module.exports.batchSetEndOfBlockRangeScannedData = chunkBatchQuery(
-  batchSetEndOfBlockRangeScannedDataCore
-);
-
-module.exports.readEndOfBlockRangeScannedDataForChain = (sql, chainId) => {
-  return sql`
-    SELECT * FROM ${sql(publicSchema)}."end_of_block_range_scanned_data"
-    WHERE
-      chain_id = ${chainId}
-      ORDER BY block_number ASC;`;
-};
-
-module.exports.deleteStaleEndOfBlockRangeScannedDataForChain = (
-  sql,
-  chainId,
-  blockNumberThreshold
-) => {
-  return sql`
-    DELETE
-    FROM ${sql(publicSchema)}."end_of_block_range_scanned_data"
-    WHERE chain_id = ${chainId}
-    AND block_number < ${blockNumberThreshold};`;
-};
-
-module.exports.rollbackEndOfBlockRangeScannedDataForChain = (
-  sql,
-  chainId,
-  knownBlockNumber
-) => {
-  return sql`
-    DELETE
-    FROM ${sql(publicSchema)}."end_of_block_range_scanned_data"
-    WHERE chain_id = ${chainId}
-    AND block_number > ${knownBlockNumber};`;
-};
-
 module.exports.readAllDynamicContracts = (sql, chainId) => sql`
   SELECT *
   FROM ${sql(publicSchema)}."dynamic_contract_registry"