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

Remove EnableEIP4881 flag #13826

Merged
merged 19 commits into from
Apr 24, 2024
Merged

Remove EnableEIP4881 flag #13826

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7667eee
Remove EnableEIP4881 flag
saolyn Mar 28, 2024
1fe248e
Gaz
saolyn Mar 28, 2024
8c14ee5
Fix missing error handler
saolyn Mar 28, 2024
5f8ae09
Merge branch 'develop' into cleanup-eip4881
saolyn Apr 3, 2024
e9a9241
Remove old tree and fix tests
saolyn Apr 3, 2024
ac35abe
Gaz
saolyn Apr 3, 2024
620ed8b
Fix build import
saolyn Apr 3, 2024
9de364d
Replace depositcache
saolyn Apr 3, 2024
678652d
Add pendingDeposit tests
saolyn Apr 3, 2024
8c1caef
Nishant's fix
saolyn Apr 18, 2024
d16d0f9
Fix unsafe uint64 to int
saolyn Apr 18, 2024
a424a0c
Fix other unsafe uint64 to int
saolyn Apr 18, 2024
3843fea
Merge branch 'develop' into cleanup-eip4881
saolyn Apr 18, 2024
8bc6be6
Remove: RemovePendingDeposit
saolyn Apr 19, 2024
21e5781
Deprecate and remove DisableEIP4881 flag
saolyn Apr 19, 2024
9f6930a
Check: index not greater than deposit count
saolyn Apr 19, 2024
5b39511
Merge branch 'develop' into cleanup-eip4881
saolyn Apr 19, 2024
3244e9f
Merge branch 'develop' into cleanup-eip4881
saolyn Apr 23, 2024
661882b
Move index check
saolyn Apr 24, 2024
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
2 changes: 1 addition & 1 deletion beacon-chain/blockchain/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ go_test(
"//async/event:go_default_library",
"//beacon-chain/blockchain/testing:go_default_library",
"//beacon-chain/cache:go_default_library",
"//beacon-chain/cache/depositcache:go_default_library",
"//beacon-chain/cache/depositsnapshot:go_default_library",
"//beacon-chain/core/blocks:go_default_library",
"//beacon-chain/core/feed/state:go_default_library",
"//beacon-chain/core/helpers:go_default_library",
Expand Down
4 changes: 2 additions & 2 deletions beacon-chain/blockchain/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/cache"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/cache/depositcache"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/cache/depositsnapshot"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/transition"
Expand Down Expand Up @@ -80,7 +80,7 @@ func setupBeaconChain(t *testing.T, beaconDB db.Database) *Service {
attService, err := attestations.NewService(ctx, &attestations.Config{Pool: attestations.NewPool()})
require.NoError(t, err)

depositCache, err := depositcache.New()
depositCache, err := depositsnapshot.New()
require.NoError(t, err)

fc := doublylinkedtree.New()
Expand Down
6 changes: 3 additions & 3 deletions beacon-chain/blockchain/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/prysmaticlabs/prysm/v5/async/event"
mock "github.com/prysmaticlabs/prysm/v5/beacon-chain/blockchain/testing"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/cache"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/cache/depositcache"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/cache/depositsnapshot"
statefeed "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed/state"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/db"
"github.com/prysmaticlabs/prysm/v5/beacon-chain/db/filesystem"
Expand Down Expand Up @@ -79,7 +79,7 @@ type testServiceRequirements struct {
attPool attestations.Pool
attSrv *attestations.Service
blsPool *blstoexec.Pool
dc *depositcache.DepositCache
dc *depositsnapshot.Cache
}

func minimalTestService(t *testing.T, opts ...Option) (*Service, *testServiceRequirements) {
Expand All @@ -94,7 +94,7 @@ func minimalTestService(t *testing.T, opts ...Option) (*Service, *testServiceReq
attSrv, err := attestations.NewService(ctx, &attestations.Config{Pool: attPool})
require.NoError(t, err)
blsPool := blstoexec.NewPool()
dc, err := depositcache.New()
dc, err := depositsnapshot.New()
require.NoError(t, err)
req := &testServiceRequirements{
ctx: ctx,
Expand Down
50 changes: 0 additions & 50 deletions beacon-chain/cache/depositcache/BUILD.bazel
View file
Open in desktop

This file was deleted.

Loading
Loading