diff --git a/.github/actions/tests/local-environment-tests/action.yml b/.github/actions/tests/local-environment-tests/action.yml index 41bec5e5a..70eda2124 100644 --- a/.github/actions/tests/local-environment-tests/action.yml +++ b/.github/actions/tests/local-environment-tests/action.yml @@ -114,6 +114,7 @@ runs: keyword: "test_get_status or test_get_params" blockchain: substrate local-environment: "true" + log_level: debug - name: Wait for epoch 2 uses: ./.github/actions/tests/wait-for-epoch with: @@ -133,6 +134,7 @@ runs: blockchain: substrate markers: "not active_flow and not passive_flow and not probability and not rpc" local-environment: "true" + log_level: debug - name: Wait for epoch 3 if: ${{ inputs.tests == 'postmerge' }} uses: ./.github/actions/tests/wait-for-epoch @@ -149,6 +151,7 @@ runs: init_timestamp: ${{ env.INIT_TIMESTAMP }} blockchain: substrate local-environment: "true" + log_level: debug - name: Wait for epoch 4 if: ${{ inputs.tests == 'postmerge' }} uses: ./.github/actions/tests/wait-for-epoch @@ -166,6 +169,7 @@ runs: init_timestamp: ${{ env.INIT_TIMESTAMP }} blockchain: substrate local-environment: "true" + log_level: debug - name: Check if no skipped tests if: ${{ inputs.tests == 'postmerge' }} run: | diff --git a/.github/actions/tests/run-e2e-tests/action.yml b/.github/actions/tests/run-e2e-tests/action.yml index 0143c2aed..59df2cbef 100644 --- a/.github/actions/tests/run-e2e-tests/action.yml +++ b/.github/actions/tests/run-e2e-tests/action.yml @@ -89,6 +89,7 @@ runs: ${decrypt_switch} \ --json-report \ --json-report-summary \ + --tb=short \ --junitxml=junit_report.xml" if [[ "${{ inputs.local-environment }}" == "true" ]]; then diff --git a/E2E-tests/tests/committee/test_registrations.py b/E2E-tests/tests/committee/test_registrations.py index bbe9febf8..ffb645c1c 100644 --- a/E2E-tests/tests/committee/test_registrations.py +++ b/E2E-tests/tests/committee/test_registrations.py @@ -19,41 +19,70 @@ def test_register_candidate(candidate: Candidates, api: BlockchainApi, db: Sessi * wait for next partner chain block * check that registered candidate appeared in the partner_chain_getAriadneParameters() response """ - logging.info(f"Registering {candidate}") - result, next_status_epoch = api.register_candidate(candidate.name) - assert result, f"Registration of candidate {candidate.name} failed." - - registered_candidate = Candidates() - registered_candidate.name = candidate.name - registered_candidate.next_status = "active" - registered_candidate.next_status_epoch = next_status_epoch - db.add(registered_candidate) - db.commit() + logging.info("Starting test: test_register_candidate") + logging.info(f"Candidate: {candidate}, API: {api}, DB: {db}, Config: {config}") - # TODO: split into separate test - # Get registration status from RPC - api.wait_for_next_pc_block() - candidate_registrations = api.get_trustless_candidates(next_status_epoch, valid_only=False) - spo_public_key = config.nodes_config.nodes[candidate.name].keys_files.spo_public_key - registered_mc_pub_key = f"0x{api._read_cardano_key_file(spo_public_key)}" - # FIXME: ETCM-7370 handle multiple registrations for a single spo - registration = candidate_registrations[registered_mc_pub_key][0] - registered_pc_pub_key = config.nodes_config.nodes[candidate.name].public_key - registered_aura_pub_key = config.nodes_config.nodes[candidate.name].aura_public_key - registered_grandpa_pub_key = config.nodes_config.nodes[candidate.name].grandpa_public_key - assert ( - registered_pc_pub_key == registration["sidechainPubKey"] - ), f"Could not find SC public key {registered_pc_pub_key} registered for MC epoch {next_status_epoch}" - assert ( - registered_mc_pub_key == registration["mainchainPubKey"] - ), f"Could not find MC public key {registered_mc_pub_key} registered for MC epoch {next_status_epoch}" - assert ( - registered_aura_pub_key == registration["auraPubKey"] - ), f"Could not find Aura public key {registered_aura_pub_key} registered for MC epoch {next_status_epoch}" - assert ( - registered_grandpa_pub_key == registration["grandpaPubKey"] - ), f"Could not find Grandpa public key {registered_grandpa_pub_key} registered for MC epoch {next_status_epoch}" - assert registration["isValid"], f"Registered candidate {candidate.name} is not valid" + try: + # Step 1: Register the candidate + logging.info(f"Registering candidate {candidate.name}") + result, next_status_epoch = api.register_candidate(candidate.name) + logging.info(f"Registration result: {result}, next status epoch: {next_status_epoch}") + assert result, f"Registration of candidate {candidate.name} failed." + + # Step 2: Commit the registration to the database + logging.info("Committing candidate registration to the database.") + registered_candidate = Candidates() + registered_candidate.name = candidate.name + registered_candidate.next_status = "active" + registered_candidate.next_status_epoch = next_status_epoch + db.add(registered_candidate) + db.commit() + logging.info("Candidate successfully committed to the database.") + + # Step 3: Wait for the next partner chain block + logging.info("Waiting for the next partner chain block.") + api.wait_for_next_pc_block() + + # Step 4: Get registration status from RPC + logging.info(f"Fetching trustless candidates for epoch {next_status_epoch}") + candidate_registrations = api.get_trustless_candidates(next_status_epoch, valid_only=False) + spo_public_key = config.nodes_config.nodes[candidate.name].keys_files.spo_public_key + registered_mc_pub_key = f"0x{api._read_cardano_key_file(spo_public_key)}" + logging.info(f"MC public key: {registered_mc_pub_key}") + + # FIXME: ETCM-7370 handle multiple registrations for a single SPO + registration = candidate_registrations[registered_mc_pub_key][0] + logging.info(f"Fetched registration: {registration}") + + registered_pc_pub_key = config.nodes_config.nodes[candidate.name].public_key + registered_aura_pub_key = config.nodes_config.nodes[candidate.name].aura_public_key + registered_grandpa_pub_key = config.nodes_config.nodes[candidate.name].grandpa_public_key + + # Step 5: Validate keys and status + logging.info("Validating registration keys and status.") + assert ( + registered_pc_pub_key == registration["sidechainPubKey"] + ), f"Could not find SC public key {registered_pc_pub_key} registered for MC epoch {next_status_epoch}" + assert ( + registered_mc_pub_key == registration["mainchainPubKey"] + ), f"Could not find MC public key {registered_mc_pub_key} registered for MC epoch {next_status_epoch}" + assert ( + registered_aura_pub_key == registration["auraPubKey"] + ), f"Could not find Aura public key {registered_aura_pub_key} registered for MC epoch {next_status_epoch}" + assert ( + registered_grandpa_pub_key == registration["grandpaPubKey"] + ), f"Could not find Grandpa public key {registered_grandpa_pub_key} registered for MC epoch {next_status_epoch}" + assert registration["isValid"], f"Registered candidate {candidate.name} is not valid" + + logging.info("Test completed successfully: test_register_candidate") + except AssertionError as e: + logging.error(f"Test failed: {e}") + raise + except Exception as e: + logging.error(f"Unexpected error during test: {e}") + raise + finally: + logging.info("Test execution finished: test_register_candidate") @mark.skip_blockchain("pc_evm", reason="not implemented yet") diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/topology-pool1.json b/dev/local-environment/configurations/cardano/cardano-node-1/topology-pool1.json deleted file mode 100644 index 642653cc3..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-1/topology-pool1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "localRoots": [ - { - "accessPoints": [ - { - "address": "cardano-node-2.partner-chains-demo_default", - "port": 32005 - } - ], - "valency": 1 - }, - { - "accessPoints": [ - { - "address": "cardano-node-3.partner-chains-demo_default", - "port": 32010 - } - ], - "valency": 1 - } - ], - "publicRoots": [ - { - "accessPoints": [], - "advertise": false - } - ] -} \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/config-pool2.json b/dev/local-environment/configurations/cardano/cardano-node-2/config-pool2.json deleted file mode 100644 index f133f44c5..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/config-pool2.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "AlonzoGenesisFile": "/shared/shelley/genesis.alonzo.json", - "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", - "ByronGenesisFile": "/shared/byron/genesis.json", - "ByronGenesisHash": "83de1d7302569ad56cf9139a41e2e11346d4cb4a31c00142557b6ab3fa550761", - "ConwayGenesisFile": "/shared/conway/genesis.conway.json", - "ConwayGenesisHash": "9cc5084f02e27210eacba47af0872e3dba8946ad9460b6072d793e1d2f3987ef", - "EnableP2P": true, - "ExperimentalHardForksEnabled": true, - "ExperimentalProtocolsEnabled": true, - "LastKnownBlockVersion-Alt": 0, - "LastKnownBlockVersion-Major": 3, - "LastKnownBlockVersion-Minor": 1, - "MinNodeVersion": "8.12.0", - "PeerSharing": true, - "Protocol": "Cardano", - "RequiresNetworkMagic": "RequiresMagic", - "NetworkMagic": 42, - "ShelleyGenesisFile": "/shared/shelley/genesis.json", - "ShelleyGenesisHash": "363498d1024f84bb39d3fa9593ce391483cb40d479b87233f868d6e57c3a400d", - "TargetNumberOfActivePeers": 20, - "TargetNumberOfEstablishedPeers": 50, - "TargetNumberOfKnownPeers": 150, - "TargetNumberOfRootPeers": 60, - "TestAllegraHardForkAtEpoch": 0, - "TestAlonzoHardForkAtEpoch": 0, - "TestMaryHardForkAtEpoch": 0, - "TestShelleyHardForkAtEpoch": 0, - "TestBabbageHardForkAtEpoch": 0, - "TestConwayHardForkAtEpoch": 0, - "TraceAcceptPolicy": true, - "TraceBlockFetchClient": false, - "TraceBlockFetchDecisions": false, - "TraceBlockFetchProtocol": false, - "TraceBlockFetchProtocolSerialised": false, - "TraceBlockFetchServer": false, - "TraceChainDb": true, - "TraceChainSyncBlockServer": false, - "TraceChainSyncClient": false, - "TraceChainSyncHeaderServer": false, - "TraceChainSyncProtocol": false, - "TraceConnectionManager": true, - "TraceDNSResolver": true, - "TraceDNSSubscription": true, - "TraceDiffusionInitialization": true, - "TraceErrorPolicy": true, - "TraceForge": true, - "TraceHandshake": true, - "TraceInboundGovernor": true, - "TraceIpSubscription": true, - "TraceLedgerPeers": true, - "TraceLocalChainSyncProtocol": false, - "TraceLocalConnectionManager": true, - "TraceLocalErrorPolicy": true, - "TraceLocalHandshake": true, - "TraceLocalRootPeers": true, - "TraceLocalTxSubmissionProtocol": false, - "TraceLocalTxSubmissionServer": false, - "TraceMempool": true, - "TraceMux": false, - "TracePeerSelection": true, - "TracePeerSelectionActions": true, - "TracePublicRootPeers": true, - "TraceServer": true, - "TraceTxInbound": false, - "TraceTxOutbound": false, - "TraceTxSubmissionProtocol": false, - "TracingVerbosity": "NormalVerbosity", - "TurnOnLogMetrics": true, - "TurnOnLogging": true, - "defaultBackends": [ - "KatipBK" - ], - "defaultScribes": [ - [ - "StdoutSK", - "stdout" - ] - ], - "hasEKG": 12788, - "hasPrometheus": [ - "127.0.0.1", - 12798 - ], - "minSeverity": "Info", - "options": { - "mapBackends": { - "cardano.node.metrics": [ - "EKGViewBK" - ], - "cardano.node.resources": [ - "EKGViewBK" - ] - }, - "mapSubtrace": { - "cardano.node.metrics": { - "subtrace": "Neutral" - } - } - }, - "rotation": { - "rpKeepFilesNum": 10, - "rpLogLimitBytes": 5000000, - "rpMaxAgeHours": 24 - }, - "setupBackends": [ - "KatipBK" - ], - "setupScribes": [ - { - "scFormat": "ScText", - "scKind": "StdoutSK", - "scName": "stdout", - "scRotation": null - } - ] -} \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/entrypoint.sh b/dev/local-environment/configurations/cardano/cardano-node-2/entrypoint.sh deleted file mode 100644 index 768a596fd..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/entrypoint.sh +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/bash - -chmod 600 /keys/* - -echo "Waiting for Node 1 to prepare configuration files and set the target start time..." - -while true; do - if [ -f "/shared/cardano.start" ]; then - target_time=$(cat /shared/cardano.start) - echo "Node 1 is ready. Starting synchronization..." - break - else - sleep 1 - fi -done - -adjusted_target_time=$((target_time - 10)) -current_epoch=$(date +%s%3N) -sleep_milliseconds=$((adjusted_target_time * 1000 - current_epoch)) -sleep_seconds=$(($sleep_milliseconds / 1000)) -remaining_milliseconds=$((sleep_milliseconds % 1000)) -total_sleep_time=$(printf "%.3f" "$(echo "scale=3; $sleep_milliseconds / 1000" | /busybox bc)") -echo "Waiting for $total_sleep_time seconds until 10 seconds before the target time..." -sleep $total_sleep_time -echo "Current time is now: $(date +"%H:%M:%S.%3N"). Starting node..." - -cardano-node run \ ---topology /shared/node-2-topology.json \ ---database-path /data/db \ ---socket-path /data/node.socket \ ---host-addr 0.0.0.0 \ ---port 32005 \ ---config /shared/node-2-config.json \ ---shelley-kes-key /keys/kes.skey \ ---shelley-vrf-key /keys/vrf.skey \ ---shelley-operational-certificate /keys/node.cert & - -touch /shared/cardano-node-2.ready - -wait diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.counter b/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.counter deleted file mode 100644 index 9b4fc145c..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.counter +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "NodeOperationalCertificateIssueCounter", - "description": "Next certificate issue number: 1", - "cborHex": "820158207c0298ad84878a4edaaebbf88abe996983f6caac119d3e005e5a0444c6c736b7" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.skey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.skey deleted file mode 100644 index a550429ac..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakePoolSigningKey_ed25519", - "description": "Stake Pool Operator Signing Key", - "cborHex": "5820d50ffecf682e5b5275e5f867a07f45f18d4286f99b958a34487102bb76b54d7e" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.vkey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.vkey deleted file mode 100644 index 2526d4411..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/cold.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakePoolVerificationKey_ed25519", - "description": "Stake Pool Operator Verification Key", - "cborHex": "58207c0298ad84878a4edaaebbf88abe996983f6caac119d3e005e5a0444c6c736b7" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/kes.skey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/kes.skey deleted file mode 100644 index 001f96521..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/kes.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "KesSigningKey_ed25519_kes_2^6", - "description": "KES Signing Key", - "cborHex": "590260381824c33389f44d23002dd8ef2eaccd347a562a67b8b1f22dd50db2b2c14e3042eaaa9e2c22891ef0b4c18d509971b8d74828d3c26333897057e92d7ff2f63d3f58087cd3d5956635ab9ec4d53d7cbbea82ab2194ff765ac47ba3a25507fd626b257778cb4be185054b06d429f3251b6462147046df7f8df1c72aa25240468ffb29af72500aac9be7c94e5921ab0ac63a5e460c3b79abca3a105cb173bc8b7c7401a8b985fe35557e10d6f6df2bc6d37ed4f758eddc42bbec304f79a5d238981bc370e80d1781dd0969501fccdf85e35b6d205ae52a185bb0c4e5d4571f2f2a0bfd5a6fb7c10c9542e4506d96a27476300897279f15fb63f484df6beae9f27f47df65360020a147c8d64b4c933b95a8183a3672f08e2bfe1c2d46adb895dc0a3aaa1a0c89324e00968ff68d82c1b37304447e2776d06f25bb8fceb50b2805a64e97b4eae3d2812ade2afd087c23c72662a9e6de7b5ca8bdb335a520e6614f1b5416acd72f870f194592da66c0309fd0623fee295f3a308b4ff534d06594982a48e1d2dbe3b6e352d97c544d7b477824628c7756f3a38fa66ed7bf3293ac8da68ce9955801ed1b2059031b07502b0551045cc2c28c9f13e167b11394e56ec4229858123b43bd05894e3e4f3ade40f93febae4239cfecee5868f00403e9060fe072e4e9fa56a1decb24ad93670e0f51b653ee63cb651138dcfbfe4077130a1204ac74f31cd70fa1d0ef267694944f3e95bfe077b7e41670b33398dcf0cba5fdbac2a22da73ca7ced2ce974e4600ab286a60c97abb9d30553d183cefdf1037092510745f66d871837b188139499b8cd80f4eb9559072adde682ef199dc1de54d4c" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/kes.vkey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/kes.vkey deleted file mode 100644 index 1d3552626..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/kes.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "KesVerificationKey_ed25519_kes_2^6", - "description": "KES Verification Key", - "cborHex": "58200d67cc52f41f203f7d5dff8738d713a46a93ab4c00a9d8a163a7339914a6b3d8" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/op.cert b/dev/local-environment/configurations/cardano/cardano-node-2/keys/op.cert deleted file mode 100644 index 754db1a92..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/op.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "NodeOperationalCertificate", - "description": "", - "cborHex": "828458200d67cc52f41f203f7d5dff8738d713a46a93ab4c00a9d8a163a7339914a6b3d800005840f231ba0c8f542399850f57fe8faa73ec3342ad378a2df6b05d1740fc9e94ac1a2b96f58b6219e69618e76786248a515a3359ab0e90f318a3ae43c852e53a920858207c0298ad84878a4edaaebbf88abe996983f6caac119d3e005e5a0444c6c736b7" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.addr b/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.addr deleted file mode 100644 index 33f06f9ed..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.addr +++ /dev/null @@ -1 +0,0 @@ -stake_test1uzujgdl3znllulthgwe9lr9dnddqdg23n3zrdcc484lasvgqcyvjf \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.deleg.cert b/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.deleg.cert deleted file mode 100644 index a29e5d6a2..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.deleg.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "CertificateShelley", - "description": "Stake Delegation Certificate", - "cborHex": "83028200581cb92437f114fffe7d7743b25f8cad9b5a06a1519c4436e3153d7fd831581c3ae3d52682660d1eaffe35747911481ccc9bc7eb4ea7c5b97f22a503" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.skey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.skey deleted file mode 100644 index 2aa14afd6..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakeSigningKeyShelley_ed25519", - "description": "Stake Signing Key", - "cborHex": "582002a0f516f180f7380d7d4ac99a2ab4d21a476893dd4a0c05f41b1546d307f158" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.vkey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.vkey deleted file mode 100644 index 4137bd7df..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-stake.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakeVerificationKeyShelley_ed25519", - "description": "Stake Verification Key", - "cborHex": "58201790608c384b9ca9f9e178b95ec7492edb70b8824beb7de138be6c450e7f1ed3" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-utxo.skey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-utxo.skey deleted file mode 100644 index c525fa281..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-utxo.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PaymentSigningKeyShelley_ed25519", - "description": "Payment Signing Key", - "cborHex": "582034a6ce19688e950b58ea73803a00db61d0505ba10d65756d85f27c37d24c06af" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-utxo.vkey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-utxo.vkey deleted file mode 100644 index d928805e8..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner-utxo.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PaymentVerificationKeyShelley_ed25519", - "description": "Payment Verification Key", - "cborHex": "5820a5ab6e82531cac3480cf7ff360f38a0beeea93cabfdd1ed0495e0423f7875c57" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner.addr b/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner.addr deleted file mode 100644 index 307ab241a..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/owner.addr +++ /dev/null @@ -1 +0,0 @@ -addr_test1qzzt5pwz3pum9xdgxalxyy52m3aqur0n43pcl727l37ggsaeysmlz98lle7hwsajt7x2mx66q6s4r8zyxm3320tlmqcsr7gazd \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/port b/dev/local-environment/configurations/cardano/cardano-node-2/keys/port deleted file mode 100644 index fe2a908fb..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/port +++ /dev/null @@ -1 +0,0 @@ -32010 diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/register.cert b/dev/local-environment/configurations/cardano/cardano-node-2/keys/register.cert deleted file mode 100644 index 225316057..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/register.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "CertificateShelley", - "description": "Stake Pool Registration Certificate", - "cborHex": "8a03581c3ae3d52682660d1eaffe35747911481ccc9bc7eb4ea7c5b97f22a5035820771d4c6125b9dabb6d9136f35b2e82f5404aa4d9a852bb9e5f4f0de8481e68c41b000000e8d4a51000190258d81e820714581de062513bb8ef979efcf5a4c9164ffd9b4355ad50584bc729bcbe09bdb081581cb92437f114fffe7d7743b25f8cad9b5a06a1519c4436e3153d7fd831818400197d0a447f000001f6827821687474703a2f2f6c6f63616c686f73743a33323039392f706f6f6c322e6a736f6e58208367cb2ca03bd318afc0a3b5e0b83ea647d43e01ecf808da952df1f68168044a" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/reward.skey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/reward.skey deleted file mode 100644 index fd686cc20..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/reward.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakeSigningKeyShelley_ed25519", - "description": "Stake Signing Key", - "cborHex": "5820ec3324814482613169c9614769e545c852e9ad85efcab27b8751fdc928b6b486" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/reward.vkey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/reward.vkey deleted file mode 100644 index 6ce8b5742..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/reward.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakeVerificationKeyShelley_ed25519", - "description": "Stake Verification Key", - "cborHex": "5820669c66b7cd9ebbdb68e89599e1335b1b54c5c0a41eb331eaa052b2408526ac20" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/stake-reward.reg.cert b/dev/local-environment/configurations/cardano/cardano-node-2/keys/stake-reward.reg.cert deleted file mode 100644 index d6cf6d8ba..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/stake-reward.reg.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "CertificateShelley", - "description": "Stake Address Registration Certificate", - "cborHex": "82008200581c62513bb8ef979efcf5a4c9164ffd9b4355ad50584bc729bcbe09bdb0" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/stake.reg.cert b/dev/local-environment/configurations/cardano/cardano-node-2/keys/stake.reg.cert deleted file mode 100644 index 7c15a6f75..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/stake.reg.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "CertificateShelley", - "description": "Stake Address Registration Certificate", - "cborHex": "82008200581cb92437f114fffe7d7743b25f8cad9b5a06a1519c4436e3153d7fd831" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/vrf.skey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/vrf.skey deleted file mode 100644 index ebd41cd34..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/vrf.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "VrfSigningKey_PraosVRF", - "description": "VRF Signing Key", - "cborHex": "5840b31cbc09745c9748c7325deb83c5be14de439826f302d8fe89d116fbc67effa57f520568ba12e1ef9bb08da109ec75bbf921c069f459ef641197848dc27368b3" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/keys/vrf.vkey b/dev/local-environment/configurations/cardano/cardano-node-2/keys/vrf.vkey deleted file mode 100644 index 395c81824..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/keys/vrf.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "VrfVerificationKey_PraosVRF", - "description": "VRF Verification Key", - "cborHex": "58207f520568ba12e1ef9bb08da109ec75bbf921c069f459ef641197848dc27368b3" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-2/topology-pool2.json b/dev/local-environment/configurations/cardano/cardano-node-2/topology-pool2.json deleted file mode 100644 index aa718e50e..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-2/topology-pool2.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "localRoots": [ - { - "accessPoints": [ - { - "address": "cardano-node-1.partner-chains-demo_default", - "port": 32000 - } - ], - "valency": 1 - }, - { - "accessPoints": [ - { - "address": "cardano-node-3.partner-chains-demo_default", - "port": 32010 - } - ], - "valency": 1 - } - ], - "publicRoots": [ - { - "accessPoints": [], - "advertise": false - } - ] -} \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/config-pool3.json b/dev/local-environment/configurations/cardano/cardano-node-3/config-pool3.json deleted file mode 100644 index f133f44c5..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/config-pool3.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "AlonzoGenesisFile": "/shared/shelley/genesis.alonzo.json", - "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", - "ByronGenesisFile": "/shared/byron/genesis.json", - "ByronGenesisHash": "83de1d7302569ad56cf9139a41e2e11346d4cb4a31c00142557b6ab3fa550761", - "ConwayGenesisFile": "/shared/conway/genesis.conway.json", - "ConwayGenesisHash": "9cc5084f02e27210eacba47af0872e3dba8946ad9460b6072d793e1d2f3987ef", - "EnableP2P": true, - "ExperimentalHardForksEnabled": true, - "ExperimentalProtocolsEnabled": true, - "LastKnownBlockVersion-Alt": 0, - "LastKnownBlockVersion-Major": 3, - "LastKnownBlockVersion-Minor": 1, - "MinNodeVersion": "8.12.0", - "PeerSharing": true, - "Protocol": "Cardano", - "RequiresNetworkMagic": "RequiresMagic", - "NetworkMagic": 42, - "ShelleyGenesisFile": "/shared/shelley/genesis.json", - "ShelleyGenesisHash": "363498d1024f84bb39d3fa9593ce391483cb40d479b87233f868d6e57c3a400d", - "TargetNumberOfActivePeers": 20, - "TargetNumberOfEstablishedPeers": 50, - "TargetNumberOfKnownPeers": 150, - "TargetNumberOfRootPeers": 60, - "TestAllegraHardForkAtEpoch": 0, - "TestAlonzoHardForkAtEpoch": 0, - "TestMaryHardForkAtEpoch": 0, - "TestShelleyHardForkAtEpoch": 0, - "TestBabbageHardForkAtEpoch": 0, - "TestConwayHardForkAtEpoch": 0, - "TraceAcceptPolicy": true, - "TraceBlockFetchClient": false, - "TraceBlockFetchDecisions": false, - "TraceBlockFetchProtocol": false, - "TraceBlockFetchProtocolSerialised": false, - "TraceBlockFetchServer": false, - "TraceChainDb": true, - "TraceChainSyncBlockServer": false, - "TraceChainSyncClient": false, - "TraceChainSyncHeaderServer": false, - "TraceChainSyncProtocol": false, - "TraceConnectionManager": true, - "TraceDNSResolver": true, - "TraceDNSSubscription": true, - "TraceDiffusionInitialization": true, - "TraceErrorPolicy": true, - "TraceForge": true, - "TraceHandshake": true, - "TraceInboundGovernor": true, - "TraceIpSubscription": true, - "TraceLedgerPeers": true, - "TraceLocalChainSyncProtocol": false, - "TraceLocalConnectionManager": true, - "TraceLocalErrorPolicy": true, - "TraceLocalHandshake": true, - "TraceLocalRootPeers": true, - "TraceLocalTxSubmissionProtocol": false, - "TraceLocalTxSubmissionServer": false, - "TraceMempool": true, - "TraceMux": false, - "TracePeerSelection": true, - "TracePeerSelectionActions": true, - "TracePublicRootPeers": true, - "TraceServer": true, - "TraceTxInbound": false, - "TraceTxOutbound": false, - "TraceTxSubmissionProtocol": false, - "TracingVerbosity": "NormalVerbosity", - "TurnOnLogMetrics": true, - "TurnOnLogging": true, - "defaultBackends": [ - "KatipBK" - ], - "defaultScribes": [ - [ - "StdoutSK", - "stdout" - ] - ], - "hasEKG": 12788, - "hasPrometheus": [ - "127.0.0.1", - 12798 - ], - "minSeverity": "Info", - "options": { - "mapBackends": { - "cardano.node.metrics": [ - "EKGViewBK" - ], - "cardano.node.resources": [ - "EKGViewBK" - ] - }, - "mapSubtrace": { - "cardano.node.metrics": { - "subtrace": "Neutral" - } - } - }, - "rotation": { - "rpKeepFilesNum": 10, - "rpLogLimitBytes": 5000000, - "rpMaxAgeHours": 24 - }, - "setupBackends": [ - "KatipBK" - ], - "setupScribes": [ - { - "scFormat": "ScText", - "scKind": "StdoutSK", - "scName": "stdout", - "scRotation": null - } - ] -} \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/entrypoint.sh b/dev/local-environment/configurations/cardano/cardano-node-3/entrypoint.sh deleted file mode 100644 index 78dd1069a..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/entrypoint.sh +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/bash - -chmod 600 /keys/* - -echo "Waiting for Node 1 to prepare configuration files and set the target start time..." - -while true; do - if [ -f "/shared/cardano.start" ]; then - target_time=$(cat /shared/cardano.start) - echo "Node 1 is ready. Starting synchronization..." - break - else - sleep 1 - fi -done - -adjusted_target_time=$((target_time - 10)) -current_epoch=$(date +%s%3N) -sleep_milliseconds=$((adjusted_target_time * 1000 - current_epoch)) -sleep_seconds=$(($sleep_milliseconds / 1000)) -remaining_milliseconds=$((sleep_milliseconds % 1000)) -total_sleep_time=$(printf "%.3f" "$(echo "scale=3; $sleep_milliseconds / 1000" | /busybox bc)") -echo "Waiting for $total_sleep_time seconds until 10 seconds before the target time..." -sleep $total_sleep_time -echo "Current time is now: $(date +"%H:%M:%S.%3N"). Starting node..." - -cardano-node run \ ---topology /shared/node-3-topology.json \ ---database-path /data/db \ ---socket-path /data/node.socket \ ---host-addr 0.0.0.0 \ ---port 32010 \ ---config /shared/node-3-config.json \ ---shelley-kes-key /keys/kes.skey \ ---shelley-vrf-key /keys/vrf.skey \ ---shelley-operational-certificate /keys/node.cert & - -touch /shared/cardano-node-3.ready - -wait diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.counter b/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.counter deleted file mode 100644 index c0cc37cad..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.counter +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "NodeOperationalCertificateIssueCounter", - "description": "Next certificate issue number: 1", - "cborHex": "820158203174e3fc556e89d039613b8fcf8e2203f93cf173697802ca0bc2a8a8f4717c0c" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.skey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.skey deleted file mode 100644 index f692f544d..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakePoolSigningKey_ed25519", - "description": "Stake Pool Operator Signing Key", - "cborHex": "5820951a02c3c8a6a026f52fdc60071342c045858abc9c84254a16b1c3a2ba5e899c" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.vkey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.vkey deleted file mode 100644 index 00fd59d89..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/cold.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakePoolVerificationKey_ed25519", - "description": "Stake Pool Operator Verification Key", - "cborHex": "58203174e3fc556e89d039613b8fcf8e2203f93cf173697802ca0bc2a8a8f4717c0c" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/kes.skey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/kes.skey deleted file mode 100644 index 2d8bac25e..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/kes.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "KesSigningKey_ed25519_kes_2^6", - "description": "KES Signing Key", - "cborHex": "59026033f237a6e0c08aed678005c0d0ced61cf2c9fca789135c13ea3df6c9e19392a2ca520bf0ff0dc530002d3e1ef66bbb900fe5289a071c21a7de1115fd5f78ca9cd7e86a4a801d14f97f278eb7668de491e2f7bce36361861eeeb9063b601f091eb9dafca6adcc1437b5344e8ce8808b4790974a900647eaf94bf9e8ab7a1fe1014640221e436f9f75c346a41a183424f89da68715653d70c005cacf3bf2f5c676cc05060e51465985e81378d6d205802395c3be8ff362d5a3669395860eb6b450472d88db17975009a61a54d9cbb3a60c91a258870d7204fb844cafc03a5178087da6909d6db8cac4641c29345b6060cc81d1cd0bf0c89f276438a1c69212038547db6e70d3c896220eca9a40492aa5703fcc75363f90b595e06f44f4915d693486d52359e692332560477834276f6154ca6d5cdccc0596e14a917ded341fc4f9eae8dd6c1332c7d02dc42aa254c491bb23041337388afd4362baabbd608196973730e19d024a2fc236157ba1cce8b4540fb20130ac91b796065f9517fdaa575419213dfbc8da8e3cc33bdec86bc39b029452fe0221d79c6030c0d3ff78d46ad3d77597c4e8ae580107827d4a281362f219c9e7738031763dadd294af94d8670fd603071b30293e569cd94f37dcee9286865c77776910c2eef2ddc69e8348a08a65f14601f6ce95aca35ce4d308f9ac89b46ef9801f586ef8dbe625e49a5b36ba3219e90497c627fb74956639d214b0e21de9ab13a85421ffdd5d4b1788df15f22652269b4b7d7500ba0224e03587df5816cde452cd397a043d04ac32410d93e46dd10a3596db7085674fc9f4665ed0de9b2ef7d0a6044aa436501cc66e5e6b8e" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/kes.vkey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/kes.vkey deleted file mode 100644 index 405f14b74..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/kes.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "KesVerificationKey_ed25519_kes_2^6", - "description": "KES Verification Key", - "cborHex": "58205870794f1883efe5ed426e4a8ebc753002fe90a648ed9401d8fec898c70cde02" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/op.cert b/dev/local-environment/configurations/cardano/cardano-node-3/keys/op.cert deleted file mode 100644 index bc647966a..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/op.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "NodeOperationalCertificate", - "description": "", - "cborHex": "828458205870794f1883efe5ed426e4a8ebc753002fe90a648ed9401d8fec898c70cde0200005840a608b4fed6c9aac97570397f5e8f5183724f261c3a125f6b8efde880ca04771fe7f7df7dbc43eaafee385bb73c1f9101aedb3b5417cf7cc61f40f231f7c77a0658203174e3fc556e89d039613b8fcf8e2203f93cf173697802ca0bc2a8a8f4717c0c" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.addr b/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.addr deleted file mode 100644 index c7493a6e0..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.addr +++ /dev/null @@ -1 +0,0 @@ -stake_test1uzxjuewzcyzefgh6e6fkf7j7rhdm05xsqjrccjlayvlgllsvw2zw3 \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.deleg.cert b/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.deleg.cert deleted file mode 100644 index f58484c53..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.deleg.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "CertificateShelley", - "description": "Stake Delegation Certificate", - "cborHex": "83028200581c8d2e65c2c10594a2face9364fa5e1ddbb7d0d004878c4bfd233e8ffe581c2d0de269b0996fdcd8f19f0b6d7d0bf14363984482f181a5a1ccd036" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.skey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.skey deleted file mode 100644 index b666ced01..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakeSigningKeyShelley_ed25519", - "description": "Stake Signing Key", - "cborHex": "58205c9f4ab3b8f7c982f591b24c864783fdef56a5b7c0efcd594526ab52788f25e6" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.vkey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.vkey deleted file mode 100644 index 47c72151b..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-stake.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakeVerificationKeyShelley_ed25519", - "description": "Stake Verification Key", - "cborHex": "58209e4a2c30e8e8bed26ca0deec7710a1ab6f5c3e7933cf0c2b59c394aa104ef72c" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-utxo.skey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-utxo.skey deleted file mode 100644 index eefbcc713..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-utxo.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PaymentSigningKeyShelley_ed25519", - "description": "Payment Signing Key", - "cborHex": "58205f74f32693665da421de9881f10de556460af0abc2146c351b3592b03c8413a3" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-utxo.vkey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-utxo.vkey deleted file mode 100644 index fb3f2ca5b..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner-utxo.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PaymentVerificationKeyShelley_ed25519", - "description": "Payment Verification Key", - "cborHex": "5820816d4845ae6f1c1fd88911e069ad528195ee559cb24009a807bee1826a6f91ef" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner.addr b/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner.addr deleted file mode 100644 index 2fe59783c..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/owner.addr +++ /dev/null @@ -1 +0,0 @@ -addr_test1qzgsvysdnctt3w7ju80pfhwmz56kwgwz6g2z9nwrrztvqxvd9eju9sg9jj304n5nvna9u8wmklgdqpy8339l6ge73llq3ddyyw \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/port b/dev/local-environment/configurations/cardano/cardano-node-3/keys/port deleted file mode 100644 index ffbda029e..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/port +++ /dev/null @@ -1 +0,0 @@ -32015 diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/register.cert b/dev/local-environment/configurations/cardano/cardano-node-3/keys/register.cert deleted file mode 100644 index 7e6e7e11a..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/register.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "CertificateShelley", - "description": "Stake Pool Registration Certificate", - "cborHex": "8a03581c2d0de269b0996fdcd8f19f0b6d7d0bf14363984482f181a5a1ccd036582072255c577e9fa3146e397ffeb45a187c48505a5f950216d7b1224d85dc4fbbac1b000000e8d4a51000190258d81e820714581de0f0834f87e577f514cecdd41db9feabcc42671b4b15cd5a27924e571c81581c8d2e65c2c10594a2face9364fa5e1ddbb7d0d004878c4bfd233e8ffe818400197d0f447f000001f6827821687474703a2f2f6c6f63616c686f73743a33323039392f706f6f6c332e6a736f6e582023808487b3fe1860595e45d52674fac2a7f3c0ffb0394dc76744ed1fc6e8faaf" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/reward.skey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/reward.skey deleted file mode 100644 index b3834bad5..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/reward.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakeSigningKeyShelley_ed25519", - "description": "Stake Signing Key", - "cborHex": "582006c507ee5fec15723e4f2512676f83c3a7243a260e5aa83c1635531a9b76bec4" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/reward.vkey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/reward.vkey deleted file mode 100644 index 228cc9717..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/reward.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakeVerificationKeyShelley_ed25519", - "description": "Stake Verification Key", - "cborHex": "58200aea6851633551085417261a4d0f35af53b24e472c8d094e99e8b3d9289cd5d8" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/stake-reward.reg.cert b/dev/local-environment/configurations/cardano/cardano-node-3/keys/stake-reward.reg.cert deleted file mode 100644 index f87784e6a..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/stake-reward.reg.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "CertificateShelley", - "description": "Stake Address Registration Certificate", - "cborHex": "82008200581cf0834f87e577f514cecdd41db9feabcc42671b4b15cd5a27924e571c" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/stake.reg.cert b/dev/local-environment/configurations/cardano/cardano-node-3/keys/stake.reg.cert deleted file mode 100644 index 71c4dd564..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/stake.reg.cert +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "CertificateShelley", - "description": "Stake Address Registration Certificate", - "cborHex": "82008200581c8d2e65c2c10594a2face9364fa5e1ddbb7d0d004878c4bfd233e8ffe" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/vrf.skey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/vrf.skey deleted file mode 100644 index e825a6c99..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/vrf.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "VrfSigningKey_PraosVRF", - "description": "VRF Signing Key", - "cborHex": "58400038f1f739b610cf48ad120428bd1dac07f30b666662cf44f94eab578f0633224f34fe4377bfde2c2276efa811661b02b0c75975dd0b7d58faea9674f0315cfa" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/keys/vrf.vkey b/dev/local-environment/configurations/cardano/cardano-node-3/keys/vrf.vkey deleted file mode 100644 index 718c8809c..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/keys/vrf.vkey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "VrfVerificationKey_PraosVRF", - "description": "VRF Verification Key", - "cborHex": "58204f34fe4377bfde2c2276efa811661b02b0c75975dd0b7d58faea9674f0315cfa" -} diff --git a/dev/local-environment/configurations/cardano/cardano-node-3/topology-pool3.json b/dev/local-environment/configurations/cardano/cardano-node-3/topology-pool3.json deleted file mode 100644 index 41b545d4c..000000000 --- a/dev/local-environment/configurations/cardano/cardano-node-3/topology-pool3.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "localRoots": [ - { - "accessPoints": [ - { - "address": "cardano-node-1.partner-chains-demo_default", - "port": 32000 - } - ], - "valency": 1 - }, - { - "accessPoints": [ - { - "address": "cardano-node-2.partner-chains-demo_default", - "port": 32005 - } - ], - "valency": 1 - } - ], - "publicRoots": [ - { - "accessPoints": [], - "advertise": false - } - ] -} \ No newline at end of file diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/config-pool1.json b/dev/local-environment/configurations/cardano/config-pool1.json similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/config-pool1.json rename to dev/local-environment/configurations/cardano/config-pool1.json diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/entrypoint.sh b/dev/local-environment/configurations/cardano/entrypoint.sh similarity index 83% rename from dev/local-environment/configurations/cardano/cardano-node-1/entrypoint.sh rename to dev/local-environment/configurations/cardano/entrypoint.sh index c08db00e0..2d5360007 100644 --- a/dev/local-environment/configurations/cardano/cardano-node-1/entrypoint.sh +++ b/dev/local-environment/configurations/cardano/entrypoint.sh @@ -39,20 +39,12 @@ alonzo_hash=$(/bin/cardano-cli latest genesis hash --genesis /shared/shelley/gen conway_hash=$(/bin/cardano-cli latest genesis hash --genesis /shared/conway/genesis.conway.json) /busybox sed "s/\"ByronGenesisHash\": \"[^\"]*\"/\"ByronGenesisHash\": \"$byron_hash\"/" /shared/node-1-config.json.base > /shared/node-1-config.json.base.byron -/busybox sed "s/\"ByronGenesisHash\": \"[^\"]*\"/\"ByronGenesisHash\": \"$byron_hash\"/" /shared/node-2-config.json.base > /shared/node-2-config.json.base.byron -/busybox sed "s/\"ByronGenesisHash\": \"[^\"]*\"/\"ByronGenesisHash\": \"$byron_hash\"/" /shared/node-3-config.json.base > /shared/node-3-config.json.base.byron /busybox sed "s/\"ByronGenesisHash\": \"[^\"]*\"/\"ByronGenesisHash\": \"$byron_hash\"/" /shared/db-sync-config.json.base > /shared/db-sync-config.json.base.byron /busybox sed "s/\"ShelleyGenesisHash\": \"[^\"]*\"/\"ShelleyGenesisHash\": \"$shelley_hash\"/" /shared/node-1-config.json.base.byron > /shared/node-1-config.base.shelley -/busybox sed "s/\"ShelleyGenesisHash\": \"[^\"]*\"/\"ShelleyGenesisHash\": \"$shelley_hash\"/" /shared/node-2-config.json.base.byron > /shared/node-2-config.base.shelley -/busybox sed "s/\"ShelleyGenesisHash\": \"[^\"]*\"/\"ShelleyGenesisHash\": \"$shelley_hash\"/" /shared/node-3-config.json.base.byron > /shared/node-3-config.base.shelley /busybox sed "s/\"ShelleyGenesisHash\": \"[^\"]*\"/\"ShelleyGenesisHash\": \"$shelley_hash\"/" /shared/db-sync-config.json.base.byron > /shared/db-sync-config.base.shelley /busybox sed "s/\"AlonzoGenesisHash\": \"[^\"]*\"/\"AlonzoGenesisHash\": \"$alonzo_hash\"/" /shared/node-1-config.base.shelley > /shared/node-1-config.json.base.conway -/busybox sed "s/\"AlonzoGenesisHash\": \"[^\"]*\"/\"AlonzoGenesisHash\": \"$alonzo_hash\"/" /shared/node-2-config.base.shelley > /shared/node-2-config.json.base.conway -/busybox sed "s/\"AlonzoGenesisHash\": \"[^\"]*\"/\"AlonzoGenesisHash\": \"$alonzo_hash\"/" /shared/node-3-config.base.shelley > /shared/node-3-config.json.base.conway /busybox sed "s/\"AlonzoGenesisHash\": \"[^\"]*\"/\"AlonzoGenesisHash\": \"$alonzo_hash\"/" /shared/db-sync-config.base.shelley > /shared/db-sync-config.json.base.conway /busybox sed "s/\"ConwayGenesisHash\": \"[^\"]*\"/\"ConwayGenesisHash\": \"$conway_hash\"/" /shared/node-1-config.json.base.conway > /shared/node-1-config.json -/busybox sed "s/\"ConwayGenesisHash\": \"[^\"]*\"/\"ConwayGenesisHash\": \"$conway_hash\"/" /shared/node-2-config.json.base.conway > /shared/node-2-config.json -/busybox sed "s/\"ConwayGenesisHash\": \"[^\"]*\"/\"ConwayGenesisHash\": \"$conway_hash\"/" /shared/node-3-config.json.base.conway > /shared/node-3-config.json /busybox sed "s/\"ConwayGenesisHash\": \"[^\"]*\"/\"ConwayGenesisHash\": \"$conway_hash\"/" /shared/db-sync-config.json.base.conway > /shared/db-sync-config.json echo "Updated ByronGenesisHash value in config files to: $byron_hash" @@ -85,15 +77,13 @@ cardano-node run \ --shelley-vrf-key /keys/vrf.skey \ --shelley-operational-certificate /keys/node.cert & -touch /shared/cardano-node-1.ready - -echo "Waiting for node 2 and node 3 to start..." +echo "Waiting for node.socket..." while true; do - if [ -f "/shared/cardano-node-2.ready" ] && [ -f "/shared/cardano-node-3.ready" ]; then + if [ -e "/data/node.socket" ]; then break else - sleep 10 + sleep 1 fi done @@ -146,9 +136,6 @@ cardano-cli latest transaction sign \ cat /data/tx.signed -echo "Transaction prepared, waiting 20 seconds for other nodes to start..." -sleep 20 - echo "Submitting transaction..." cardano-cli latest transaction submit \ --tx-file /data/tx.signed \ @@ -195,7 +182,7 @@ cat /shared/genesis.utxo echo "Saving placeholder values for NATIVE_TOKEN_POLICY_ID, NATIVE_TOKEN_ASSET_NAME, and ILLIQUID_SUPPLY_VALIDATOR_ADDRESS to /shared:" echo 'ada83ddd029614381f00e28de0922ab0dec6983ea9dd29ae20eef9b4' > /shared/NATIVE_TOKEN_POLICY_ID echo '5043546f6b656e44656d6f' > /shared/NATIVE_TOKEN_ASSET_NAME -echo 'addr_test1wrhvtvx3f0g9wv9rx8kfqc60jva3e07nqujk2cspekv4mqs9rjdvz' > /shared/ILLIQUID_SUPPLY_VALIDATOR_ADDRESS +echo 'addr_test1wrhvtvx3f0g9wv9rx8kfqc60jva3e07nqujk2cspekv4mqs9rjdvz' > /shared/ILLIQUID_SUPPLY_VALIDATOR_ADDRESS touch /shared/cardano.ready diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/cold.counter b/dev/local-environment/configurations/cardano/keys/cold.counter similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/cold.counter rename to dev/local-environment/configurations/cardano/keys/cold.counter diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/cold.skey b/dev/local-environment/configurations/cardano/keys/cold.skey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/cold.skey rename to dev/local-environment/configurations/cardano/keys/cold.skey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/cold.vkey b/dev/local-environment/configurations/cardano/keys/cold.vkey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/cold.vkey rename to dev/local-environment/configurations/cardano/keys/cold.vkey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/funded_address.skey b/dev/local-environment/configurations/cardano/keys/funded_address.skey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/funded_address.skey rename to dev/local-environment/configurations/cardano/keys/funded_address.skey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/funded_address.vkey b/dev/local-environment/configurations/cardano/keys/funded_address.vkey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/funded_address.vkey rename to dev/local-environment/configurations/cardano/keys/funded_address.vkey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/kes.skey b/dev/local-environment/configurations/cardano/keys/kes.skey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/kes.skey rename to dev/local-environment/configurations/cardano/keys/kes.skey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/kes.vkey b/dev/local-environment/configurations/cardano/keys/kes.vkey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/kes.vkey rename to dev/local-environment/configurations/cardano/keys/kes.vkey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/op.cert b/dev/local-environment/configurations/cardano/keys/op.cert similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/op.cert rename to dev/local-environment/configurations/cardano/keys/op.cert diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-stake.addr b/dev/local-environment/configurations/cardano/keys/owner-stake.addr similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-stake.addr rename to dev/local-environment/configurations/cardano/keys/owner-stake.addr diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-stake.deleg.cert b/dev/local-environment/configurations/cardano/keys/owner-stake.deleg.cert similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-stake.deleg.cert rename to dev/local-environment/configurations/cardano/keys/owner-stake.deleg.cert diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-stake.skey b/dev/local-environment/configurations/cardano/keys/owner-stake.skey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-stake.skey rename to dev/local-environment/configurations/cardano/keys/owner-stake.skey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-stake.vkey b/dev/local-environment/configurations/cardano/keys/owner-stake.vkey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-stake.vkey rename to dev/local-environment/configurations/cardano/keys/owner-stake.vkey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-utxo.skey b/dev/local-environment/configurations/cardano/keys/owner-utxo.skey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-utxo.skey rename to dev/local-environment/configurations/cardano/keys/owner-utxo.skey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-utxo.vkey b/dev/local-environment/configurations/cardano/keys/owner-utxo.vkey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/owner-utxo.vkey rename to dev/local-environment/configurations/cardano/keys/owner-utxo.vkey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/owner.addr b/dev/local-environment/configurations/cardano/keys/owner.addr similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/owner.addr rename to dev/local-environment/configurations/cardano/keys/owner.addr diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/port b/dev/local-environment/configurations/cardano/keys/port similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/port rename to dev/local-environment/configurations/cardano/keys/port diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/register.cert b/dev/local-environment/configurations/cardano/keys/register.cert similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/register.cert rename to dev/local-environment/configurations/cardano/keys/register.cert diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/reward.skey b/dev/local-environment/configurations/cardano/keys/reward.skey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/reward.skey rename to dev/local-environment/configurations/cardano/keys/reward.skey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/reward.vkey b/dev/local-environment/configurations/cardano/keys/reward.vkey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/reward.vkey rename to dev/local-environment/configurations/cardano/keys/reward.vkey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/stake-reward.reg.cert b/dev/local-environment/configurations/cardano/keys/stake-reward.reg.cert similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/stake-reward.reg.cert rename to dev/local-environment/configurations/cardano/keys/stake-reward.reg.cert diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/stake.reg.cert b/dev/local-environment/configurations/cardano/keys/stake.reg.cert similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/stake.reg.cert rename to dev/local-environment/configurations/cardano/keys/stake.reg.cert diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/vrf.skey b/dev/local-environment/configurations/cardano/keys/vrf.skey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/vrf.skey rename to dev/local-environment/configurations/cardano/keys/vrf.skey diff --git a/dev/local-environment/configurations/cardano/cardano-node-1/keys/vrf.vkey b/dev/local-environment/configurations/cardano/keys/vrf.vkey similarity index 100% rename from dev/local-environment/configurations/cardano/cardano-node-1/keys/vrf.vkey rename to dev/local-environment/configurations/cardano/keys/vrf.vkey diff --git a/dev/local-environment/configurations/cardano/topology-pool1.json b/dev/local-environment/configurations/cardano/topology-pool1.json new file mode 100644 index 000000000..5bf5ecaab --- /dev/null +++ b/dev/local-environment/configurations/cardano/topology-pool1.json @@ -0,0 +1,9 @@ +{ + "localRoots": [], + "publicRoots": [ + { + "accessPoints": [], + "advertise": false + } + ] +} diff --git a/dev/local-environment/configurations/genesis/byron/genesis.json b/dev/local-environment/configurations/genesis/byron/genesis.json index 9d609dd68..e177fbcf0 100644 --- a/dev/local-environment/configurations/genesis/byron/genesis.json +++ b/dev/local-environment/configurations/genesis/byron/genesis.json @@ -1,7 +1,5 @@ { "bootStakeholders": { "2944b52e7773f56388382cd54f2c687e9769d988c5ff13e249b4da15": 1 - , "38d155323b0c1c761fcd5429ddf4d028663594fcc474fe8c1b0f5ca4": 1 - , "42090ce672754e4e8b6df76d79dfb3ada7040f1acce996715e69896f": 1 } , "heavyDelegation": { "2944b52e7773f56388382cd54f2c687e9769d988c5ff13e249b4da15": @@ -13,24 +11,6 @@ , "cert": "7377108dc4398bf02bad39c583e9a026c489b7d37f5e1b85bf1258bb536785640ecc52d691cafb510ccd12b954871502cbb6162ee6a7fff615e396972bef2009" } - , "38d155323b0c1c761fcd5429ddf4d028663594fcc474fe8c1b0f5ca4": - { "omega": 0 - , "issuerPk": - "gdu2yPZT8DKdCP01icG37ZOcN0r0fzelUh/2+mnknfxE7zk7Q3cL2N7Q/2BosO2z9w0FOCOWXvHi0wNKHvYhMQ==" - , "delegatePk": - "YwSI8scESVUVlZSP1giUMu0yw1j2PY5ibSOfZszsPpNBc1MIk/hXjYHeH1D6R7kKQBV6PXHpWvY1sX2zoScMyw==" - , "cert": - "8d9a5ef9e01ee8d382605289f8807de84e77e5913c5303848a01b5d2120b61b9bd736093a7fdb5337d464242574f0fc61c9d000a1685882ded20c9745c0f7b0c" - } - , "42090ce672754e4e8b6df76d79dfb3ada7040f1acce996715e69896f": - { "omega": 0 - , "issuerPk": - "ZmeMK1IG0GXXqVhyE3OIo/NqIYzgFhwY1MW9YgdEZI0xd3Be3W+b1AYYfIuB2U4V7sZRXgqSmYgr/5Ogf9/YGQ==" - , "delegatePk": - "Lf/idM1q2GtVcrZfmAq/sr1qyKAVqSbrKnfzOtCA15BlsdACRgS3mC78I4hBUeNYeBKCIEeh9mxFuXQbRNuCPQ==" - , "cert": - "00f4931448473df3fa41d24557e9c79ef9a76ae01afb6b52507a837fa31446f2065860ffa080cfd2877bffd0121b86d6b52f3d7bf6a450b0bbcfe9c90726540c" - } } , "startTime": 1719856178 , "nonAvvmBalances": @@ -64,4 +44,4 @@ } , "protocolConsts": { "k": 10 , "protocolMagic": 42 } , "avvmDistr": {} -} \ No newline at end of file +} diff --git a/dev/local-environment/configurations/genesis/shelley/genesis.json b/dev/local-environment/configurations/genesis/shelley/genesis.json index 4e041c182..d4096c785 100644 --- a/dev/local-environment/configurations/genesis/shelley/genesis.json +++ b/dev/local-environment/configurations/genesis/shelley/genesis.json @@ -1,23 +1,13 @@ { - "activeSlotsCoeff": 0.8, + "activeSlotsCoeff": 0.4, "epochLength": 120, "genDelegs": { "4090c4d9554ab626a30a393ae3dd1fde40336e0515b1d4f430d6ae92": { "delegate": "145375666292cb07f76d583a87e2ca670c0f0a6df9fac87b9c730e6b", "vrf": "a98e88c05a5213d70a4562686afaefaaa9c1b25e5ab13502d7fb59a56c997365" - }, - "4d155b0043d217ba214ac5185830c4a3a2c12138d0ce75f6ca6fdd46": { - "delegate": "8ebe81d6fdaea9a69e34510479ea190ca38c28fe64e282d274910427", - "vrf": "cf900e7709bd19d05cc3a79391df97dc57d2303193682ea2b44a79e6af47f519" - }, - "bd025e4687723e07c8f011458ef72fd29a3d49ed5ebfd91913617854": { - "delegate": "63487d53beeb05ae2679654f0428555adf39f05745dd8bd5694b2682", - "vrf": "3700fc4b7df160c211fd172bde8975e9e8afb04dd10f9a1ada40c6ea0448baf4" } }, "initialFunds": { - "00207e498c990230dd7db797eaa2de8b8c9fce9b522b5a0f7d658c2974d27cb9a1a408b81239b55ec03f6e004deffcc094e7252d5c45743784": 3480000000000, - "005281ccb1fceb0a3b038602500080dd771cccd6800dc753c9786ff5d3f441c3ef7ef4a8ade039f4f4224b9ae494125bbcff284df64e8e73d8": 3480000000000, "008a75c2002312f380c7ceaf3b18d5ee5aa8a3d309ef40c80fca9006b2d9267776d1289412d8d3c09599393044730deba14feb31f52b0e6ef2": 3480000000000, "6029390bd65da533dc5d03f5e1bf6fd8114c41d3cefdab7aae10e4d9ef": 29993040000000000 }, @@ -54,38 +44,6 @@ "slotsPerKESPeriod": 129600, "staking": { "pools": { - "2d0de269b0996fdcd8f19f0b6d7d0bf14363984482f181a5a1ccd036": { - "cost": 0, - "margin": 0, - "metadata": null, - "owners": [], - "pledge": 0, - "publicKey": "2d0de269b0996fdcd8f19f0b6d7d0bf14363984482f181a5a1ccd036", - "relays": [], - "rewardAccount": { - "credential": { - "keyHash": "f0834f87e577f514cecdd41db9feabcc42671b4b15cd5a27924e571c" - }, - "network": "Testnet" - }, - "vrf": "72255c577e9fa3146e397ffeb45a187c48505a5f950216d7b1224d85dc4fbbac" - }, - "3ae3d52682660d1eaffe35747911481ccc9bc7eb4ea7c5b97f22a503": { - "cost": 0, - "margin": 0, - "metadata": null, - "owners": [], - "pledge": 0, - "publicKey": "3ae3d52682660d1eaffe35747911481ccc9bc7eb4ea7c5b97f22a503", - "relays": [], - "rewardAccount": { - "credential": { - "keyHash": "62513bb8ef979efcf5a4c9164ffd9b4355ad50584bc729bcbe09bdb0" - }, - "network": "Testnet" - }, - "vrf": "771d4c6125b9dabb6d9136f35b2e82f5404aa4d9a852bb9e5f4f0de8481e68c4" - }, "bcf4107cca955239a101ef4a99795bd49ba4fde68ff82c913f547a7a": { "cost": 0, "margin": 0, @@ -104,9 +62,7 @@ } }, "stake": { - "d27cb9a1a408b81239b55ec03f6e004deffcc094e7252d5c45743784": "3ae3d52682660d1eaffe35747911481ccc9bc7eb4ea7c5b97f22a503", - "d9267776d1289412d8d3c09599393044730deba14feb31f52b0e6ef2": "bcf4107cca955239a101ef4a99795bd49ba4fde68ff82c913f547a7a", - "f441c3ef7ef4a8ade039f4f4224b9ae494125bbcff284df64e8e73d8": "2d0de269b0996fdcd8f19f0b6d7d0bf14363984482f181a5a1ccd036" + "d9267776d1289412d8d3c09599393044730deba14feb31f52b0e6ef2": "bcf4107cca955239a101ef4a99795bd49ba4fde68ff82c913f547a7a" } }, "systemStart": "2024-07-01T17:49:38Z", diff --git a/dev/local-environment/configurations/ogmios/entrypoint.sh b/dev/local-environment/configurations/ogmios/entrypoint.sh index 616a04b11..208af61d3 100644 --- a/dev/local-environment/configurations/ogmios/entrypoint.sh +++ b/dev/local-environment/configurations/ogmios/entrypoint.sh @@ -17,4 +17,4 @@ exec /bin/ogmios \ --node-config=/shared/node-1-config.json \ --node-socket=/node-ipc/node.socket & -wait \ No newline at end of file +wait diff --git a/dev/local-environment/configurations/pc-contracts-cli/entrypoint.sh b/dev/local-environment/configurations/pc-contracts-cli/entrypoint.sh index 8ef91af20..d62d49eeb 100644 --- a/dev/local-environment/configurations/pc-contracts-cli/entrypoint.sh +++ b/dev/local-environment/configurations/pc-contracts-cli/entrypoint.sh @@ -81,6 +81,8 @@ echo "Initializing governance authority ..." export GENESIS_UTXO=$(cat /shared/genesis.utxo) +echo "Genesis UTXO: $GENESIS_UTXO" + ./pc-contracts-cli init-governance \ --network testnet \ --kupo-host kupo --kupo-port $KUPO_PORT \ diff --git a/dev/local-environment/modules/cardano.txt b/dev/local-environment/modules/cardano.txt index e31536a56..c65f5d428 100644 --- a/dev/local-environment/modules/cardano.txt +++ b/dev/local-environment/modules/cardano.txt @@ -8,17 +8,15 @@ - shared-volume:/shared - ./configurations/busybox:/busybox - ./configurations/pc-contracts-cli:/pc-contracts-cli - - ./configurations/cardano/cardano-node-1/entrypoint.sh:/entrypoint.sh - - ./configurations/cardano/cardano-node-1/topology-pool1.json:/shared/node-1-topology.json - - ./configurations/cardano/cardano-node-1/keys/cold.vkey:/keys/cold.vkey - - ./configurations/cardano/cardano-node-1/keys/kes.skey:/keys/kes.skey - - ./configurations/cardano/cardano-node-1/keys/vrf.skey:/keys/vrf.skey - - ./configurations/cardano/cardano-node-1/keys/funded_address.skey:/keys/funded_address.skey - - ./configurations/cardano/cardano-node-1/keys/funded_address.vkey:/keys/funded_address.vkey - - ./configurations/cardano/cardano-node-1/keys/op.cert:/keys/node.cert - - ./configurations/cardano/cardano-node-1/config-pool1.json:/shared/node-1-config.json.base - - ./configurations/cardano/cardano-node-2/config-pool2.json:/shared/node-2-config.json.base - - ./configurations/cardano/cardano-node-3/config-pool3.json:/shared/node-3-config.json.base + - ./configurations/cardano/entrypoint.sh:/entrypoint.sh + - ./configurations/cardano/topology-pool1.json:/shared/node-1-topology.json + - ./configurations/cardano/keys/cold.vkey:/keys/cold.vkey + - ./configurations/cardano/keys/kes.skey:/keys/kes.skey + - ./configurations/cardano/keys/vrf.skey:/keys/vrf.skey + - ./configurations/cardano/keys/funded_address.skey:/keys/funded_address.skey + - ./configurations/cardano/keys/funded_address.vkey:/keys/funded_address.vkey + - ./configurations/cardano/keys/op.cert:/keys/node.cert + - ./configurations/cardano/config-pool1.json:/shared/node-1-config.json.base - ./configurations/db-sync/config.json:/shared/db-sync-config.json.base - ./configurations/genesis/byron/genesis.json:/shared/byron/genesis.json.base - ./configurations/genesis/shelley/genesis.json:/shared/shelley/genesis.json.base @@ -32,43 +30,3 @@ entrypoint: ["/bin/bash", "/entrypoint.sh"] ports: - "32000:32000" - - cardano-node-2: - container_name: cardano-node-2 - image: ${CARDANO_IMAGE} - platform: linux/amd64 - volumes: - - cardano-node-2-data:/data - - shared-volume:/shared - - ./configurations/busybox:/busybox - - ./configurations/cardano/cardano-node-2/entrypoint.sh:/entrypoint.sh - - ./configurations/cardano/cardano-node-2/topology-pool2.json:/shared/node-2-topology.json - - ./configurations/cardano/cardano-node-2/keys/cold.vkey:/keys/cold.vkey - - ./configurations/cardano/cardano-node-2/keys/kes.skey:/keys/kes.skey - - ./configurations/cardano/cardano-node-2/keys/vrf.skey:/keys/vrf.skey - - ./configurations/cardano/cardano-node-2/keys/op.cert:/keys/node.cert - environment: - - CARDANO_NODE_SOCKET_PATH=/data/node.socket - entrypoint: ["/bin/bash", "/entrypoint.sh"] - ports: - - "32005:32005" - - cardano-node-3: - container_name: cardano-node-3 - image: ${CARDANO_IMAGE} - platform: linux/amd64 - volumes: - - cardano-node-3-data:/data - - shared-volume:/shared - - ./configurations/busybox:/busybox - - ./configurations/cardano/cardano-node-3/entrypoint.sh:/entrypoint.sh - - ./configurations/cardano/cardano-node-3/topology-pool3.json:/shared/node-3-topology.json - - ./configurations/cardano/cardano-node-3/keys/cold.vkey:/keys/cold.vkey - - ./configurations/cardano/cardano-node-3/keys/kes.skey:/keys/kes.skey - - ./configurations/cardano/cardano-node-3/keys/vrf.skey:/keys/vrf.skey - - ./configurations/cardano/cardano-node-3/keys/op.cert:/keys/node.cert - environment: - - CARDANO_NODE_SOCKET_PATH=/data/node.socket - entrypoint: ["/bin/bash", "/entrypoint.sh"] - ports: - - "32010:32010" diff --git a/dev/local-environment/modules/pc-contracts-cli.txt b/dev/local-environment/modules/pc-contracts-cli.txt index cd53c469e..3296eb0f7 100644 --- a/dev/local-environment/modules/pc-contracts-cli.txt +++ b/dev/local-environment/modules/pc-contracts-cli.txt @@ -7,9 +7,9 @@ - shared-volume:/shared - cardano-node-1-data:/data - ./configurations/genesis/shelley/genesis-utxo.skey:/shared/shelley/genesis-utxo.skey - - ./configurations/cardano/cardano-node-1/keys/funded_address.skey:/keys/funded_address.skey - - ./configurations/cardano/cardano-node-1/keys/funded_address.vkey:/keys/funded_address.vkey - - ./configurations/cardano/cardano-node-1/keys/owner-stake.skey:/keys/owner-stake.skey + - ./configurations/cardano/keys/funded_address.skey:/keys/funded_address.skey + - ./configurations/cardano/keys/funded_address.vkey:/keys/funded_address.vkey + - ./configurations/cardano/keys/owner-stake.skey:/keys/owner-stake.skey - ./configurations/pc-contracts-cli/entrypoint.sh:/entrypoint.sh - ./configurations/pc-contracts-cli/overrides:/overrides/ - ./configurations/partner-chains-nodes/:/partner-chains-nodes/ diff --git a/dev/local-environment/modules/volumes.txt b/dev/local-environment/modules/volumes.txt index 7c6ceff1c..28eb27a39 100644 --- a/dev/local-environment/modules/volumes.txt +++ b/dev/local-environment/modules/volumes.txt @@ -1,8 +1,6 @@ volumes: cardano-node-1-data: {} - cardano-node-2-data: {} - cardano-node-3-data: {} shared-volume: {} db-sync-state-dir: {} partner-chains-node-1-data: {}