From c0938c33c1e052d36376d30ec0f7c23d85a8db68 Mon Sep 17 00:00:00 2001 From: Marcus Girolneto Date: Tue, 16 Apr 2024 09:14:30 -0300 Subject: [PATCH 1/7] v1.3.3-SNAPSHOT --- metagraph/version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metagraph/version.sbt b/metagraph/version.sbt index cc530a0..825300c 100644 --- a/metagraph/version.sbt +++ b/metagraph/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.3.2" +ThisBuild / version := "1.3.3-SNAPSHOT" From de85cc4e67bbba891c7de90c8a593c89fae32bbb Mon Sep 17 00:00:00 2001 From: Marcus Girolneto Date: Tue, 16 Apr 2024 09:23:01 -0300 Subject: [PATCH 2/7] Updating tessellation version to 2.3.3 --- metagraph/build.sbt | 2 +- .../src/main/scala/com/my/dor_metagraph/data_l1/Main.scala | 4 +++- .../l0/src/main/scala/com/my/dor_metagraph/l0/Main.scala | 6 ++++-- .../my/dor_metagraph/l0/custom_routes/CustomRoutes.scala | 2 +- .../scala/com/my/dor_metagraph/l0/rewards/DorRewards.scala | 4 ++-- .../scala/com/my/dor_metagraph/l0/BuildRewardsTest.scala | 2 +- .../l1/src/main/scala/com/my/dor_metagraph/l1/Main.scala | 4 +++- metagraph/project/Dependencies.scala | 4 ++-- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/metagraph/build.sbt b/metagraph/build.sbt index d476c35..e5f4bfc 100644 --- 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 index 9808b15..9ecf722 100644 --- 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 index a0fc25e..655c950 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 @@ -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 index d3a35f7..434d7f1 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 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 index 4970961..86e7207 100644 --- 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 index 9f7e956..ee03b76 100644 --- 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 index a0fb6d8..f84349f 100644 --- 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,6 +2,7 @@ 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 @@ -9,5 +10,6 @@ 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 index c60a3ad..2eb04dd 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.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() From 3d73c239b40adbd1c36278f4ec41510acc9d5c62 Mon Sep 17 00:00:00 2001 From: Marcus Girolneto Date: Tue, 16 Apr 2024 09:24:16 -0300 Subject: [PATCH 3/7] v1.3.3 --- metagraph/version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metagraph/version.sbt b/metagraph/version.sbt index 825300c..fcdc5f5 100644 --- a/metagraph/version.sbt +++ b/metagraph/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.3.3-SNAPSHOT" +ThisBuild / version := "1.3.3" From e0850d94a1f9f8a6c6216e67710dcb27ee75e93a Mon Sep 17 00:00:00 2001 From: Marcus Girolneto Date: Tue, 16 Apr 2024 09:27:39 -0300 Subject: [PATCH 4/7] updating action --- .github/templates/build_tessellation/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/templates/build_tessellation/action.yml b/.github/templates/build_tessellation/action.yml index 949446e..5055c5d 100644 --- a/.github/templates/build_tessellation/action.yml +++ b/.github/templates/build_tessellation/action.yml @@ -26,4 +26,4 @@ runs: git checkout $TESSELLATION_VERSION sbt clean - sbt kernel/publishM2 dagL1/publishM2 keytool/publishM2 shared/publishM2 sdk/publishM2 currencyL0/publishM2 currencyL1/publishM2 \ No newline at end of file + sbt kernel/publishM2 dagL1/publishM2 keytool/publishM2 shared/publishM2 nodeShared/publishM2 currencyL0/publishM2 currencyL1/publishM2 \ No newline at end of file From 7726083950941db29625d99e1f3b198ebcdd297f Mon Sep 17 00:00:00 2001 From: Marcus Girolneto Date: Fri, 26 Apr 2024 12:37:54 -0300 Subject: [PATCH 5/7] v1.3.4-SNAPSHOT --- metagraph/version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metagraph/version.sbt b/metagraph/version.sbt index fcdc5f5..9c397e9 100644 --- a/metagraph/version.sbt +++ b/metagraph/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.3.3" +ThisBuild / version := "1.3.4-SNAPSHOT" From 40ce0f3547f21d86c358db6917fea95fa54a09fe Mon Sep 17 00:00:00 2001 From: Marcus Girolneto Date: Fri, 26 Apr 2024 12:40:51 -0300 Subject: [PATCH 6/7] Updating tessellation-version --- .../assets/integrationnet-lambda-payload.json | 77 ------------------- .github/assets/mainnet-lambda-payload.json | 77 ------------------- .github/assets/testnet-lambda-payload.json | 77 ------------------- .github/workflows/deploy-integrationnet.yml | 24 +----- .github/workflows/deploy-mainnet.yml | 25 +----- .github/workflows/deploy-testnet.yml | 24 +----- metagraph/project/Dependencies.scala | 2 +- 7 files changed, 4 insertions(+), 302 deletions(-) delete mode 100644 .github/assets/integrationnet-lambda-payload.json delete mode 100644 .github/assets/mainnet-lambda-payload.json delete mode 100644 .github/assets/testnet-lambda-payload.json diff --git a/.github/assets/integrationnet-lambda-payload.json b/.github/assets/integrationnet-lambda-payload.json deleted file mode 100644 index dce3563..0000000 --- a/.github/assets/integrationnet-lambda-payload.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "metagraph": { - "id": "DAG5kfY9GoHF1CYaY8tuRJxmB3JSzAEARJEAkA2C", - "name": "DOR", - "version": "v1.2.0", - "include_currency_l1_layer": true, - "include_data_l1_layer": true, - "file_system": { - "base_metagraph_l0_directory": "/home/ubuntu/code/metagraph-l0", - "base_currency_l1_directory": "/home/ubuntu/code/currency-l1", - "base_data_l1_directory": "/home/ubuntu/code/data-l1" - }, - "ports": { - "metagraph_l0_public_port": 7000, - "metagraph_l0_p2p_port": 7001, - "metagraph_l0_cli_port": 7002, - "currency_l1_public_port": 8000, - "currency_l1_p2p_port": 8001, - "currency_l1_cli_port": 8002, - "data_l1_public_port": 9000, - "data_l1_p2p_port": 9001, - "data_l1_cli_port": 9002 - }, - "required_env_variables": { - "cl_app_env": "integrationnet", - "cl_collateral": 0 - }, - "additional_metagraph_l0_env_variables": [ - "METAGRAPH_L0_NODE_URL=http://54.218.46.24:7000/cluster/info", - "DATA_L1_NODE_URL=http://54.218.46.24:9000/cluster/info" - ], - "additional_currency_l1_env_variables": [], - "additional_data_l1_env_variables": [ - "DOR_API_URL=https://api.getdor.com/metagraph/device" - ], - "seedlists": { - "location": "Github", - "ml0": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "ml0-integrationnet-seedlist" - }, - "cl1": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "cl1-integrationnet-seedlist" - }, - "dl1": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "dl1-integrationnet-seedlist" - } - } - }, - "network": { - "name": "integrationnet" - }, - "aws": { - "region": "us-west-2", - "ec2": { - "instances": { - "genesis": { - "id": "${EC2_INSTANCE_1_ID_INTEGRATIONNET}", - "ip": "${EC2_INSTANCE_1_IP_INTEGRATIONNET}" - }, - "validators": [ - { - "id": "${EC2_INSTANCE_2_ID_INTEGRATIONNET}", - "ip": "${EC2_INSTANCE_2_IP_INTEGRATIONNET}" - }, - { - "id": "${EC2_INSTANCE_3_ID_INTEGRATIONNET}", - "ip": "${EC2_INSTANCE_3_IP_INTEGRATIONNET}" - } - ] - } - } - }, - "force_metagraph_restart": true -} \ No newline at end of file diff --git a/.github/assets/mainnet-lambda-payload.json b/.github/assets/mainnet-lambda-payload.json deleted file mode 100644 index d80a60e..0000000 --- a/.github/assets/mainnet-lambda-payload.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "metagraph": { - "id": "DAG0CyySf35ftDQDQBnd1bdQ9aPyUdacMghpnCuM", - "name": "DOR", - "version": "v1.2.0", - "include_currency_l1_layer": true, - "include_data_l1_layer": true, - "file_system": { - "base_metagraph_l0_directory": "/home/ubuntu/code/metagraph-l0", - "base_currency_l1_directory": "/home/ubuntu/code/currency-l1", - "base_data_l1_directory": "/home/ubuntu/code/data-l1" - }, - "ports": { - "metagraph_l0_public_port": 7000, - "metagraph_l0_p2p_port": 7001, - "metagraph_l0_cli_port": 7002, - "currency_l1_public_port": 8000, - "currency_l1_p2p_port": 8001, - "currency_l1_cli_port": 8002, - "data_l1_public_port": 9000, - "data_l1_p2p_port": 9001, - "data_l1_cli_port": 9002 - }, - "required_env_variables": { - "cl_app_env": "mainnet", - "cl_collateral": 0 - }, - "additional_metagraph_l0_env_variables": [ - "METAGRAPH_L0_NODE_URL=http://54.191.143.191:7000/cluster/info", - "DATA_L1_NODE_URL=http://54.191.143.191:9000/cluster/info" - ], - "additional_currency_l1_env_variables": [], - "additional_data_l1_env_variables": [ - "DOR_API_URL=https://api.getdor.com/metagraph/device" - ], - "seedlists": { - "location": "Github", - "ml0": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "ml0-mainnet-seedlist" - }, - "cl1": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "cl1-mainnet-seedlist" - }, - "dl1": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "dl1-mainnet-seedlist" - } - } - }, - "network": { - "name": "mainnet" - }, - "aws": { - "region": "us-west-2", - "ec2": { - "instances": { - "genesis": { - "id": "${EC2_INSTANCE_1_ID_MAINNET}", - "ip": "${EC2_INSTANCE_1_IP_MAINNET}" - }, - "validators": [ - { - "id": "${EC2_INSTANCE_2_ID_MAINNET}", - "ip": "${EC2_INSTANCE_2_IP_MAINNET}" - }, - { - "id": "${EC2_INSTANCE_3_ID_MAINNET}", - "ip": "${EC2_INSTANCE_3_IP_MAINNET}" - } - ] - } - } - }, - "force_metagraph_restart": true -} \ No newline at end of file diff --git a/.github/assets/testnet-lambda-payload.json b/.github/assets/testnet-lambda-payload.json deleted file mode 100644 index a635e02..0000000 --- a/.github/assets/testnet-lambda-payload.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "metagraph": { - "id": "DAG8gMagrwoJ4nAMjbGx17WB5D6nqBEPZYChc3zH", - "name": "DOR", - "version": "v1.2.0", - "include_currency_l1_layer": true, - "include_data_l1_layer": true, - "file_system": { - "base_metagraph_l0_directory": "/home/ubuntu/code/metagraph-l0", - "base_currency_l1_directory": "/home/ubuntu/code/currency-l1", - "base_data_l1_directory": "/home/ubuntu/code/data-l1" - }, - "ports": { - "metagraph_l0_public_port": 7000, - "metagraph_l0_p2p_port": 7001, - "metagraph_l0_cli_port": 7002, - "currency_l1_public_port": 8000, - "currency_l1_p2p_port": 8001, - "currency_l1_cli_port": 8002, - "data_l1_public_port": 9000, - "data_l1_p2p_port": 9001, - "data_l1_cli_port": 9002 - }, - "required_env_variables": { - "cl_app_env": "testnet", - "cl_collateral": 0 - }, - "additional_metagraph_l0_env_variables": [ - "METAGRAPH_L0_NODE_URL=http://34.212.38.215:7000/cluster/info", - "DATA_L1_NODE_URL=http://34.212.38.215:9000/cluster/info" - ], - "additional_currency_l1_env_variables": [], - "additional_data_l1_env_variables": [ - "DOR_API_URL=https://api.getdor.com/metagraph/device" - ], - "seedlists": { - "location": "Github", - "ml0": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "ml0-testnet-seedlist" - }, - "cl1": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "cl1-testnet-seedlist" - }, - "dl1": { - "base_url": "https://github.com/Constellation-Labs/dor-metagraph/releases/download", - "file_name": "dl1-testnet-seedlist" - } - } - }, - "network": { - "name": "testnet" - }, - "aws": { - "region": "us-west-2", - "ec2": { - "instances": { - "genesis": { - "id": "${EC2_INSTANCE_1_ID_TESTNET}", - "ip": "${EC2_INSTANCE_1_IP_TESTNET}" - }, - "validators": [ - { - "id": "${EC2_INSTANCE_2_ID_TESTNET}", - "ip": "${EC2_INSTANCE_2_IP_TESTNET}" - }, - { - "id": "${EC2_INSTANCE_3_ID_TESTNET}", - "ip": "${EC2_INSTANCE_3_IP_TESTNET}" - } - ] - } - } - }, - "force_metagraph_restart": true -} \ No newline at end of file diff --git a/.github/workflows/deploy-integrationnet.yml b/.github/workflows/deploy-integrationnet.yml index c6b000f..deed241 100644 --- a/.github/workflows/deploy-integrationnet.yml +++ b/.github/workflows/deploy-integrationnet.yml @@ -21,26 +21,4 @@ jobs: EC2_INSTANCE_1_ID: ${{ secrets.EC2_INSTANCE_1_ID_INTEGRATIONNET }} EC2_INSTANCE_2_ID: ${{ secrets.EC2_INSTANCE_2_ID_INTEGRATIONNET }} - EC2_INSTANCE_3_ID: ${{ secrets.EC2_INSTANCE_3_ID_INTEGRATIONNET }} - - - name: Inject information to JSON - uses: Lambdaspire/action-substitute-secrets-in-file@v1.0.0 - with: - file: .github/assets/integrationnet-lambda-payload.json - tokenPattern: ${TOKEN} - secretsJson: ${{ toJSON(secrets) }} - - - name: Trigger Auto Restart Lambda - Integrationnet - shell: bash - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_INTEGRATIONNET }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_INTEGRATIONNET }} - AWS_REGION: ${{ secrets.AWS_REGION_INTEGRATIONNET }} - AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION_INTEGRATIONNET }} - run: | - aws lambda invoke \ - --function-name MetagraphMonitor \ - --invocation-type Event \ - --cli-binary-format raw-in-base64-out \ - --payload file://.github/assets/integrationnet-lambda-payload.json \ - response.json \ No newline at end of file + EC2_INSTANCE_3_ID: ${{ secrets.EC2_INSTANCE_3_ID_INTEGRATIONNET }} \ No newline at end of file diff --git a/.github/workflows/deploy-mainnet.yml b/.github/workflows/deploy-mainnet.yml index fb7505c..fba301d 100644 --- a/.github/workflows/deploy-mainnet.yml +++ b/.github/workflows/deploy-mainnet.yml @@ -20,27 +20,4 @@ jobs: EC2_INSTANCE_1_ID: ${{ secrets.EC2_INSTANCE_1_ID_MAINNET }} EC2_INSTANCE_2_ID: ${{ secrets.EC2_INSTANCE_2_ID_MAINNET }} - EC2_INSTANCE_3_ID: ${{ secrets.EC2_INSTANCE_3_ID_MAINNET }} - - - name: Inject information to JSON - uses: Lambdaspire/action-substitute-secrets-in-file@v1.0.0 - with: - file: .github/assets/mainnet-lambda-payload.json - tokenPattern: ${TOKEN} - secretsJson: ${{ toJSON(secrets) }} - - - name: Trigger Auto Restart Lambda - Mainnet - shell: bash - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_MAINNET }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_MAINNET }} - AWS_REGION: ${{ secrets.AWS_REGION_MAINNET }} - AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION_MAINNET }} - run: | - echo "test" - aws lambda invoke \ - --function-name MetagraphMonitor \ - --invocation-type Event \ - --cli-binary-format raw-in-base64-out \ - --payload file://.github/assets/mainnet-lambda-payload.json \ - response.json \ No newline at end of file + EC2_INSTANCE_3_ID: ${{ secrets.EC2_INSTANCE_3_ID_MAINNET }} \ No newline at end of file diff --git a/.github/workflows/deploy-testnet.yml b/.github/workflows/deploy-testnet.yml index 5c1716d..076c12f 100644 --- a/.github/workflows/deploy-testnet.yml +++ b/.github/workflows/deploy-testnet.yml @@ -20,26 +20,4 @@ jobs: EC2_INSTANCE_1_ID: ${{ secrets.EC2_INSTANCE_1_ID_TESTNET }} EC2_INSTANCE_2_ID: ${{ secrets.EC2_INSTANCE_2_ID_TESTNET }} - EC2_INSTANCE_3_ID: ${{ secrets.EC2_INSTANCE_3_ID_TESTNET }} - - - name: Inject information to JSON - uses: Lambdaspire/action-substitute-secrets-in-file@v1.0.0 - with: - file: .github/assets/testnet-lambda-payload.json - tokenPattern: ${TOKEN} - secretsJson: ${{ toJSON(secrets) }} - - - name: Trigger Auto Restart Lambda - Testnet - shell: bash - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_TESTNET }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_TESTNET }} - AWS_REGION: ${{ secrets.AWS_REGION_TESTNET }} - AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION_TESTNET }} - run: | - aws lambda invoke \ - --function-name MetagraphMonitor \ - --invocation-type Event \ - --cli-binary-format raw-in-base64-out \ - --payload file://.github/assets/testnet-lambda-payload.json \ - response.json \ No newline at end of file + EC2_INSTANCE_3_ID: ${{ secrets.EC2_INSTANCE_3_ID_TESTNET }} \ No newline at end of file diff --git a/metagraph/project/Dependencies.scala b/metagraph/project/Dependencies.scala index 2eb04dd..7c29fec 100644 --- a/metagraph/project/Dependencies.scala +++ b/metagraph/project/Dependencies.scala @@ -3,7 +3,7 @@ import sbt._ object Dependencies { object V { - val tessellation = "2.3.3" + val tessellation = "2.3.4" val decline = "2.4.1" } From 3b9298d7aa611e48a7fc34a62d6601b6ab1fe096 Mon Sep 17 00:00:00 2001 From: Marcus Girolneto Date: Fri, 26 Apr 2024 12:41:53 -0300 Subject: [PATCH 7/7] v1.3.4 --- metagraph/version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metagraph/version.sbt b/metagraph/version.sbt index 9c397e9..d1325c0 100644 --- a/metagraph/version.sbt +++ b/metagraph/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.3.4-SNAPSHOT" +ThisBuild / version := "1.3.4"