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

Eip6110 queue deposit requests #14430

Merged
merged 64 commits into from
Oct 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
2cc1ff3
wip
james-prysm Aug 8, 2024
b008a3b
updating types and wip on functions
james-prysm Aug 9, 2024
8d0d444
fixing conficts and merging develop
james-prysm Sep 6, 2024
4a87609
Merge branch 'develop' into eip6110-queue
james-prysm Sep 6, 2024
a0bef32
renaming to MAX_PENDING_DEPOSITS_PER_EPOCH
james-prysm Sep 6, 2024
46e88f0
fixing linting and conversions
james-prysm Sep 6, 2024
6cf54bc
adding queue deposit changes
james-prysm Sep 6, 2024
5334144
Merge branch 'develop' into eip6110-queue
james-prysm Sep 6, 2024
3c25797
fixing test and cloning
james-prysm Sep 6, 2024
330cfa3
removing unneeded test based on update
james-prysm Sep 6, 2024
3566543
gaz
james-prysm Sep 6, 2024
41ba44b
Merge branch 'develop' into eip6110-queue
james-prysm Sep 9, 2024
0690e44
Merge branch 'develop' into eip6110-queue
james-prysm Sep 10, 2024
f697f65
wip apply pending deposit
james-prysm Sep 10, 2024
792a4f7
fixing replay test and adding apply pending deposit
james-prysm Sep 10, 2024
af3f8d0
Merge branch 'develop' into eip6110-queue
james-prysm Sep 12, 2024
8bb1fcc
fixing setters test
james-prysm Sep 11, 2024
5dda6df
updating transition test
james-prysm Sep 11, 2024
1e4e826
changelog
james-prysm Sep 12, 2024
29cf448
Merge branch 'develop' into eip6110-queue
james-prysm Sep 16, 2024
f1a2dca
updating pending deposits
james-prysm Sep 12, 2024
944afd1
fixing ProcessPendingDeposit unit tests
james-prysm Sep 16, 2024
5fb1e10
gaz
james-prysm Sep 16, 2024
1a55937
fixing cyclic dependencies
james-prysm Sep 16, 2024
fe2598d
fix visiblity
james-prysm Sep 17, 2024
26216ef
missed adding the right signature verification
james-prysm Sep 17, 2024
582444c
adding point to infinity topup test
james-prysm Sep 18, 2024
8776421
adding apply pending deposit test
james-prysm Sep 18, 2024
f6e06d7
making changes based on eip6110 changes
james-prysm Sep 19, 2024
9110135
fixing ineffassign
james-prysm Sep 19, 2024
9abebd7
gaz
james-prysm Sep 19, 2024
41f1406
Merge branch 'develop' into eip6110-queue
james-prysm Sep 20, 2024
f95f87c
adding batched verifications sigs
james-prysm Sep 23, 2024
377f5a6
Merge branch 'develop' into eip6110-queue
james-prysm Sep 23, 2024
134fe8c
Merge branch 'develop' into eip6110-queue
james-prysm Sep 24, 2024
fe5c942
Merge branch 'develop' into eip6110-queue
james-prysm Sep 26, 2024
b5d2d90
fixing broken type
james-prysm Sep 26, 2024
446cba2
fixing proto
james-prysm Sep 27, 2024
c3fb312
Merge branch 'develop' into eip6110-queue
james-prysm Sep 27, 2024
7a5ff1a
Merge branch 'develop' into eip6110-queue
james-prysm Oct 7, 2024
f976c26
updated consensus spec tests and fixed consensus bug tests
james-prysm Oct 8, 2024
c2e6686
Merge branch 'develop' into eip6110-queue
james-prysm Oct 8, 2024
abd0e1e
testing readability improvement by avoiding ApplyPendingDeposit
james-prysm Oct 8, 2024
5b40a23
removing the boolean from apply pending deposit
james-prysm Oct 8, 2024
64545de
improve naming
james-prysm Oct 8, 2024
c37cd17
review comments and fixing a small bug using wrong variable
james-prysm Oct 8, 2024
de43591
fixing tests and skipping a test
james-prysm Oct 8, 2024
dc38cf9
Merge branch 'develop' into eip6110-queue
james-prysm Oct 8, 2024
7abdd5d
adding some test skips
james-prysm Oct 8, 2024
6677634
fixing bugs terence found
james-prysm Oct 8, 2024
4e310e7
Merge branch 'develop' into eip6110-queue
james-prysm Oct 8, 2024
d52d819
adding test for batchProcessNewPendingDeposits
james-prysm Oct 8, 2024
c66c2e9
gaz
james-prysm Oct 8, 2024
44a41c4
adding churn test
james-prysm Oct 9, 2024
197163b
updating spec tests to alpha.8
james-prysm Oct 9, 2024
1c0d70e
Merge branch 'develop' into eip6110-queue
james-prysm Oct 9, 2024
0eb8e79
adding pr to changelog
james-prysm Oct 9, 2024
c48a58b
addressing terence's comments
james-prysm Oct 10, 2024
cc3e941
Update beacon-chain/core/electra/validator.go
james-prysm Oct 10, 2024
a637027
adding tests for batch verify and rename some variables
james-prysm Oct 10, 2024
fa23924
Merge branch 'develop' into eip6110-queue
james-prysm Oct 10, 2024
cd39461
skipping tests , add them back in later
james-prysm Oct 10, 2024
9b96fa6
skipping one more test
james-prysm Oct 10, 2024
d786dc5
Merge branch 'develop' into eip6110-queue
james-prysm Oct 11, 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
Prev Previous commit
Next Next commit
missed adding the right signature verification
  • Loading branch information
james-prysm committed Sep 17, 2024
commit 26216efc2229c67b24758bb59acfb1517f397fd2
14 changes: 14 additions & 0 deletions beacon-chain/core/electra/deposits.go
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,20 @@ func processDepositRequest(beaconState state.BeaconState, request *enginev1.Depo
return nil, errors.Wrap(err, "could not set deposit requests start index")
}
}
if verifySignature {
valid, err := IsValidDepositSignature(&ethpb.Deposit_Data{
PublicKey: bytesutil.SafeCopyBytes(request.Pubkey),
WithdrawalCredentials: bytesutil.SafeCopyBytes(request.WithdrawalCredentials),
Amount: request.Amount,
Signature: bytesutil.SafeCopyBytes(request.Signature),
})
if err != nil {
return nil, errors.Wrap(err, "could not verify deposit signature")
}
if !valid {
return beaconState, nil
}
}
if err := beaconState.AppendPendingDeposit(&ethpb.PendingDeposit{
PublicKey: bytesutil.SafeCopyBytes(request.Pubkey),
Amount: request.Amount,
Expand Down
Loading