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

Basic Alonzo node #2657

Merged
merged 7 commits into from
May 20, 2021
Merged

Basic Alonzo node #2657

merged 7 commits into from
May 20, 2021

Conversation

Jimbo4350
Copy link
Contributor

@Jimbo4350 Jimbo4350 commented Apr 26, 2021 •
edited
Loading

In order to have QA begin testing on an Alonzo capable node we have minimally integrated the Alonzo era such that a node can hardfork to the Alonzo era. No other functionality has been implemented i.e nothing cli related and only enough in the api to allow a hardfork.

NB: #2400 needs to be merged to enable hardforking to Alonzo

@Jimbo4350 Jimbo4350 added the WIP Work In Progress (cannot be merged yet) label Apr 26, 2021
@Jimbo4350 Jimbo4350 force-pushed the jordan/basic-alonzo-node branch 2 times, most recently from 682d158 to f7fa53c Compare April 27, 2021 09:27
@Jimbo4350
Copy link
Contributor Author

After 2932 in ouroboros-network is merged, I can update the node deps in this PR and finalize this PR.

@Jimbo4350 Jimbo4350 force-pushed the jordan/basic-alonzo-node branch 3 times, most recently from d2be177 to fa6f0cf Compare May 7, 2021 07:39
@Jimbo4350 Jimbo4350 force-pushed the jordan/basic-alonzo-node branch 7 times, most recently from f8001d2 to 8c19e28 Compare May 11, 2021 10:45
dcoutts
dcoutts requested changes May 11, 2021
View reviewed changes
Copy link
Contributor

@dcoutts dcoutts left a comment

Choose a reason for hiding this comment

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

Looking great.

cardano-api/src/Cardano/Api/Eras.hs Show resolved Hide resolved
cardano-api/src/Cardano/Api/Fees.hs Show resolved Hide resolved
cardano-api/src/Cardano/Api/LedgerState.hs Outdated Show resolved Hide resolved
cardano-api/src/Cardano/Api/LedgerState.hs Outdated Show resolved Hide resolved
cardano-api/src/Cardano/Api/Query.hs Show resolved Hide resolved
cardano-cli/src/Cardano/CLI/Shelley/Orphans.hs Show resolved Hide resolved
cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs Outdated Show resolved Hide resolved
cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs Show resolved Hide resolved
cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Orphans.hs Outdated Show resolved Hide resolved
dcoutts
dcoutts previously requested changes May 12, 2021
View reviewed changes
Copy link
Contributor

@dcoutts dcoutts left a comment

Choose a reason for hiding this comment

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

Nearly there.

cardano-node/src/Cardano/Node/Orphans.hs Outdated Show resolved Hide resolved
cardano-node/src/Cardano/Node/Protocol/Cardano.hs Outdated
@@ -158,7 +167,7 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
-- is in the Allegra era. That is, it is the version of protocol
-- /after/ Allegra, i.e. Mary.
allegraProtVer =
ProtVer 4 0
ProtVer 3 0
Copy link
Contributor

Choose a reason for hiding this comment

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

This still needs fixing.

cardano-node/src/Cardano/Node/Protocol/Cardano.hs Outdated Show resolved Hide resolved
@dcoutts dcoutts marked this pull request as ready for review May 12, 2021 21:01
@dcoutts dcoutts dismissed their stale review May 12, 2021 22:02

I've addressed my comments.

@dcoutts dcoutts mentioned this pull request May 14, 2021
Merged
cblp
cblp reviewed May 14, 2021
View reviewed changes
cardano-node/src/Cardano/Node/Protocol/Cardano.hs Outdated
-- During testing of the Alonzo era, we conditionally declare that we
-- know about the Alonzo era. We do so only when a config option for
-- testing development/unstable eras is used. This lets us include
-- not-yet-ready eras in released node versions without mainnet nodes
Copy link
Contributor

Choose a reason for hiding this comment

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

Can a specially forged packet break a node?

Copy link
Contributor

Choose a reason for hiding this comment

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

No. It's just about not prematurely advertising support for a new era.

@Jimbo4350 Jimbo4350 force-pushed the jordan/basic-alonzo-node branch 2 times, most recently from e8ddaa2 to 45bbb5b Compare May 18, 2021 12:30
dcoutts and others added 3 commits May 19, 2021 08:14
@dcoutts @Jimbo4350
Remove unused Cardano.Node.Query
6f20e8d 
This avoids having to update it for Alonzo support.
@Jimbo4350 @dcoutts
Add initial Alonzo era support to the API and node
7af399f 
Update the cardano-api and cardano-node with initial support for the
Alonzo era in order to pave the path to a basic Alonzo node. A lot of
functionality still not implemented for Alonzo era. It remains as stubs
or as TODOs.

Co-authored-by: Duncan Coutts <duncan@well-typed.com>
@Jimbo4350
Update mkfiles.sh to allow immediate hard forking to Alonzo
aadfae2
@Jimbo4350 Jimbo4350 mentioned this pull request May 19, 2021
Merged
@Jimbo4350 Jimbo4350 force-pushed the jordan/basic-alonzo-node branch 5 times, most recently from 3fc290c to 2d944a5 Compare May 19, 2021 16:11
@jbgi jbgi force-pushed the jordan/basic-alonzo-node branch from 692d68c to 1e4ebe3 Compare May 20, 2021 10:12
@jbgi jbgi force-pushed the jordan/basic-alonzo-node branch from 1e4ebe3 to 52a8247 Compare May 20, 2021 12:25
@Jimbo4350 Jimbo4350 removed the WIP Work In Progress (cannot be merged yet) label May 20, 2021
@Jimbo4350
Copy link
Contributor Author

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented May 20, 2021

Build succeeded:

@iohk-bors iohk-bors bot merged commit ad76ebe into master May 20, 2021
@iohk-bors iohk-bors bot deleted the jordan/basic-alonzo-node branch May 20, 2021 13:15
iohk-bors bot added a commit that referenced this pull request May 24, 2021
@iohk-bors @newhoggy
@dcoutts @Jimbo4350
Merge #2642
73ab3e8 
2642: Update Cardano.Api.Tx in preparation for Alonzo r=dcoutts a=Jimbo4350

Depends on: 
1. #2657
2. #2400 
3. #2699
4. #2649

Co-authored-by: John Ky <john.ky@iohk.io>
Co-authored-by: Duncan Coutts <duncan@well-typed.com>
Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
@rvl rvl mentioned this pull request Jun 1, 2021
Merged
2 tasks
iohk-bors bot added a commit that referenced this pull request Jun 28, 2021
@iohk-bors @rvl
@hamishmack @jbgi
Merge #2768
aa88564 
2768: Bring back Windows and macOS builds on Hydra r=jbgi a=rvl

The Windows and macOS builds were disabled in #2657 so that at least something could be merged.

- [x] Revert commit 8c0e2e9.
- [ ] Fix failed build of `plutus-core:library:plutus-core` when cross-compiling to windows.

See [Hydra jobset for PR #2768](https://hydra.iohk.io/jobset/Cardano/cardano-node-pr-2768#tabs-jobs)

cc: @Jimbo4350 @disassembler @jbgi 


Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
Co-authored-by: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cblp cblp cblp left review comments

@dcoutts dcoutts dcoutts approved these changes

@DavidEichmann DavidEichmann Awaiting requested review from DavidEichmann

@erikd erikd Awaiting requested review from erikd

@newhoggy newhoggy Awaiting requested review from newhoggy

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

Successfully merging this pull request may close these issues.
5 participants
@Jimbo4350 @cblp @dcoutts @rvl @jbgi