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

Txpool 4844 upgrades Part 2 #8213

Merged
merged 32 commits into from
Sep 20, 2023
Merged

Conversation

somnathb1
Copy link
Collaborator

@somnathb1 somnathb1 commented Sep 16, 2023

Some peer-review changes from the last related PR.
Addition of a flag for BlobSlots - for max allowed blobs per account in txpool.
Use BlobFee from the block to validate txs in the pool.

See also ledgerwatch/erigon-lib#1125

@somnathb1 somnathb1 marked this pull request as draft September 16, 2023 08:01
@somnathb1 somnathb1 marked this pull request as ready for review September 16, 2023 12:16
@somnathb1 somnathb1 added the dencun The Deneb/Cancun protocol upgrade label Sep 16, 2023
backend.notifications.Accumulator.StartChange(currentBlock.NumberU64(), currentBlock.Hash(), nil, false)
backend.notifications.Accumulator.SendAndReset(ctx, backend.notifications.StateChangesConsumer, baseFee, currentBlock.GasLimit(), 0)

backend.notifications.Accumulator.SendAndReset(ctx, backend.notifications.StateChangesConsumer, baseFee, blobFee, currentBlock.GasLimit(), 0)
Copy link
Collaborator

Choose a reason for hiding this comment

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

If we are sending pending rather than current blobFee, it makes sense to do the same for baseFee (pending instead of current).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, i will make that change as well. Meanwhile, in this case we are sending values (to txPool) with respect to the CurrentBlock, which is where the sync is at. Should we consider sending values for the canonical head instead?

Copy link
Collaborator

Choose a reason for hiding this comment

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

This piece of code looks like a kludge. I'd leave currentBlock as is since it seems to be doing the job.

eth/backend.go Outdated Show resolved Hide resolved
github-merge-queue bot pushed a commit to ledgerwatch/erigon-lib that referenced this pull request Sep 20, 2023
Fix some peer-review comments from the last related PR, and add some
enhancements

#### Change summary
- Addition of a flag for BlobSlots - for max allowed blobs per account
in txpool
- Use BlobFee from the block to validate txs in the pool
- Let go of unwound blob txn's onNewBlock, if not present in the cache;
we don't request them again from the network

Related: ledgerwatch/erigon#8213
ledgerwatch/interfaces#195
@somnathb1 somnathb1 merged commit f51d9b6 into ledgerwatch:devel Sep 20, 2023
4 checks passed
@somnathb1 somnathb1 deleted the txpool-4844-upgrades branch October 3, 2023 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dencun The Deneb/Cancun protocol upgrade
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants