forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pr reviews

Browse source
This commit is contained in:
Dror Tirosh 2024-07-06 15:49:03 +03:00
parent 603d385c05
commit fcf91d4525
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/state_processor_rip7560.go
View file

@ -36,15 +36,18 @@ func UnpackValidationData(validationData []byte) (authorizerMagic uint64, validU
return return
} }
func UnpackPaymasterValidationReturn(paymasterValidationReturn []byte) (validationData, context []byte) { func UnpackPaymasterValidationReturn(paymasterValidationReturn []byte) (validationData, context []byte, err error) {
if len(paymasterValidationReturn) < 96 { if len(paymasterValidationReturn) < 96 {
return nil, nil return nil, nil, errors.New("paymaster return data: too short")
} }
validationData = paymasterValidationReturn[0:32] validationData = paymasterValidationReturn[0:32]
//2nd bytes32 is ignored (its an offset value) //2nd bytes32 is ignored (its an offset value)
contextLen := new(big.Int).SetBytes(paymasterValidationReturn[64:96]) contextLen := new(big.Int).SetBytes(paymasterValidationReturn[64:96])
if uint64(len(paymasterValidationReturn)) < 96+contextLen.Uint64() { if uint64(len(paymasterValidationReturn)) < 96+contextLen.Uint64() {
return nil, nil return nil, nil, errors.New("paymaster return data: unable to decode context")
}
if contextLen.Cmp(big.NewInt(PAYMASTER_MAX_CONTEXT_SIZE)) > 0 {
return nil, nil, errors.New("paymaster return data: context too large")
} }
context = paymasterValidationReturn[96 : 96+contextLen.Uint64()] context = paymasterValidationReturn[96 : 96+contextLen.Uint64()]
@ -383,8 +386,7 @@ func prepareAccountValidationMessage(baseTx *types.Transaction, chainConfig *par
func preparePaymasterValidationMessage(baseTx *types.Transaction, config *params.ChainConfig, signingHash common.Hash) (*Message, error) { func preparePaymasterValidationMessage(baseTx *types.Transaction, config *params.ChainConfig, signingHash common.Hash) (*Message, error) {
tx := baseTx.Rip7560TransactionData() tx := baseTx.Rip7560TransactionData()
paymasterAddress := tx.Paymaster if tx.Paymaster == nil {
if paymasterAddress == nil {
return nil, nil return nil, nil
} }
jsondata := `[ jsondata := `[
@ -400,7 +402,7 @@ func preparePaymasterValidationMessage(baseTx *types.Transaction, config *params
} }
return &Message{ return &Message{
From: config.EntryPointAddress, From: config.EntryPointAddress,
To: paymasterAddress, To: tx.Paymaster,
Value: big.NewInt(0), Value: big.NewInt(0),
GasLimit: tx.PaymasterGas, GasLimit: tx.PaymasterGas,
GasPrice: tx.GasFeeCap, GasPrice: tx.GasFeeCap,
@ -447,10 +449,9 @@ func preparePostOpMessage(vpr *ValidationPhaseResult, chainConfig *params.ChainC
if err != nil { if err != nil {
return nil, err return nil, err
} }
var paymasterAddress = tx.Paymaster
return &Message{ return &Message{
From: chainConfig.EntryPointAddress, From: chainConfig.EntryPointAddress,
To: paymasterAddress, To: tx.Paymaster,
Value: big.NewInt(0), Value: big.NewInt(0),
GasLimit: tx.PaymasterGas - executionResult.UsedGas, GasLimit: tx.PaymasterGas - executionResult.UsedGas,
GasPrice: tx.GasFeeCap, GasPrice: tx.GasFeeCap,
@ -482,17 +483,14 @@ func validatePaymasterReturnData(data []byte) (context []byte, validAfter, valid
if len(data) < 32 { if len(data) < 32 {
return nil, 0, 0, errors.New("invalid paymaster return data length") return nil, 0, 0, errors.New("invalid paymaster return data length")
} }
validationData, context := UnpackPaymasterValidationReturn(data) validationData, context, err := UnpackPaymasterValidationReturn(data)
if validationData == nil { if err != nil {
return nil, 0, 0, errors.New("invalid paymaster return data") return nil, 0, 0, err
} }
magicExpected, validUntil, validAfter := UnpackValidationData(validationData) magicExpected, validUntil, validAfter := UnpackValidationData(validationData)
if magicExpected != MAGIC_VALUE_PAYMASTER { if magicExpected != MAGIC_VALUE_PAYMASTER {
return nil, 0, 0, errors.New("paymaster did not return correct MAGIC_VALUE") return nil, 0, 0, errors.New("paymaster did not return correct MAGIC_VALUE")
} }
if len(context) > PAYMASTER_MAX_CONTEXT_SIZE {
return nil, 0, 0, errors.New("paymaster context too large")
}
return context, validAfter, validUntil, nil return context, validAfter, validUntil, nil
} }

4
tests/rip7560/paymaster_test.go
View file

@ -49,7 +49,7 @@ func TestPaymasterValidationFailure_unparseable_return_value(t *testing.T) {
PaymasterGas: 1000000000, PaymasterGas: 1000000000,
GasFeeCap: big.NewInt(1000000000), GasFeeCap: big.NewInt(1000000000),
Paymaster: &DEFAULT_PAYMASTER, Paymaster: &DEFAULT_PAYMASTER,
}, "invalid paymaster return data") }, "paymaster return data: too short")
} }
func TestPaymasterValidationFailure_wrong_magic(t *testing.T) { func TestPaymasterValidationFailure_wrong_magic(t *testing.T) {
@ -81,7 +81,7 @@ func TestPaymasterValidationFailure_contextTooLarge(t *testing.T) {
PaymasterGas: 1000000000, PaymasterGas: 1000000000,
GasFeeCap: big.NewInt(1000000000), GasFeeCap: big.NewInt(1000000000),
Paymaster: &DEFAULT_PAYMASTER, Paymaster: &DEFAULT_PAYMASTER,
}, "paymaster context too large") }, "paymaster return data: context too large")
} }
func TestPaymasterValidationFailure_validAfter(t *testing.T) { func TestPaymasterValidationFailure_validAfter(t *testing.T) {