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

Bump cardano-node #1755

Merged
merged 19 commits into from
Jun 16, 2020
Merged

Bump cardano-node #1755

merged 19 commits into from
Jun 16, 2020

Conversation

Anviking
Copy link
Member

  • Appears to break compatibility with the most recent FF genesis
  • Should include what we need to get non myopic member rewards

@Anviking
Copy link
Member Author

bors try

iohk-bors bot added a commit that referenced this pull request Jun 13, 2020
@iohk-bors
Try #1755:
45b7d43
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jun 13, 2020

try

Build failed

@Anviking Anviking force-pushed the anviking/ADP-311/bump-node branch from 55523e2 to 4b4e260 Compare June 13, 2020 20:19
@rvl
Copy link
Contributor

rvl commented Jun 15, 2020

Looks like there is a proper build failure in cardano-node/cardano-config. I have asked about it on slack.

@Anviking Anviking force-pushed the anviking/ADP-311/bump-node branch 2 times, most recently from 4ed5d2d to b0a7c42 Compare June 15, 2020 10:15
@Anviking
Copy link
Member Author

bors try

@Anviking Anviking marked this pull request as ready for review June 15, 2020 10:57
@Anviking
Copy link
Member Author

Do we merge this now even if it breaks FF compatibility? Maybe we do still…?

@Anviking Anviking requested review from rvl and KtorZ June 15, 2020 10:58
iohk-bors bot added a commit that referenced this pull request Jun 15, 2020
@iohk-bors
Try #1755:
67f3109
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jun 15, 2020

try

Build failed

rvl
rvl approved these changes Jun 15, 2020
View reviewed changes
Copy link
Contributor

@rvl rvl left a comment

Choose a reason for hiding this comment

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

Looks good to me. I am not sure whether we should wait for a ff respin before merging.

@piotr-iohk
Copy link
Contributor

Looks good to me. I am not sure whether we should wait for a ff respin before merging.

I'd be for waiting a bit unless it is blocking further development.

Anviking added 13 commits June 16, 2020 15:43
@Anviking @KtorZ
Bump libraries to target most recent cardano-node
8777a8c
@Anviking @KtorZ
Allow localStateQ to have multiple queries in the same queue
75fe0cf 
To allow both PParams, and StakeDistribution checks in the same queue.
@Anviking @KtorZ
List stake pools
ac78674 
- Return dummy rewards, cost, margin, productions for now
- Embed LSQ queue in cursor
- Remove mock knownPools
@Anviking @KtorZ
Remove mock pool ids from integration tests
59058fd
@Anviking @KtorZ
Add integration test for listing stake pools
72aac2b
@Anviking @KtorZ
Actually read wallet balance when listing pools (w/ test and swagger …
bf39f0b 
…for failure)

Also, now passing around spl instead of a separate server for the
list stake pool endpoint.
@Anviking @KtorZ
Generalize fromRewards, rename to fromNonMyopicMemberRewards
ca4c851
@Anviking @KtorZ
Fix mislabeled safeConvert
d6880e9
@Anviking @KtorZ
Rename stake -> relativeStake
a538957
@Anviking @KtorZ
Rename stakeButNoRew -> stakeButNoRewards
42367f2
@Anviking @KtorZ
askNode -> fetchLsqPoolMetrics, improve docs
220994a
@Anviking @KtorZ
Adjust comment on stakeButNoRewards merge-case
3f599c7
@Anviking @KtorZ
Add: STAKE_POOLS_LIST_06 - NonMyopicMemberRewards are 0 for empty wal…
13d7c7f 
…lets
Anviking and others added 4 commits June 16, 2020 15:43
@Anviking @KtorZ
fixup: embed responsesErr404 in responsesListStakePools itself
7f528bb
@Anviking @KtorZ
Move shelley LSQ code to Network module
cbe1203 
Using a type family to allow jormungandr and haskell implementations to
be different.
@rvl @KtorZ
Bump cardano-node again to latest master
f845ce7 
This includes my PRs. No changes to cabal.project since the last bump.
@rvl @KtorZ
nix: Set the gitrev when importing cardano-node
63908d1 
So that it displays the version correctly.
@KtorZ KtorZ force-pushed the anviking/ADP-311/bump-node branch from c04336f to 63908d1 Compare June 16, 2020 13:44
@KtorZ
Copy link
Member

KtorZ commented Jun 16, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Jun 16, 2020
@iohk-bors @Anviking @rvl
Merge #1755
28f8f4e 
1755: Bump cardano-node r=KtorZ a=Anviking

- Appears to break compatibility with the most recent FF genesis
- Should include what we need to get non myopic member rewards

Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Rodney Lorrimar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jun 16, 2020

Canceled

@Anviking
Copy link
Member Author

bors r+

iohk-bors bot added a commit that referenced this pull request Jun 16, 2020
@iohk-bors @Anviking @rvl
Merge #1755 #1765 #1767
8cf60f7 
1755: Bump cardano-node r=Anviking a=Anviking

- Appears to break compatibility with the most recent FF genesis
- Should include what we need to get non myopic member rewards

1765: Add script to show cardano-node and cardano-cli versions r=rvl a=rvl

Run this script if you would like to know which version of `cardano-node` will be in the `nix-shell` (i.e. CI).

This PR IntersectMBO/cardano-node#1283 fixes the CLI version strings.


1767: Better tracing of shelley network local state query r=rvl a=rvl

### Issue Number

ADP-302 / #1750

### Overview

More detail in the logs.


Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Rodney Lorrimar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jun 16, 2020

Build failed (retrying...)

iohk-bors bot added a commit that referenced this pull request Jun 16, 2020
@iohk-bors @Anviking @rvl
Merge #1755
33cc355 
1755: Bump cardano-node r=Anviking a=Anviking

- Appears to break compatibility with the most recent FF genesis
- Should include what we need to get non myopic member rewards

Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Rodney Lorrimar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jun 16, 2020

Canceled

@rvl
Copy link
Contributor

rvl commented Jun 16, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Jun 16, 2020
@iohk-bors @Anviking @rvl
Merge #1755 #1765 #1767
dc821d1 
1755: Bump cardano-node r=rvl a=Anviking

- Appears to break compatibility with the most recent FF genesis
- Should include what we need to get non myopic member rewards

1765: Add script to show cardano-node and cardano-cli versions r=rvl a=rvl

Run this script if you would like to know which version of `cardano-node` will be in the `nix-shell` (i.e. CI).

This PR IntersectMBO/cardano-node#1283 fixes the CLI version strings.


1767: Better tracing of shelley network local state query r=rvl a=rvl

### Issue Number

ADP-302 / #1750

### Overview

More detail in the logs.


Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Rodney Lorrimar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jun 16, 2020

Build failed (retrying...)

@Anviking
Copy link
Member Author

It compiles locally for me, and it seems rebased 🤔

@Anviking
Copy link
Member Author

Ah, maybe due to other PRs in the same batch

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jun 16, 2020

Build succeeded

@iohk-bors iohk-bors bot merged commit 76398e7 into master Jun 16, 2020
@iohk-bors iohk-bors bot deleted the anviking/ADP-311/bump-node branch June 16, 2020 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KtorZ KtorZ KtorZ approved these changes

@rvl rvl rvl approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@Anviking @rvl @piotr-iohk @KtorZ