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.

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

Bump cardano-ledger-specs to include a fix on non-myopic member reward ordering #1841

Merged
merged 7 commits into from Jul 3, 2020

Conversation

KtorZ
Copy link
Member

@KtorZ KtorZ commented Jul 1, 2020

Issue Number

Overview

  • 04b8141
    📍 Bump cardano-node to include a fix on non-myopic member reward ordering

  • d064a2b
    📍 update compatibility matrix

  • 67865c9
    📍 Also bump cardano-node in niv
    Matches revision in snapshot.yaml.

I can fix it later so that the cardano-node rev is defined in only one
place, in the stack snapshot.

  • c571917
    📍 Unfortunately stack-to-nix does not support recursive snapshot URLs

  • 02f6166
    📍 Regenerate nix

Comments

As requested by Darko / Daedalus.

@KtorZ KtorZ added the RESOLVING ISSUE Mark a PR as resolving issues, for auto-generated CHANGELOG label Jul 1, 2020
@KtorZ KtorZ requested a review from a team July 1, 2020 15:44
@KtorZ KtorZ self-assigned this Jul 1, 2020
@Anviking
Copy link
Collaborator

Anviking commented Jul 1, 2020

I thought it was cardano-node that needed to have the fix, not us?

The calculation happens on the "server-side" i.e. the node, so bumping the specs for the client (us) would be meaningless?

@KtorZ
Copy link
Member Author

KtorZ commented Jul 1, 2020

You're probably right. It'll likely mess up with the whole build actually... because there would be two different versions in cardano-node and cardano-wallet.

@Anviking
Copy link
Collaborator

Anviking commented Jul 1, 2020

But we could probably fork the node from 1.14.2, fork cardano-ledger-specs from here https://github.com/input-output-hk/cardano-node/blob/1.14.2/stack.yaml#L62, cherry-pick in the fix, and target the resulting cardano-node from the wallet

@KtorZ KtorZ force-pushed the KtorZ/ledger-spec-fix-reward-ordering branch 2 times, most recently from 86aaebe to a5f7d49 Compare July 1, 2020 16:08
@KtorZ KtorZ force-pushed the KtorZ/ledger-spec-fix-reward-ordering branch from a5f7d49 to b1b2967 Compare July 2, 2020 08:08
@KtorZ
Copy link
Member Author

KtorZ commented Jul 2, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Jul 2, 2020
1841: Bump cardano-ledger-specs to include a fix on non-myopic member reward ordering r=KtorZ a=KtorZ

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- [x] I have bumped cardano-ledger-specs to include a fix on non-myopic member reward ordering

# Comments

<!-- Additional comments or screenshots to attach if any -->

As requested by Darko / Daedalus.

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: KtorZ <matthias.benkort@gmail.com>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 2, 2020

Canceled

@paweljakubas
Copy link
Contributor

@KtorZ what about also to update matrix in README ?

@rvl rvl force-pushed the KtorZ/ledger-spec-fix-reward-ordering branch from 2c45e94 to 31a66d5 Compare July 3, 2020 08:23
@KtorZ
Copy link
Member Author

KtorZ commented Jul 3, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Jul 3, 2020
1841: Bump cardano-ledger-specs to include a fix on non-myopic member reward ordering r=KtorZ a=KtorZ

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- [x] I have bumped cardano-ledger-specs to include a fix on non-myopic member reward ordering

# Comments

<!-- Additional comments or screenshots to attach if any -->

As requested by Darko / Daedalus.

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: KtorZ <matthias.benkort@gmail.com>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
@KtorZ
Copy link
Member Author

KtorZ commented Jul 3, 2020

Unfortunately stack-to-nix does not support recursive snapshot URLs

😢 😞

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 3, 2020

Build failed

@KtorZ
Copy link
Member Author

KtorZ commented Jul 3, 2020

bors retry

iohk-bors bot added a commit that referenced this pull request Jul 3, 2020
1841: Bump cardano-ledger-specs to include a fix on non-myopic member reward ordering r=KtorZ a=KtorZ

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- [x] I have bumped cardano-ledger-specs to include a fix on non-myopic member reward ordering

# Comments

<!-- Additional comments or screenshots to attach if any -->

As requested by Darko / Daedalus.

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: KtorZ <matthias.benkort@gmail.com>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 3, 2020

Build failed

@KtorZ KtorZ force-pushed the KtorZ/ledger-spec-fix-reward-ordering branch from 6b0917a to 02f6166 Compare July 3, 2020 16:14
@KtorZ
Copy link
Member Author

KtorZ commented Jul 3, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Jul 3, 2020
1841: Bump cardano-ledger-specs to include a fix on non-myopic member reward ordering r=KtorZ a=KtorZ

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- 04b8141
  📍 **Bump cardano-node to include a fix on non-myopic member reward ordering**
  
- d064a2b
  📍 **update compatibility matrix**
  
- 67865c9
  📍 **Also bump cardano-node in niv**
  Matches revision in snapshot.yaml.

I can fix it later so that the cardano-node rev is defined in only one
place, in the stack snapshot.

- c571917
  📍 **Unfortunately stack-to-nix does not support recursive snapshot URLs**
  
- 02f6166
  📍 **Regenerate nix**
  


# Comments

<!-- Additional comments or screenshots to attach if any -->

As requested by Darko / Daedalus.

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: KtorZ <matthias.benkort@gmail.com>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 3, 2020

Build failed

@KtorZ
Copy link
Member Author

KtorZ commented Jul 3, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Jul 3, 2020
1841: Bump cardano-ledger-specs to include a fix on non-myopic member reward ordering r=KtorZ a=KtorZ

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- 04b8141
  📍 **Bump cardano-node to include a fix on non-myopic member reward ordering**
  
- d064a2b
  📍 **update compatibility matrix**
  
- 67865c9
  📍 **Also bump cardano-node in niv**
  Matches revision in snapshot.yaml.

I can fix it later so that the cardano-node rev is defined in only one
place, in the stack snapshot.

- c571917
  📍 **Unfortunately stack-to-nix does not support recursive snapshot URLs**
  
- 02f6166
  📍 **Regenerate nix**
  


# Comments

<!-- Additional comments or screenshots to attach if any -->

As requested by Darko / Daedalus.

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: KtorZ <matthias.benkort@gmail.com>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 3, 2020

Build failed

@KtorZ
Copy link
Member Author

KtorZ commented Jul 3, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Jul 3, 2020
1841: Bump cardano-ledger-specs to include a fix on non-myopic member reward ordering r=KtorZ a=KtorZ

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- 04b8141
  📍 **Bump cardano-node to include a fix on non-myopic member reward ordering**
  
- d064a2b
  📍 **update compatibility matrix**
  
- 67865c9
  📍 **Also bump cardano-node in niv**
  Matches revision in snapshot.yaml.

I can fix it later so that the cardano-node rev is defined in only one
place, in the stack snapshot.

- c571917
  📍 **Unfortunately stack-to-nix does not support recursive snapshot URLs**
  
- 02f6166
  📍 **Regenerate nix**
  


# Comments

<!-- Additional comments or screenshots to attach if any -->

As requested by Darko / Daedalus.

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: KtorZ <matthias.benkort@gmail.com>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 3, 2020

Build failed

@KtorZ KtorZ force-pushed the KtorZ/ledger-spec-fix-reward-ordering branch from 07efd81 to 148e370 Compare July 3, 2020 22:19
@KtorZ
Copy link
Member Author

KtorZ commented Jul 3, 2020

bors try

iohk-bors bot added a commit that referenced this pull request Jul 3, 2020
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 3, 2020

try

Build failed

@KtorZ KtorZ merged commit c2fe8f6 into master Jul 3, 2020
@KtorZ KtorZ deleted the KtorZ/ledger-spec-fix-reward-ordering branch July 3, 2020 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RESOLVING ISSUE Mark a PR as resolving issues, for auto-generated CHANGELOG
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants