Skip to content

Commit 0cc4ca5

Browse files
ladamesnyladamesny
authored
ETCM-8664 update local env to use cardano-node 10.1.2 (#203)
* ETCM-8664 update local env to use cardano-node 10.1.1 (post Chang+1 HF) * Update node version * ETCM-8664 remove typo
1 parent 240ba9f commit 0cc4ca5

File tree

12 files changed

+27
-27
lines changed

12 files changed

+27
-27
lines changed

‎.github/actions/tests/local-environment-tests/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ runs:
8484
8585
# Wait for the Partner Chain node to be ready or until max restarts or epoch 2 is reached
8686
while ! docker exec partner-chains-node-1 [ -e /shared/partner-chains-node-1.ready ]; do
87-
epoch=$(docker exec cardano-node-1 cardano-cli query tip --testnet-magic 42 | jq -r .epoch)
87+
epoch=$(docker exec cardano-node-1 cardano-cli latest query tip --testnet-magic 42 | jq -r .epoch)
8888
echo "Epoch: $epoch"
8989
container_status=$(docker inspect -f '{{.State.Status}}' partner-chains-node-1)
9090
echo "Container status: $container_status"

‎.github/actions/tests/wait-for-epoch/action.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ runs:
2222
shell: bash
2323
run: |
2424
if [ "${{ inputs.deployment }}" == "docker" ]; then
25-
epoch=$(docker exec ${{ inputs.node }} cardano-cli query tip --testnet-magic 42 | jq -r .epoch)
25+
epoch=$(docker exec ${{ inputs.node }} cardano-cli latest query tip --testnet-magic 42 | jq -r .epoch)
2626
while [ $epoch -lt ${{ inputs.epoch }} ]; do
2727
echo "Epoch: $epoch"
2828
sleep 10
29-
epoch=$(docker exec ${{ inputs.node }} cardano-cli query tip --testnet-magic 42 | jq -r .epoch)
29+
epoch=$(docker exec ${{ inputs.node }} cardano-cli latest query tip --testnet-magic 42 | jq -r .epoch)
3030
done
3131
echo "Epoch: $epoch"
3232
@@ -40,11 +40,11 @@ runs:
4040
exit 1
4141
fi
4242
43-
epoch=$(kubectl exec ${{ inputs.node }} -c cardano-node -n ${{ inputs.environment }} -- cardano-cli query tip --testnet-magic $testnet_magic | jq -r .epoch)
43+
epoch=$(kubectl exec ${{ inputs.node }} -c cardano-node -n ${{ inputs.environment }} -- cardano-cli latest query tip --testnet-magic $testnet_magic | jq -r .epoch)
4444
while [ $epoch -lt ${{ inputs.epoch }} ]; do
4545
echo "Epoch: $epoch"
4646
sleep 10
47-
epoch=$(kubectl exec ${{ inputs.node }} -c cardano-node -n ${{ inputs.environment }} -- cardano-cli query tip --testnet-magic $testnet_magic | jq -r .epoch)
47+
epoch=$(kubectl exec ${{ inputs.node }} -c cardano-node -n ${{ inputs.environment }} -- cardano-cli latest query tip --testnet-magic $testnet_magic | jq -r .epoch)
4848
done
4949
echo "Epoch: $epoch"
5050

‎dev/local-environment/configurations/cardano/cardano-node-1/entrypoint.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ cp /shared/shelley/genesis.alonzo.json.base /shared/shelley/genesis.alonzo.json
3434
echo "Created /shared/conway/genesis.conway.json and /shared/shelley/genesis.alonzo.json"
3535

3636
byron_hash=$(/bin/cardano-cli byron genesis print-genesis-hash --genesis-json /shared/byron/genesis.json)
37-
shelley_hash=$(/bin/cardano-cli genesis hash --genesis /shared/shelley/genesis.json)
38-
alonzo_hash=$(/bin/cardano-cli genesis hash --genesis /shared/shelley/genesis.alonzo.json)
39-
conway_hash=$(/bin/cardano-cli genesis hash --genesis /shared/conway/genesis.conway.json)
37+
shelley_hash=$(/bin/cardano-cli latest genesis hash --genesis /shared/shelley/genesis.json)
38+
alonzo_hash=$(/bin/cardano-cli latest genesis hash --genesis /shared/shelley/genesis.alonzo.json)
39+
conway_hash=$(/bin/cardano-cli latest genesis hash --genesis /shared/conway/genesis.conway.json)
4040

4141
/busybox sed "s/\"ByronGenesisHash\": \"[^\"]*\"/\"ByronGenesisHash\": \"$byron_hash\"/" /shared/node-1-config.json.base > /shared/node-1-config.json.base.byron
4242
/busybox sed "s/\"ByronGenesisHash\": \"[^\"]*\"/\"ByronGenesisHash\": \"$byron_hash\"/" /shared/node-2-config.json.base > /shared/node-2-config.json.base.byron
@@ -99,7 +99,7 @@ done
9999

100100
echo "Generating new address and funding it with 2 UTXOs from the genesis address"
101101

102-
new_address=$(cardano-cli address build \
102+
new_address=$(cardano-cli latest address build \
103103
--payment-verification-key-file /keys/funded_address.vkey \
104104
--testnet-magic 42)
105105

@@ -127,7 +127,7 @@ fee=1000000
127127
change=$((tx_in_amount - total_output - fee))
128128

129129
# Build the raw transaction
130-
cardano-cli transaction build-raw \
130+
cardano-cli latest transaction build-raw \
131131
--tx-in $tx_in1 \
132132
--tx-out "$new_address+$tx_out1" \
133133
--tx-out "$new_address+$tx_out2" \
@@ -138,7 +138,7 @@ cardano-cli transaction build-raw \
138138
--out-file /data/tx.raw
139139

140140
# Sign the transaction
141-
cardano-cli transaction sign \
141+
cardano-cli latest transaction sign \
142142
--tx-body-file /data/tx.raw \
143143
--signing-key-file /shared/shelley/genesis-utxo.skey \
144144
--testnet-magic 42 \
@@ -150,7 +150,7 @@ echo "Transaction prepared, waiting 20 seconds for other nodes to start..."
150150
sleep 20
151151

152152
echo "Submitting transaction..."
153-
cardano-cli transaction submit \
153+
cardano-cli latest transaction submit \
154154
--tx-file /data/tx.signed \
155155
--testnet-magic 42
156156

@@ -160,17 +160,17 @@ echo "Balance:"
160160

161161
# Query UTXOs at new_address, dave_address, and eve_address
162162
echo "Querying UTXO for new_address:"
163-
cardano-cli query utxo \
163+
cardano-cli latest query utxo \
164164
--testnet-magic 42 \
165165
--address $new_address
166166

167167
echo "Querying UTXO for Dave address:"
168-
cardano-cli query utxo \
168+
cardano-cli latest query utxo \
169169
--testnet-magic 42 \
170170
--address $dave_address
171171

172172
echo "Querying UTXO for Eve address:"
173-
cardano-cli query utxo \
173+
cardano-cli latest query utxo \
174174
--testnet-magic 42 \
175175
--address $eve_address
176176

@@ -179,12 +179,12 @@ echo $new_address > /shared/FUNDED_ADDRESS
179179
echo "Created /shared/FUNDED_ADDRESS with value: $new_address"
180180

181181
echo "Querying and saving the first UTXO details for Dave address to /shared/dave.utxo:"
182-
cardano-cli query utxo --testnet-magic 42 --address "${dave_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/dave.utxo
182+
cardano-cli latest query utxo --testnet-magic 42 --address "${dave_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/dave.utxo
183183
echo "UTXO details for Dave saved in /shared/dave.utxo."
184184
cat /shared/dave.utxo
185185

186186
echo "Querying and saving the first UTXO details for Eve address to /shared/eve.utxo:"
187-
cardano-cli query utxo --testnet-magic 42 --address "${eve_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/eve.utxo
187+
cardano-cli latest query utxo --testnet-magic 42 --address "${eve_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/eve.utxo
188188
echo "UTXO details for Eve saved in /shared/eve.utxo."
189189
cat /shared/eve.utxo
190190

‎dev/local-environment/configurations/genesis/shelley/genesis.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"nOpt": 500,
4444
"poolDeposit": 500000000,
4545
"protocolVersion": {
46-
"major": 9,
46+
"major": 10,
4747
"minor": 0
4848
},
4949
"rho": 0.0022,

‎dev/local-environment/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node:v1.2.0"
4-
CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:9.2.1"
4+
CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.1.2"
55
DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.5.0.2"
66
KUPO_IMAGE="cardanosolutions/kupo:v2.9.0"
77
OGMIOS_IMAGE="cardanosolutions/ogmios:v6.8.0"

‎envs/devnet/.envrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export CHAIN_ID=1
22
export THRESHOLD_NUMERATOR=2
33
export THRESHOLD_DENOMINATOR=3
44
export GENESIS_COMMITTEE_UTXO="0000000000000000000000000000000000000000000000000000000000000000#0"
5-
# cardano-cli address key-hash --payment-verification-key-file <path to authority vkey>
5+
# cardano-cli latest address key-hash --payment-verification-key-file <path to authority vkey>
66
export GOVERNANCE_AUTHORITY=76da17b2e3371ab7ca88ce0500441149f03cc5091009f99c99c080d9
77

88
# unique identifier of the beneficiary that will be credited

‎envs/staging-preprod/.envrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export CHAIN_ID=1
22
export THRESHOLD_NUMERATOR=2
33
export THRESHOLD_DENOMINATOR=3
44
export GENESIS_COMMITTEE_UTXO="4e65eddc6132c1b9891d43f9d67a4a0a7b6e614b648f59dc97538f3f23eb96bf#1"
5-
# cardano-cli address key-hash --payment-verification-key-file <path to authority vkey>
5+
# cardano-cli latest address key-hash --payment-verification-key-file <path to authority vkey>
66
export GOVERNANCE_AUTHORITY=1f0977bc0f57c67ca6d77296c1b575fe05a6dc2c5fa38056ba63c50c
77

88
# unique identifier of the beneficiary that will be credited

‎envs/staging-preview/.envrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export CHAIN_ID=1
22
export THRESHOLD_NUMERATOR=2
33
export THRESHOLD_DENOMINATOR=3
44
export GENESIS_COMMITTEE_UTXO="4e65eddc6132c1b9891d43f9d67a4a0a7b6e614b648f59dc97538f3f23eb96bf#1"
5-
# cardano-cli address key-hash --payment-verification-key-file <path to authority vkey>
5+
# cardano-cli latest address key-hash --payment-verification-key-file <path to authority vkey>
66
export GOVERNANCE_AUTHORITY=1f0977bc0f57c67ca6d77296c1b575fe05a6dc2c5fa38056ba63c50c
77

88
# unique identifier of the beneficiary that will be credited

‎nix/processes.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
command = ''
5050
export CARDANO_NODE_SOCKET_PATH=${node-socket}
5151
while true; do
52-
${self'.packages.cardano-cli}/bin/cardano-cli \
52+
${self'.packages.cardano-cli}/bin/cardano-cli latest \
5353
query tip ${if network == "mainnet" then "--mainnet" else magic};
5454
sleep 10
5555
done
@@ -62,7 +62,7 @@
6262
exec = {
6363
command = ''
6464
export CARDANO_NODE_SOCKET_PATH=${node-socket}
65-
${self'.packages.cardano-cli}/bin/cardano-cli \
65+
${self'.packages.cardano-cli}/bin/cardano-cli latest \
6666
query tip ${if network == "mainnet" then "--mainnet" else magic}; \
6767
| jq -e '.syncProgress == "100.00" | not' && exit 1 || exit 0
6868
'';

‎nix/shell.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
name = "cardano-cli";
9999
help = "CLI v9.2.1 that is used in partner-chains dependency stack";
100100
# This command has some eval because of IFD
101-
command = "${self'.packages.cardano-cli}/bin/cardano-cli $@";
101+
command = "${self'.packages.cardano-cli}/bin/cardano-cli latest $@";
102102
}
103103
];
104104
}

‎primitives/chain-params/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub struct SidechainParams {
3131
pub threshold_numerator: u64,
3232
#[cfg_attr(feature = "std", arg(long))]
3333
pub threshold_denominator: u64,
34-
/// Obtained with cardano-cli address key-hash --payment-verification-key-file <vkey of chosen governance>
34+
/// Obtained with cardano-cli latest address key-hash --payment-verification-key-file <vkey of chosen governance>
3535
#[cfg_attr(feature = "std", arg(long))]
3636
pub governance_authority: MainchainAddressHash,
3737
}

‎primitives/domain/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl TryFrom<Vec<u8>> for MainchainPublicKey {
229229
pub const MAINCHAIN_ADDRESS_HASH_LEN: usize = 28;
230230

231231
/// Some hash of MainchainAddress, 28 bytes. Presumably blake2b_224.
232-
/// Way to get it: cardano-cli address key-hash --payment-verification-key-file FILE
232+
/// Way to get it: cardano-cli latest address key-hash --payment-verification-key-file FILE
233233
#[derive(
234234
Clone, Copy, Decode, Default, Eq, Encode, Hash, MaxEncodedLen, PartialEq, ToDatum, TypeInfo,
235235
)]

0 commit comments

Comments
 (0)