Protocol I changes - part 2

conseil-api/src/main/resources/metadata.conf

@@ -59,6 +59,10 @@ metadata-configuration {
         include "metadata/tezos.hangzhounet.conf"
         visible: true
       }
+      ithacanet {
+        include "metadata/tezos.ithacanet.conf"
+        visible: true
+      }
     }
   }
   bitcoin {

conseil-common/src/main/scala/tech/cryptonomic/conseil/common/tezos/TezosOptics.scala

@@ -178,6 +178,9 @@ object TezosOptics {
         case x: EndorsementWithSlot =>
           index += 1
           x.copy(blockOrder = Some(index))
+        case x: Preendorsement =>
+          index += 1
+          x.copy(blockOrder = Some(index))
         case x: SeedNonceRevelation =>
           index += 1
           x.copy(blockOrder = Some(index))
@@ -187,6 +190,9 @@ object TezosOptics {
         case x: DoubleEndorsementEvidence =>
           index += 1
           x.copy(blockOrder = Some(index))
+        case x: DoublePreendorsementEvidence =>
+          index += 1
+          x.copy(blockOrder = Some(index))
         case x: DoubleBakingEvidence =>
           index += 1
           x.copy(blockOrder = Some(index))

conseil-common/src/main/scala/tech/cryptonomic/conseil/common/tezos/TezosTypes.scala

@@ -223,7 +223,9 @@ object TezosTypes {
     "endorsement",
     "proposals",
     "ballot",
-    "endorsement_with_slot"
+    "endorsement_with_slot",
+    "preendorsement",
+    "double_preendorsement_evidence"
   )
 
   final case class Operations(
@@ -247,6 +249,12 @@ object TezosTypes {
       blockOrder: Option[Int] = None
   ) extends Operation
 
+  final case class Preendorsement(
+      level: BlockLevel,
+      metadata: PreendorsementMetadata,
+      blockOrder: Option[Int] = None
+  ) extends Operation
+
   final case class SeedNonceRevelation(
       level: BlockLevel,
       nonce: Nonce,
@@ -319,6 +327,8 @@ object TezosTypes {
   ) extends Operation
 
   final case class DoubleEndorsementEvidence(blockOrder: Option[Int] = None) extends Operation
+  final case class DoublePreendorsementEvidence(blockOrder: Option[Int] = None) extends Operation
+
   final case class DoubleBakingEvidence(blockOrder: Option[Int] = None) extends Operation
   final case class Proposals(
       source: Option[ContractId],
@@ -348,7 +358,12 @@ object TezosTypes {
   //metadata definitions, both shared or specific to operation kind
   final case class EndorsementMetadata(
       slot: Option[Int],
-      slots: List[Int],
+      slots: Option[List[Int]],
+      delegate: PublicKeyHash,
+      balance_updates: List[OperationMetadata.BalanceUpdate]
+  )
+
+  final case class PreendorsementMetadata(
       delegate: PublicKeyHash,
       balance_updates: List[OperationMetadata.BalanceUpdate]
   )
@@ -727,7 +742,8 @@ object TezosTypes {
   final case class BakingRights(
       level: BlockLevel,
       delegate: String,
-      priority: Int,
+      priority: Option[Int],
+      round: Option[Int],
       estimated_time: Option[ZonedDateTime],
       cycle: Option[Int],
       governancePeriod: Option[Int]

conseil-lorre/src/main/resources/application.conf

@@ -37,17 +37,17 @@ lorre {
 
   # feature flags: select if some functionality should be turned off
   enabled-features {
-    future-rights-fetching-is-on: true
+    future-rights-fetching-is-on: false
     future-rights-fetching-is-on: ${?CONSEIL_LORRE_FUTURE_RIGHTS_FETCHING_ENABLED}
-    metadata-fetching-is-on: true
+    metadata-fetching-is-on: false
     metadata-fetching-is-on: ${?CONSEIL_LORRE_BLOCK_RIGHTS_FETCHING_ENABLED}
     fork-handling-is-on: false
     fork-handling-is-on: ${?CONSEIL_LORRE_FORK_DETECTION_ENABLED}
     registered-tokens-is-on: false
     registered-tokens-is-on: ${?CONSEIL_LORRE_REGISTERED_TOKENS_FETCHING_ENABLED}
-    rights-processing-is-on: true
+    rights-processing-is-on: false
     rights-processing-is-on: ${?CONSEIL_LORRE_RIGHTS_PROCESSING_ENABLED}
-    baker-features-are-on: true
+    baker-features-are-on: false
     baker-features-are-on: ${?CONSEIL_LORRE_BAKER_FEATURES_ENABLED}
   }
 

conseil-lorre/src/main/resources/registered_tokens/ithacanet.json

@@ -0,0 +1 @@
+[]

conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/TezosDatabaseConversions.scala

@@ -263,15 +263,15 @@ private[tezos] object TezosDatabaseConversions {
       kind = "endorsement_with_slot",
       level = Some(endorsement.operations.level),
       delegate = Some(metadata.delegate.value),
-      slots = Some(metadata.slots).map(concatenateToString),
+      slots = metadata.slots.map(concatenateToString),
       operationOrder = blockOrder,
       blockHash = block.data.hash.value,
       blockLevel = block.data.header.level,
       timestamp = toSql(block.data.header.timestamp),
       internal = false,
       cycle = TezosOptics.Blocks.extractCycle(block),
       branch = block.operationGroups.find(h => h.hash == groupHash).map(_.branch.value),
-      numberOfSlots = Some(metadata.slots.length),
+      numberOfSlots = metadata.slots.map(_.length),
       period = TezosOptics.Blocks.extractPeriod(block.data.metadata),
       utcYear = year,
       utcMonth = month,
@@ -290,15 +290,15 @@ private[tezos] object TezosDatabaseConversions {
         kind = "endorsement",
         level = Some(level),
         delegate = Some(metadata.delegate.value),
-        slots = Some(metadata.slots).map(concatenateToString),
+        slots = metadata.slots.map(concatenateToString),
         operationOrder = blockOrder,
         blockHash = block.data.hash.value,
         blockLevel = block.data.header.level,
         timestamp = toSql(block.data.header.timestamp),
         internal = false,
         cycle = TezosOptics.Blocks.extractCycle(block),
         branch = block.operationGroups.find(h => h.hash == groupHash).map(_.branch.value),
-        numberOfSlots = Some(metadata.slots.length),
+        numberOfSlots = metadata.slots.map(_.length),
         period = TezosOptics.Blocks.extractPeriod(block.data.metadata),
         utcYear = year,
         utcMonth = month,
@@ -646,6 +646,7 @@ private[tezos] object TezosDatabaseConversions {
   ] = { case (block, groupHash, op) =>
     val kind = op match {
       case DoubleEndorsementEvidence(_) => "double_endorsement_evidence"
+      case DoublePreendorsementEvidence(_) => "double_preendorsement_evidence"
       case DoubleBakingEvidence(_) => "double_baking_evidence"
       case _ => ""
     }
@@ -904,7 +905,7 @@ private[tezos] object TezosDatabaseConversions {
           blockHash = Some(fetchKey.blockHash.value),
           blockLevel = bakingRights.level,
           delegate = bakingRights.delegate,
-          priority = bakingRights.priority,
+          priority = bakingRights.priority.orElse(bakingRights.round).get,
           estimatedTime = bakingRights.estimated_time.map(toSql),
           cycle = fetchKey.cycle,
           governancePeriod = fetchKey.governancePeriod,
@@ -940,7 +941,7 @@ private[tezos] object TezosDatabaseConversions {
         blockHash = None,
         blockLevel = from.level,
         delegate = from.delegate,
-        priority = from.priority,
+        priority = from.priority.orElse(from.round).get,
         estimatedTime = from.estimated_time.map(toSql),
         cycle = from.cycle,
         governancePeriod = from.governancePeriod,

conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/TezosIndexer.scala

@@ -132,7 +132,7 @@ class TezosIndexer private (
       _ <- feeOperations
         .processTezosAverageFees(lorreConf.feesAverageTimeWindow)
         .whenA(iteration % lorreConf.feeUpdateInterval == 0)
-      _ <- rightsProcessor.updateRights()
+      _ <- if (featureFlags.futureRightsFetchingIsOn) rightsProcessor.updateRights() else Future.successful(())
     } yield Some(unhandled)
 
     /* Won't stop Lorre on failure from processing the chain, unless overridden by the environment to halt.

conseil-lorre/src/main/scala/tech/cryptonomic/conseil/indexer/tezos/TezosJsonDecoders.scala

@@ -252,6 +252,7 @@ private[tezos] object TezosJsonDecoders {
       //derive all the remaining decoders, sorted to preserve dependencies
       implicit val balanceUpdateDecoder: Decoder[OperationMetadata.BalanceUpdate] = deriveConfiguredDecoder
       implicit val endorsementMetadataDecoder: Decoder[EndorsementMetadata] = deriveConfiguredDecoder
+      implicit val preendorsementMetadataDecoder: Decoder[PreendorsementMetadata] = deriveConfiguredDecoder
       implicit val balanceUpdatesMetadataDecoder: Decoder[BalanceUpdatesMetadata] = deriveConfiguredDecoder
       implicit val revealResultDecoder: Decoder[OperationResult.Reveal] = deriveConfiguredDecoder
       implicit val transactionResultDecoder: Decoder[OperationResult.Transaction] = deriveConfiguredDecoder

conseil-lorre/src/test/scala/tech/cryptonomic/conseil/indexer/tezos/JsonDecodersTestFixtures.scala

@@ -488,7 +488,7 @@ trait OperationsJsonData {
       level = 182308,
       metadata = EndorsementMetadata(
         slot = None,
-        slots = List(29, 27, 20, 17),
+        slots = Some(List(29, 27, 20, 17)),
         delegate = PublicKeyHash("tz1fyvFH2pd3V9UEq5psqVokVBYkt7rHTKio"),
         balance_updates = List(
           BalanceUpdate(

conseil-lorre/src/test/scala/tech/cryptonomic/conseil/indexer/tezos/TezosDatabaseConversionsTestFixtures.scala

@@ -24,7 +24,7 @@ trait TezosDatabaseConversionsTestFixtures {
       level = 182308,
       metadata = EndorsementMetadata(
         slot = None,
-        slots = List(29, 27, 20, 17),
+        slots = Some(List(29, 27, 20, 17)),
         delegate = PublicKeyHash("tz1fyvFH2pd3V9UEq5psqVokVBYkt7rHTKio"),
         balance_updates = List(
           BalanceUpdate(

conseil-lorre/src/test/scala/tech/cryptonomic/conseil/indexer/tezos/TezosDatabaseOperationsTestFixtures.scala

@@ -407,7 +407,7 @@ trait TezosDatabaseOperationsTestFixtures extends RandomGenerationKit {
         level = 182308,
         metadata = EndorsementMetadata(
           slot = None,
-          slots = List(29, 27, 20, 17),
+          slots = Some(List(29, 27, 20, 17)),
           delegate = PublicKeyHash("tz1fyvFH2pd3V9UEq5psqVokVBYkt7rHTKio"),
           balance_updates = List(
             BalanceUpdate(