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

patch to resolve instant-verifier testhelper error

Browse source
This commit is contained in:
tak 2025-08-05 17:48:26 +09:00
parent 612c9e0f4a
commit d95bd50ada
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
eth/catalyst/simulated_beacon.go
View file

@ -158,6 +158,11 @@ func (c *SimulatedBeacon) Stop() error {
return nil return nil
} }
// Oasys: Returns the simulated Ethereum.
func (c *SimulatedBeacon) Ethereum() *eth.Ethereum {
return c.eth
}
// sealBlock initiates payload building for a new block and creates a new block // sealBlock initiates payload building for a new block and creates a new block
// with the completed payload. // with the completed payload.
func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp uint64) error { func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp uint64) error {

15
ethclient/simulated/backend.go
View file

@ -29,6 +29,7 @@ import (
"github.com/ethereum/go-ethereum/eth/ethconfig" "github.com/ethereum/go-ethereum/eth/ethconfig"
"github.com/ethereum/go-ethereum/eth/filters" "github.com/ethereum/go-ethereum/eth/filters"
"github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/ethclient/gethclient"
"github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
@ -62,6 +63,8 @@ type simClient struct {
// Backend is a simulated blockchain. You can use it to test your contracts or // Backend is a simulated blockchain. You can use it to test your contracts or
// other code that interacts with the Ethereum chain. // other code that interacts with the Ethereum chain.
type Backend struct { type Backend struct {
gethclient *gethclient.Client // Added by Oasys
node *node.Node node *node.Node
beacon *catalyst.SimulatedBeacon beacon *catalyst.SimulatedBeacon
client simClient client simClient
@ -129,6 +132,8 @@ func newWithNode(stack *node.Node, conf *eth.Config, blockPeriod uint64) (*Backe
return nil, err return nil, err
} }
return &Backend{ return &Backend{
gethclient: gethclient.New(stack.Attach()), // Added by Oasys
node: stack, node: stack,
beacon: beacon, beacon: beacon,
client: simClient{ethclient.NewClient(stack.Attach())}, client: simClient{ethclient.NewClient(stack.Attach())},
@ -190,3 +195,13 @@ func (n *Backend) AdjustTime(adjustment time.Duration) error {
func (n *Backend) Client() Client { func (n *Backend) Client() Client {
return n.client return n.client
} }
// Oasys: GethClient returns a gethclient that accesses the simulated chain.
func (n *Backend) GethClient() *gethclient.Client {
return n.gethclient
}
// Oasys: Blockchain returns the simulated chain.
func (n *Backend) Blockchain() *core.BlockChain {
return n.beacon.Ethereum().BlockChain()
}