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

Update Cardano.Api.Tx in preparation for Alonzo #2642

Merged
merged 18 commits into from
May 24, 2021
Merged

Update Cardano.Api.Tx in preparation for Alonzo #2642

merged 18 commits into from
May 24, 2021

Conversation

Jimbo4350
Copy link
Contributor

@Jimbo4350 Jimbo4350 commented Apr 22, 2021 •
edited
Loading

@Jimbo4350 Jimbo4350 force-pushed the jordan/alonzo-prep-api-tx-module branch from 860d2c3 to c38e2c9 Compare April 22, 2021 10:35
@Jimbo4350 Jimbo4350 force-pushed the jordan/alonzo-prep-api-tx-module branch 8 times, most recently from aa10055 to 5ade9b9 Compare May 17, 2021 15:06
@dcoutts dcoutts force-pushed the jordan/alonzo-prep-api-tx-module branch from 07752b8 to 134b792 Compare May 19, 2021 21:03
@dcoutts dcoutts added the WIP Work In Progress (cannot be merged yet) label May 19, 2021
@dcoutts dcoutts force-pushed the jordan/alonzo-prep-api-tx-module branch from 134b792 to 8c34b3c Compare May 19, 2021 23:12
Jimbo4350
Jimbo4350 commented May 20, 2021
View reviewed changes
cardano-api/src/Cardano/Api/TxBody.hs Outdated
@@ -878,6 +878,9 @@ data TxBody era where
-- witnesses set, since they need to be known when building the body.
-> [Ledger.Script (ShelleyLedgerEra era)]

--TODO: we will probably want to or need to put the Alonzo data and
Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍

@dcoutts dcoutts mentioned this pull request May 20, 2021
Closed
@dcoutts dcoutts force-pushed the jordan/alonzo-prep-api-tx-module branch from 51d7684 to 3e7cc16 Compare May 20, 2021 13:52
@newhoggy newhoggy force-pushed the jordan/alonzo-prep-api-tx-module branch 2 times, most recently from d307dec to 14e41aa Compare May 21, 2021 02:06
@newhoggy
Copy link
Contributor

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented May 21, 2021

👎 Rejected by label

@newhoggy newhoggy added WIP Work In Progress (cannot be merged yet) and removed WIP Work In Progress (cannot be merged yet) labels May 21, 2021
@newhoggy newhoggy force-pushed the jordan/alonzo-prep-api-tx-module branch from 2e3a97b to 14e41aa Compare May 21, 2021 06:48
@Jimbo4350 Jimbo4350 mentioned this pull request May 21, 2021
Closed
@Jimbo4350 Jimbo4350 force-pushed the jordan/alonzo-prep-api-tx-module branch from e487ee2 to 2a9e029 Compare May 21, 2021 08:30
@Jimbo4350 Jimbo4350 force-pushed the jordan/alonzo-prep-api-tx-module branch from 2a9e029 to e633016 Compare May 21, 2021 10:08
@Jimbo4350 Jimbo4350 mentioned this pull request May 21, 2021
Merged
newhoggy and others added 18 commits May 24, 2021 11:36
@newhoggy @dcoutts
Fill in many TODOs in the Alonzo support.
7eabf0a 
Including Alonzo constructors for the "feature X supported in era" GADTs
used in TxBody.
@dcoutts
Extend getBlockTxs to cover all eras.
cdf338e 
This manages to keep a single era-generic implementation, rather than
having to do a case split on Alonzo vs the other Shelley-based eras.
@dcoutts
Change Tx from wrapping Shelley.Tx to Ledger.Tx
9f184f8 
The Ledger.Tx is the type family indexed on the era, while Shelley.Tx is
a specific type for the Shelley era (but also used by Allegra and Mary).
@dcoutts @Jimbo4350
Do some of the TODOs in Cardano.Api.Tx
88fd478 
Several of the easy straightforward ones.

Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
@dcoutts
Complete the Alonzo case for the SerialiseAsCBOR KeyWitness instance
545ad4d 
It turns out that the serialiseToCBOR side did not need to do case
analysis on the era at all.
@dcoutts @Jimbo4350
Fill in the Alonzo case for the Tx pattern
bf6b8b4 
Specifically the Alonzo cases for the getTxBody and getTxWitnesses
helper functions used by the Tx pattern on the destructor side.

Also the Alonzo case for makeSignedTransaction. There are still TODOs
here to construct the dataum and redeemer mappings.

Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
@dcoutts
Fill in more Alonzo TODOs in TxBody
5cf766e 
A bunch more of the easy ones.
@dcoutts
Partially fill in the Alonzo TxOut support
d7c5aad 
Still a TODO for the Alonzo tx out data hash.
@dcoutts
Partially fill in the Alonzo auxiliary data support
b041871 
Still TODOs for the aux script data.
@dcoutts
Partially fill in Alonzo support for makeShelleyTransactionBody
8789967 
Still several TODOs for the new and changed fields.
@dcoutts
Add a Hash data family instance for ScriptData to the API
5ce75db 
We will use Hash ScriptData in the tx out datum hash.
@dcoutts
Don't export the Hash representations from the API top level module
afaa684 
But do export the representations from the Byron and Shelley API modules
since those are supposed to expose the representations.
@dcoutts
Extend TxBody API with TxOutDatumHash and TxAuxScriptData
1aea531 
Both depending on the feature GADT ScriptDataSupportedInEra which covers
only the Alonzo era.

The TxOutDatumHash ptionally contains a Hash ScriptData. It will be
added to the TxOut as a 3rd component.

The TxAuxScriptData is like TxAuxScripts but for script data rather than
scripts. It will be added to the TxBodyContent record.

This commit just adds the types but does not yet use them.
@dcoutts
Add TxOutDatumHash to TxOut in the API
e52be95 
Not yet supported in the CLI.
@newhoggy @dcoutts
Add TxOutDatumHashNone placeholder
cbf6ff7
@newhoggy @dcoutts
Mark out some Alonzo TODOs
392d27c
@Jimbo4350 @dcoutts
Align Alonzo Prices with formal spec
9c5d547
@Jimbo4350 @dcoutts
Remove plutus-ledger-api dep from cardano-node
27010f0
@dcoutts dcoutts force-pushed the jordan/alonzo-prep-api-tx-module branch from 6fe08a3 to 27010f0 Compare May 24, 2021 13:11
@dcoutts dcoutts mentioned this pull request May 24, 2021
Merged
dcoutts
dcoutts approved these changes May 24, 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.

I'm happy with this now.

Follow-up commits are now in #2738, in particular the redeemer map stuff.

@Jimbo4350 Jimbo4350 removed WIP Work In Progress (cannot be merged yet) hydra-dont-build labels May 24, 2021
@dcoutts
Copy link
Contributor

dcoutts commented May 24, 2021

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented May 24, 2021

Build succeeded:

@iohk-bors iohk-bors bot merged commit 73ab3e8 into master May 24, 2021
@iohk-bors iohk-bors bot deleted the jordan/alonzo-prep-api-tx-module branch May 24, 2021 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcoutts dcoutts dcoutts approved these changes

@newhoggy newhoggy newhoggy approved these changes

@DavidEichmann DavidEichmann Awaiting requested review from DavidEichmann

@erikd erikd Awaiting requested review from erikd

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

Successfully merging this pull request may close these issues.
3 participants
@Jimbo4350 @newhoggy @dcoutts