Resolve merge conflict: Accept BEEFY keys for nodes 1 and 2 in permissioned candidates

- Keep BEEFY keys (beef:) for nodes 1 and 2 in permissioned_candidates.csv
- Remove nodes 3, 4, 6 from permissioned candidates (they will be registered candidates)
- This aligns with the BEEFY testing setup where only nodes 1-2 get BEEFY keys initially

Author: ladamesny

dev/local-environment/configurations/partner-chains-nodes/partner-chains-node-2/entrypoint.sh

@@ -23,6 +23,7 @@ export MC__FIRST_EPOCH_TIMESTAMP_MILLIS=$(cat /shared/MC__FIRST_EPOCH_TIMESTAMP_
   --keystore-path=/keystore \
   --unsafe-rpc-external \
   --rpc-port=9934 \
+  -lbeefy=trace \
   --rpc-cors=all \
   --prometheus-port=9616 \
   --prometheus-external \

dev/local-environment/configurations/partner-chains-setup/entrypoint.sh

@@ -71,19 +71,19 @@ 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 25 \
+    --registered-candidates-count 5 \
     --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 = 25, R = 5)!"
 else
     echo "Couldn't insert D-parameter..."
     exit 1
 fi
 
 # sidechain.vkey:aura.vkey:grandpa.vkey
-echo "Inserting permissioned candidates for 'node-1' and 'node-2'..."
+echo "Inserting permissioned candidates for nodes 1, 2, 3, 4, and 6..."
 
 node1_sidechain_vkey=$(cat /partner-chains-nodes/partner-chains-node-1/keys/sidechain.vkey)
 node1_aura_vkey=$(cat /partner-chains-nodes/partner-chains-node-1/keys/aura.vkey)
@@ -95,6 +95,18 @@ node2_aura_vkey=$(cat /partner-chains-nodes/partner-chains-node-2/keys/aura.vkey
 node2_beefy_vkey=$(cat /partner-chains-nodes/partner-chains-node-2/keys/beefy.vkey)
 node2_grandpa_vkey=$(cat /partner-chains-nodes/partner-chains-node-2/keys/grandpa.vkey)
 
+node3_sidechain_vkey=$(cat /partner-chains-nodes/partner-chains-node-3/keys/sidechain.vkey)
+node3_aura_vkey=$(cat /partner-chains-nodes/partner-chains-node-3/keys/aura.vkey)
+node3_grandpa_vkey=$(cat /partner-chains-nodes/partner-chains-node-3/keys/grandpa.vkey)
+
+node4_sidechain_vkey=$(cat /partner-chains-nodes/partner-chains-node-4/keys/sidechain.vkey)
+node4_aura_vkey=$(cat /partner-chains-nodes/partner-chains-node-4/keys/aura.vkey)
+node4_grandpa_vkey=$(cat /partner-chains-nodes/partner-chains-node-4/keys/grandpa.vkey)
+
+node6_sidechain_vkey=$(cat /partner-chains-nodes/partner-chains-node-6/keys/sidechain.vkey)
+node6_aura_vkey=$(cat /partner-chains-nodes/partner-chains-node-6/keys/aura.vkey)
+node6_grandpa_vkey=$(cat /partner-chains-nodes/partner-chains-node-6/keys/grandpa.vkey)
+
 cat <<EOF > permissioned_candidates.csv
 $node1_sidechain_vkey,aura:$node1_aura_vkey,beef:$node1_beefy_vkey,gran:$node1_grandpa_vkey
 $node2_sidechain_vkey,aura:$node2_aura_vkey,beef:$node2_beefy_vkey,gran:$node2_grandpa_vkey
@@ -107,9 +119,9 @@ EOF
     --payment-key-file /keys/funded_address.skey
 
 if [ $? -eq 0 ]; then
-    echo "Permissioned candidates 'node-1' and 'node-2' inserted successfully!"
+    echo "Permissioned candidates for nodes 1, 2, 3, 4, and 6 inserted successfully!"
 else
-    echo "Permission candidates 'node-1' and 'node-2' failed to be added..."
+    echo "Permission candidates for nodes 1, 2, 3, 4, and 6 failed to be added..."
     exit 1
 fi
 

dev/local-environment/modules/partner-chains-nodes.txt

@@ -150,3 +150,34 @@
         limits:
           cpus: ${CPU_PARTNER_CHAINS_NODE:-}
           memory: ${MEM_PARTNER_CHAINS_NODE:-}
+
+  partner-chains-node-6:
+    container_name: partner-chains-node-6
+    image: ${PARTNER_CHAINS_NODE_IMAGE}
+    platform: linux/amd64
+    volumes:
+      - partner-chains-node-6-data:/data
+      - shared-volume:/shared
+      - ./configurations/partner-chains-nodes/partner-chains-node-6/entrypoint.sh:/entrypoint.sh
+      - ./configurations/partner-chains-nodes/partner-chains-node-6/keystore:/keystore
+      - ./configurations/partner-chains-nodes/partner-chains-node-6/network:/network
+    environment:
+      DB_SYNC_POSTGRES_CONNECTION_STRING: "postgres://postgres:${POSTGRES_PASSWORD}@postgres:${POSTGRES_PORT}/cexplorer"
+      CARDANO_DATA_SOURCE: "db-sync"
+      CARDANO_SECURITY_PARAMETER: "5"
+      CARDANO_ACTIVE_SLOTS_COEFF: "0.4"
+      MC__FIRST_EPOCH_NUMBER: "0"
+      MC__FIRST_SLOT_NUMBER: "0"
+      MC__EPOCH_DURATION_MILLIS: "120000"
+      BLOCK_STABILITY_MARGIN: "0"
+    entrypoint: ["/bin/bash", "/entrypoint.sh"]
+    ports:
+      - "30338:30338"
+      - "9938:9938"
+      - "9620:9620"
+    restart: always
+    deploy:
+      resources:
+        limits:
+          cpus: ${CPU_PARTNER_CHAINS_NODE:-}
+          memory: ${MEM_PARTNER_CHAINS_NODE:-}

dev/local-environment/modules/volumes.txt

@@ -8,5 +8,6 @@ volumes:
   partner-chains-node-3-data: {}
   partner-chains-node-4-data: {}
   partner-chains-node-5-data: {}
+  partner-chains-node-6-data: {}
   ogmios-data: {}
   ipc: {}