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

Shelley forge should respect max block size override #3238

Conversation

EncodePanda
Copy link
Contributor

@EncodePanda EncodePanda commented Jul 2, 2021

Addresses: #3237 and #3225

Also #3239 was fixed in 4b456e1

@EncodePanda EncodePanda requested a review from nfrisby July 2, 2021 11:04
Copy link
Contributor

@nfrisby nfrisby left a comment

Choose a reason for hiding this comment

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

A few last bits to tie up.

@EncodePanda EncodePanda force-pushed the EncodePanda/3225-max-tx-capacity-override-included-in-shelley branch 2 times, most recently from 6596cb1 to 4b456e1 Compare July 2, 2021 14:19
Copy link
Contributor

@nfrisby nfrisby left a comment

Choose a reason for hiding this comment

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

Approving; there are just a couple minor things left to do before merging:

  • update the comments around MaxTxCapacityOverride
  • remove a couple of extra newlines

By making a MaxTxCapacityOverride polymorphic on the block we open up
possibility to use when calculating max capacity for Alonzo
block (whose Measure is product of ByteSize and ExUnits)
It also allows us to define one for the HardForkBlock, which allows to
unify the usage of TxLimits in both Byron and Shelley while forging blocks.
In a process we had to introduce Overrides data family because the
MaxTxCapacityOverride of HardForkBlock had do be different (NP of
individual MaxTxCapacityOverrides) then for normal blocks (where it is
just a Measure).
In the process of making those changes TxLimits was moved from
Ouroboros.Consensus.Shelley.TxLimits to
Ouroboros.Consensus.Mempool.TxLimits
@EncodePanda EncodePanda force-pushed the EncodePanda/3225-max-tx-capacity-override-included-in-shelley branch from 4b456e1 to e244a30 Compare July 5, 2021 09:04
@EncodePanda
Copy link
Contributor Author

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 5, 2021

@iohk-bors iohk-bors bot merged commit 3011351 into master Jul 5, 2021
@iohk-bors iohk-bors bot deleted the EncodePanda/3225-max-tx-capacity-override-included-in-shelley branch July 5, 2021 10:34
coot pushed a commit that referenced this pull request May 16, 2022
3238: Shelley forge should respect max block size override  r=EncodePanda a=EncodePanda

Addresses: #3237 and #3225

Also #3239 was fixed in 4b456e1

Co-authored-by: EncodePanda <paul.szulc@gmail.com>
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.

2 participants