forked from erigontech/erigon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/devel' into devel+classic
Conflicts: core/blockchain.go
- Loading branch information
Showing
95 changed files
with
1,359 additions
and
806 deletions.
There are no files selected for viewing
This file contains 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 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,62 @@ | ||
| name: Consensus specification tests | ||
| on: | ||
| push: | ||
| branches: | ||
| - devel | ||
| - alpha | ||
| - 'release/**' | ||
| pull_request: | ||
| branches: | ||
| - devel | ||
| - alpha | ||
| - 'release/**' | ||
| types: | ||
| - opened | ||
| - reopened | ||
| - synchronize | ||
| - ready_for_review | ||
|
|
||
| jobs: | ||
| tests: | ||
| strategy: | ||
| matrix: | ||
| os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments | ||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version: '1.20' | ||
| - name: Install dependencies on Linux | ||
| if: runner.os == 'Linux' | ||
| run: sudo apt update && sudo apt install build-essential | ||
|
|
||
| - name: test-integration-caplin | ||
| run: cd cl/spectest && make tests && make mainnet | ||
|
|
||
| tests-windows: | ||
| strategy: | ||
| matrix: | ||
| os: [ windows-2022 ] | ||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version: '1.20' | ||
|
|
||
| - uses: actions/cache@v3 | ||
| with: | ||
| path: | | ||
| C:\ProgramData\chocolatey\lib\mingw | ||
| C:\ProgramData\chocolatey\lib\cmake | ||
| key: chocolatey-${{ matrix.os }} | ||
| - name: Install dependencies | ||
| run: | | ||
| choco upgrade mingw -y --no-progress --version 11.2.0.07112021 | ||
| choco install cmake -y --no-progress --version 3.23.1 | ||
| - name: test-integration-caplin | ||
| run: cd ./cl/spectest/ && .\wmake.ps1 Tests Mainnet |
This file contains 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 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 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 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 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 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 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,72 @@ | ||
| package cltypes | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| libcommon "github.com/ledgerwatch/erigon-lib/common" | ||
| "github.com/ledgerwatch/erigon-lib/common/length" | ||
| "github.com/ledgerwatch/erigon-lib/types/ssz" | ||
| "github.com/ledgerwatch/erigon/cl/merkle_tree" | ||
| "github.com/ledgerwatch/erigon/core/types" | ||
| ) | ||
|
|
||
| type Withdrawal struct { | ||
| Index uint64 `json:"index"` // monotonically increasing identifier issued by consensus layer | ||
| Validator uint64 `json:"validatorIndex"` // index of validator associated with withdrawal | ||
| Address libcommon.Address `json:"address"` // target address for withdrawn ether | ||
| Amount uint64 `json:"amount"` // value of withdrawal in GWei | ||
| } | ||
|
|
||
| func (obj *Withdrawal) EncodeSSZ(buf []byte) ([]byte, error) { | ||
| buf = append(buf, ssz.Uint64SSZ(obj.Index)...) | ||
| buf = append(buf, ssz.Uint64SSZ(obj.Validator)...) | ||
| buf = append(buf, obj.Address[:]...) | ||
| buf = append(buf, ssz.Uint64SSZ(obj.Amount)...) | ||
| return buf, nil | ||
| } | ||
|
|
||
| func (obj *Withdrawal) DecodeSSZ(buf []byte, _ int) error { | ||
| if len(buf) < obj.EncodingSizeSSZ() { | ||
| return fmt.Errorf("[Withdrawal] err: %s", ssz.ErrLowBufferSize) | ||
| } | ||
| obj.Index = ssz.UnmarshalUint64SSZ(buf) | ||
| obj.Validator = ssz.UnmarshalUint64SSZ(buf[8:]) | ||
| copy(obj.Address[:], buf[16:]) | ||
| obj.Amount = ssz.UnmarshalUint64SSZ(buf[36:]) | ||
| return nil | ||
| } | ||
|
|
||
| func (obj *Withdrawal) EncodingSizeSSZ() int { | ||
| // Validator Index (8 bytes) + Index (8 bytes) + Amount (8 bytes) + address length | ||
| return 24 + length.Addr | ||
| } | ||
|
|
||
| func (obj *Withdrawal) HashSSZ() ([32]byte, error) { // the [32]byte is temporary | ||
| return merkle_tree.HashTreeRoot(obj.Index, obj.Validator, obj.Address[:], obj.Amount) | ||
| } | ||
|
|
||
| func convertExecutionWithdrawalToConsensusWithdrawal(executionWithdrawal *types.Withdrawal) *Withdrawal { | ||
| return &Withdrawal{ | ||
| Index: executionWithdrawal.Index, | ||
| Validator: executionWithdrawal.Validator, | ||
| Address: executionWithdrawal.Address, | ||
| Amount: executionWithdrawal.Amount, | ||
| } | ||
| } | ||
|
|
||
| func convertConsensusWithdrawalToExecutionWithdrawal(consensusWithdrawal *Withdrawal) *types.Withdrawal { | ||
| return &types.Withdrawal{ | ||
| Index: consensusWithdrawal.Index, | ||
| Validator: consensusWithdrawal.Validator, | ||
| Address: consensusWithdrawal.Address, | ||
| Amount: consensusWithdrawal.Amount, | ||
| } | ||
| } | ||
|
|
||
| func convertExecutionWithdrawalsToConsensusWithdrawals(executionWithdrawal []*types.Withdrawal) []*Withdrawal { | ||
| ret := make([]*Withdrawal, len(executionWithdrawal)) | ||
| for i, w := range executionWithdrawal { | ||
| ret[i] = convertExecutionWithdrawalToConsensusWithdrawal(w) | ||
| } | ||
| return ret | ||
| } |
This file contains 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
Oops, something went wrong.