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

remove StateTransition rip7560Frame bool

Browse source 
is msg.isRip7560Frame,
which allows usage of plain ApplyMessage
This commit is contained in:
Dror Tirosh 2024-05-28 18:27:33 +03:00
parent 19fc05d6c3
commit c29c3eb9bc
2 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/state_processor_rip7560.go
View file

@ -113,21 +113,6 @@ func BuyGasRip7560Transaction(st *types.Rip7560AccountAbstractionTx, state vm.St
return nil
}
func ApplyRip7560FrameMessage(evm *vm.EVM, msg *Message, gp *GasPool) (*ExecutionResult, error) {
return NewRip7560StateTransition(evm, msg, gp).TransitionDb()
}
// NewRip7560StateTransition initialises and returns a new state transition object.
func NewRip7560StateTransition(evm *vm.EVM, msg *Message, gp *GasPool) *StateTransition {
return &StateTransition{
gp: gp,
evm: evm,
msg: msg,
state: evm.StateDB,
rip7560Frame: true,
}
}
func ApplyRip7560ValidationPhases(chainConfig *params.ChainConfig, bc ChainContext, author *common.Address, gp *GasPool, statedb *state.StateDB, header *types.Header, tx *types.Transaction, cfg vm.Config) (*ValidationPhaseResult, error) {
stubMsg := prepareStubMessage(tx, chainConfig)
blockContext := NewEVMBlockContext(header, bc, author)
@ -138,7 +123,7 @@ func ApplyRip7560ValidationPhases(chainConfig *params.ChainConfig, bc ChainConte
deployerMsg := prepareDeployerMessage(tx, chainConfig)
var deploymentUsedGas uint64
if deployerMsg != nil {
resultDeployer, err := ApplyRip7560FrameMessage(evm, deployerMsg, gp)
resultDeployer, err := ApplyMessage(evm, deployerMsg, gp)
if err != nil {
return nil, err
}
@ -154,7 +139,7 @@ func ApplyRip7560ValidationPhases(chainConfig *params.ChainConfig, bc ChainConte
signer := types.MakeSigner(chainConfig, header.Number, header.Time)
signingHash := signer.Hash(tx)
accountValidationMsg, err := prepareAccountValidationMessage(tx, chainConfig, signingHash, deploymentUsedGas)
resultAccountValidation, err := ApplyRip7560FrameMessage(evm, accountValidationMsg, gp)
resultAccountValidation, err := ApplyMessage(evm, accountValidationMsg, gp)
if err != nil {
return nil, err
}
@ -199,7 +184,7 @@ func applyPaymasterValidationFrame(tx *types.Transaction, chainConfig *params.Ch
return nil, 0, 0, 0, err
}
if paymasterMsg != nil {
resultPm, err := ApplyRip7560FrameMessage(evm, paymasterMsg, gp)
resultPm, err := ApplyMessage(evm, paymasterMsg, gp)
if err != nil {
return nil, 0, 0, 0, err
}
@ -226,7 +211,7 @@ func applyPaymasterPostOpFrame(vpr *ValidationPhaseResult, executionResult *Exec
if err != nil {
return nil, err
}
paymasterPostOpResult, err = ApplyRip7560FrameMessage(evm, paymasterPostOpMsg, gp)
paymasterPostOpResult, err = ApplyMessage(evm, paymasterPostOpMsg, gp)
if err != nil {
return nil, err
}
@ -245,7 +230,7 @@ func ApplyRip7560ExecutionPhase(config *params.ChainConfig, vpr *ValidationPhase
evm := vm.NewEVM(blockContext, txContext, statedb, config, cfg)
accountExecutionMsg := prepareAccountExecutionMessage(vpr.Tx, evm.ChainConfig())
executionResult, err := ApplyRip7560FrameMessage(evm, accountExecutionMsg, gp)
executionResult, err := ApplyMessage(evm, accountExecutionMsg, gp)
if err != nil {
return nil, err
}

3
core/state_transition.go
View file

@ -217,7 +217,6 @@ type StateTransition struct {
initialGas uint64
state vm.StateDB
evm *vm.EVM
rip7560Frame bool
}
// NewStateTransition initialises and returns a new state transition object.
@ -364,7 +363,7 @@ func (st *StateTransition) preCheck() error {
// no need to "buy gus" for individual frames
// there is a single shared gas pre-charge
if st.rip7560Frame {
if st.msg.IsRip7560Frame {
st.gasRemaining += st.msg.GasLimit
st.initialGas = st.msg.GasLimit
return nil