Skip to content

Commit f67adf1

Browse files
dlachaumedlachaume
authored
Merge pull request #2085 from input-output-hk/dlachaume/2072/update-cardano-cli-calls
Feat: add `latest` shortcut as targeted era for Cardano CLI commands
2 parents 49a411c + 9f75399 commit f67adf1

File tree

5 files changed

+25
-16
lines changed

5 files changed

+25
-16
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mithril-common/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mithril-common"
3-
version = "0.4.78"
3+
version = "0.4.79"
44
description = "Common types, interfaces, and utilities for Mithril nodes."
55
authors = { workspace = true }
66
edition = { workspace = true }

‎mithril-common/src/chain_observer/cli_observer.rs‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ use crate::crypto_helper::{encode_bech32, KESPeriod, OpCert, SerDeShelleyFileFor
1515
use crate::entities::{BlockNumber, ChainPoint, Epoch, SlotNumber, StakeDistribution};
1616
use crate::{CardanoNetwork, StdResult};
1717

18+
const CARDANO_ERA: &str = "latest";
19+
1820
/// `CliRunner` trait defines the asynchronous methods
1921
/// for interaction with the Cardano CLI.
2022
#[async_trait]
@@ -66,6 +68,7 @@ impl CardanoCliRunner {
6668
fn command_for_utxo(&self, address: &str, out_file: PathBuf) -> Command {
6769
let mut command = self.get_command();
6870
command
71+
.arg(CARDANO_ERA)
6972
.arg("query")
7073
.arg("utxo")
7174
.arg("--address")
@@ -79,7 +82,10 @@ impl CardanoCliRunner {
7982

8083
fn command_for_stake_distribution(&self) -> Command {
8184
let mut command = self.get_command();
82-
command.arg("query").arg("stake-distribution");
85+
command
86+
.arg(CARDANO_ERA)
87+
.arg("query")
88+
.arg("stake-distribution");
8389
self.post_config_command(&mut command);
8490

8591
command
@@ -88,6 +94,7 @@ impl CardanoCliRunner {
8894
fn command_for_stake_snapshot(&self, stake_pool_id: &str) -> Command {
8995
let mut command = self.get_command();
9096
command
97+
.arg(CARDANO_ERA)
9198
.arg("query")
9299
.arg("stake-snapshot")
93100
.arg("--stake-pool-id")
@@ -100,6 +107,7 @@ impl CardanoCliRunner {
100107
fn command_for_stake_snapshot_all_pools(&self) -> Command {
101108
let mut command = self.get_command();
102109
command
110+
.arg(CARDANO_ERA)
103111
.arg("query")
104112
.arg("stake-snapshot")
105113
.arg("--all-stake-pools");
@@ -110,15 +118,15 @@ impl CardanoCliRunner {
110118

111119
fn command_for_epoch(&self) -> Command {
112120
let mut command = self.get_command();
113-
command.arg("query").arg("tip");
121+
command.arg(CARDANO_ERA).arg("query").arg("tip");
114122
self.post_config_command(&mut command);
115123

116124
command
117125
}
118126

119127
fn command_for_chain_point(&self) -> Command {
120128
let mut command = self.get_command();
121-
command.arg("query").arg("tip");
129+
command.arg(CARDANO_ERA).arg("query").arg("tip");
122130
self.post_config_command(&mut command);
123131

124132
command
@@ -127,6 +135,7 @@ impl CardanoCliRunner {
127135
fn command_for_kes_period(&self, opcert_file: &str) -> Command {
128136
let mut command = self.get_command();
129137
command
138+
.arg(CARDANO_ERA)
130139
.arg("query")
131140
.arg("kes-period-info")
132141
.arg("--op-cert-file")
@@ -556,8 +565,8 @@ mod tests {
556565
CardanoNetwork::TestNet(10),
557566
);
558567

559-
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"tip\" \"--testnet-magic\" \"10\", kill_on_drop: false }", format!("{:?}", runner.command_for_epoch()));
560-
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"stake-distribution\" \"--testnet-magic\" \"10\", kill_on_drop: false }", format!("{:?}", runner.command_for_stake_distribution()));
568+
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"tip\" \"--testnet-magic\" \"10\", kill_on_drop: false }", format!("{:?}", runner.command_for_epoch()));
569+
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"stake-distribution\" \"--testnet-magic\" \"10\", kill_on_drop: false }", format!("{:?}", runner.command_for_stake_distribution()));
561570
}
562571

563572
#[tokio::test]
@@ -568,8 +577,8 @@ mod tests {
568577
CardanoNetwork::DevNet(25),
569578
);
570579

571-
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"tip\" \"--cardano-mode\" \"--testnet-magic\" \"25\", kill_on_drop: false }", format!("{:?}", runner.command_for_epoch()));
572-
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"stake-distribution\" \"--cardano-mode\" \"--testnet-magic\" \"25\", kill_on_drop: false }", format!("{:?}", runner.command_for_stake_distribution()));
580+
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"tip\" \"--cardano-mode\" \"--testnet-magic\" \"25\", kill_on_drop: false }", format!("{:?}", runner.command_for_epoch()));
581+
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"stake-distribution\" \"--cardano-mode\" \"--testnet-magic\" \"25\", kill_on_drop: false }", format!("{:?}", runner.command_for_stake_distribution()));
573582
}
574583

575584
#[tokio::test]
@@ -581,11 +590,11 @@ mod tests {
581590
);
582591

583592
assert_eq!(
584-
"Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"tip\" \"--mainnet\", kill_on_drop: false }",
593+
"Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"tip\" \"--mainnet\", kill_on_drop: false }",
585594
format!("{:?}", runner.command_for_epoch())
586595
);
587596
assert_eq!(
588-
"Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"stake-distribution\" \"--mainnet\", kill_on_drop: false }",
597+
"Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"stake-distribution\" \"--mainnet\", kill_on_drop: false }",
589598
format!("{:?}", runner.command_for_stake_distribution())
590599
);
591600
}

‎mithril-test-lab/mithril-devnet/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.4.5
1+
0.4.6

‎mithril-test-lab/mithril-devnet/query-cardano.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#!/usr/bin/env bash
22

33
echo ">> Query chain tip"
4-
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli query tip \
4+
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli latest query tip \
55
--cardano-mode \
66
--testnet-magic 42 | jq .
77

88
echo
99
echo ">> Query whole utxo"
10-
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli query utxo \
10+
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli latest query utxo \
1111
--cardano-mode \
1212
--testnet-magic 42 \
1313
--whole-utxo
1414
echo
1515

1616
echo ">> Query stake pools"
17-
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli query stake-pools \
17+
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli latest query stake-pools \
1818
--cardano-mode \
1919
--testnet-magic 42
2020
echo
2121

2222
echo ">> Query stake distribution"
23-
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli query stake-snapshot --all-stake-pools \
23+
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli latest query stake-snapshot --all-stake-pools \
2424
--cardano-mode \
2525
--testnet-magic 42 | jq .
2626
echo

0 commit comments

Comments
 (0)