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.

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

simulators/ethereum/engine: Refactor Legacy Engine API Tests #840

Merged
merged 18 commits into from
Sep 12, 2023
Merged

simulators/ethereum/engine: Refactor Legacy Engine API Tests #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d69d975
Refactor previous tests to run on new forks
marioevz Sep 2, 2023
603469b
Fix configuration on Cancun
marioevz Sep 6, 2023
0ddb933
Fix spec fork time
marioevz Sep 6, 2023
74f279d
Run all tests using blob transactions when possible
marioevz Sep 7, 2023
f04776b
Allow blob transaction modifications
marioevz Sep 7, 2023
5b84b6e
Add more Cancun invalid field tests
marioevz Sep 7, 2023
549c6c6
Update expected invalid detection on versioned hashes
marioevz Sep 8, 2023
17cb75c
Use multiple source accounts for test transactions by default
marioevz Sep 9, 2023
2ef0308
Get full block only when necessary
marioevz Sep 9, 2023
d835962
Fixes on some of the tests
marioevz Sep 11, 2023
39f5606
Update suggested fee recipient tests
marioevz Sep 11, 2023
5365d3d
Update prev-randao tests
marioevz Sep 11, 2023
7fc06f5
NewPayload Tests Refactor
marioevz Sep 11, 2023
87389bc
Refactor last re-org tests
marioevz Sep 11, 2023
045657f
Simplify ForkID tests
marioevz Sep 11, 2023
8f75919
Incorrect comment
marioevz Sep 11, 2023
66dfdc7
Fix pyspec
marioevz Sep 11, 2023
f9115dc
More Versioned Hashes Tests
marioevz Sep 12, 2023
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
98 changes: 0 additions & 98 deletions simulators/ethereum/engine/chains/README.md
View file
Open in desktop

This file was deleted.

Binary file removed simulators/ethereum/engine/chains/blocks_1024_td_135112316.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_10_td_1971072_1.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_10_td_1971072_2.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_10_td_1971072_3.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_10_td_1971072_4.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_10_td_1971072_5.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_1_td_196416.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_1_td_196608.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_1_td_196704.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_2_td_393120.rlp
View file
Open in desktop
Binary file not shown.
Binary file removed simulators/ethereum/engine/chains/blocks_2_td_393504.rlp
View file
Open in desktop
Binary file not shown.
17 changes: 12 additions & 5 deletions simulators/ethereum/engine/client/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type Eth interface {
BlockNumber(ctx context.Context) (uint64, error)
BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error)
HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
HeaderByHash(ctx context.Context, hash common.Hash) (*types.Header, error)
SendTransaction(ctx context.Context, tx typ.Transaction) error
SendTransactions(ctx context.Context, txs ...typ.Transaction) []error
StorageAt(ctx context.Context, account common.Address, key common.Hash, blockNumber *big.Int) ([]byte, error)
Expand All @@ -39,10 +40,10 @@ type Engine interface {
GetPayloadV3(ctx context.Context, payloadId *api.PayloadID) (typ.ExecutableData, *big.Int, *typ.BlobsBundle, *bool, error)
GetPayload(ctx context.Context, version int, payloadId *api.PayloadID) (typ.ExecutableData, *big.Int, *typ.BlobsBundle, *bool, error)

NewPayload(ctx context.Context, version int, payload interface{}, versionedHashes *[]common.Hash, beaconRoot *common.Hash) (api.PayloadStatusV1, error)
NewPayloadV1(ctx context.Context, payload *typ.ExecutableDataV1) (api.PayloadStatusV1, error)
NewPayload(ctx context.Context, version int, payload *typ.ExecutableData) (api.PayloadStatusV1, error)
NewPayloadV1(ctx context.Context, payload *typ.ExecutableData) (api.PayloadStatusV1, error)
NewPayloadV2(ctx context.Context, payload *typ.ExecutableData) (api.PayloadStatusV1, error)
NewPayloadV3(ctx context.Context, payload *typ.ExecutableData, versionedHashes *[]common.Hash, beaconRoot *common.Hash) (api.PayloadStatusV1, error)
NewPayloadV3(ctx context.Context, payload *typ.ExecutableData) (api.PayloadStatusV1, error)

GetPayloadBodiesByRangeV1(ctx context.Context, start uint64, count uint64) ([]*typ.ExecutionPayloadBodyV1, error)
GetPayloadBodiesByHashV1(ctx context.Context, hashes []common.Hash) ([]*typ.ExecutionPayloadBodyV1, error)
Expand All @@ -54,15 +55,21 @@ type Engine interface {
LatestNewPayloadResponse() (payloadResponse *api.PayloadStatusV1)
}

type EngineAPIVersionResolver interface {
ForkchoiceUpdatedVersion(headTimestamp uint64, payloadAttributesTimestamp *uint64) int
NewPayloadVersion(timestamp uint64) int
GetPayloadVersion(timestamp uint64) int
}

type EngineClient interface {
// General Methods
ID() string
Close() error
EnodeURL() (string, error)

// Local Test Account Management
GetLastAccountNonce(testCtx context.Context, account common.Address) (uint64, error)
GetNextAccountNonce(testCtx context.Context, account common.Address) (uint64, error)
GetLastAccountNonce(testCtx context.Context, account common.Address, head *types.Header) (uint64, error)
GetNextAccountNonce(testCtx context.Context, account common.Address, head *types.Header) (uint64, error)
UpdateNonce(testCtx context.Context, account common.Address, newNonce uint64) error

// TTD Methods
Expand Down
49 changes: 27 additions & 22 deletions simulators/ethereum/engine/client/hive_rpc/hive_rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,34 +454,33 @@ func (ec *HiveRPCEngineClient) GetBlobsBundleV1(ctx context.Context, payloadId *
}

// New Payload API Call Methods
func (ec *HiveRPCEngineClient) NewPayload(ctx context.Context, version int, payload interface{}, versionedHashes *[]common.Hash, beaconRoot *common.Hash) (result api.PayloadStatusV1, err error) {
func (ec *HiveRPCEngineClient) NewPayload(ctx context.Context, version int, payload *typ.ExecutableData) (result api.PayloadStatusV1, err error) {
if err := ec.PrepareDefaultAuthCallToken(); err != nil {
return result, err
}

if version >= 3 {
err = ec.c.CallContext(ctx, &result, fmt.Sprintf("engine_newPayloadV%d", version), payload, versionedHashes, beaconRoot)
err = ec.c.CallContext(ctx, &result, fmt.Sprintf("engine_newPayloadV%d", version), payload, payload.VersionedHashes, payload.ParentBeaconBlockRoot)
} else {
err = ec.c.CallContext(ctx, &result, fmt.Sprintf("engine_newPayloadV%d", version), payload)
}
ec.latestPayloadStatusReponse = &result
return result, err
}

func (ec *HiveRPCEngineClient) NewPayloadV1(ctx context.Context, payload *typ.ExecutableDataV1) (api.PayloadStatusV1, error) {
ed := payload.ToExecutableData()
ec.latestPayloadSent = &ed
return ec.NewPayload(ctx, 1, payload, nil, nil)
func (ec *HiveRPCEngineClient) NewPayloadV1(ctx context.Context, payload *typ.ExecutableData) (api.PayloadStatusV1, error) {
ec.latestPayloadSent = payload
return ec.NewPayload(ctx, 1, payload)
}

func (ec *HiveRPCEngineClient) NewPayloadV2(ctx context.Context, payload *typ.ExecutableData) (api.PayloadStatusV1, error) {
ec.latestPayloadSent = payload
return ec.NewPayload(ctx, 2, payload, nil, nil)
return ec.NewPayload(ctx, 2, payload)
}

func (ec *HiveRPCEngineClient) NewPayloadV3(ctx context.Context, payload *typ.ExecutableData, versionedHashes *[]common.Hash, beaconRoot *common.Hash) (api.PayloadStatusV1, error) {
func (ec *HiveRPCEngineClient) NewPayloadV3(ctx context.Context, payload *typ.ExecutableData) (api.PayloadStatusV1, error) {
ec.latestPayloadSent = payload
return ec.NewPayload(ctx, 3, payload, versionedHashes, beaconRoot)
return ec.NewPayload(ctx, 3, payload)
}

// Exchange Transition Configuration API Call Methods
Expand All @@ -501,13 +500,16 @@ func (ec *HiveRPCEngineClient) ExchangeCapabilities(ctx context.Context, clCapab
}

// Account Nonce
func (ec *HiveRPCEngineClient) GetLastAccountNonce(testCtx context.Context, account common.Address) (uint64, error) {
func (ec *HiveRPCEngineClient) GetLastAccountNonce(testCtx context.Context, account common.Address, head *types.Header) (uint64, error) {
// First get the current head of the client where we will send the tx
ctx, cancel := context.WithTimeout(testCtx, globals.RPCTimeout)
defer cancel()
head, err := ec.HeaderByNumber(ctx, nil)
if err != nil {
return 0, err
if head == nil {
ctx, cancel := context.WithTimeout(testCtx, globals.RPCTimeout)
defer cancel()
var err error
head, err = ec.HeaderByNumber(ctx, nil)
if err != nil {
return 0, err
}
}

// Then check if we have any info about this account, and when it was last updated
Expand All @@ -520,13 +522,16 @@ func (ec *HiveRPCEngineClient) GetLastAccountNonce(testCtx context.Context, acco
return 0, fmt.Errorf("no previous nonce for account %s", account.String())
}

func (ec *HiveRPCEngineClient) GetNextAccountNonce(testCtx context.Context, account common.Address) (uint64, error) {
func (ec *HiveRPCEngineClient) GetNextAccountNonce(testCtx context.Context, account common.Address, head *types.Header) (uint64, error) {
// First get the current head of the client where we will send the tx
ctx, cancel := context.WithTimeout(testCtx, globals.RPCTimeout)
defer cancel()
head, err := ec.HeaderByNumber(ctx, nil)
if err != nil {
return 0, err
if head == nil {
ctx, cancel := context.WithTimeout(testCtx, globals.RPCTimeout)
defer cancel()
var err error
head, err = ec.HeaderByNumber(ctx, nil)
if err != nil {
return 0, err
}
}
// Then check if we have any info about this account, and when it was last updated
if accTxInfo, ok := ec.accTxInfoMap[account]; ok && accTxInfo != nil && (accTxInfo.PreviousBlock == head.Hash() || accTxInfo.PreviousBlock == head.ParentHash) {
Expand All @@ -537,7 +542,7 @@ func (ec *HiveRPCEngineClient) GetNextAccountNonce(testCtx context.Context, acco
return accTxInfo.PreviousNonce, nil
}
// We don't have info about this account, or is outdated, or we re-org'd, we must request the nonce
ctx, cancel = context.WithTimeout(testCtx, globals.RPCTimeout)
ctx, cancel := context.WithTimeout(testCtx, globals.RPCTimeout)
defer cancel()
nonce, err := ec.NonceAt(ctx, account, head.Number)
if err != nil {
Expand Down
Loading