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

Propagate protocol in block type #3818

Merged
merged 22 commits into from
May 21, 2022
Merged

Conversation

Jimbo4350
Copy link
Contributor

@Jimbo4350 Jimbo4350 commented Apr 22, 2022

This PR:

  • Propagates updated ShelleyBlock type (which is now also parameterized over the protocol)
  • Re-enables the TestEnableDevelopmentHardForkEras flag so we can hardfork to Babbage without advertising we know about the Babbage era

@Jimbo4350 Jimbo4350 force-pushed the jordan/dep-bump-protocol-in-block branch 3 times, most recently from 99cffa2 to c5099a5 Compare April 25, 2022 18:38
@Jimbo4350 Jimbo4350 force-pushed the jordan/dep-bump-protocol-in-block branch 8 times, most recently from 286402b to 98892cb Compare April 28, 2022 15:13
@Jimbo4350 Jimbo4350 marked this pull request as ready for review April 28, 2022 15:16
Copy link
Contributor

@MarcFontaine MarcFontaine left a comment

Choose a reason for hiding this comment

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

LTGM

@Jimbo4350 Jimbo4350 mentioned this pull request Apr 28, 2022
38 tasks
@newhoggy newhoggy force-pushed the jordan/dep-bump-protocol-in-block branch 2 times, most recently from d0e7f46 to f555430 Compare May 4, 2022 13:22
Praos.babbageProtVer =
if npcTestEnableDevelopmentHardForkEras
then ProtVer 7 0 -- Advertise we can support Babbage
else ProtVer 6 0, -- Otherwise we only advertise we know about Mary,=
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the trailing ,= intended?

throughout cardano-api. Note this leaves the leadership-schedule, kes-info
and protocol-state query commands temporarily broken.
Update readFileTx and acceptTxCDDLSerialisation functions for Babbage
Disable the kes-period-info command test temporarily
@Jimbo4350 Jimbo4350 force-pushed the jordan/dep-bump-protocol-in-block branch from b6a6851 to 55d1ec3 Compare May 20, 2022 14:33
@nfrisby nfrisby force-pushed the jordan/dep-bump-protocol-in-block branch from 6036e3c to b4308ef Compare May 20, 2022 17:48
@Jimbo4350
Copy link
Contributor Author

bors merge

iohk-bors bot added a commit that referenced this pull request May 20, 2022
3818: Propagate protocol in block type r=Jimbo4350 a=Jimbo4350

This PR: 
- Propagates updated ShelleyBlock type (which is now also parameterized over the protocol)
- Re-enables the TestEnableDevelopmentHardForkEras flag so we can hardfork to Babbage without advertising we know about the Babbage era

Co-authored-by: Jordan Millar <[email protected]>
Co-authored-by: Nicolas Frisby <[email protected]>
Co-authored-by: Alexander Esgen <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented May 20, 2022

Timed out.

deepfire pushed a commit that referenced this pull request May 20, 2022
sized Metadate : tests for Alonzo & Babbage
rebase on #3818 and reuse code from Cardano.Api.InMode
fixes in SubmissionClient
workbench:  add babbage era
@disassembler
Copy link
Contributor

bors merge

iohk-bors bot added a commit that referenced this pull request May 21, 2022
3818: Propagate protocol in block type r=disassembler a=Jimbo4350

This PR: 
- Propagates updated ShelleyBlock type (which is now also parameterized over the protocol)
- Re-enables the TestEnableDevelopmentHardForkEras flag so we can hardfork to Babbage without advertising we know about the Babbage era

Co-authored-by: Jordan Millar <[email protected]>
Co-authored-by: Nicolas Frisby <[email protected]>
Co-authored-by: Alexander Esgen <[email protected]>
@disassembler
Copy link
Contributor

bors r-

@iohk-bors
Copy link
Contributor

iohk-bors bot commented May 21, 2022

Canceled.

@disassembler
Copy link
Contributor

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented May 21, 2022

Build succeeded:

@iohk-bors iohk-bors bot merged commit d0b0fa1 into master May 21, 2022
@iohk-bors iohk-bors bot deleted the jordan/dep-bump-protocol-in-block branch May 21, 2022 03:34
deepfire pushed a commit that referenced this pull request May 22, 2022
sized Metadate : tests for Alonzo & Babbage
rebase on #3818 and reuse code from Cardano.Api.InMode
fixes in SubmissionClient
workbench:  add babbage era
deepfire pushed a commit that referenced this pull request May 22, 2022
sized Metadate : tests for Alonzo & Babbage
rebase on #3818 and reuse code from Cardano.Api.InMode
fixes in SubmissionClient
workbench:  add babbage era
deepfire pushed a commit that referenced this pull request May 23, 2022
sized Metadate : tests for Alonzo & Babbage
rebase on #3818 and reuse code from Cardano.Api.InMode
fixes in SubmissionClient
workbench:  add babbage era
MarcFontaine added a commit that referenced this pull request May 25, 2022
sized Metadate : tests for Alonzo & Babbage
rebase on #3818 and reuse code from Cardano.Api.InMode
fixes in SubmissionClient
workbench:  add babbage era
deepfire pushed a commit that referenced this pull request May 26, 2022
sized Metadate : tests for Alonzo & Babbage
rebase on #3818 and reuse code from Cardano.Api.InMode
fixes in SubmissionClient
workbench:  add babbage era
deepfire pushed a commit that referenced this pull request May 27, 2022
sized Metadate : tests for Alonzo & Babbage
rebase on #3818 and reuse code from Cardano.Api.InMode
fixes in SubmissionClient
workbench:  add babbage era
deepfire pushed a commit that referenced this pull request May 27, 2022
sized Metadate : tests for Alonzo & Babbage
rebase on #3818 and reuse code from Cardano.Api.InMode
fixes in SubmissionClient
workbench:  add babbage era
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants