|
94 | 94 | # Some code paths may not use the era bundled cli |
95 | 95 | # shellcheck disable=SC2034 |
96 | 96 | CARDANO_CLI=("''${CARDANO_CLI_NO_ERA[@]}" "''${ERA_CMD:+$ERA_CMD}") |
| 97 | +
|
| 98 | + # Use a cardano-cli breaking change marker to handle version specific breaking changes |
| 99 | + if [ "$(printf "%s\n10.11.0.0" "$("''${CARDANO_CLI_NO_ERA[@]}" --version)" | sort -V | head -n 1)" = "10.11.0.0" ]; then |
| 100 | + # shellcheck disable=SC2034 |
| 101 | + CARDANO_CLI_BREAKING="true" |
| 102 | + else |
| 103 | + # shellcheck disable=SC2034 |
| 104 | + CARDANO_CLI_BREAKING="false" |
| 105 | + fi |
97 | 106 | ''; |
98 | 107 |
|
99 | 108 | updateProposalTemplate = '' |
@@ -166,11 +175,19 @@ in { |
166 | 175 | function create_proposal { |
167 | 176 | TARGET_EPOCH="$1" |
168 | 177 |
|
169 | | - "''${CARDANO_CLI_NO_ERA[@]}" legacy governance create-update-proposal \ |
170 | | - --epoch "$TARGET_EPOCH" \ |
171 | | - "''${PROPOSAL_ARGS[@]}" \ |
172 | | - "''${PROPOSAL_KEY_ARGS[@]}" \ |
173 | | - --out-file update.proposal |
| 178 | + if [ "$CARDANO_CLI_BREAKING" = "true" ]; then |
| 179 | + "''${CARDANO_CLI_NO_ERA[@]}" compatible "''${ERA_CMD:-alonzo}" governance action create-protocol-parameters-update \ |
| 180 | + --epoch "$TARGET_EPOCH" \ |
| 181 | + "''${PROPOSAL_ARGS[@]}" \ |
| 182 | + "''${PROPOSAL_KEY_ARGS[@]}" \ |
| 183 | + --out-file update.proposal |
| 184 | + else |
| 185 | + "''${CARDANO_CLI_NO_ERA[@]}" legacy governance create-update-proposal \ |
| 186 | + --epoch "$TARGET_EPOCH" \ |
| 187 | + "''${PROPOSAL_ARGS[@]}" \ |
| 188 | + "''${PROPOSAL_KEY_ARGS[@]}" \ |
| 189 | + --out-file update.proposal |
| 190 | + fi |
174 | 191 |
|
175 | 192 | "''${CARDANO_CLI_NO_ERA[@]}" compatible "''${ERA_CMD:-alonzo}" transaction signed-transaction \ |
176 | 193 | --tx-in "$TXIN" \ |
@@ -2058,8 +2075,8 @@ in { |
2058 | 2075 | ${selectCardanoCli} |
2059 | 2076 |
|
2060 | 2077 | "''${CARDANO_CLI_NO_ERA[@]}" latest governance committee create-hot-key-authorization-certificate \ |
2061 | | - --cold-verification-key-file "$CC_DIR"/cc-"$INDEX"-cold.vkey \ |
2062 | | - --hot-verification-key-file "$CC_DIR"/cc-"$INDEX"-hot.vkey \ |
| 2078 | + --cold-verification-key-file "$(decrypt_check "$CC_DIR"/cc-"$INDEX"-cold.vkey)" \ |
| 2079 | + --hot-verification-key-file "$(decrypt_check "$CC_DIR"/cc-"$INDEX"-hot.vkey)" \ |
2063 | 2080 | --out-file cc-"$INDEX"-reg.cert |
2064 | 2081 |
|
2065 | 2082 | WITNESSES=2 |
@@ -2090,7 +2107,7 @@ in { |
2090 | 2107 | --tx-body-file tx-cc-"$INDEX".txbody \ |
2091 | 2108 | --out-file tx-cc-"$INDEX".txsigned \ |
2092 | 2109 | --signing-key-file "$(decrypt_check "$PAYMENT_KEY".skey)" \ |
2093 | | - --signing-key-file "$CC_DIR"/cc-"$INDEX"-cold.skey |
| 2110 | + --signing-key-file "$(decrypt_check "$CC_DIR"/cc-"$INDEX"-cold.skey)" |
2094 | 2111 |
|
2095 | 2112 | fd --type file . "$CC_DIR"/ --exec bash -c 'encrypt_check {}' |
2096 | 2113 |
|
@@ -2121,12 +2138,12 @@ in { |
2121 | 2138 | mkdir -p "$CC_DIR" |
2122 | 2139 |
|
2123 | 2140 | "''${CARDANO_CLI_NO_ERA[@]}" latest governance committee key-gen-cold \ |
2124 | | - --verification-key-file "$CC_DIR"/cc-"$INDEX"-cold.vkey \ |
2125 | | - --signing-key-file "$CC_DIR"/cc-"$INDEX"-cold.skey |
| 2141 | + --verification-key-file "$(decrypt_check "$CC_DIR"/cc-"$INDEX"-cold.vkey)" \ |
| 2142 | + --signing-key-file "$(decrypt_check "$CC_DIR"/cc-"$INDEX"-cold.skey)" |
2126 | 2143 |
|
2127 | 2144 | "''${CARDANO_CLI_NO_ERA[@]}" latest governance committee key-gen-hot \ |
2128 | | - --verification-key-file "$CC_DIR"/cc-"$INDEX"-hot.vkey \ |
2129 | | - --signing-key-file "$CC_DIR"/cc-"$INDEX"-hot.skey |
| 2145 | + --verification-key-file "$(decrypt_check "$CC_DIR"/cc-"$INDEX"-hot.vkey)" \ |
| 2146 | + --signing-key-file "$(decrypt-check "$CC_DIR"/cc-"$INDEX"-hot.skey)" |
2130 | 2147 | ''; |
2131 | 2148 | }; |
2132 | 2149 |
|
|
0 commit comments