forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 13:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore(API): enforce from address when checking pol tx (#52)

Browse source
This commit is contained in:
Cal Bera 2025-08-08 10:30:06 -07:00 committed by GitHub
parent 2e040fc486
commit 497e1a4e42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/types/tx_pol.go
View file

@ -160,10 +160,10 @@ func getDistributeForData(pubkey *common.Pubkey) ([]byte, error) {
} }
// IsPoLDistribution returns true if the transaction is a PoL distribution. // IsPoLDistribution returns true if the transaction is a PoL distribution.
func IsPoLDistribution(to *common.Address, data []byte, distributorAddress common.Address) bool { func IsPoLDistribution(from common.Address, to *common.Address, data []byte, distributorAddress common.Address) bool {
// Txs that call the `distributeFor(bytes pubkey)` method on the PoL Distributor // Txs that call the `distributeFor(bytes pubkey)` method on the PoL Distributor
// contract are also consideredPoL txs. // contract are also consideredPoL txs.
return to != nil && *to == distributorAddress && isDistributeForCall(data) return from == params.SystemAddress && to != nil && *to == distributorAddress && isDistributeForCall(data)
} }
// isDistributeForCall returns true if the provided calldata corresponds to a // isDistributeForCall returns true if the provided calldata corresponds to a

13
core/types/tx_pol_test.go
View file

@ -92,26 +92,31 @@ func TestIsPoLDistribution(t *testing.T) {
} }
// Positive case. // Positive case.
if !IsPoLDistribution(&distributor, tx.Data(), distributor) { if !IsPoLDistribution(params.SystemAddress, &distributor, tx.Data(), distributor) {
t.Fatalf("expected IsPoLDistribution to return true for valid PoL call") t.Fatalf("expected IsPoLDistribution to return true for valid PoL call")
} }
// Wrong address. // Wrong address.
otherAddr := common.HexToAddress("0x0200000000000000000000000000000000000002") otherAddr := common.HexToAddress("0x0200000000000000000000000000000000000002")
if IsPoLDistribution(&otherAddr, tx.Data(), distributor) { if IsPoLDistribution(params.SystemAddress, &otherAddr, tx.Data(), distributor) {
t.Fatalf("expected false when distributor address mismatches") t.Fatalf("expected false when distributor address mismatches")
} }
// Too-short data. // Too-short data.
shortData := []byte{0x01, 0x02, 0x03} shortData := []byte{0x01, 0x02, 0x03}
if IsPoLDistribution(&distributor, shortData, distributor) { if IsPoLDistribution(params.SystemAddress, &distributor, shortData, distributor) {
t.Fatalf("expected false for data shorter than selector") t.Fatalf("expected false for data shorter than selector")
} }
// Nil address. // Nil address.
if IsPoLDistribution(nil, tx.Data(), distributor) { if IsPoLDistribution(params.SystemAddress, nil, tx.Data(), distributor) {
t.Fatalf("expected false when to==nil") t.Fatalf("expected false when to==nil")
} }
// Wrong from address.
if IsPoLDistribution(distributor, &distributor, tx.Data(), distributor) {
t.Fatalf("expected false when from address mismatches")
}
} }
// TestPoLTx_RawSignatureValues confirms that PoLTx reports no signature. // TestPoLTx_RawSignatureValues confirms that PoLTx reports no signature.

4
internal/ethapi/transaction_args.go
View file

@ -463,7 +463,7 @@ func (args *TransactionArgs) ToMessage(baseFee *big.Int, skipNonceCheck, skipEoA
SetCodeAuthorizations: args.AuthorizationList, SetCodeAuthorizations: args.AuthorizationList,
SkipNonceChecks: skipNonceCheck, SkipNonceChecks: skipNonceCheck,
SkipFromEOACheck: skipEoACheck, SkipFromEOACheck: skipEoACheck,
IsPoLTx: isPrague1 && types.IsPoLDistribution(args.To, args.data(), distributorAddress), IsPoLTx: isPrague1 && types.IsPoLDistribution(args.from(), args.To, args.data(), distributorAddress),
} }
} }
@ -472,7 +472,7 @@ func (args *TransactionArgs) ToMessage(baseFee *big.Int, skipNonceCheck, skipEoA
func (args *TransactionArgs) ToTransaction(defaultType int, isPrague1 bool, distributorAddress common.Address) *types.Transaction { func (args *TransactionArgs) ToTransaction(defaultType int, isPrague1 bool, distributorAddress common.Address) *types.Transaction {
usedType := types.LegacyTxType usedType := types.LegacyTxType
switch { switch {
case isPrague1 && types.IsPoLDistribution(args.To, args.data(), distributorAddress): case isPrague1 && types.IsPoLDistribution(args.from(), args.To, args.data(), distributorAddress):
usedType = types.PoLTxType usedType = types.PoLTxType
case args.AuthorizationList != nil || defaultType == types.SetCodeTxType: case args.AuthorizationList != nil || defaultType == types.SetCodeTxType:
usedType = types.SetCodeTxType usedType = types.SetCodeTxType