Bugfix/missing account updates fix (#1095)

* adding jakartanet metadata * fixed wording
Cryptonomic · Jun 17, 2022 · 42b1148 · 42b1148
1 parent 4f728d0
commit 42b1148
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/conseil-common/src/main/scala/tech/cryptonomic/conseil/common/tezos/TezosTypes.scala b/conseil-common/src/main/scala/tech/cryptonomic/conseil/common/tezos/TezosTypes.scala
@@ -102,9 +102,19 @@ object TezosTypes {
       voting_period_kind: Option[VotingPeriod.Kind],
       voting_period_info: Option[VotingPeriodInfo],
       level: Option[BlockHeaderMetadataLevel],
-      level_info: Option[BlockHeaderMetadataLevelInfo]
+      level_info: Option[BlockHeaderMetadataLevelInfo],
+      implicit_operations_results: Option[List[ImplicitOperationResults]]
   ) extends BlockMetadata
 
+  final case class ImplicitOperationResults(
+      kind: String,
+      storage: Option[Micheline],
+      balance_updates: List[OperationMetadata.BalanceUpdate],
+      consumed_gas: PositiveBigNumber,
+      consumed_miligas: PositiveBigNumber,
+      storage_size: PositiveBigNumber
+  )
+
   final case class BlockHeaderMetadataLevel(
       level: BlockLevel,
       level_position: Int,

diff --git a/conseil-common/src/main/scala/tech/cryptonomic/conseil/common/tezos/VotingOperations.scala b/conseil-common/src/main/scala/tech/cryptonomic/conseil/common/tezos/VotingOperations.scala
@@ -21,9 +21,9 @@ object VotingOperations {
 
   /* Used to classify blocks by voting periods via metadata */
   private def votingPeriodIn(accept: VotingPeriod.ValueSet, metadata: BlockMetadata): Boolean = metadata match {
-    case BlockHeaderMetadata(_, _, _, _, Some(voting_period_kind), _, _, _) =>
+    case BlockHeaderMetadata(_, _, _, _, Some(voting_period_kind), _, _, _, _) =>
       accept(voting_period_kind)
-    case BlockHeaderMetadata(_, _, _, _, _, Some(voting_period_info), _, _) =>
+    case BlockHeaderMetadata(_, _, _, _, _, Some(voting_period_info), _, _, _) =>
       accept(voting_period_info.voting_period.kind)
     case GenesisMetadata =>
       false

diff --git a/conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/Balances.scala b/conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/Balances.scala
@@ -80,7 +80,8 @@ object BlockBalances {
     Map(
       BlockTagged.fromBlockData(data, BLOCK_SOURCE) -> (data.metadata match {
         case GenesisMetadata => List.empty
-        case BlockHeaderMetadata(balance_updates, _, _, _, _, _, _, _) => balance_updates
+        case BlockHeaderMetadata(balance_updates, _, _, _, _, _, _, _, maybeImplicitOperationResults) =>
+          balance_updates ++ maybeImplicitOperationResults.toList.flatten.flatMap(_.balance_updates)
       })
     )
   )

diff --git a/conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/TezosJsonDecoders.scala b/conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/TezosJsonDecoders.scala
@@ -158,6 +158,7 @@ private[tezos] object TezosJsonDecoders {
       implicit val metadataLevelDecoder: Decoder[BlockHeaderMetadataLevel] = deriveConfiguredDecoder
       val blockMetadataDecoder: Decoder[BlockHeaderMetadata] = deriveConfiguredDecoder
       implicit val votingPeriodInfoDecoder: Decoder[VotingPeriodInfo] = deriveConfiguredDecoder
+      implicit val implicitOperationResultsDecoder: Decoder[ImplicitOperationResults] = deriveConfiguredDecoder
       implicit val votingPeriodObjectDecoder: Decoder[VotingPeriodObject] = deriveConfiguredDecoder
       implicit val blockHeaderMetadataLevelInfoDecoder: Decoder[BlockHeaderMetadataLevelInfo] = deriveConfiguredDecoder
       implicit val metadataDecoder: Decoder[BlockMetadata] = blockMetadataDecoder.widen or genesisMetadataDecoder.widen

diff --git a/conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/TezosNodeOperator.scala b/conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/TezosNodeOperator.scala
@@ -722,6 +722,12 @@ private[tezos] class TezosNodeOperator(
         id <- balanceUpdate.contract.map(_.id).toList ::: balanceUpdate.delegate.map(_.value).toList
       } yield makeAccountId(id)
 
+    def extractAccountIdsFromImplicitOpResults(blockData: BlockData): List[AccountId] =
+      for {
+        blockHeaderMetadata <- discardGenesis(blockData.metadata).toList
+        id <- blockHeaderMetadata.implicit_operations_results.toList.flatten.flatMap(_.balance_updates.flatMap(_.contract.toList))
+      } yield makeAccountId(id.id)
+
     //Gets blocks data for the requested offsets and associates the operations and account hashes available involved in said operations
     //Special care is taken for the genesis block (level = 0) that doesn't have operations defined, we use empty data for it
     /* implicitly uses:
@@ -745,7 +751,7 @@ private[tezos] class TezosNodeOperator(
       fetchedBlocksData.map { case (offset, md) =>
         val (ops, accs) = if (isGenesis(md)) (List.empty, List.empty) else operationalDataMap(md.hash)
         val votes = proposalsMap.getOrElse(md.hash, CurrentVotes.empty)
-        (parseMichelsonScripts(Block(md, ops, votes)), (accs ::: extractAccountIds(md)).distinct)
+        (parseMichelsonScripts(Block(md, ops, votes)), (accs ::: extractAccountIds(md) ::: extractAccountIdsFromImplicitOpResults(md)).distinct)
       }
     }
   }

diff --git a/...tech/cryptonomic/conseil/indexer/tezos/processing/BakingAndEndorsingRightsProcessor.scala b/...tech/cryptonomic/conseil/indexer/tezos/processing/BakingAndEndorsingRightsProcessor.scala
@@ -52,7 +52,7 @@ class BakingAndEndorsingRightsProcessor(
       data.metadata match {
         case TezosTypes.GenesisMetadata =>
           RightsFetchKey(data.hash, None, None)
-        case BlockHeaderMetadata(_, _, _, _, _, voting_period_info, level, level_info) =>
+        case BlockHeaderMetadata(_, _, _, _, _, voting_period_info, level, level_info, _) =>
           RightsFetchKey(
             data.hash,
             level.map(_.cycle).orElse(level_info.map(_.cycle)),