Skip to content

Commit b1f8d91

Browse files
gitmachtlgitmachtl
committed
Update 2025-11 - New ICC members and CLI 10.12.0.0
- Added all the new ICC members - Corrected changes introduced by CLI 10.11.0.0 - Way faster Governance Actions Summary voting value calculation
1 parent acf99eb commit b1f8d91

File tree

11 files changed

+43
-33
lines changed

11 files changed

+43
-33
lines changed

‎cardano/mainnet/00_common.sh‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,20 @@ case "${network,,}" in
197197
_ccMemberColdHashNames='{
198198
"scriptHash-349e55f83e9af24813e6cb368df6a80d38951b2a334dfcdf26815558": "CAC",
199199
"scriptHash-84aebcfd3e00d0f87af918fc4b5e00135f407e379893df7e7d392c6a": "ECC",
200-
"scriptHash-b6012034ba0a7e4afbbf2c7a1432f8824aee5299a48e38e41a952686": "CF",
201-
"scriptHash-ce8b37a72b178a37bbd3236daa7b2c158c9d3604e7aa667e6c6004b7": "Emurgo",
202-
"scriptHash-df0e83bde65416dade5b1f97e7f115cc1ff999550ad968850783fe50": "IOG",
203-
"scriptHash-e8165b3328027ee0d74b1f07298cb092fd99aa7697a1436f5997f625": "CJC",
204-
"scriptHash-f0dc2c00d92a45521267be2d5de1c485f6f9d14466d7e16062897cf7": "ICC",
205-
"scriptHash-1980dbf1ad624b0cb5410359b5ab14d008561994a6c2b6c53fabec00": "TV"
200+
"scriptHash-9cc3f387623f45dae6a68b7096b0c2e403d8601a82dc40221ead41e2": "CJC",
201+
"scriptHash-9752e4306e5ae864441d21064f791174c8b626199b8e7a45f9e03b45": "Ace",
202+
"scriptHash-1980dbf1ad624b0cb5410359b5ab14d008561994a6c2b6c53fabec00": "Ting",
203+
"keyHash-13493790d9b03483a1e1e684ea4faf1ee48a58f402574e7f2246f4d4": "Phil",
204+
"keyHash-dc0d6ef49590eb6880a50a00adde17596e6d76f7159572fa1ff85f2a": "KtorZ",
205+
"---": "old ones",
206+
"scriptHash-b6012034ba0a7e4afbbf2c7a1432f8824aee5299a48e38e41a952686": "CF",
207+
"scriptHash-ce8b37a72b178a37bbd3236daa7b2c158c9d3604e7aa667e6c6004b7": "Emurgo",
208+
"scriptHash-df0e83bde65416dade5b1f97e7f115cc1ff999550ad968850783fe50": "IOG",
209+
"scriptHash-e8165b3328027ee0d74b1f07298cb092fd99aa7697a1436f5997f625": "CJC",
210+
"scriptHash-f0dc2c00d92a45521267be2d5de1c485f6f9d14466d7e16062897cf7": "ICC"
206211
}'
207212
;;
208213

209-
210214
"preprod"|"pre-prod" )
211215
network="PreProd"
212216
_magicparam="--testnet-magic 1"
@@ -323,7 +327,7 @@ if [[ "${adahandleAPI: -1}" == "/" ]]; then adahandleAPI=${adahandleAPI%?}; fi #
323327
if [[ "${magicparam}" == "" || ${addrformat} == "" || ${byronToShelleyEpochs} == "" ]]; then majorError "The 'magicparam', 'addrformat' or 'byronToShelleyEpochs' is not set!\nOr maybe you have set the wrong parameter network=\"${network}\" ?\nList of preconfigured network-names: ${networknames}"; exit 1; fi
324328

325329
#Don't allow to overwrite the needed Versions, so we set it after the overwrite part
326-
minCliVersion="10.9.0" #minimum allowed cli version for this script-collection version
330+
minCliVersion="10.12.0" #minimum allowed cli version for this script-collection version
327331
maxCliVersion="99.99.9" #maximum allowed cli version, 99.99.9 = no limit so far
328332
minNodeVersion="10.3.1" #minimum allowed node version for this script-collection version
329333
maxNodeVersion="99.99.9" #maximum allowed node version, 99.99.9 = no limit so far
@@ -1199,7 +1203,8 @@ convert_actionBech2UTXO() {
11991203
if [[ "${govActionBech}" != "gov_action1"* ]]; then exit 1; fi
12001204
local govActionBechHex=$(${bech32_bin} <<< "${govActionBech}" 2> /dev/null)
12011205
local govActionUTXO=${govActionBechHex:0:64}
1202-
local govActionIdx=$(bc <<< "obase=10;ibase=16;${govActionBechHex:64}")
1206+
local govActionIdxHex=${govActionBechHex:64}
1207+
local govActionIdx=$(bc <<< "obase=10;ibase=16;${govActionIdxHex^^}")
12031208
echo -n "${govActionUTXO}#${govActionIdx}"
12041209
}
12051210
#-------------------------------------------------------

‎cardano/mainnet/03b_regStakingAddrCert.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,15 +552,14 @@ if [[ -f "${fromAddr}.hwsfile" && -f "${stakeAddr}.hwsfile" && "${paymentName}"
552552
start_HwWallet; checkError "$?"; if [ $? -ne 0 ]; then exit $?; fi
553553

554554
tmp=$(${cardanohwcli} transaction witness --tx-file ${txBodyFile} --hw-signing-file ${fromAddr}.hwsfile --hw-signing-file ${stakeAddr}.hwsfile --change-output-key-file ${fromAddr}.hwsfile --change-output-key-file ${stakeAddr}.hwsfile ${magicparam} --out-file ${txWitnessFile} --out-file ${txWitnessFile2} 2> /dev/stdout)
555-
checkError "$?"; if [ $? -ne 0 ]; then exit $?; fi
555+
if [ $? -ne 0 ]; then echo -e "\e[35m${tmp}\e[0m\n"; exit 1; fi
556556
if [[ "${tmp^^}" =~ (ERROR|DISCONNECT) ]]; then echo -e "\e[35m${tmp}\e[0m\n"; exit 1; else echo -ne "\e[0mWitnessed ... "; fi
557557

558558
${cardanocli} ${cliEra} transaction assemble --tx-body-file ${txBodyFile} --witness-file ${txWitnessFile} --witness-file ${txWitnessFile2} --out-file ${txFile}
559559
checkError "$?"; if [ $? -ne 0 ]; then exit $?; fi
560560
echo -e "Assembled ... \e[32mDONE\e[0m\n";
561561

562-
elif [[ -f "${fromAddr}.skey" ]]; then #with the normal cli skey
563-
562+
elif [[ -f "${fromAddr}.skey" && -f "${stakeAddr}.skey" ]]; then #with the normal cli skey
564563

565564
#read the needed signing keys into ram and sign the transaction
566565
skeyJSON1=$(read_skeyFILE "${fromAddr}.skey"); if [ $? -ne 0 ]; then echo -e "\e[35m${skeyJSON1}\e[0m\n"; exit 1; else echo -e "\e[32mOK\e[0m\n"; fi

‎cardano/mainnet/24a_genVote.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ case ${workMode} in
307307

308308
#Get the alwaysNoConfidence stake power (counts as a no-power in all actions, except the NoConfidence-Action, there it counts to the yes-power)
309309
dRepStakeDistributionJSON=$(${cardanocli} ${cliEra} query drep-stake-distribution --all-dreps 2> /dev/stdout) #only used for the dRepPowerAlwaysNoConfidence calculation
310-
dRepPowerAlwaysNoConfidence=$(jq -r '(.[] | select(.[0] == "drep-alwaysNoConfidence") | .[1]) // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null)
310+
#dRepPowerAlwaysNoConfidence=$(jq -r '(.[] | select(.[0] == "drep-alwaysNoConfidence") | .[1]) // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null)
311+
dRepPowerAlwaysNoConfidence=$(jq -r '."drep-alwaysNoConfidence" // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null) #changed with cli 10.11.x.x or so, was an array before
311312

312313
#Get new Pool Stake Distribution including default delgation, for quorum calculation later on - available with this command since cli 10.2.0.0
313314
showProcessAnimation "Query Stakepool-Distribution Info: " &

‎cardano/mainnet/24c_queryVote.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ case ${workMode} in
352352

353353
#Get the alwaysNoConfidence stake power (counts as a no-power in all actions, except the NoConfidence-Action, there it counts to the yes-power)
354354
dRepStakeDistributionJSON=$(${cardanocli} ${cliEra} query drep-stake-distribution --all-dreps 2> /dev/stdout) #only used for the dRepPowerAlwaysNoConfidence calculation
355-
dRepPowerAlwaysNoConfidence=$(jq -r '(.[] | select(.[0] == "drep-alwaysNoConfidence") | .[1]) // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null)
355+
dRepPowerAlwaysNoConfidence=$(jq -r '."drep-alwaysNoConfidence" // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null) #changed with cli 10.11.x.x or so, was an array before
356356

357357
#Get new Pool Stake Distribution including default delgation, for quorum calculation later on - available with this command since cli 10.2.0.0
358358
showProcessAnimation "Query Stakepool-Distribution Info: " &

‎cardano/mainnet/cardano-signer‎

699 KB
Binary file not shown.

‎cardano/mainnet/sha256sum_sposcripts.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
b2fde6e865c936ec9670d8139a1958c86c879954df8db2f5ba950f986b1f385a 00_common.sh
1+
577f23191b6adf251bf5a691d1ae6e42851f488ceb5bf6c112b5e8564efaadd4 00_common.sh
22
3f5685d008f29a31085082f72670de881ecb89b7c549b260e1a0771bd6c69ecf 01_claimRewards.sh
33
8f98ef3f0983ed12ba714390b9a528ccf06b41f51dfcd1d52c50d86f038455c8 01_protectKey.sh
44
0bf24a499ccc8f6665cc9b5b2e40f8af3f653656b23cd5e3eb99e27ac9279678 01_queryAddress.sh
@@ -7,7 +7,7 @@ b2fde6e865c936ec9670d8139a1958c86c879954df8db2f5ba950f986b1f385a 00_common.sh
77
b18308fa50ddab8a35c96310f2c92ee4c81b3fdc7fe4c4c5e36522c039805f91 01_workOffline.sh
88
760b6678180fbd0ca7b95f782bc4558399de415cb95c4175c6609a472e1c102f 02_genPaymentAddrOnly.sh
99
d5022c70f02ce9ee4432339f0efec65f61faacc4f40437dbf9b6559c5f3e82dd 03a_genStakingPaymentAddr.sh
10-
3e18044f0ea04bf40523a4a4f9901d8d298551a565289cb9e3f08be267d69d4e 03b_regStakingAddrCert.sh
10+
5bf6b64e30af9dbd57b7d6b17c4a551dc11936b6dd2809ee5d922a925a9d2941 03b_regStakingAddrCert.sh
1111
c81bbde557680eb37e3f85b311d0832c77d05133c608dd7b1ae34614e401a56a 03c_checkStakingAddrOnChain.sh
1212
15af161057c9bd652eea0617ee988059ba4764e34b2c87aac7fb8d4dab217896 04a_genNodeKeys.sh
1313
f522d1670169e11f26b22397e5d9b73292983d29209692a9852e63769bef2303 04b_genVRFKeys.sh
@@ -43,12 +43,12 @@ b3dc04d57dab6532375c2c7fe7857e775e877e6e9cb6dac1bf30a08e58b3f2ef 23b_genComHotK
4343
b5840cb93c592ea51b4f253cdd7d0643c610d03cdb2decd94a3ce0e8d152d5d1 23c_regComAuthCert.sh
4444
d7d4753a6066fd792d9b46238c4cfe365e0ba342b3bdf891048f8795df8962cd 23d_checkComOnChain.sh
4545
18cb3611f363ac081280e52cefffe47eaa7b9038f281acee9517fe62287633b1 23e_retComColdKeys.sh
46-
12b6d56db067b4f8ca47ab9cba24997fabfa3a0b3dad1a4aa2caac3b8a8be321 24a_genVote.sh
46+
9e0b690507477c0abc0bb512ffe5ec97a0a2419ca4f02d5848f54390a4c9f700 24a_genVote.sh
4747
4ba6a4e6bdab571335df54921de7b569aa6ddd475550607cbf3c50e69e6ac791 24b_regVote.sh
48-
946b897babf79e53ccbd24cd2afb541e0f908117bcf6635c780b841814c9351f 24c_queryVote.sh
48+
dd8d4203e054a855ff99b023a23e43efb30cde89598acd957e992a8ff796064b 24c_queryVote.sh
4949
0004e496a15589cd01d936c70aef59b17aa378c8f64783789224d579f7a016a1 25a_genAction.sh
5050
087fae298f192aa01db38ac403227f12c33eed553e5594fc146d252e28afa0a7 25b_regAction.sh
5151
b7b13da87eeafe5dbd0f0d1810e2f4e69dc02c8c1e0697f8c7847740dc73a4fb bech32
5252
6c5df521e2848c6767f878bbe81a7ec077ff8d1b0dbd01819aea45e1701d5a4a token-metadata-creator
5353
0ae1c4ae68451994edceafc2282af23ef5f1fdd641efb907c769ef135c701e03 catalyst-toolbox
54-
423ca8e676ba54a62baff377e99ed1ebcd68677ccf8baa44734d1abdf114e42a cardano-signer
54+
708d2d0e0c75d2747911a4219db5d61071061db26839c7cfc942fe128c615699 cardano-signer

‎cardano/testnet/00_common.sh‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,20 @@ case "${network,,}" in
197197
_ccMemberColdHashNames='{
198198
"scriptHash-349e55f83e9af24813e6cb368df6a80d38951b2a334dfcdf26815558": "CAC",
199199
"scriptHash-84aebcfd3e00d0f87af918fc4b5e00135f407e379893df7e7d392c6a": "ECC",
200-
"scriptHash-b6012034ba0a7e4afbbf2c7a1432f8824aee5299a48e38e41a952686": "CF",
201-
"scriptHash-ce8b37a72b178a37bbd3236daa7b2c158c9d3604e7aa667e6c6004b7": "Emurgo",
202-
"scriptHash-df0e83bde65416dade5b1f97e7f115cc1ff999550ad968850783fe50": "IOG",
203-
"scriptHash-e8165b3328027ee0d74b1f07298cb092fd99aa7697a1436f5997f625": "CJC",
204-
"scriptHash-f0dc2c00d92a45521267be2d5de1c485f6f9d14466d7e16062897cf7": "ICC",
205-
"scriptHash-1980dbf1ad624b0cb5410359b5ab14d008561994a6c2b6c53fabec00": "TV"
200+
"scriptHash-9cc3f387623f45dae6a68b7096b0c2e403d8601a82dc40221ead41e2": "CJC",
201+
"scriptHash-9752e4306e5ae864441d21064f791174c8b626199b8e7a45f9e03b45": "Ace",
202+
"scriptHash-1980dbf1ad624b0cb5410359b5ab14d008561994a6c2b6c53fabec00": "Ting",
203+
"keyHash-13493790d9b03483a1e1e684ea4faf1ee48a58f402574e7f2246f4d4": "Phil",
204+
"keyHash-dc0d6ef49590eb6880a50a00adde17596e6d76f7159572fa1ff85f2a": "KtorZ",
205+
"---": "old ones",
206+
"scriptHash-b6012034ba0a7e4afbbf2c7a1432f8824aee5299a48e38e41a952686": "CF",
207+
"scriptHash-ce8b37a72b178a37bbd3236daa7b2c158c9d3604e7aa667e6c6004b7": "Emurgo",
208+
"scriptHash-df0e83bde65416dade5b1f97e7f115cc1ff999550ad968850783fe50": "IOG",
209+
"scriptHash-e8165b3328027ee0d74b1f07298cb092fd99aa7697a1436f5997f625": "CJC",
210+
"scriptHash-f0dc2c00d92a45521267be2d5de1c485f6f9d14466d7e16062897cf7": "ICC"
206211
}'
207212
;;
208213

209-
210214
"preprod"|"pre-prod" )
211215
network="PreProd"
212216
_magicparam="--testnet-magic 1"
@@ -323,7 +327,7 @@ if [[ "${adahandleAPI: -1}" == "/" ]]; then adahandleAPI=${adahandleAPI%?}; fi #
323327
if [[ "${magicparam}" == "" || ${addrformat} == "" || ${byronToShelleyEpochs} == "" ]]; then majorError "The 'magicparam', 'addrformat' or 'byronToShelleyEpochs' is not set!\nOr maybe you have set the wrong parameter network=\"${network}\" ?\nList of preconfigured network-names: ${networknames}"; exit 1; fi
324328

325329
#Don't allow to overwrite the needed Versions, so we set it after the overwrite part
326-
minCliVersion="10.9.0" #minimum allowed cli version for this script-collection version
330+
minCliVersion="10.12.0" #minimum allowed cli version for this script-collection version
327331
maxCliVersion="99.99.9" #maximum allowed cli version, 99.99.9 = no limit so far
328332
minNodeVersion="10.3.1" #minimum allowed node version for this script-collection version
329333
maxNodeVersion="99.99.9" #maximum allowed node version, 99.99.9 = no limit so far
@@ -1199,7 +1203,8 @@ convert_actionBech2UTXO() {
11991203
if [[ "${govActionBech}" != "gov_action1"* ]]; then exit 1; fi
12001204
local govActionBechHex=$(${bech32_bin} <<< "${govActionBech}" 2> /dev/null)
12011205
local govActionUTXO=${govActionBechHex:0:64}
1202-
local govActionIdx=$(bc <<< "obase=10;ibase=16;${govActionBechHex:64}")
1206+
local govActionIdxHex=${govActionBechHex:64}
1207+
local govActionIdx=$(bc <<< "obase=10;ibase=16;${govActionIdxHex^^}")
12031208
echo -n "${govActionUTXO}#${govActionIdx}"
12041209
}
12051210
#-------------------------------------------------------

‎cardano/testnet/03b_regStakingAddrCert.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,15 +552,14 @@ if [[ -f "${fromAddr}.hwsfile" && -f "${stakeAddr}.hwsfile" && "${paymentName}"
552552
start_HwWallet; checkError "$?"; if [ $? -ne 0 ]; then exit $?; fi
553553

554554
tmp=$(${cardanohwcli} transaction witness --tx-file ${txBodyFile} --hw-signing-file ${fromAddr}.hwsfile --hw-signing-file ${stakeAddr}.hwsfile --change-output-key-file ${fromAddr}.hwsfile --change-output-key-file ${stakeAddr}.hwsfile ${magicparam} --out-file ${txWitnessFile} --out-file ${txWitnessFile2} 2> /dev/stdout)
555-
checkError "$?"; if [ $? -ne 0 ]; then exit $?; fi
555+
if [ $? -ne 0 ]; then echo -e "\e[35m${tmp}\e[0m\n"; exit 1; fi
556556
if [[ "${tmp^^}" =~ (ERROR|DISCONNECT) ]]; then echo -e "\e[35m${tmp}\e[0m\n"; exit 1; else echo -ne "\e[0mWitnessed ... "; fi
557557

558558
${cardanocli} ${cliEra} transaction assemble --tx-body-file ${txBodyFile} --witness-file ${txWitnessFile} --witness-file ${txWitnessFile2} --out-file ${txFile}
559559
checkError "$?"; if [ $? -ne 0 ]; then exit $?; fi
560560
echo -e "Assembled ... \e[32mDONE\e[0m\n";
561561

562-
elif [[ -f "${fromAddr}.skey" ]]; then #with the normal cli skey
563-
562+
elif [[ -f "${fromAddr}.skey" && -f "${stakeAddr}.skey" ]]; then #with the normal cli skey
564563

565564
#read the needed signing keys into ram and sign the transaction
566565
skeyJSON1=$(read_skeyFILE "${fromAddr}.skey"); if [ $? -ne 0 ]; then echo -e "\e[35m${skeyJSON1}\e[0m\n"; exit 1; else echo -e "\e[32mOK\e[0m\n"; fi

‎cardano/testnet/24a_genVote.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ case ${workMode} in
307307

308308
#Get the alwaysNoConfidence stake power (counts as a no-power in all actions, except the NoConfidence-Action, there it counts to the yes-power)
309309
dRepStakeDistributionJSON=$(${cardanocli} ${cliEra} query drep-stake-distribution --all-dreps 2> /dev/stdout) #only used for the dRepPowerAlwaysNoConfidence calculation
310-
dRepPowerAlwaysNoConfidence=$(jq -r '(.[] | select(.[0] == "drep-alwaysNoConfidence") | .[1]) // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null)
310+
#dRepPowerAlwaysNoConfidence=$(jq -r '(.[] | select(.[0] == "drep-alwaysNoConfidence") | .[1]) // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null)
311+
dRepPowerAlwaysNoConfidence=$(jq -r '."drep-alwaysNoConfidence" // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null) #changed with cli 10.11.x.x or so, was an array before
311312

312313
#Get new Pool Stake Distribution including default delgation, for quorum calculation later on - available with this command since cli 10.2.0.0
313314
showProcessAnimation "Query Stakepool-Distribution Info: " &

‎cardano/testnet/24c_queryVote.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ case ${workMode} in
352352

353353
#Get the alwaysNoConfidence stake power (counts as a no-power in all actions, except the NoConfidence-Action, there it counts to the yes-power)
354354
dRepStakeDistributionJSON=$(${cardanocli} ${cliEra} query drep-stake-distribution --all-dreps 2> /dev/stdout) #only used for the dRepPowerAlwaysNoConfidence calculation
355-
dRepPowerAlwaysNoConfidence=$(jq -r '(.[] | select(.[0] == "drep-alwaysNoConfidence") | .[1]) // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null)
355+
dRepPowerAlwaysNoConfidence=$(jq -r '."drep-alwaysNoConfidence" // 0' <<< "${dRepStakeDistributionJSON}" 2> /dev/null) #changed with cli 10.11.x.x or so, was an array before
356356

357357
#Get new Pool Stake Distribution including default delgation, for quorum calculation later on - available with this command since cli 10.2.0.0
358358
showProcessAnimation "Query Stakepool-Distribution Info: " &

0 commit comments

Comments
 (0)