Merge branch 'main' into dependabot/pip/catalyst-gateway/tests/api_te…

…sts/idna-3.7

.config/dictionaries/project.dic

@@ -104,6 +104,7 @@ netifas
 netkey
 nextest
 Oleksandr
+onboarded
 oneshot
 openapi
 opentelemetry

catalyst-gateway/bin/src/cardano/registration/61284.cddl → catalyst-gateway/bin/src/cardano/cip36_registration/cip36_registration.cddl

@@ -1,5 +1,10 @@
-registration_cbor = {
-  61284: key_registration,
+
+key_registration = {
+  1 : [+delegation] / legacy_key_registration,
+  2 : $stake_credential,
+  3 : $payment_address,
+  4 : $nonce,
+  ? 5 : $voting_purpose .default 0
 }
 
 $cip36_vote_pub_key /= bytes .size 32
@@ -12,22 +17,5 @@ delegation = [$cip36_vote_pub_key, $weight]
 
 
 $stake_credential /= $staking_pub_key
-$stake_witness /= $ed25519_signature
 ; A stake key credential, not tagged for backward compatibility
 $staking_pub_key /= bytes .size 32
-; Witness for a stake key credential, not tagged for backward compatibility
-$ed25519_signature /= bytes .size 64
-
-
-key_registration = {
-  1 : [+delegation] / legacy_key_registration,
-  2 : $stake_credential,
-  3 : $payment_address,
-  4 : $nonce,
-  ? 5 : $voting_purpose .default 0
-}
-
-
-registration_witness = {
-  1 : $stake_witness
-}

catalyst-gateway/bin/src/cardano/registration/61285.cddl → catalyst-gateway/bin/src/cardano/cip36_registration/cip36_witness.cddl

@@ -1,12 +1,7 @@
-registration_cbor = {
-  61285: registration_witness
+registration_witness = {
+  1 : $stake_witness
 }
 
 $stake_witness /= $ed25519_signature
-
 ; Witness for a stake key credential, not tagged for backward compatibility
-$ed25519_signature /= bytes .size 64
-
-registration_witness = {
-  1 : $stake_witness
-}
+$ed25519_signature /= bytes .size 64