Insert events and contract as main_chain = false

tdroxler · tdroxler · commit 4572cd3472d3 · 2024-07-04T16:36:14.000+02:00
The same way we do for other entities, the `main_chain = true`
is updated later.
diff --git a/app/src/main/scala/org/alephium/explorer/persistence/model/ContractEntity.scala b/app/src/main/scala/org/alephium/explorer/persistence/model/ContractEntity.scala
@@ -110,7 +110,7 @@ object ContractEntity {
           destructionEventOrder = None,
           category = None,
           interfaceId = None,
-          mainChain = true
+          mainChain = false
         )
       }
     } else {
diff --git a/app/src/main/scala/org/alephium/explorer/persistence/model/EventEntity.scala b/app/src/main/scala/org/alephium/explorer/persistence/model/EventEntity.scala
@@ -67,7 +67,7 @@ object EventEntity {
       eventIndex,
       fields,
       order,
-      mainChain = true
+      mainChain = false
     )
   }
 }
diff --git a/app/src/main/scala/org/alephium/explorer/persistence/queries/ContractQueries.scala b/app/src/main/scala/org/alephium/explorer/persistence/queries/ContractQueries.scala
@@ -133,6 +133,7 @@ object ContractQueries {
       SELECT *
       FROM contracts
       WHERE contract = $contract
+      AND main_chain = true
       """.asASE[ContractEntity](contractEntityGetResult)
   }
 
@@ -143,6 +144,7 @@ object ContractQueries {
       SELECT parent
       FROM contracts
       WHERE contract = $contract
+      AND main_chain = true
       LIMIT 1
       """.asASE[Option[Address]](optionAddressGetResult).headOrNone.map(_.flatten)
   }
diff --git a/app/src/main/scala/org/alephium/explorer/persistence/schema/CustomGetResult.scala b/app/src/main/scala/org/alephium/explorer/persistence/schema/CustomGetResult.scala
@@ -377,7 +377,8 @@ object CustomGetResult {
         destructionTimestamp = result.<<?,
         destructionEventOrder = result.<<?,
         category = result.<<?,
-        interfaceId = result.<<?
+        interfaceId = result.<<?,
+        mainChain = result.<<
       )
 
   implicit val migrationVersionGetResult: GetResult[AppState.MigrationVersion] =
diff --git a/app/src/test/scala/org/alephium/explorer/GenDBModel.scala b/app/src/test/scala/org/alephium/explorer/GenDBModel.scala
@@ -239,7 +239,9 @@ object GenDBModel {
       token = token
     )
 
-  def eventEntityGen()(implicit groupSetting: GroupSetting): Gen[EventEntity] =
+  def eventEntityGen(
+      mainChain: Boolean = false
+  )(implicit groupSetting: GroupSetting): Gen[EventEntity] =
     for {
       blockHash       <- blockHashGen
       hash            <- transactionHashGen
@@ -249,16 +251,18 @@ object GenDBModel {
       eventIndex      <- Gen.posNum[Int]
       fields          <- Gen.listOf(valGen())
 
-    } yield EventEntity.from(
-      blockHash,
-      hash,
-      contractAddress,
-      inputAddress,
-      timestamp,
-      eventIndex,
-      fields,
-      0
-    )
+    } yield EventEntity
+      .from(
+        blockHash,
+        hash,
+        contractAddress,
+        inputAddress,
+        timestamp,
+        eventIndex,
+        fields,
+        0
+      )
+      .copy(mainChain = mainChain)
 
   def tokenOutputEntityGen(
       addressGen: Gen[Address] = addressGen,
diff --git a/app/src/test/scala/org/alephium/explorer/persistence/model/ContractEntitySpec.scala b/app/src/test/scala/org/alephium/explorer/persistence/model/ContractEntitySpec.scala
@@ -72,7 +72,7 @@ class ContractEntitySpec extends AlephiumSpec {
               None,
               None,
               None,
-              true
+              false
             )
           )
       }
diff --git a/app/src/test/scala/org/alephium/explorer/persistence/queries/ContractQueriesSpec.scala b/app/src/test/scala/org/alephium/explorer/persistence/queries/ContractQueriesSpec.scala
@@ -55,6 +55,9 @@ class ContractQueriesSpec
         run(ContractSchema.table.result).futureValue.sortBy(_.creationTimestamp) is events
           .flatMap(ContractEntity.creationFromEventEntity(_, groupIndex))
           .sortBy(_.creationTimestamp)
+        events.foreach(event =>
+          run(BlockQueries.updateMainChainStatusQuery(event.blockHash, true)).futureValue
+        )
 
         // Destruction
         val destroyEvents = events.map(e => destroyEventGen(contractAddressFromEvent(e)).sample.get)
@@ -72,10 +75,13 @@ class ContractQueriesSpec
       forAll(createEventsGen()) { case (groupIndex, events) =>
         run(ContractSchema.table.delete).futureValue
         run(ContractQueries.insertContractCreation(events, groupIndex)).futureValue
+        events.foreach(event =>
+          run(BlockQueries.updateMainChainStatusQuery(event.blockHash, true)).futureValue
+        )
 
         events.flatMap(ContractEntity.creationFromEventEntity(_, groupIndex)).foreach { event =>
           run(ContractQueries.getContractEntity(event.contract)).futureValue is
-            ArraySeq(event)
+            ArraySeq(event.copy(mainChain = true))
         }
 
         run(ContractQueries.getContractEntity(addressGen.sample.get)).futureValue is ArraySeq.empty
@@ -86,6 +92,9 @@ class ContractQueriesSpec
       forAll(createEventsGen()) { case (groupIndex, events) =>
         run(ContractSchema.table.delete).futureValue
         run(ContractQueries.insertContractCreation(events, groupIndex)).futureValue
+        events.foreach(event =>
+          run(BlockQueries.updateMainChainStatusQuery(event.blockHash, true)).futureValue
+        )
 
         events.flatMap(ContractEntity.creationFromEventEntity(_, groupIndex)).foreach { event =>
           run(ContractQueries.getParentAddressQuery(event.contract)).futureValue is
@@ -107,6 +116,9 @@ class ContractQueriesSpec
         run(ContractSchema.table.delete).futureValue
         run(ContractQueries.insertContractCreation(events, groupIndex)).futureValue
         run(ContractQueries.insertContractCreation(otherEvents, otherGroup)).futureValue
+        (events ++ otherEvents).foreach(event =>
+          run(BlockQueries.updateMainChainStatusQuery(event.blockHash, true)).futureValue
+        )
 
         run(ContractQueries.getSubContractsQuery(parent, pagination)).futureValue is events
           .sortBy(_.timestamp)
diff --git a/app/src/test/scala/org/alephium/explorer/persistence/queries/EventQueriesSpec.scala b/app/src/test/scala/org/alephium/explorer/persistence/queries/EventQueriesSpec.scala
@@ -43,7 +43,7 @@ class EventQueriesSpec
 
   "Event Queries" should {
     "get event by tx hash" in {
-      forAll(Gen.nonEmptyListOf(eventEntityGen())) { events =>
+      forAll(Gen.nonEmptyListOf(eventEntityGen(true))) { events =>
         insert(events)
 
         events.map { event =>
@@ -55,7 +55,7 @@ class EventQueriesSpec
     }
 
     "get all events with same tx hash" in {
-      forAll(Gen.nonEmptyListOf(eventEntityGen())) { events =>
+      forAll(Gen.nonEmptyListOf(eventEntityGen(true))) { events =>
         val txHash = transactionHashGen.sample.get
         val uniqueTxHashEvents = events.zipWithIndex.map { case (event, order) =>
           event.copy(txHash = txHash, eventOrder = order)
@@ -73,7 +73,7 @@ class EventQueriesSpec
     }
 
     "get event by contract address" in {
-      forAll(Gen.nonEmptyListOf(eventEntityGen())) { events =>
+      forAll(Gen.nonEmptyListOf(eventEntityGen(true))) { events =>
         insert(events)
 
         events.map { event =>
@@ -88,7 +88,7 @@ class EventQueriesSpec
     }
 
     "get all events with same contractAddress" in {
-      forAll(Gen.nonEmptyListOf(eventEntityGen())) { events =>
+      forAll(Gen.nonEmptyListOf(eventEntityGen(true))) { events =>
         val contractAddress = addressGen.sample.get
         val uniqueContractAddressEvents = events.map { event =>
           event.copy(contractAddress = contractAddress)
@@ -121,7 +121,7 @@ class EventQueriesSpec
     }
 
     "get event by contract address and input address" in {
-      forAll(Gen.nonEmptyListOf(eventEntityGen())) { events =>
+      forAll(Gen.nonEmptyListOf(eventEntityGen(true))) { events =>
         insert(events)
 
         events.map { event =>
@@ -153,7 +153,7 @@ class EventQueriesSpec
     }
 
     "get all events with same contractAddress and input address" in {
-      forAll(Gen.nonEmptyListOf(eventEntityGen())) { events =>
+      forAll(Gen.nonEmptyListOf(eventEntityGen(true))) { events =>
         val contractAddress = addressGen.sample.get
         val inputAddress    = addressGen.sample.get
         val uniqueContractAddressEvents = events.map { event =>

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ object ContractEntity {`
`110`	`110`	`destructionEventOrder = None,`
`111`	`111`	`category = None,`
`112`	`112`	`interfaceId = None,`
`113`		`- mainChain = true`
	`113`	`+ mainChain = false`
`114`	`114`	`)`
`115`	`115`	`}`
`116`	`116`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ object EventEntity {`
`67`	`67`	`eventIndex,`
`68`	`68`	`fields,`
`69`	`69`	`order,`
`70`		`- mainChain = true`
	`70`	`+ mainChain = false`
`71`	`71`	`)`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ object ContractQueries {`
`133`	`133`	`SELECT *`
`134`	`134`	`FROM contracts`
`135`	`135`	`WHERE contract = $contract`
	`136`	`+ AND main_chain = true`
`136`	`137`	`""".asASE[ContractEntity](contractEntityGetResult)`
`137`	`138`	`}`
`138`	`139`
`@@ -143,6 +144,7 @@ object ContractQueries {`
`143`	`144`	`SELECT parent`
`144`	`145`	`FROM contracts`
`145`	`146`	`WHERE contract = $contract`
	`147`	`+ AND main_chain = true`
`146`	`148`	`LIMIT 1`
`147`	`149`	`""".asASE[Option[Address]](optionAddressGetResult).headOrNone.map(_.flatten)`
`148`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,8 @@ object CustomGetResult {`
`377`	`377`	`destructionTimestamp = result.<<?,`
`378`	`378`	`destructionEventOrder = result.<<?,`
`379`	`379`	`category = result.<<?,`
`380`		`- interfaceId = result.<<?`
	`380`	`+ interfaceId = result.<<?,`
	`381`	`+ mainChain = result.<<`
`381`	`382`	`)`
`382`	`383`
`383`	`384`	`implicit val migrationVersionGetResult: GetResult[AppState.MigrationVersion] =`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class ContractEntitySpec extends AlephiumSpec {`
`72`	`72`	`None,`
`73`	`73`	`None,`
`74`	`74`	`None,`
`75`		`- true`
	`75`	`+ false`
`76`	`76`	`)`
`77`	`77`	`)`
`78`	`78`	`}`