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

allow unprotected txns #1098

Merged
merged 4 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions core/txpool/legacypool/legacypool.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@
AccountQueue: 64,
GlobalQueue: 1024,

Lifetime: 3 * time.Hour,
Lifetime: 3 * time.Hour,
AllowUnprotectedTxs: false,
}

// sanitize checks the provided user configurations and changes anything that's
Expand Down Expand Up @@ -590,7 +591,8 @@
// and does not require the pool mutex to be held.
func (pool *LegacyPool) validateTxBasics(tx *types.Transaction, local bool) error {
opts := &txpool.ValidationOptions{
Config: pool.chainconfig,
Config: pool.chainconfig,
AllowUnprotectedTxs: pool.config.AllowUnprotectedTxs,
Accept: 0 |
1<<types.LegacyTxType |
1<<types.AccessListTxType |
Expand Down Expand Up @@ -660,6 +662,11 @@
knownTxMeter.Mark(1)
return false, ErrAlreadyKnown
}

if pool.config.AllowUnprotectedTxs {
pool.signer = types.NewFakeSigner(tx.ChainId())
}

Check warning on line 668 in core/txpool/legacypool/legacypool.go

View check run for this annotation

Codecov / codecov/patch

core/txpool/legacypool/legacypool.go#L667-L668

Added lines #L667 - L668 were not covered by tests

// Make the local flag. If it's from local source or it's from the network but
// the sender is marked as local previously, treat it as the local transaction.
isLocal := local || pool.locals.containsTx(tx)
Expand Down Expand Up @@ -982,6 +989,11 @@
knownTxMeter.Mark(1)
continue
}

if pool.config.AllowUnprotectedTxs {
pool.signer = types.NewFakeSigner(tx.ChainId())
}

Check warning on line 995 in core/txpool/legacypool/legacypool.go

View check run for this annotation

Codecov / codecov/patch

core/txpool/legacypool/legacypool.go#L994-L995

Added lines #L994 - L995 were not covered by tests

// Exclude transactions with basic errors, e.g invalid signatures and
// insufficient intrinsic gas as soon as possible and cache senders
// in transactions before obtaining lock
Expand Down
4 changes: 3 additions & 1 deletion core/txpool/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import (
type ValidationOptions struct {
Config *params.ChainConfig // Chain configuration to selectively validate based on current fork rules

AllowUnprotectedTxs bool // Whether to allow unprotected transactions in the pool

Accept uint8 // Bitmap of transaction types that should be accepted for the calling pool
MaxSize uint64 // Maximum size of a transaction that the caller can meaningfully handle
MinTip *big.Int // Minimum gas tip needed to allow a transaction into the caller pool
Expand Down Expand Up @@ -91,7 +93,7 @@ func ValidateTransaction(tx *types.Transaction, blobs []kzg4844.Blob, commits []
return core.ErrTipAboveFeeCap
}
// Make sure the transaction is signed properly
if _, err := types.Sender(signer, tx); err != nil {
if _, err := types.Sender(signer, tx); err != nil && !opts.AllowUnprotectedTxs {
return ErrInvalidSender
}
// Ensure the transaction has more gas than the bare minimum needed to cover
Expand Down
35 changes: 35 additions & 0 deletions core/types/transaction_signing.go
Original file line number Diff line number Diff line change
Expand Up @@ -594,3 +594,38 @@
v = new(big.Int).Sub(v, big.NewInt(35))
return v.Div(v, big.NewInt(2))
}

// FakeSigner implements the Signer interface and accepts unprotected transactions
type FakeSigner struct{ londonSigner }

var _ Signer = FakeSigner{}

func NewFakeSigner(chainId *big.Int) Signer {
signer := NewLondonSigner(chainId)
ls, _ := signer.(londonSigner)
return FakeSigner{londonSigner: ls}

Check warning on line 606 in core/types/transaction_signing.go

View check run for this annotation

Codecov / codecov/patch

core/types/transaction_signing.go#L603-L606

Added lines #L603 - L606 were not covered by tests
}

func (f FakeSigner) Sender(tx *Transaction) (common.Address, error) {
return f.londonSigner.Sender(tx)

Check warning on line 610 in core/types/transaction_signing.go

View check run for this annotation

Codecov / codecov/patch

core/types/transaction_signing.go#L609-L610

Added lines #L609 - L610 were not covered by tests
}

func (f FakeSigner) SignatureValues(tx *Transaction, sig []byte) (r, s, v *big.Int, err error) {
return f.londonSigner.SignatureValues(tx, sig)

Check warning on line 614 in core/types/transaction_signing.go

View check run for this annotation

Codecov / codecov/patch

core/types/transaction_signing.go#L613-L614

Added lines #L613 - L614 were not covered by tests
}

func (f FakeSigner) ChainID() *big.Int {
return f.londonSigner.ChainID()

Check warning on line 618 in core/types/transaction_signing.go

View check run for this annotation

Codecov / codecov/patch

core/types/transaction_signing.go#L617-L618

Added lines #L617 - L618 were not covered by tests
}

// Hash returns 'signature hash', i.e. the transaction hash that is signed by the
// private key. This hash does not uniquely identify the transaction.
func (f FakeSigner) Hash(tx *Transaction) common.Hash {
return f.londonSigner.Hash(tx)

Check warning on line 624 in core/types/transaction_signing.go

View check run for this annotation

Codecov / codecov/patch

core/types/transaction_signing.go#L623-L624

Added lines #L623 - L624 were not covered by tests
}

// Equal returns true if the given signer is the same as the receiver.
func (f FakeSigner) Equal(Signer) bool {
// Always return true
return true

Check warning on line 630 in core/types/transaction_signing.go

View check run for this annotation

Codecov / codecov/patch

core/types/transaction_signing.go#L628-L630

Added lines #L628 - L630 were not covered by tests
}
3 changes: 1 addition & 2 deletions eth/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@

eth.APIBackend = &EthAPIBackend{stack.Config().ExtRPCEnabled(), stack.Config().AllowUnprotectedTxs, eth, nil}
if eth.APIBackend.allowUnprotectedTxs {
log.Debug(" ###########", "Unprotected transactions allowed")
temaniarpit27 marked this conversation as resolved.
Show resolved Hide resolved

log.Info("------Unprotected transactions allowed-------")

Check warning on line 171 in eth/backend.go

View check run for this annotation

Codecov / codecov/patch

eth/backend.go#L171

Added line #L171 was not covered by tests
config.TxPool.AllowUnprotectedTxs = true
}

Expand Down
Loading