Merge pull request #58 from Constellation-Labs/updating-tessellation-…

…v2.3.3 Updating tessellation version to 2.3.3
Constellation-Labs · Apr 16, 2024 · 065b9a5 · 065b9a5
2 parents c0938c3 + de85cc4
commit 065b9a5
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/metagraph/build.sbt b/metagraph/build.sbt
@@ -46,7 +46,7 @@ lazy val sharedData = (project in file("modules/shared_data"))
       CompilerPlugin.kindProjector,
       CompilerPlugin.betterMonadicFor,
       CompilerPlugin.semanticDB,
-      Libraries.tessellationSDK,
+      Libraries.tessellationNodeShared,
       Libraries.borerCore,
       Libraries.borerDerivation,
       Libraries.requests,

diff --git a/metagraph/modules/data_l1/src/main/scala/com/my/dor_metagraph/data_l1/Main.scala b/metagraph/modules/data_l1/src/main/scala/com/my/dor_metagraph/data_l1/Main.scala
@@ -19,6 +19,7 @@ import org.tessellation.currency.l1.CurrencyL1App
 import org.tessellation.ext.cats.effect.ResourceIO
 import org.tessellation.schema.SnapshotOrdinal
 import org.tessellation.schema.cluster.ClusterId
+import org.tessellation.schema.semver.{MetagraphVersion, TessellationVersion}
 import org.tessellation.security.hash.Hash
 import org.tessellation.security.signature.Signed
 
@@ -28,7 +29,8 @@ object Main extends CurrencyL1App(
   "currency-data_l1",
   "currency data L1 node",
   ClusterId(UUID.fromString("517c3a05-9219-471b-a54c-21b7d72f4ae5")),
-  version = org.tessellation.BuildInfo.version
+  tessellationVersion = TessellationVersion.unsafeFrom(org.tessellation.BuildInfo.version),
+  metagraphVersion = MetagraphVersion.unsafeFrom(com.my.dor_metagraph.data_l1.BuildInfo.version)
 ) {
 
   private def makeBaseDataApplicationL1Service(

diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/Main.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/Main.scala
@@ -23,9 +23,10 @@ import org.tessellation.currency.l0.CurrencyL0App
 import org.tessellation.currency.l0.snapshot.CurrencySnapshotEvent
 import org.tessellation.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof}
 import org.tessellation.ext.cats.effect.ResourceIO
+import org.tessellation.node.shared.domain.rewards.Rewards
 import org.tessellation.schema.SnapshotOrdinal
 import org.tessellation.schema.cluster.ClusterId
-import org.tessellation.sdk.domain.rewards.Rewards
+import org.tessellation.schema.semver.{MetagraphVersion, TessellationVersion}
 import org.tessellation.security.SecurityProvider
 import org.tessellation.security.hash.Hash
 import org.tessellation.security.signature.Signed
@@ -36,7 +37,8 @@ object Main extends CurrencyL0App(
   "currency-l0",
   "currency L0 node",
   ClusterId(UUID.fromString("517c3a05-9219-471b-a54c-21b7d72f4ae5")),
-  version = org.tessellation.BuildInfo.version
+  tessellationVersion = TessellationVersion.unsafeFrom(org.tessellation.BuildInfo.version),
+  metagraphVersion = MetagraphVersion.unsafeFrom(com.my.dor_metagraph.l0.BuildInfo.version)
 ) {
   private def makeBaseDataApplicationL0Service(
     calculatedStateService: CalculatedStateService[IO]

diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/custom_routes/CustomRoutes.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/custom_routes/CustomRoutes.scala
@@ -10,7 +10,7 @@ import org.http4s.circe.CirceEntityCodec.circeEntityEncoder
 import org.http4s.dsl.Http4sDsl
 import org.http4s.server.middleware.CORS
 import org.http4s.{HttpRoutes, Response}
-import org.tessellation.http.routes.internal.{InternalUrlPrefix, PublicRoutes}
+import org.tessellation.routes.internal.{InternalUrlPrefix, PublicRoutes}
 
 case class CustomRoutes[F[_] : Async](calculatedStateService: CalculatedStateService[F]) extends Http4sDsl[F] with PublicRoutes[F] {
 

diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/DorRewards.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/DorRewards.scala
@@ -11,11 +11,11 @@ import com.my.dor_metagraph.shared_data.types.Types._
 import org.tessellation.currency.dataApplication.DataCalculatedState
 import org.tessellation.currency.l0.snapshot.CurrencySnapshotEvent
 import org.tessellation.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof}
+import org.tessellation.node.shared.domain.rewards.Rewards
+import org.tessellation.node.shared.infrastructure.consensus.trigger.{ConsensusTrigger, EventTrigger, TimeTrigger}
 import org.tessellation.schema.address.Address
 import org.tessellation.schema.balance.Balance
 import org.tessellation.schema.transaction.{RewardTransaction, Transaction}
-import org.tessellation.sdk.domain.rewards.Rewards
-import org.tessellation.sdk.infrastructure.consensus.trigger.{ConsensusTrigger, EventTrigger, TimeTrigger}
 import org.tessellation.security.signature.Signed
 import org.typelevel.log4cats.slf4j.Slf4jLogger
 

diff --git a/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BuildRewardsTest.scala b/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BuildRewardsTest.scala
@@ -12,13 +12,13 @@ import com.my.dor_metagraph.shared_data.types.Types.{AnalyticsBountyInformation,
 import eu.timepit.refined.auto._
 import eu.timepit.refined.types.numeric.NonNegLong
 import org.tessellation.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof}
+import org.tessellation.node.shared.infrastructure.consensus.trigger.TimeTrigger
 import org.tessellation.schema.address.Address
 import org.tessellation.schema.balance.Balance
 import org.tessellation.schema.epoch.EpochProgress
 import org.tessellation.schema.height.{Height, SubHeight}
 import org.tessellation.schema.transaction.RewardTransaction
 import org.tessellation.schema.{ActiveTip, BlockReference, DeprecatedTip, ID, SnapshotOrdinal, SnapshotTips}
-import org.tessellation.sdk.infrastructure.consensus.trigger.TimeTrigger
 import org.tessellation.security.hash.{Hash, ProofsHash}
 import org.tessellation.security.hex.Hex
 import org.tessellation.security.signature.Signed

diff --git a/metagraph/modules/l1/src/main/scala/com/my/dor_metagraph/l1/Main.scala b/metagraph/modules/l1/src/main/scala/com/my/dor_metagraph/l1/Main.scala
@@ -2,12 +2,14 @@ package com.my.dor_metagraph.l1
 
 import org.tessellation.currency.l1.CurrencyL1App
 import org.tessellation.schema.cluster.ClusterId
+import org.tessellation.schema.semver.{MetagraphVersion, TessellationVersion}
 
 import java.util.UUID
 
 object Main extends CurrencyL1App(
   "currency-l1",
   "currency L1 node",
   ClusterId(UUID.fromString("517c3a05-9219-471b-a54c-21b7d72f4ae5")),
-  version = org.tessellation.BuildInfo.version
+  tessellationVersion = TessellationVersion.unsafeFrom(org.tessellation.BuildInfo.version),
+  metagraphVersion = MetagraphVersion.unsafeFrom(com.my.dor_metagraph.l1.BuildInfo.version)
 ) {}
diff --git a/metagraph/project/Dependencies.scala b/metagraph/project/Dependencies.scala
@@ -3,7 +3,7 @@ import sbt._
 object Dependencies {
 
   object V {
-    val tessellation = "2.2.2"
+    val tessellation = "2.3.3"
     val decline = "2.4.1"
   }
 
@@ -15,7 +15,7 @@ object Dependencies {
     } % V.decline
 
   object Libraries {
-    val tessellationSDK = tessellation("sdk")
+    val tessellationNodeShared = tessellation("node-shared")
     val tessellationCurrencyL0 = tessellation("currency-l0")
     val tessellationCurrencyL1 = tessellation("currency-l1")
     val declineCore = decline()