diff --git a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/cold.skey b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/cold.skey index 1b3739b365..a550429ace 100644 --- a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/cold.skey +++ b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/cold.skey @@ -1,5 +1,5 @@ { "type": "StakePoolSigningKey_ed25519", "description": "Stake Pool Operator Signing Key", - "cborHex": "58202ec3d8f330880819d153a91866ac6f898cd4fde7f2cc0134fb57b38b746b6438" -} \ No newline at end of file + "cborHex": "5820d50ffecf682e5b5275e5f867a07f45f18d4286f99b958a34487102bb76b54d7e" +} diff --git a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/cold.vkey b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/cold.vkey index 5651bbadda..2526d4411c 100644 --- a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/cold.vkey +++ b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/cold.vkey @@ -1,5 +1,5 @@ { "type": "StakePoolVerificationKey_ed25519", "description": "Stake Pool Operator Verification Key", - "cborHex": "582008accadc8b60a5f519ee74ab144ada6993709f5479152f9217688889d8a2db2e" + "cborHex": "58207c0298ad84878a4edaaebbf88abe996983f6caac119d3e005e5a0444c6c736b7" } diff --git a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/payment.addr b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-4/keys/payment.addr deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/cold.skey b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/cold.skey index a550429ace..f692f544d9 100644 --- a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/cold.skey +++ b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/cold.skey @@ -1,5 +1,5 @@ { "type": "StakePoolSigningKey_ed25519", "description": "Stake Pool Operator Signing Key", - "cborHex": "5820d50ffecf682e5b5275e5f867a07f45f18d4286f99b958a34487102bb76b54d7e" + "cborHex": "5820951a02c3c8a6a026f52fdc60071342c045858abc9c84254a16b1c3a2ba5e899c" } diff --git a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/cold.vkey b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/cold.vkey index 2526d4411c..00fd59d897 100644 --- a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/cold.vkey +++ b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/cold.vkey @@ -1,5 +1,5 @@ { "type": "StakePoolVerificationKey_ed25519", "description": "Stake Pool Operator Verification Key", - "cborHex": "58207c0298ad84878a4edaaebbf88abe996983f6caac119d3e005e5a0444c6c736b7" + "cborHex": "58203174e3fc556e89d039613b8fcf8e2203f93cf173697802ca0bc2a8a8f4717c0c" } diff --git a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/payment.addr b/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/payment.addr deleted file mode 100644 index 307ab241a6..0000000000 --- a/dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-5/keys/payment.addr +++ /dev/null @@ -1 +0,0 @@ -addr_test1qzzt5pwz3pum9xdgxalxyy52m3aqur0n43pcl727l37ggsaeysmlz98lle7hwsajt7x2mx66q6s4r8zyxm3320tlmqcsr7gazd \ No newline at end of file diff --git a/dev/local-environment/configurations/partner-chains-setup/entrypoint.sh b/dev/local-environment/configurations/partner-chains-setup/entrypoint.sh index 046a8acd77..070eb478a9 100644 --- a/dev/local-environment/configurations/partner-chains-setup/entrypoint.sh +++ b/dev/local-environment/configurations/partner-chains-setup/entrypoint.sh @@ -71,12 +71,12 @@ echo "Inserting D parameter..." ./partner-chains-node smart-contracts upsert-d-parameter \ --ogmios-url http://ogmios:$OGMIOS_PORT \ --genesis-utxo $GENESIS_UTXO \ - --permissioned-candidates-count 3 \ - --registered-candidates-count 2 \ + --permissioned-candidates-count 6 \ + --registered-candidates-count 4 \ --payment-key-file /keys/funded_address.skey if [ $? -eq 0 ]; then - echo "Successfully inserted D-parameter (P = 3, R = 2)!" + echo "Successfully inserted D-parameter (P = 6, R = 4)!" else echo "Couldn't insert D-parameter..." exit 1 @@ -151,6 +151,46 @@ else exit 1 fi +echo "Inserting registered candidate Eve..." + +# Prepare eve registration values +eve_utxo=$(cat /shared/eve.utxo) +eve_mainchain_signing_key=$(jq -r '.cborHex | .[4:]' /partner-chains-nodes/partner-chains-node-5/keys/cold.skey) +eve_sidechain_signing_key=$(cat /partner-chains-nodes/partner-chains-node-5/keys/sidechain.skey) + +# Process registration signatures for eve +eve_output=$(./partner-chains-node registration-signatures \ + --genesis-utxo $GENESIS_UTXO \ + --mainchain-signing-key $eve_mainchain_signing_key \ + --sidechain-signing-key $eve_sidechain_signing_key \ + --registration-utxo $eve_utxo) + +# Extract signatures and keys from eve output +eve_spo_public_key=$(echo "$eve_output" | jq -r ".spo_public_key") +eve_spo_signature=$(echo "$eve_output" | jq -r ".spo_signature") +eve_sidechain_public_key=$(echo "$eve_output" | jq -r ".sidechain_public_key") +eve_sidechain_signature=$(echo "$eve_output" | jq -r ".sidechain_signature") +eve_aura_vkey=$(cat /partner-chains-nodes/partner-chains-node-5/keys/aura.vkey) +eve_grandpa_vkey=$(cat /partner-chains-nodes/partner-chains-node-5/keys/grandpa.vkey) + +# Register eve +./partner-chains-node smart-contracts register \ + --ogmios-url http://ogmios:$OGMIOS_PORT \ + --genesis-utxo $GENESIS_UTXO \ + --spo-public-key $eve_spo_public_key \ + --spo-signature $eve_spo_signature \ + --sidechain-public-keys $eve_sidechain_public_key:$eve_aura_vkey:$eve_grandpa_vkey \ + --sidechain-signature $eve_sidechain_signature \ + --registration-utxo $eve_utxo \ + --payment-key-file /partner-chains-nodes/partner-chains-node-5/keys/payment.skey + +if [ $? -eq 0 ]; then + echo "Registered candidate eve inserted successfully!" +else + echo "Registration for eve failed." + exit 1 +fi + echo "Generating chain-spec.json file for Partner chain Nodes..." ./partner-chains-node build-spec --disable-default-bootnode > chain-spec.json diff --git a/e2e-tests/secrets/substrate/local/keys/dave/cold.skey b/e2e-tests/secrets/substrate/local/keys/dave/cold.skey index a1999927c2..a550429ace 100644 --- a/e2e-tests/secrets/substrate/local/keys/dave/cold.skey +++ b/e2e-tests/secrets/substrate/local/keys/dave/cold.skey @@ -1,5 +1,5 @@ { - "type": "StakePoolSigningKey_ed25519", - "description": "Stake Pool Operator Signing Key", - "cborHex": "58202ec3d8f330880819d153a91866ac6f898cd4fde7f2cc0134fb57b38b746b6438" -} \ No newline at end of file + "type": "StakePoolSigningKey_ed25519", + "description": "Stake Pool Operator Signing Key", + "cborHex": "5820d50ffecf682e5b5275e5f867a07f45f18d4286f99b958a34487102bb76b54d7e" +} diff --git a/e2e-tests/secrets/substrate/local/keys/dave/cold.vkey b/e2e-tests/secrets/substrate/local/keys/dave/cold.vkey index 49ce1c1429..2526d4411c 100644 --- a/e2e-tests/secrets/substrate/local/keys/dave/cold.vkey +++ b/e2e-tests/secrets/substrate/local/keys/dave/cold.vkey @@ -1,5 +1,5 @@ { - "type": "StakePoolVerificationKey_ed25519", - "description": "Stake Pool Operator Verification Key", - "cborHex": "582008accadc8b60a5f519ee74ab144ada6993709f5479152f9217688889d8a2db2e" -} \ No newline at end of file + "type": "StakePoolVerificationKey_ed25519", + "description": "Stake Pool Operator Verification Key", + "cborHex": "58207c0298ad84878a4edaaebbf88abe996983f6caac119d3e005e5a0444c6c736b7" +} diff --git a/e2e-tests/secrets/substrate/local/keys/eve/cold.skey b/e2e-tests/secrets/substrate/local/keys/eve/cold.skey index 9b39da05b2..f692f544d9 100644 --- a/e2e-tests/secrets/substrate/local/keys/eve/cold.skey +++ b/e2e-tests/secrets/substrate/local/keys/eve/cold.skey @@ -1,5 +1,5 @@ { - "type": "StakePoolSigningKey_ed25519", - "description": "Stake Pool Operator Signing Key", - "cborHex": "5820d50ffecf682e5b5275e5f867a07f45f18d4286f99b958a34487102bb76b54d7e" -} \ No newline at end of file + "type": "StakePoolSigningKey_ed25519", + "description": "Stake Pool Operator Signing Key", + "cborHex": "5820951a02c3c8a6a026f52fdc60071342c045858abc9c84254a16b1c3a2ba5e899c" +} diff --git a/e2e-tests/secrets/substrate/local/keys/eve/cold.vkey b/e2e-tests/secrets/substrate/local/keys/eve/cold.vkey index 2d9b9b2832..00fd59d897 100644 --- a/e2e-tests/secrets/substrate/local/keys/eve/cold.vkey +++ b/e2e-tests/secrets/substrate/local/keys/eve/cold.vkey @@ -1,5 +1,5 @@ { - "type": "StakePoolVerificationKey_ed25519", - "description": "Stake Pool Operator Verification Key", - "cborHex": "58207c0298ad84878a4edaaebbf88abe996983f6caac119d3e005e5a0444c6c736b7" -} \ No newline at end of file + "type": "StakePoolVerificationKey_ed25519", + "description": "Stake Pool Operator Verification Key", + "cborHex": "58203174e3fc556e89d039613b8fcf8e2203f93cf173697802ca0bc2a8a8f4717c0c" +}