Skip to content

Replace full blocks with headers in hook.Points #38

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.

Sign up for GitHub

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

Open
StephenButtolph wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace full blocks with headers in hook.Points #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions hook/hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,16 @@ import (

// Points define user-injected hook points.
type Points interface {
GasTarget(parent *types.Block) gas.Gas
SubSecondBlockTime(*types.Block) gas.Gas
GasTarget(parent *types.Header) gas.Gas
// SubSecondBlockTime returns the sub-second portion of the block time based
// on the provided gas rate.
//
// For example, if the block timestamp is 10.75 seconds and the gas rate is
// 100 gas/second, then this method should return 75 gas.
SubSecondBlockTime(*types.Header) gas.Gas
// BeforeBlock is called immediately prior to executing the block.
BeforeBlock(params.Rules, *state.StateDB, *types.Block) error
// AfterBlock is called immediately after executing the block.
AfterBlock(*state.StateDB, *types.Block, types.Receipts)
}

Expand All @@ -34,9 +41,9 @@ type Points interface {
func BeforeBlock(pts Points, rules params.Rules, sdb *state.StateDB, b *blocks.Block, clock *gastime.Time) error {
clock.FastForwardTo(
b.BuildTime(),
pts.SubSecondBlockTime(b.EthBlock()),
pts.SubSecondBlockTime(b.Header()),
)
target := pts.GasTarget(b.ParentBlock().EthBlock())
target := pts.GasTarget(b.ParentBlock().Header())
if err := clock.SetTarget(target); err != nil {
return fmt.Errorf("%T.SetTarget() before block: %w", clock, err)
}
Expand Down
4 changes: 2 additions & 2 deletions hook/hookstest/stub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ type Stub struct {
var _ hook.Points = (*Stub)(nil)

// GasTarget ignores its argument and always returns [Stub.Target].
func (s *Stub) GasTarget(parent *types.Block) gas.Gas {
func (s *Stub) GasTarget(*types.Header) gas.Gas {
return s.Target
}

// SubSecondBlockTime time ignores its argument and always returns 0.
func (*Stub) SubSecondBlockTime(*types.Block) gas.Gas {
func (*Stub) SubSecondBlockTime(*types.Header) gas.Gas {
return 0
}

Expand Down