WIP: EIP-7907 Meter Contract Code Size And Increase Limit #32003
+386
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lightclient
requested review from
fjl,
karalabe,
gballet,
rjl493456442,
zsfelfoldi,
MariusVanDerWijden and
jwasinger
as code owners
Co-authored-by: lightclient <[email protected]> Co-authored-by: Qi Zhou <[email protected]>
Co-authored-by: lightclient <[email protected]> Co-authored-by: Qi Zhou <[email protected]>
fjl
reviewed
Jun 12, 2025
core/state/access_list.go
Outdated
| @@ -142,6 +164,11 @@ func (al *accessList) Equal(other *accessList) bool { | |||
| return slices.EqualFunc(al.slots, other.slots, maps.Equal) | |||
| } | |||
|
|
|||
| // DeleteAddressCode removes an address code from the access list. | |||
| func (al *accessList) DeleteAddressCode(address common.Address) { | |||
| delete(al.addresses, address) | |||
There was a problem hiding this comment.
This function is identical to DeleteAddress.
| @@ -132,8 +132,10 @@ const ( | |||
| DefaultElasticityMultiplier = 2 // Bounds the maximum gas limit an EIP-1559 block may have. | |||
| InitialBaseFee = 1000000000 // Initial base fee for EIP-1559 blocks. | |||
|
|
|||
| MaxCodeSize = 24576 // Maximum bytecode to permit for a contract | |||
| MaxInitCodeSize = 2 * MaxCodeSize // Maximum initcode to permit in a creation transaction and create instructions | |||
There was a problem hiding this comment.
There seems to be some use of MaxInitCodeSize yet:
--- a/cmd/evm/internal/t8ntool/transaction.go
+++ b/cmd/evm/internal/t8ntool/transaction.go
@@ -180,7 +180,7 @@ func Transaction(ctx *cli.Context) error {
r.Error = errors.New("gas * maxFeePerGas exceeds 256 bits")
}
// Check whether the init code size has been exceeded.
- if chainConfig.IsShanghai(new(big.Int), 0) && tx.To() == nil && len(tx.Data()) > params.MaxInitCodeSize {
+ if chainConfig.IsShanghai(new(big.Int), 0) && tx.To() == nil && len(tx.Data()) > params.MaxInitCodeSizeEIP3860 {
r.Error = errors.New("max initcode size exceeded")
}
results = append(results, r)
diff --git a/core/txpool/validation.go b/core/txpool/validation.go
index 720d0d3b7..29c335038 100644
--- a/core/txpool/validation.go
+++ b/core/txpool/validation.go
@@ -87,8 +87,8 @@ func ValidateTransaction(tx *types.Transaction, head *types.Header, signer types
return fmt.Errorf("%w: type %d rejected, pool not yet in Prague", core.ErrTxTypeNotSupported, tx.Type())
}
// Check whether the init code size has been exceeded
- if rules.IsShanghai && tx.To() == nil && len(tx.Data()) > params.MaxInitCodeSize {
- return fmt.Errorf("%w: code size %v, limit %v", core.ErrMaxInitCodeSizeExceeded, len(tx.Data()), params.MaxInitCodeSize)
+ if rules.IsShanghai && tx.To() == nil && len(tx.Data()) > params.MaxInitCodeSizeEIP3860 {
+ return fmt.Errorf("%w: code size %v, limit %v", core.ErrMaxInitCodeSizeExceeded, len(tx.Data()), params.MaxInitCodeSizeEIP3860)
}
// Transactions can't be negative. This may never happen using RLP decoded
// transactions but may occur for transactions created using the RPC.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WIP implementation of EIP-7907.