From c7093fbfdd8e6cda19c29f0d2fed2a2290b53ff5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Mon, 4 Dec 2023 09:42:53 +0100 Subject: [PATCH 01/13] chore: configure new 'testing-sanchonet' test deployment --- .github/workflows/test-deploy-network.yml | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-deploy-network.yml b/.github/workflows/test-deploy-network.yml index 7fee1dde512..ffb51244a68 100644 --- a/.github/workflows/test-deploy-network.yml +++ b/.github/workflows/test-deploy-network.yml @@ -15,6 +15,7 @@ on: type: choice options: - dev-preview + - testing-sanchonet dry_run: description: Dry run will not deploy the distribution to the Mithril network required: true @@ -26,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - environment: [ dev-preview ] + environment: [ dev-preview, testing-sanchonet ] include: - environment: dev-preview environment_prefix: dev @@ -60,6 +61,30 @@ jobs: google_machine_type: e2-highmem-4 google_compute_instance_boot_disk_size: 200 google_compute_instance_data_disk_size: 250 + - environment: testing-sanchonet + environment_prefix: testing + cardano_network: sanchonet + mithril_use_p2p_network: false + mithril_api_domain: api.mithril.network + mithril_protocol_parameters: | + { + k = 5 + m = 100 + phi_f = 0.65 + } + mithril_signers: | + { + "1" = { + type = "verified", + pool_id = "", + }, + } + terraform_backend_bucket: hydra-terraform-admin + google_region: europe-west1 + google_zone: europe-west1-b + google_machine_type: e2-highmem-4 + google_compute_instance_boot_disk_size: 200 + google_compute_instance_data_disk_size: 250 environment: ${{ matrix.environment }} runs-on: ubuntu-22.04 From de1ae7e10169ba110defcb8be061fe0c71898cd6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Mon, 4 Dec 2023 09:43:42 +0100 Subject: [PATCH 02/13] chore: configure new 'Sanchonet' Cardano network --- mithril-common/src/entities/cardano_network.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mithril-common/src/entities/cardano_network.rs b/mithril-common/src/entities/cardano_network.rs index 4707dc9ca70..1ea3990ba79 100644 --- a/mithril-common/src/entities/cardano_network.rs +++ b/mithril-common/src/entities/cardano_network.rs @@ -8,6 +8,7 @@ const MAINNET_MAGIC_ID: MagicId = 764824073; const TESTNET_MAGIC_ID: MagicId = 1097911063; const PREPROD_MAGIC_ID: MagicId = 1; const PREVIEW_MAGIC_ID: MagicId = 2; +const SANCHONET_MAGIC_ID: MagicId = 4; #[derive(Error, Debug)] pub enum CardanoNetworkError { @@ -40,6 +41,7 @@ impl CardanoNetwork { "testnet" => Ok(CardanoNetwork::TestNet(TESTNET_MAGIC_ID)), "preview" => Ok(CardanoNetwork::TestNet(PREVIEW_MAGIC_ID)), "preprod" => Ok(CardanoNetwork::TestNet(PREPROD_MAGIC_ID)), + "sanchonet" => Ok(CardanoNetwork::TestNet(SANCHONET_MAGIC_ID)), "private" => { if let Some(magic) = network_magic { Ok(CardanoNetwork::TestNet(magic)) @@ -83,6 +85,7 @@ impl Display for CardanoNetwork { TESTNET_MAGIC_ID => write!(f, "testnet"), PREVIEW_MAGIC_ID => write!(f, "preview"), PREPROD_MAGIC_ID => write!(f, "preprod"), + SANCHONET_MAGIC_ID => write!(f, "sanchonet"), _ => write!(f, "private"), }, } @@ -119,6 +122,14 @@ mod tests { CardanoNetwork::from_code("preprod".to_string(), Some(123)).unwrap(), CardanoNetwork::TestNet(PREPROD_MAGIC_ID) ); + assert_eq!( + CardanoNetwork::from_code("sanchonet".to_string(), None).unwrap(), + CardanoNetwork::TestNet(SANCHONET_MAGIC_ID) + ); + assert_eq!( + CardanoNetwork::from_code("sanchonet".to_string(), Some(123)).unwrap(), + CardanoNetwork::TestNet(SANCHONET_MAGIC_ID) + ); assert_eq!( CardanoNetwork::from_code("testnet".to_string(), None).unwrap(), CardanoNetwork::TestNet(TESTNET_MAGIC_ID) From b8545c6389f2ce9d0a4ac6316622ee338e6b0514 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Mon, 4 Dec 2023 17:05:27 +0100 Subject: [PATCH 03/13] feat: support custom Cardano Docker image registry in infra --- mithril-infra/assets/docker/Dockerfile.cardano | 3 ++- .../assets/docker/docker-compose-aggregator-auth-p2p.yaml | 1 + .../assets/docker/docker-compose-aggregator-auth.yaml | 1 + .../assets/docker/docker-compose-aggregator-noauth-p2p.yaml | 1 + .../assets/docker/docker-compose-aggregator-noauth.yaml | 1 + .../docker/docker-compose-signer-unverified-norelay.yaml | 1 + .../assets/docker/docker-compose-signer-unverified-p2p.yaml | 1 + .../assets/docker/docker-compose-signer-unverified.yaml | 1 + .../docker/docker-compose-signer-verified-norelay.yaml | 1 + .../assets/docker/docker-compose-signer-verified-p2p.yaml | 1 + .../assets/docker/docker-compose-signer-verified.yaml | 1 + mithril-infra/mithril.aggregator.tf | 1 + mithril-infra/mithril.signer.tf | 1 + mithril-infra/variables.tf | 6 ++++++ 14 files changed, 20 insertions(+), 1 deletion(-) diff --git a/mithril-infra/assets/docker/Dockerfile.cardano b/mithril-infra/assets/docker/Dockerfile.cardano index 73657b3af30..1c3ddf13615 100644 --- a/mithril-infra/assets/docker/Dockerfile.cardano +++ b/mithril-infra/assets/docker/Dockerfile.cardano @@ -1,5 +1,6 @@ ARG CARDANO_IMAGE_ID -FROM ghcr.io/intersectmbo/cardano-node:$CARDANO_IMAGE_ID +ARG CARDANO_IMAGE_REGISTRY +FROM $CARDANO_IMAGE_REGISTRY:$CARDANO_IMAGE_ID # Fix env file rights # In order to be able to interact with the Cardano node trough its 'node.socket' diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-auth-p2p.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-auth-p2p.yaml index d370e8a9b69..96b2dfc6c7e 100644 --- a/mithril-infra/assets/docker/docker-compose-aggregator-auth-p2p.yaml +++ b/mithril-infra/assets/docker/docker-compose-aggregator-auth-p2p.yaml @@ -10,6 +10,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml index d4e87ce4c57..f8ff355f7f8 100644 --- a/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml +++ b/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml @@ -10,6 +10,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-noauth-p2p.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-noauth-p2p.yaml index 5e78353fbf7..883700f53d4 100644 --- a/mithril-infra/assets/docker/docker-compose-aggregator-noauth-p2p.yaml +++ b/mithril-infra/assets/docker/docker-compose-aggregator-noauth-p2p.yaml @@ -10,6 +10,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml index 4dd6838b1d7..dd44405bbb5 100644 --- a/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml +++ b/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml @@ -10,6 +10,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-signer-unverified-norelay.yaml b/mithril-infra/assets/docker/docker-compose-signer-unverified-norelay.yaml index c3aaaa9b15d..efb2493388c 100644 --- a/mithril-infra/assets/docker/docker-compose-signer-unverified-norelay.yaml +++ b/mithril-infra/assets/docker/docker-compose-signer-unverified-norelay.yaml @@ -12,6 +12,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-signer-unverified-p2p.yaml b/mithril-infra/assets/docker/docker-compose-signer-unverified-p2p.yaml index 666f4895480..c9c265a877a 100644 --- a/mithril-infra/assets/docker/docker-compose-signer-unverified-p2p.yaml +++ b/mithril-infra/assets/docker/docker-compose-signer-unverified-p2p.yaml @@ -12,6 +12,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-signer-unverified.yaml b/mithril-infra/assets/docker/docker-compose-signer-unverified.yaml index 5ea81163e99..d261c8612e9 100644 --- a/mithril-infra/assets/docker/docker-compose-signer-unverified.yaml +++ b/mithril-infra/assets/docker/docker-compose-signer-unverified.yaml @@ -12,6 +12,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-signer-verified-norelay.yaml b/mithril-infra/assets/docker/docker-compose-signer-verified-norelay.yaml index 4af596d1ee1..c0a1df8a8e2 100644 --- a/mithril-infra/assets/docker/docker-compose-signer-verified-norelay.yaml +++ b/mithril-infra/assets/docker/docker-compose-signer-verified-norelay.yaml @@ -12,6 +12,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-signer-verified-p2p.yaml b/mithril-infra/assets/docker/docker-compose-signer-verified-p2p.yaml index 6292d9f8c63..09f41d4445f 100644 --- a/mithril-infra/assets/docker/docker-compose-signer-verified-p2p.yaml +++ b/mithril-infra/assets/docker/docker-compose-signer-verified-p2p.yaml @@ -12,6 +12,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/assets/docker/docker-compose-signer-verified.yaml b/mithril-infra/assets/docker/docker-compose-signer-verified.yaml index fcb3375e5ea..94bddbe84ea 100644 --- a/mithril-infra/assets/docker/docker-compose-signer-verified.yaml +++ b/mithril-infra/assets/docker/docker-compose-signer-verified.yaml @@ -12,6 +12,7 @@ services: dockerfile: Dockerfile.cardano args: CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID} + CARDANO_IMAGE_REGISTRY: ${CARDANO_IMAGE_REGISTRY} user: ${CURRENT_UID} profiles: - cardano diff --git a/mithril-infra/mithril.aggregator.tf b/mithril-infra/mithril.aggregator.tf index e36f31ab41e..00bb9147af1 100644 --- a/mithril-infra/mithril.aggregator.tf +++ b/mithril-infra/mithril.aggregator.tf @@ -48,6 +48,7 @@ EOT inline = [ "export NETWORK=${var.cardano_network}", "export CARDANO_IMAGE_ID=${var.cardano_image_id}", + "export CARDANO_IMAGE_REGISTRY=${var.cardano_image_registry}", "export MITHRIL_IMAGE_ID=${var.mithril_image_id}", "export AGGREGATOR_HOST=${local.mithril_aggregator_host}", "export GOOGLE_APPLICATION_CREDENTIALS_JSON='${local.google_cloud_storage_credentials_json}'", diff --git a/mithril-infra/mithril.signer.tf b/mithril-infra/mithril.signer.tf index b0e5a5d99fc..b452d528a28 100644 --- a/mithril-infra/mithril.signer.tf +++ b/mithril-infra/mithril.signer.tf @@ -73,6 +73,7 @@ EOT "export PARTY_ID=${each.value.pool_id}", "export NETWORK=${var.cardano_network}", "export CARDANO_IMAGE_ID=${var.cardano_image_id}", + "export CARDANO_IMAGE_REGISTRY=${var.cardano_image_registry}", "export MITHRIL_IMAGE_ID=${var.mithril_image_id}", "export AGGREGATOR_CREDENTIALS=${local.mithril_aggregator_credentials}", "export SIGNER_HOST=${local.mithril_signers_host[each.key]}", diff --git a/mithril-infra/variables.tf b/mithril-infra/variables.tf index 3fbfc53f8c7..7d40ed20af0 100644 --- a/mithril-infra/variables.tf +++ b/mithril-infra/variables.tf @@ -144,6 +144,12 @@ variable "cardano_image_id" { default = "8.7.3" } +variable "cardano_image_registry" { + type = string + description = "The Cardano image repository of service to deploy" + default = "ghcr.io/intersectmbo/cardano-node" +} + variable "cardano_configurations_repository_commit" { type = string description = "The Cardano configurations commit to use" From f61c05b63b4da2ea187c32daeed55077fb35e02c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Mon, 4 Dec 2023 17:14:05 +0100 Subject: [PATCH 04/13] feat: support custom Cardano Docker image registry in CI --- .../actions/deploy-terraform-infrastructure/action.yml | 5 +++++ .github/workflows/ci.yml | 1 + .github/workflows/pre-release.yml | 1 + .github/workflows/release.yml | 1 + .github/workflows/test-deploy-network.yml | 1 + 5 files changed, 9 insertions(+) diff --git a/.github/workflows/actions/deploy-terraform-infrastructure/action.yml b/.github/workflows/actions/deploy-terraform-infrastructure/action.yml index 849f8ad020e..1e8c054b35e 100644 --- a/.github/workflows/actions/deploy-terraform-infrastructure/action.yml +++ b/.github/workflows/actions/deploy-terraform-infrastructure/action.yml @@ -20,6 +20,10 @@ inputs: cardano_node_version: description: Cardano node version. required: true + cardano_node_docker_registry: + description: Cardano node Docker image registry. + required: false + default: "ghcr.io/intersectmbo/cardano-node" google_region: description: Google Cloud region name. required: true @@ -145,6 +149,7 @@ runs: environment_prefix = "${{ inputs.environment_prefix }}" cardano_network = "${{ inputs.cardano_network }}" cardano_image_id = "${{ inputs.cardano_node_version }}" + cardano_image_registry = "${{ inputs.cardano_node_docker_registry }}" google_region = "${{ inputs.google_region }}" google_zone = "${{ inputs.google_zone }}" google_machine_type = "${{ inputs.google_machine_type }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 835a14431ea..a513432b7ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -626,6 +626,7 @@ jobs: environment: ${{ matrix.environment }} cardano_network: ${{ matrix.cardano_network }} cardano_node_version: ${{ vars.CARDANO_NODE_VERSION }} + cardano_node_docker_registry: ${{ vars.CARDANO_NODE_DOCKER_REGISTRY }} google_region: ${{ matrix.google_region }} google_zone: ${{ matrix.google_zone }} google_machine_type: ${{ matrix.google_machine_type }} diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 98e67bbc102..45838763c27 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -195,6 +195,7 @@ jobs: environment: ${{ matrix.environment }} cardano_network: ${{ matrix.cardano_network }} cardano_node_version: ${{ vars.CARDANO_NODE_VERSION }} + cardano_node_docker_registry: ${{ vars.CARDANO_NODE_DOCKER_REGISTRY }} google_region: ${{ matrix.google_region }} google_zone: ${{ matrix.google_zone }} google_machine_type: ${{ matrix.google_machine_type }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4a75cc4758..29455611e94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -135,6 +135,7 @@ jobs: environment: ${{ matrix.environment }} cardano_network: ${{ matrix.cardano_network }} cardano_node_version: ${{ vars.CARDANO_NODE_VERSION }} + cardano_node_docker_registry: ${{ vars.CARDANO_NODE_DOCKER_REGISTRY }} google_region: ${{ matrix.google_region }} google_zone: ${{ matrix.google_zone }} google_machine_type: ${{ matrix.google_machine_type }} diff --git a/.github/workflows/test-deploy-network.yml b/.github/workflows/test-deploy-network.yml index ffb51244a68..dd9910d9da7 100644 --- a/.github/workflows/test-deploy-network.yml +++ b/.github/workflows/test-deploy-network.yml @@ -106,6 +106,7 @@ jobs: environment: ${{ matrix.environment }} cardano_network: ${{ matrix.cardano_network }} cardano_node_version: ${{ vars.CARDANO_NODE_VERSION }} + cardano_node_docker_registry: ${{ vars.CARDANO_NODE_DOCKER_REGISTRY }} google_region: ${{ matrix.google_region }} google_zone: ${{ matrix.google_zone }} google_machine_type: ${{ matrix.google_machine_type }} From b8b53354363f34a2370614e391b406555f1e318b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Tue, 5 Dec 2023 18:12:07 +0100 Subject: [PATCH 05/13] feat: support custom era reader type in manual network deployment --- .../actions/deploy-terraform-infrastructure/action.yml | 6 +++++- .github/workflows/test-deploy-network.yml | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions/deploy-terraform-infrastructure/action.yml b/.github/workflows/actions/deploy-terraform-infrastructure/action.yml index 1e8c054b35e..9c6c02beef9 100644 --- a/.github/workflows/actions/deploy-terraform-infrastructure/action.yml +++ b/.github/workflows/actions/deploy-terraform-infrastructure/action.yml @@ -64,6 +64,10 @@ inputs: mithril_genesis_verification_key_url: description: Mithril genesis verification key location. required: true + mithril_era_reader_adapter_type: + description: Mithril era reader adapter type. + required: false + default: "cardano-chain" mithril_era_reader_address_url: description: Mithril era reader address location. required: true @@ -163,7 +167,7 @@ runs: mithril_genesis_secret_key = "${{ inputs.mithril_genesis_secret_key }}" mithril_protocol_parameters = ${{ fromJSON(inputs.mithril_protocol_parameters) }} mithril_signers = ${{ fromJSON(inputs.mithril_signers) }} - mithril_era_reader_adapter_type = "cardano-chain" + mithril_era_reader_adapter_type = "${{ inputs.mithril_era_reader_adapter_type }}" mithril_era_reader_address_url = "${{ inputs.mithril_era_reader_address_url }}" mithril_era_reader_verification_key_url = "${{ inputs.mithril_era_reader_verification_key_url }}" mithril_era_reader_secret_key = "${{ inputs.mithril_era_reader_secret_key }}" diff --git a/.github/workflows/test-deploy-network.yml b/.github/workflows/test-deploy-network.yml index dd9910d9da7..f266985c304 100644 --- a/.github/workflows/test-deploy-network.yml +++ b/.github/workflows/test-deploy-network.yml @@ -34,6 +34,7 @@ jobs: cardano_network: preview mithril_use_p2p_network: true mithril_api_domain: api.mithril.network + mithril_era_reader_adapter_type: cardano-chain mithril_protocol_parameters: | { k = 5 @@ -66,6 +67,7 @@ jobs: cardano_network: sanchonet mithril_use_p2p_network: false mithril_api_domain: api.mithril.network + mithril_era_reader_adapter_type: bootstrap mithril_protocol_parameters: | { k = 5 @@ -120,6 +122,7 @@ jobs: mithril_signers: ${{ toJSON(matrix.mithril_signers) }} mithril_genesis_secret_key: ${{ secrets.GENESIS_SECRET_KEY }} mithril_genesis_verification_key_url: ${{ vars.GENESIS_VERIFICATION_KEY_URL }} + mithril_era_reader_adapter_type: ${{ matrix.mithril_era_reader_adapter_type }} mithril_era_reader_address_url: ${{ vars.ERA_READER_ADDRESS_URL }} mithril_era_reader_verification_key_url: ${{ vars.ERA_READER_VERIFICATION_KEY_URL }} mithril_era_reader_secret_key: ${{ secrets.ERA_READER_SECRET_KEY }} From acef6ec26486efd43bbda87002d107f3c067b0ab Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Mon, 5 Feb 2024 16:53:24 +0100 Subject: [PATCH 06/13] chore: add 'testing-sanchonet' configuration in infra --- mithril-infra/configuration/testing-sanchonet/era.addr | 1 + mithril-infra/configuration/testing-sanchonet/era.vkey | 1 + mithril-infra/configuration/testing-sanchonet/genesis.vkey | 1 + 3 files changed, 3 insertions(+) create mode 100644 mithril-infra/configuration/testing-sanchonet/era.addr create mode 100644 mithril-infra/configuration/testing-sanchonet/era.vkey create mode 100644 mithril-infra/configuration/testing-sanchonet/genesis.vkey diff --git a/mithril-infra/configuration/testing-sanchonet/era.addr b/mithril-infra/configuration/testing-sanchonet/era.addr new file mode 100644 index 00000000000..22551899d60 --- /dev/null +++ b/mithril-infra/configuration/testing-sanchonet/era.addr @@ -0,0 +1 @@ +addr_test1qrg9v8xjjjjx95k2h2gquwrah8424798wqa5exuyhqpcggfyse0nuafkp7rnkxsssxue37259lfhemjdhs333u7v0gwsd0dr30 \ No newline at end of file diff --git a/mithril-infra/configuration/testing-sanchonet/era.vkey b/mithril-infra/configuration/testing-sanchonet/era.vkey new file mode 100644 index 00000000000..a69633e2f66 --- /dev/null +++ b/mithril-infra/configuration/testing-sanchonet/era.vkey @@ -0,0 +1 @@ +5b35352c3232382c3134342c38372c3133382c3133362c34382c382c31342c3138372c38352c3134382c39372c3233322c3235352c3232392c33382c3234342c3234372c3230342c3139382c31332c33312c3232322c32352c3136342c35322c3130322c39312c3132302c3230382c3134375d \ No newline at end of file diff --git a/mithril-infra/configuration/testing-sanchonet/genesis.vkey b/mithril-infra/configuration/testing-sanchonet/genesis.vkey new file mode 100644 index 00000000000..575154ce701 --- /dev/null +++ b/mithril-infra/configuration/testing-sanchonet/genesis.vkey @@ -0,0 +1 @@ +5b3132372c37332c3132342c3136312c362c3133372c3133312c3231332c3230372c3131372c3139382c38352c3137362c3139392c3136322c3234312c36382c3132332c3131392c3134352c31332c3233322c3234332c34392c3232392c322c3234392c3230352c3230352c33392c3233352c34345d \ No newline at end of file From cb23ae7dae63a70e4cd6bddcdddcd7e6d8f8e638 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Mon, 5 Feb 2024 17:43:08 +0100 Subject: [PATCH 07/13] chore: add 'testing-sanchonet' in network matrix documentation --- docs/website/root/networks-matrix.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/website/root/networks-matrix.md b/docs/website/root/networks-matrix.md index 1513d83c873..b00b69fa346 100644 --- a/docs/website/root/networks-matrix.md +++ b/docs/website/root/networks-matrix.md @@ -85,6 +85,25 @@ Here is an updated list of all **Mithril networks**, including their configurati | **Era reader adapter type** | `cardano-chain` | **Era reader address** | `https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-preview/era.addr` [:arrow_upper_right:](https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-preview/era.addr) | **Era reader verification key** | `https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-preview/era.vkey` [:arrow_upper_right:](https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-preview/era.vkey) +| **Build from** | **Main branch** [:arrow_upper_right:](https://github.com/input-output-hk/mithril/tree/main) + + + +## `testing-sanchonet` +> :warning: For devs only + +| Information | - +|------------|------------ +| **Mithril network** | `testing-sanchonet` [:mag_right:](https://mithril.network/explorer?aggregator=https%3A%2F%2Faggregator.testing-sanchonet.api.mithril.network%2Faggregator) +| **Cardano network** | `sanchonet` +| **Cardano magic Id** | `4` +| **Supported** | Yes :heavy_check_mark: +| **Status** | Unstable 🔴 +| **Aggregator endpoint** | `https://aggregator.testing-sanchonet.api.mithril.network/aggregator` [:arrow_upper_right:](https://aggregator.testing-sanchonet.api.mithril.network/aggregator) +| **Genesis verification key** | `https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-sanchonet/genesis.vkey` [:arrow_upper_right:](https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-sanchonet/genesis.vkey) +| **Era reader adapter type** | `cardano-chain` +| **Era reader address** | `https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-sanchonet/era.addr` [:arrow_upper_right:](https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-sanchonet/era.addr) +| **Era reader verification key** | `https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-sanchonet/era.vkey` [:arrow_upper_right:](https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-sanchonet/era.vkey) | **Build from** | **Main branch** [:arrow_upper_right:](https://github.com/input-output-hk/mithril/tree/main) From ffbc4d17a3886866a33adc3582dad6d80867559e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Mon, 5 Feb 2024 17:45:23 +0100 Subject: [PATCH 08/13] chore: support 'testing-sanchonet' network in explorer --- mithril-explorer/src/aggregators-list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/mithril-explorer/src/aggregators-list.js b/mithril-explorer/src/aggregators-list.js index 3d5a92ae931..17ce7df8d38 100644 --- a/mithril-explorer/src/aggregators-list.js +++ b/mithril-explorer/src/aggregators-list.js @@ -3,6 +3,7 @@ export const defaultAggregators = [ "https://aggregator.release-preprod.api.mithril.network/aggregator", "https://aggregator.pre-release-preview.api.mithril.network/aggregator", "https://aggregator.testing-preview.api.mithril.network/aggregator", + "https://aggregator.testing-sanchonet.api.mithril.network/aggregator", "http://localhost:8080/aggregator", ]; From 49641e273e33c98c53602fbd5fe3831f8884c08a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Tue, 6 Feb 2024 15:29:01 +0100 Subject: [PATCH 09/13] chore: support 'testing-sanchonet' deployment in CI --- .github/workflows/ci.yml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a513432b7ab..f6662159a52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -567,7 +567,7 @@ jobs: strategy: fail-fast: false matrix: - environment: [ testing-preview ] + environment: [ testing-preview, testing-sanchonet ] include: - environment: testing-preview environment_prefix: testing @@ -601,6 +601,30 @@ jobs: google_machine_type: e2-standard-8 google_compute_instance_boot_disk_size: 200 google_compute_instance_data_disk_size: 250 + - environment: testing-sanchonet + environment_prefix: testing + cardano_network: sanchonet + mithril_use_p2p_network: false + mithril_api_domain: api.mithril.network + mithril_protocol_parameters: | + { + k = 5 + m = 100 + phi_f = 0.65 + } + mithril_signers: | + { + "1" = { + type = "verified", + pool_id = "", + }, + } + terraform_backend_bucket: hydra-terraform-admin + google_region: europe-west1 + google_zone: europe-west1-b + google_machine_type: e2-highmem-4 + google_compute_instance_boot_disk_size: 200 + google_compute_instance_data_disk_size: 250 environment: ${{ matrix.environment }} runs-on: ubuntu-22.04 needs: From 3ea339e80d15d9990af5dd27ff5fddcd1f545389 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Tue, 6 Feb 2024 17:25:46 +0100 Subject: [PATCH 10/13] chore: upgrade pool tools scripts in infra for conway era --- mithril-infra/assets/tools/pool/_prelude.sh | 11 ++++++++++- .../assets/tools/pool/register-stake-address.sh | 7 +++---- .../assets/tools/pool/register-stake-pool.sh | 13 ++++++------- mithril-infra/assets/tools/pool/renew-opcert.sh | 8 ++++---- .../assets/tools/pool/retire-stake-pool.sh | 9 ++++----- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/mithril-infra/assets/tools/pool/_prelude.sh b/mithril-infra/assets/tools/pool/_prelude.sh index 73d63865e45..368ff7bc8f0 100644 --- a/mithril-infra/assets/tools/pool/_prelude.sh +++ b/mithril-infra/assets/tools/pool/_prelude.sh @@ -1,4 +1,7 @@ +# Exit on error +set -e + # Debug mode if [ -v DEBUG ]; then set -x @@ -30,15 +33,21 @@ CARDANO_CLI_CMD() { docker exec ${CARDANO_NODE} cardano-cli ${@} } +# Compute current Cardano era if needed +if [ -z "${CARDANO_ERA}" ]; then + CARDANO_ERA=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq -r '.era |= ascii_downcase | .era') +fi + # Compute auxiliary env vars POOL_ARTIFACTS_DIR=/pool POOL_ARTIFACTS_DIR_PREFIX=./data/${NETWORK}/${SIGNER_NODE}/cardano POOL_WWW_DIR=/www -GENESIS_FILE=/home/curry/docker/cardano-configurations/network/preview/genesis/shelley.json +GENESIS_FILE=/home/curry/docker/cardano-configurations/network/${NETWORK}/genesis/shelley.json if [ -z "${AMOUNT_STAKED}" ]; then AMOUNT_STAKED=1000000000 fi +# Compute transaction input if needed #if [ -z "${TX_IN}" ]; then # TX_IN=$(CARDANO_CLI_CMD query utxo \ # --testnet-magic $NETWORK_MAGIC \ diff --git a/mithril-infra/assets/tools/pool/register-stake-address.sh b/mithril-infra/assets/tools/pool/register-stake-address.sh index 62a45e7f252..17e7cc9c96f 100644 --- a/mithril-infra/assets/tools/pool/register-stake-address.sh +++ b/mithril-infra/assets/tools/pool/register-stake-address.sh @@ -16,8 +16,7 @@ fi SLOT=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq .slot) ## Build transaction -CARDANO_CLI_CMD transaction build \ ---babbage-era \ +CARDANO_CLI_CMD ${CARDANO_ERA} transaction build \ --tx-in $TX_IN \ --tx-out $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr)+${AMOUNT_STAKED} \ --change-address $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr) \ @@ -28,7 +27,7 @@ CARDANO_CLI_CMD transaction build \ --witness-override 2 ## Sign transaction -CARDANO_CLI_CMD transaction sign \ +CARDANO_CLI_CMD ${CARDANO_ERA} transaction sign \ --signing-key-file ${POOL_ARTIFACTS_DIR}/payment.skey \ --signing-key-file ${POOL_ARTIFACTS_DIR}/stake.skey \ --testnet-magic $NETWORK_MAGIC \ @@ -36,6 +35,6 @@ CARDANO_CLI_CMD transaction sign \ --out-file ${POOL_ARTIFACTS_DIR}/stake-registration.tx ## Submit transaction -CARDANO_CLI_CMD transaction submit \ +CARDANO_CLI_CMD ${CARDANO_ERA} transaction submit \ --tx-file ${POOL_ARTIFACTS_DIR}/stake-registration.tx \ --testnet-magic $NETWORK_MAGIC \ No newline at end of file diff --git a/mithril-infra/assets/tools/pool/register-stake-pool.sh b/mithril-infra/assets/tools/pool/register-stake-pool.sh index 07cde3a0149..40d627177e0 100644 --- a/mithril-infra/assets/tools/pool/register-stake-pool.sh +++ b/mithril-infra/assets/tools/pool/register-stake-pool.sh @@ -43,7 +43,7 @@ POOL_RELAY_PORT=$(cat ${POOL_ARTIFACTS_DIR_PREFIX}/pool/port) SLOT=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq .slot) # Build registration certificate -CARDANO_CLI_CMD stake-pool registration-certificate \ +CARDANO_CLI_CMD ${CARDANO_ERA} stake-pool registration-certificate \ --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey \ --vrf-verification-key-file ${POOL_ARTIFACTS_DIR}/vrf.vkey \ --pool-pledge $POOL_PLEDGE \ @@ -59,7 +59,7 @@ CARDANO_CLI_CMD stake-pool registration-certificate \ --out-file ${POOL_ARTIFACTS_DIR}/pool-registration.cert # Generate delegation certificate pledge -CARDANO_CLI_CMD stake-address delegation-certificate \ +CARDANO_CLI_CMD ${CARDANO_ERA} stake-address stake-delegation-certificate \ --stake-verification-key-file ${POOL_ARTIFACTS_DIR}/stake.vkey \ --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey \ --out-file ${POOL_ARTIFACTS_DIR}/delegation.cert @@ -67,8 +67,7 @@ CARDANO_CLI_CMD stake-address delegation-certificate \ # Submit the pool certificate and delegation certificate to the blockchain ## Build transaction STAKE_ADDRESS_DEPOSIT=$(cat $GENESIS_FILE | jq .protocolParams.poolDeposit) -CARDANO_CLI_CMD transaction build \ ---babbage-era \ +CARDANO_CLI_CMD ${CARDANO_ERA} transaction build \ --tx-in $TX_IN \ --tx-out $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr)+$STAKE_ADDRESS_DEPOSIT \ --change-address $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr) \ @@ -80,7 +79,7 @@ CARDANO_CLI_CMD transaction build \ --testnet-magic $NETWORK_MAGIC # Sign transaction -CARDANO_CLI_CMD transaction sign \ +CARDANO_CLI_CMD ${CARDANO_ERA} transaction sign \ --signing-key-file ${POOL_ARTIFACTS_DIR}/payment.skey \ --signing-key-file ${POOL_ARTIFACTS_DIR}/stake.skey \ --signing-key-file ${POOL_ARTIFACTS_DIR}/cold.skey \ @@ -89,12 +88,12 @@ CARDANO_CLI_CMD transaction sign \ --out-file ${POOL_ARTIFACTS_DIR}/pool-registration.tx # Submit transaction -CARDANO_NODE_SOCKET_PATH=$CARDANO_NODE_SOCKET_PATH CARDANO_CLI_CMD transaction submit \ +CARDANO_NODE_SOCKET_PATH=$CARDANO_NODE_SOCKET_PATH CARDANO_CLI_CMD ${CARDANO_ERA} transaction submit \ --tx-file ${POOL_ARTIFACTS_DIR}/pool-registration.tx \ --testnet-magic $NETWORK_MAGIC ### Compute Pool Id -POOL_ID=$(CARDANO_CLI_CMD stake-pool id --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey) +POOL_ID=$(CARDANO_CLI_CMD ${CARDANO_ERA} stake-pool id --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey) echo $POOL_ID > ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/pool-id.txt echo POOL_ID=$POOL_ID diff --git a/mithril-infra/assets/tools/pool/renew-opcert.sh b/mithril-infra/assets/tools/pool/renew-opcert.sh index b167e6c797f..06787c86774 100644 --- a/mithril-infra/assets/tools/pool/renew-opcert.sh +++ b/mithril-infra/assets/tools/pool/renew-opcert.sh @@ -7,7 +7,7 @@ . $(dirname -- "$0")/_prelude.sh # Compute Operational Certificate new counter on running node -CARDANO_CLI_CMD query kes-period-info \ +CARDANO_CLI_CMD ${CARDANO_ERA} query kes-period-info \ --testnet-magic $NETWORK_MAGIC \ --op-cert-file ${POOL_ARTIFACTS_DIR}/opcert.cert \ --out-file ${POOL_ARTIFACTS_DIR}/kes_period_info.json @@ -17,18 +17,18 @@ OPCERT_COUNTER_NEW=$(( $OPCERT_COUNTER + 1 )) # Issue new Operational Certificate on cold environment ## Create new counter -CARDANO_CLI_CMD node new-counter \ +CARDANO_CLI_CMD ${CARDANO_ERA} node new-counter \ --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey \ --counter-value $OPCERT_COUNTER_NEW \ --operational-certificate-issue-counter-file ${POOL_ARTIFACTS_DIR}/opcert.counter.new ## Generate new KES keys (required only if MaxKESEvolutions is reached) -CARDANO_CLI_CMD node key-gen-KES \ +CARDANO_CLI_CMD ${CARDANO_ERA} node key-gen-KES \ --verification-key-file ${POOL_ARTIFACTS_DIR}/kes.vkey.new \ --signing-key-file ${POOL_ARTIFACTS_DIR}/kes.skey.new ## Issue new Operational Certificate -CARDANO_CLI_CMD node issue-op-cert \ +CARDANO_CLI_CMD ${CARDANO_ERA} node issue-op-cert \ --kes-verification-key-file ${POOL_ARTIFACTS_DIR}/kes.vkey.new \ --cold-signing-key-file ${POOL_ARTIFACTS_DIR}/cold.skey \ --operational-certificate-issue-counter-file ${POOL_ARTIFACTS_DIR}/opcert.counter.new \ diff --git a/mithril-infra/assets/tools/pool/retire-stake-pool.sh b/mithril-infra/assets/tools/pool/retire-stake-pool.sh index 5e8203ba949..af2bd8ff528 100644 --- a/mithril-infra/assets/tools/pool/retire-stake-pool.sh +++ b/mithril-infra/assets/tools/pool/retire-stake-pool.sh @@ -23,15 +23,14 @@ EPOCH_CURRENT=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq .e EPOCH_RETIREMENT=$(( EPOCH_CURRENT + 1 )) # Build deregistration certificate -CARDANO_CLI_CMD stake-pool deregistration-certificate \ +CARDANO_CLI_CMD ${CARDANO_ERA} stake-pool deregistration-certificate \ --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey \ --epoch $EPOCH_RETIREMENT \ --out-file ${POOL_ARTIFACTS_DIR}/pool-deregistration.cert # Submit the pool certificate and delegation certificate to the blockchain ## Build transaction -CARDANO_CLI_CMD transaction build \ ---babbage-era \ +CARDANO_CLI_CMD ${CARDANO_ERA} transaction build \ --tx-in $TX_IN \ --tx-out $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr)+${VALUE_OUT} \ --change-address $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr) \ @@ -42,7 +41,7 @@ CARDANO_CLI_CMD transaction build \ --testnet-magic $NETWORK_MAGIC # Sign transaction -CARDANO_CLI_CMD transaction sign \ +CARDANO_CLI_CMD ${CARDANO_ERA} transaction sign \ --signing-key-file ${POOL_ARTIFACTS_DIR}/payment.skey \ --signing-key-file ${POOL_ARTIFACTS_DIR}/cold.skey \ --testnet-magic $NETWORK_MAGIC \ @@ -50,6 +49,6 @@ CARDANO_CLI_CMD transaction sign \ --out-file ${POOL_ARTIFACTS_DIR}/pool-deregistration.tx # Submit transaction -CARDANO_NODE_SOCKET_PATH=$CARDANO_NODE_SOCKET_PATH CARDANO_CLI_CMD transaction submit \ +CARDANO_NODE_SOCKET_PATH=$CARDANO_NODE_SOCKET_PATH CARDANO_CLI_CMD ${CARDANO_ERA} transaction submit \ --tx-file ${POOL_ARTIFACTS_DIR}/pool-deregistration.tx \ --testnet-magic $NETWORK_MAGIC From 8693d1d1648f74108bd06a40be1973a5832359e1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Wed, 7 Feb 2024 14:53:39 +0100 Subject: [PATCH 11/13] chore: remove 'testing-sanchonet' from manual deployment workflow --- .github/workflows/test-deploy-network.yml | 28 +---------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.github/workflows/test-deploy-network.yml b/.github/workflows/test-deploy-network.yml index f266985c304..91505c19e8c 100644 --- a/.github/workflows/test-deploy-network.yml +++ b/.github/workflows/test-deploy-network.yml @@ -15,7 +15,6 @@ on: type: choice options: - dev-preview - - testing-sanchonet dry_run: description: Dry run will not deploy the distribution to the Mithril network required: true @@ -27,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - environment: [ dev-preview, testing-sanchonet ] + environment: [ dev-preview ] include: - environment: dev-preview environment_prefix: dev @@ -62,31 +61,6 @@ jobs: google_machine_type: e2-highmem-4 google_compute_instance_boot_disk_size: 200 google_compute_instance_data_disk_size: 250 - - environment: testing-sanchonet - environment_prefix: testing - cardano_network: sanchonet - mithril_use_p2p_network: false - mithril_api_domain: api.mithril.network - mithril_era_reader_adapter_type: bootstrap - mithril_protocol_parameters: | - { - k = 5 - m = 100 - phi_f = 0.65 - } - mithril_signers: | - { - "1" = { - type = "verified", - pool_id = "", - }, - } - terraform_backend_bucket: hydra-terraform-admin - google_region: europe-west1 - google_zone: europe-west1-b - google_machine_type: e2-highmem-4 - google_compute_instance_boot_disk_size: 200 - google_compute_instance_data_disk_size: 250 environment: ${{ matrix.environment }} runs-on: ubuntu-22.04 From a44cb1cead99b7bc49eb0203b9354936ef99533a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Wed, 7 Feb 2024 17:11:39 +0100 Subject: [PATCH 12/13] chore: upgrade era markers runbook for conway era --- docs/runbook/era-markers/README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/docs/runbook/era-markers/README.md b/docs/runbook/era-markers/README.md index c3a6cbf78c4..4eba17d479f 100644 --- a/docs/runbook/era-markers/README.md +++ b/docs/runbook/era-markers/README.md @@ -25,6 +25,11 @@ $ export ERA_ACTIVATION_SECRET_KEY=**YOUR_ERA_ACTIVATION_SECRET_KEY** $ export ASSETS_PATH=**YOUR_ASSETS_PATH** ``` +Compute the current Cardano era: +```bash +CARDANO_ERA=$(cardano-cli query tip --testnet-magic $CARDANO_TESTNET_MAGIC | jq -r '.era |= ascii_downcase | .era') +``` + Set the transaction amount used when a script transaction is made: ```bash $ export SCRIPT_TX_VALUE=2000000 @@ -54,7 +59,7 @@ $ ./mithril-aggregator era generate-tx-datum --current-era-epoch 1 --era-markers Now create the bootstrap transaction with datum: ```bash -$ cardano-cli transaction build --babbage-era --testnet-magic $CARDANO_TESTNET_MAGIC \ +$ cardano-cli $CARDANO_ERA transaction build --testnet-magic $CARDANO_TESTNET_MAGIC \ --tx-in $TX_IN \ --tx-out $(cat $CARDANO_WALLET_PATH/payment.addr)+$SCRIPT_TX_VALUE \ --tx-out-inline-datum-file $ASSETS_PATH/mithril-era-datum-1.json \ @@ -65,7 +70,7 @@ Estimated transaction fee: Lovelace 168669 Then sign the transaction: ```bash -$ cardano-cli transaction sign \ +$ cardano-cli $CARDANO_ERA transaction sign \ --tx-body-file $ASSETS_PATH/tx.raw \ --signing-key-file $CARDANO_WALLET_PATH/payment.skey \ --testnet-magic $CARDANO_TESTNET_MAGIC \ @@ -74,7 +79,7 @@ $ cardano-cli transaction sign \ And submit it: ```bash -$ cardano-cli transaction submit \ +$ cardano-cli $CARDANO_ERA transaction submit \ --testnet-magic $CARDANO_TESTNET_MAGIC \ --tx-file $ASSETS_PATH/tx.signed Transaction successfully submitted. @@ -155,7 +160,7 @@ $ ./mithril-aggregator era generate-tx-datum --current-era-epoch 1 --era-markers Now create the update transaction with datum: ```bash -$ cardano-cli transaction build --babbage-era --testnet-magic $CARDANO_TESTNET_MAGIC \ +$ cardano-cli $CARDANO_ERA transaction build --testnet-magic $CARDANO_TESTNET_MAGIC \ --tx-in $TX_IN_DATUM \ --tx-in $TX_IN_NO_DATUM \ --tx-out $(cat $CARDANO_WALLET_PATH/payment.addr)+$SCRIPT_TX_VALUE \ @@ -167,7 +172,7 @@ Estimated transaction fee: Lovelace 179889 Then sign the transaction: ```bash -$ cardano-cli transaction sign \ +$ cardano-cli $CARDANO_ERA transaction sign \ --tx-body-file $ASSETS_PATH/tx.raw \ --signing-key-file $CARDANO_WALLET_PATH/payment.skey \ --testnet-magic $CARDANO_TESTNET_MAGIC \ @@ -176,7 +181,7 @@ $ cardano-cli transaction sign \ And submit it: ```bash -$ cardano-cli transaction submit \ +$ cardano-cli $CARDANO_ERA transaction submit \ --testnet-magic $CARDANO_TESTNET_MAGIC \ --tx-file $ASSETS_PATH/tx.signed Transaction successfully submitted. From 84329f709dd6ecc93fe204ccdb8cda5420c53d2b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Wed, 7 Feb 2024 17:13:29 +0100 Subject: [PATCH 13/13] chore: bump crates versions --- Cargo.lock | 2 +- mithril-common/Cargo.toml | 2 +- mithril-explorer/package.json | 2 +- mithril-infra/assets/infra.version | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3587fb4f11..599e48d78c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3426,7 +3426,7 @@ dependencies = [ [[package]] name = "mithril-common" -version = "0.2.160" +version = "0.2.161" dependencies = [ "anyhow", "async-trait", diff --git a/mithril-common/Cargo.toml b/mithril-common/Cargo.toml index 1e679b372a2..dc2c25c7c96 100644 --- a/mithril-common/Cargo.toml +++ b/mithril-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mithril-common" -version = "0.2.160" +version = "0.2.161" description = "Common types, interfaces, and utilities for Mithril nodes." authors = { workspace = true } edition = { workspace = true } diff --git a/mithril-explorer/package.json b/mithril-explorer/package.json index d58d5ce98c6..6f0439bae76 100644 --- a/mithril-explorer/package.json +++ b/mithril-explorer/package.json @@ -1,6 +1,6 @@ { "name": "mithril-explorer", - "version": "0.4.11", + "version": "0.4.12", "private": true, "scripts": { "dev": "next dev", diff --git a/mithril-infra/assets/infra.version b/mithril-infra/assets/infra.version index 967b33ffb25..a45be462767 100644 --- a/mithril-infra/assets/infra.version +++ b/mithril-infra/assets/infra.version @@ -1 +1 @@ -0.2.7 \ No newline at end of file +0.2.8