From ca5b2958b79600a8f1b561dd2da7fb48f8ef1848 Mon Sep 17 00:00:00 2001 From: Marcus Girolneto Date: Thu, 18 Jan 2024 14:22:52 -0300 Subject: [PATCH] Updating to tessellation 2.3.0 --- metagraph/build.sbt | 8 ++++---- .../l0/src/main/scala/com/my/dor_metagraph/l0/Main.scala | 2 +- .../my/dor_metagraph/l0/custom_routes/CustomRoutes.scala | 2 +- .../com/my/dor_metagraph/l0/rewards/MainRewards.scala | 8 ++++---- metagraph/project/Dependencies.scala | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/metagraph/build.sbt b/metagraph/build.sbt index 7e38986..cbd1052 100644 --- a/metagraph/build.sbt +++ b/metagraph/build.sbt @@ -47,7 +47,7 @@ lazy val sharedData = (project in file("modules/shared_data")) CompilerPlugin.betterMonadicFor, CompilerPlugin.semanticDB, Libraries.tessellationDAGL1, - Libraries.tessellationSDK, + Libraries.tessellationNodeShared, Libraries.tessellationShared, Libraries.tessellationCurrencyL1, Libraries.borerCore, @@ -74,7 +74,7 @@ lazy val currencyL1 = (project in file("modules/l1")) CompilerPlugin.betterMonadicFor, CompilerPlugin.semanticDB, Libraries.tessellationDAGL1, - Libraries.tessellationSDK, + Libraries.tessellationNodeShared, Libraries.tessellationShared, Libraries.tessellationCurrencyL1 ) @@ -103,7 +103,7 @@ lazy val currencyL0 = (project in file("modules/l0")) Libraries.declineEffect, Libraries.tessellationKernel, Libraries.tessellationDAGL1, - Libraries.tessellationSDK, + Libraries.tessellationNodeShared, Libraries.tessellationShared, Libraries.tessellationKeytool, Libraries.tessellationCurrencyL0 @@ -129,7 +129,7 @@ lazy val dataL1 = (project in file("modules/data_l1")) CompilerPlugin.betterMonadicFor, CompilerPlugin.semanticDB, Libraries.tessellationDAGL1, - Libraries.tessellationSDK, + Libraries.tessellationNodeShared, Libraries.tessellationShared, Libraries.tessellationCurrencyL1 ) 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 index 06faee4..6363b93 100644 --- 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 @@ -22,7 +22,7 @@ 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.sdk.domain.rewards.Rewards +import org.tessellation.node.shared.domain.rewards.Rewards import org.tessellation.schema.SnapshotOrdinal import org.tessellation.schema.cluster.ClusterId import org.tessellation.security.SecurityProvider 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 index 2fb3677..f6d9ee1 100644 --- 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 eu.timepit.refined.auto._ import org.http4s.server.middleware.CORS -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/MainRewards.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/MainRewards.scala index 80e4f40..e7eec90 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/MainRewards.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/MainRewards.scala @@ -16,9 +16,9 @@ import org.tessellation.security.SecurityProvider import org.tessellation.security.signature.Signed import cats.syntax.functor.toFunctorOps import com.my.dor_metagraph.shared_data.Utils.{PosLongOps, RewardTransactionOps} -import org.tessellation.sdk.domain.rewards.Rewards -import org.tessellation.sdk.infrastructure.consensus.trigger -import org.tessellation.sdk.infrastructure.consensus.trigger.ConsensusTrigger +import org.tessellation.node.shared.domain.rewards.Rewards +import org.tessellation.node.shared.infrastructure.consensus.trigger +import org.tessellation.node.shared.infrastructure.consensus.trigger.ConsensusTrigger import org.typelevel.log4cats.SelfAwareStructuredLogger import org.typelevel.log4cats.slf4j.Slf4jLogger @@ -83,7 +83,7 @@ object MainRewards { } yield buildRewardsTransactionsSortedSet(bountyTransactions, validatorNodesTransactions) } - private def buildRewardsTransactionsSortedSet[F[_] : Async]( + private def buildRewardsTransactionsSortedSet[F[_]]( bountyTransactions : List[RewardTransaction], validatorNodesTransactions: List[RewardTransaction] ): SortedSet[RewardTransaction] = { diff --git a/metagraph/project/Dependencies.scala b/metagraph/project/Dependencies.scala index a6df40b..a72a1a5 100644 --- a/metagraph/project/Dependencies.scala +++ b/metagraph/project/Dependencies.scala @@ -3,7 +3,7 @@ import sbt._ object Dependencies { object V { - val tessellation = "2.2.0" + val tessellation = "2.3.0" val decline = "2.4.1" } def tessellation(artifact: String): ModuleID = "org.constellation" %% s"tessellation-$artifact" % V.tessellation @@ -15,7 +15,7 @@ object Dependencies { object Libraries { val tessellationKernel = tessellation("kernel") val tessellationDAGL1 = tessellation("dag-l1") - val tessellationSDK = tessellation("sdk") + val tessellationNodeShared = tessellation("node-shared") val tessellationShared = tessellation("shared") val tessellationKeytool = tessellation("keytool") val tessellationCurrencyL0 = tessellation("currency-l0")