Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add slotsInEpoch and slotsToEpochEnd to query tip command #4912

Merged
merged 2 commits into from
Mar 3, 2023
Merged

Add slotsInEpoch and slotsToEpochEnd to query tip command #4912

merged 2 commits into from
Mar 3, 2023

Conversation

newhoggy
Copy link
Contributor

@newhoggy newhoggy commented Feb 23, 2023 •
edited
Loading

Example output:

CARDANO_NODE_SOCKET_PATH=example/node-pool1/node.sock cardano-cli query tip --testnet-magic 42
{
    "block": 768,
    "epoch": 33,
    "era": "Alonzo",
    "hash": "4ca7fd3a9827e74f98e779a8ae333dc6fa3b69832cb11fdbab7af215eb68b1ee",
    "slot": 16814,
    "slotsInEpoch": 314,
    "slotsToEpochEnd": 186,
    "syncProgress": "100.00"
}

Resolves #3878

@newhoggy newhoggy marked this pull request as ready for review February 23, 2023 09:40
@newhoggy newhoggy force-pushed the newhoggy/add-slotsInEpoch-and-slotsToEpochEnd-to-query-tip-command branch from 5a4ce59 to fbb1f0d Compare February 23, 2023 23:45
@newhoggy
Copy link
Contributor Author

newhoggy commented Mar 1, 2023

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 1, 2023

👎 Rejected by too few approved reviews

@newhoggy
Copy link
Contributor Author

newhoggy commented Mar 1, 2023

bors r+

iohk-bors bot added a commit that referenced this pull request Mar 1, 2023
@iohk-bors @newhoggy @intricate
Merge #4912 #4915 #4922
8461bf8 
4912: Add slotsInEpoch and slotsToEpochEnd to query tip command r=newhoggy a=newhoggy

Example output:

```
CARDANO_NODE_SOCKET_PATH=example/node-pool1/node.sock cardano-cli query tip --testnet-magic 42
{
    "block": 768,
    "epoch": 33,
    "era": "Alonzo",
    "hash": "4ca7fd3a9827e74f98e779a8ae333dc6fa3b69832cb11fdbab7af215eb68b1ee",
    "slot": 16814,
    "slotsInEpoch": 314,
    "slotsToEpochEnd": 186,
    "syncProgress": "100.00"
}
```

Resolves #3878


4915: Tip hash metrics r=newhoggy a=newhoggy

Salvaging this PR #2006

Related to #801


4922: Deploy Haddock for merge to master only r=newhoggy a=newhoggy

To merge changes from this PR #3012

Co-authored-by: John Ky <[email protected]>
Co-authored-by: Luke Nadur <[email protected]>
Co-authored-by: James Browning <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 1, 2023

This PR was included in a batch that timed out, it will be automatically retried

iohk-bors bot added a commit that referenced this pull request Mar 1, 2023
@iohk-bors @newhoggy
Merge #4912
aa5a410 
4912: Add slotsInEpoch and slotsToEpochEnd to query tip command r=newhoggy a=newhoggy

Example output:

```
CARDANO_NODE_SOCKET_PATH=example/node-pool1/node.sock cardano-cli query tip --testnet-magic 42
{
    "block": 768,
    "epoch": 33,
    "era": "Alonzo",
    "hash": "4ca7fd3a9827e74f98e779a8ae333dc6fa3b69832cb11fdbab7af215eb68b1ee",
    "slot": 16814,
    "slotsInEpoch": 314,
    "slotsToEpochEnd": 186,
    "syncProgress": "100.00"
}
```

Resolves #3878


Co-authored-by: John Ky <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 1, 2023

Timed out.

Jimbo4350
Jimbo4350 previously requested changes Mar 1, 2023
View reviewed changes
Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"slotsInEpoch": 314, is this describing the current slot in the epoch? It looks like it is. We should change the name so slotInEpoch as slotsInEpoch sounds like the number of slots per epoch.

@newhoggy newhoggy force-pushed the newhoggy/add-slotsInEpoch-and-slotsToEpochEnd-to-query-tip-command branch from fbb1f0d to b2be3c6 Compare March 2, 2023 16:42
@newhoggy newhoggy requested a review from Jimbo4350 March 2, 2023 16:42
@newhoggy newhoggy dismissed Jimbo4350’s stale review March 2, 2023 16:43

comments addressed

@newhoggy newhoggy force-pushed the newhoggy/add-slotsInEpoch-and-slotsToEpochEnd-to-query-tip-command branch from b2be3c6 to e1f16ab Compare March 2, 2023 17:04
Jimbo4350
Jimbo4350 approved these changes Mar 2, 2023
View reviewed changes
Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

cardano-cli/ChangeLog.md Outdated
@@ -12,6 +12,8 @@

- Allow assembling transactions with no witnesses ([PR 4408](https://github.com/input-output-hk/cardano-node/pull/4408))

- Add `slotsInEpoch` and `slotsToEpochEnd` to output of `query tip` command ([PR 4912](https://github.com/input-output-hk/cardano-node/pull/4912))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sp: slotInEpoch

@newhoggy newhoggy force-pushed the newhoggy/add-slotsInEpoch-and-slotsToEpochEnd-to-query-tip-command branch 2 times, most recently from a2bd4a0 to 366827d Compare March 2, 2023 23:59
@newhoggy newhoggy force-pushed the newhoggy/add-slotsInEpoch-and-slotsToEpochEnd-to-query-tip-command branch from 366827d to 8580e60 Compare March 3, 2023 02:29
@newhoggy newhoggy added this pull request to the merge queue Mar 3, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 3, 2023
@newhoggy newhoggy added this pull request to the merge queue Mar 3, 2023
Merged via the queue into master with commit de9178b Mar 3, 2023
@iohk-bors iohk-bors bot deleted the newhoggy/add-slotsInEpoch-and-slotsToEpochEnd-to-query-tip-command branch March 3, 2023 06:21
newhoggy added a commit that referenced this pull request Mar 10, 2023
@newhoggy
Add slotsInEpoch and slotsToEpochEnd to query tip command (#4912)
707d716 
* Add slotsInEpoch and slotsToEpochEnd to query tip command

* Update changelog for new slotsInEpoch and slotsToEpochEnd fields in output of query tip command
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jimbo4350 Jimbo4350 Jimbo4350 approved these changes

@erikd erikd erikd approved these changes

@dcoutts dcoutts Awaiting requested review from dcoutts

@JaredCorduan JaredCorduan Awaiting requested review from JaredCorduan

@CarlosLopezDeLara CarlosLopezDeLara Awaiting requested review from CarlosLopezDeLara

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FR] - Show slotInEpoch in cardano-cli query tip
3 participants
@newhoggy @erikd @Jimbo4350