-
Notifications
You must be signed in to change notification settings - Fork 174
Add proof bundles #1204
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
Open
0xfornax
wants to merge
2
commits into
master
Choose a base branch
from
gloas-proofs-v2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+858
−397
Open
Add proof bundles #1204
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| package megapool | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "math/big" | ||
|
|
||
| "github.com/ethereum/go-ethereum/accounts/abi" | ||
| ) | ||
|
|
||
| // Proof versions accepted by BeaconStateVerifier on v1.4.1-dev. | ||
| var ( | ||
| ValidatorProofVersion1 = big.NewInt(1) | ||
| FinalBalanceProofVersion1 = big.NewInt(1) | ||
| FinalBalanceProofVersion2 = big.NewInt(2) | ||
| ) | ||
|
|
||
| type ValidatorProofBundleV1 struct { | ||
| ValidatorProof ValidatorProof `json:"validatorProof"` | ||
| SlotProof SlotProof `json:"slotProof"` | ||
| } | ||
|
|
||
| type FinalBalanceProofBundleV1 struct { | ||
| WithdrawalProof WithdrawalProof `json:"withdrawalProof"` | ||
| ValidatorProof ValidatorProof `json:"validatorProof"` | ||
| SlotProof SlotProof `json:"slotProof"` | ||
| } | ||
|
|
||
| type FinalBalanceProofBundleV2 struct { | ||
| WithdrawalProof WithdrawalProof `json:"withdrawalProof"` | ||
| ValidatorProof ValidatorProof `json:"validatorProof"` | ||
| SlotProof SlotProof `json:"slotProof"` | ||
| PreviousNextWithdrawalIndexProof NextWithdrawalIndexProof `json:"previousNextWithdrawalIndexProof"` | ||
| ValidatorBalanceProof ValidatorBalanceProof `json:"validatorBalanceProof"` | ||
| } | ||
|
|
||
| var ( | ||
| validatorComponents = []abi.ArgumentMarshaling{ | ||
| {Name: "pubkey", Type: "bytes"}, | ||
| {Name: "withdrawalCredentials", Type: "bytes32"}, | ||
| {Name: "effectiveBalance", Type: "uint64"}, | ||
| {Name: "slashed", Type: "bool"}, | ||
| {Name: "activationEligibilityEpoch", Type: "uint64"}, | ||
| {Name: "activationEpoch", Type: "uint64"}, | ||
| {Name: "exitEpoch", Type: "uint64"}, | ||
| {Name: "withdrawableEpoch", Type: "uint64"}, | ||
| } | ||
| validatorProofComponents = []abi.ArgumentMarshaling{ | ||
| {Name: "validatorIndex", Type: "uint40"}, | ||
| {Name: "validator", Type: "tuple", Components: validatorComponents}, | ||
| {Name: "witnesses", Type: "bytes32[]"}, | ||
| } | ||
| slotProofComponents = []abi.ArgumentMarshaling{ | ||
| {Name: "slot", Type: "uint64"}, | ||
| {Name: "witnesses", Type: "bytes32[]"}, | ||
| } | ||
| withdrawalComponents = []abi.ArgumentMarshaling{ | ||
| {Name: "index", Type: "uint64"}, | ||
| {Name: "validatorIndex", Type: "uint64"}, | ||
| {Name: "withdrawalCredentials", Type: "bytes20"}, | ||
| {Name: "amountInGwei", Type: "uint64"}, | ||
| } | ||
| withdrawalProofComponents = []abi.ArgumentMarshaling{ | ||
| {Name: "withdrawalSlot", Type: "uint64"}, | ||
| {Name: "withdrawalNum", Type: "uint16"}, | ||
| {Name: "withdrawal", Type: "tuple", Components: withdrawalComponents}, | ||
| {Name: "witnesses", Type: "bytes32[]"}, | ||
| } | ||
| nextWithdrawalIndexProofComponents = []abi.ArgumentMarshaling{ | ||
| {Name: "nextWithdrawalIndex", Type: "uint64"}, | ||
| {Name: "witnesses", Type: "bytes32[]"}, | ||
| } | ||
| validatorBalanceProofComponents = []abi.ArgumentMarshaling{ | ||
| {Name: "balanceChunk", Type: "bytes32"}, | ||
| {Name: "witnesses", Type: "bytes32[]"}, | ||
| } | ||
| ) | ||
|
|
||
| func EncodeValidatorProofBundleV1(validatorProof ValidatorProof, slotProof SlotProof) ([]byte, error) { | ||
| return encodeTuple([]abi.ArgumentMarshaling{ | ||
| {Name: "validatorProof", Type: "tuple", Components: validatorProofComponents}, | ||
| {Name: "slotProof", Type: "tuple", Components: slotProofComponents}, | ||
| }, ValidatorProofBundleV1{ | ||
| ValidatorProof: validatorProof, | ||
| SlotProof: slotProof, | ||
| }) | ||
| } | ||
|
|
||
| func EncodeFinalBalanceProofBundleV1(withdrawalProof WithdrawalProof, validatorProof ValidatorProof, slotProof SlotProof) ([]byte, error) { | ||
| return encodeTuple([]abi.ArgumentMarshaling{ | ||
| {Name: "withdrawalProof", Type: "tuple", Components: withdrawalProofComponents}, | ||
| {Name: "validatorProof", Type: "tuple", Components: validatorProofComponents}, | ||
| {Name: "slotProof", Type: "tuple", Components: slotProofComponents}, | ||
| }, FinalBalanceProofBundleV1{ | ||
| WithdrawalProof: withdrawalProof, | ||
| ValidatorProof: validatorProof, | ||
| SlotProof: slotProof, | ||
| }) | ||
| } | ||
|
|
||
| func EncodeFinalBalanceProofBundleV2( | ||
| withdrawalProof WithdrawalProof, | ||
| validatorProof ValidatorProof, | ||
| slotProof SlotProof, | ||
| previousNextWithdrawalIndexProof NextWithdrawalIndexProof, | ||
| validatorBalanceProof ValidatorBalanceProof, | ||
| ) ([]byte, error) { | ||
| return encodeTuple([]abi.ArgumentMarshaling{ | ||
| {Name: "withdrawalProof", Type: "tuple", Components: withdrawalProofComponents}, | ||
| {Name: "validatorProof", Type: "tuple", Components: validatorProofComponents}, | ||
| {Name: "slotProof", Type: "tuple", Components: slotProofComponents}, | ||
| {Name: "previousNextWithdrawalIndexProof", Type: "tuple", Components: nextWithdrawalIndexProofComponents}, | ||
| {Name: "validatorBalanceProof", Type: "tuple", Components: validatorBalanceProofComponents}, | ||
| }, FinalBalanceProofBundleV2{ | ||
| WithdrawalProof: withdrawalProof, | ||
| ValidatorProof: validatorProof, | ||
| SlotProof: slotProof, | ||
| PreviousNextWithdrawalIndexProof: previousNextWithdrawalIndexProof, | ||
| ValidatorBalanceProof: validatorBalanceProof, | ||
| }) | ||
| } | ||
|
|
||
| func encodeTuple(components []abi.ArgumentMarshaling, value any) ([]byte, error) { | ||
| typ, err := abi.NewType("tuple", "", components) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error creating proof bundle tuple type: %w", err) | ||
| } | ||
| encoded, err := abi.Arguments{{Type: typ}}.Pack(value) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error encoding proof bundle: %w", err) | ||
| } | ||
| return encoded, nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| package megapool | ||
|
|
||
| import ( | ||
| "math/big" | ||
| "testing" | ||
| ) | ||
|
|
||
| func sampleValidatorProof() ValidatorProof { | ||
| return ValidatorProof{ | ||
| ValidatorIndex: big.NewInt(7), | ||
| Validator: ProvedValidator{ | ||
| Pubkey: make([]byte, 48), | ||
| WithdrawalCredentials: [32]byte{0x01}, | ||
| EffectiveBalance: 32_000_000_000, | ||
| Slashed: false, | ||
| ActivationEligibilityEpoch: 1, | ||
| ActivationEpoch: 2, | ||
| ExitEpoch: 3, | ||
| WithdrawableEpoch: 4, | ||
| }, | ||
| Witnesses: [][32]byte{{0x11}, {0x22}}, | ||
| } | ||
| } | ||
|
|
||
| func sampleSlotProof() SlotProof { | ||
| return SlotProof{ | ||
| Slot: 99, | ||
| Witnesses: [][32]byte{{0x33}}, | ||
| } | ||
| } | ||
|
|
||
| func sampleWithdrawalProof() WithdrawalProof { | ||
| return WithdrawalProof{ | ||
| WithdrawalSlot: 50, | ||
| WithdrawalNum: 1, | ||
| Withdrawal: Withdrawal{ | ||
| Index: 10, | ||
| ValidatorIndex: 7, | ||
| WithdrawalCredentials: [20]byte{0xaa}, | ||
| AmountInGwei: 32_000_000_000, | ||
| }, | ||
| Witnesses: [][32]byte{{0x44}, {0x55}}, | ||
| } | ||
| } | ||
|
|
||
| func TestEncodeValidatorProofBundleV1(t *testing.T) { | ||
| encoded, err := EncodeValidatorProofBundleV1(sampleValidatorProof(), sampleSlotProof()) | ||
| if err != nil { | ||
| t.Fatalf("encode: %v", err) | ||
| } | ||
| if len(encoded) == 0 { | ||
| t.Fatal("expected non-empty encoding") | ||
| } | ||
| } | ||
|
|
||
| func TestEncodeFinalBalanceProofBundleV1(t *testing.T) { | ||
| encoded, err := EncodeFinalBalanceProofBundleV1(sampleWithdrawalProof(), sampleValidatorProof(), sampleSlotProof()) | ||
| if err != nil { | ||
| t.Fatalf("encode: %v", err) | ||
| } | ||
| if len(encoded) == 0 { | ||
| t.Fatal("expected non-empty encoding") | ||
| } | ||
| } | ||
|
|
||
| func TestEncodeFinalBalanceProofBundleV2(t *testing.T) { | ||
| encoded, err := EncodeFinalBalanceProofBundleV2( | ||
| sampleWithdrawalProof(), | ||
| sampleValidatorProof(), | ||
| sampleSlotProof(), | ||
| NextWithdrawalIndexProof{ | ||
| NextWithdrawalIndex: 9, | ||
| Witnesses: [][32]byte{{0x66}}, | ||
| }, | ||
| ValidatorBalanceProof{ | ||
| BalanceChunk: [32]byte{0x77}, | ||
| Witnesses: [][32]byte{{0x88}}, | ||
| }, | ||
| ) | ||
| if err != nil { | ||
| t.Fatalf("encode: %v", err) | ||
| } | ||
| if len(encoded) == 0 { | ||
| t.Fatal("expected non-empty encoding") | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.