Skip to content
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.

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

simulators/ethereum/engine: send eth_ requests to port 8545 #752

Merged
merged 1 commit into from
Apr 5, 2023
Merged
Changes from all commits
Commits
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
12 changes: 3 additions & 9 deletions simulators/ethereum/engine/client/hive_rpc/hive_rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"time"

"github.com/ethereum/go-ethereum"
api "github.com/ethereum/go-ethereum/beacon/engine"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core"
api "github.com/ethereum/go-ethereum/beacon/engine"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/rpc"
Expand Down Expand Up @@ -248,10 +248,7 @@ func (ec *HiveRPCEngineClient) StorageAtKeys(ctx context.Context, account common
results[key] = valueResult
}

if err := ec.PrepareDefaultAuthCallToken(); err != nil {
return nil, err
}
if err := ec.c.BatchCallContext(ctx, reqs); err != nil {
if err := ec.cEth.BatchCallContext(ctx, reqs); err != nil {
return nil, err
}
for i, req := range reqs {
Expand Down Expand Up @@ -513,10 +510,7 @@ func (ec *HiveRPCEngineClient) SendTransactions(ctx context.Context, txs []*type
Result: &hashes[i],
}
}
if err := ec.PrepareDefaultAuthCallToken(); err != nil {
return []error{err}
}
if err := ec.c.BatchCallContext(ctx, reqs); err != nil {
if err := ec.cEth.BatchCallContext(ctx, reqs); err != nil {
return []error{err}
}

Expand Down