status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
nimbus-eth2/beacon_chain/spec/eth2_merkleization.nim

43 lines
1.7 KiB
Nim
Raw Normal View History

some simple nimble test harnesses just to catch things locally (#28) * some simple nimble test harnesses just to catch things locally
2018-12-04 13:26:25 +00:00
# beacon_chain
bump nim-ssz-serialization to `3db6cc0f282708aca6c290914488edd832971d61` (#3119) This updates `nim-ssz-serialization` to `3db6cc0f282708aca6c290914488edd832971d61`. Notable changes: - Use `uint64` for `GeneralizedIndex` - Add support for building merkle multiproofs
2022-06-26 17:33:06 +00:00
# Copyright (c) 2018-2022 Status Research & Development GmbH
some simple nimble test harnesses just to catch things locally (#28) * some simple nimble test harnesses just to catch things locally
2018-12-04 13:26:25 +00:00
# Licensed and distributed under either of
replace links to Apache and MIT licenses with HTTPS versions (#592)
2019-11-25 15:30:02 +00:00
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
some simple nimble test harnesses just to catch things locally (#28) * some simple nimble test harnesses just to catch things locally
2018-12-04 13:26:25 +00:00
# at your option. This file may not be copied, modified, or distributed except according to those terms.
disentangle eth2 types from the ssz library (#2785) * reorganize ssz dependencies This PR continues the work in https://github.com/status-im/nimbus-eth2/pull/2646, https://github.com/status-im/nimbus-eth2/pull/2779 as well as past issues with serialization and type, to disentangle SSZ from eth2 and at the same time simplify imports and exports with a structured approach. The principal idea here is that when a library wants to introduce SSZ support, they do so via 3 files: * `ssz_codecs` which imports and reexports `codecs` - this covers the basic byte conversions and ensures no overloads get lost * `xxx_merkleization` imports and exports `merkleization` to specialize and get access to `hash_tree_root` and friends * `xxx_ssz_serialization` imports and exports `ssz_serialization` to specialize ssz for a specific library Those that need to interact with SSZ always import the `xxx_` versions of the modules and never `ssz` itself so as to keep imports simple and safe. This is similar to how the REST / JSON-RPC serializers are structured in that someone wanting to serialize spec types to REST-JSON will import `eth2_rest_serialization` and nothing else. * split up ssz into a core library that is independendent of eth2 types * rename `bytes_reader` to `codec` to highlight that it contains coding and decoding of bytes and native ssz types * remove tricky List init overload that causes compile issues * get rid of top-level ssz import * reenable merkleization tests * move some "standard" json serializers to spec * remove `ValidatorIndex` serialization for now * remove test_ssz_merkleization * add tests for over/underlong byte sequences * fix broken seq[byte] test - seq[byte] is not an SSZ type There are a few things this PR doesn't solve: * like #2646 this PR is weak on how to handle root and other dontSerialize fields that "sometimes" should be computed - the same problem appears in REST / JSON-RPC etc * Fix a build problem on macOS * Another way to fix the macOS builds Co-authored-by: Zahary Karadjov <zahary@gmail.com>
2021-08-18 18:57:58 +00:00
{.push raises: [Defect].}
# Import this module to get access to `hash_tree_root` for spec types
remove UnusedImport spam (#549) * remove UnusedImport spam * re-add random import to beacon_node
2019-11-14 10:47:55 +00:00
Introduce unittest2 and junit reports (#2522) * Introduce unittest2 and junit reports * fix XML path * don't combine multiple CI runs * fixup * public combined report also Co-authored-by: Ștefan Talpalaru <stefantalpalaru@yahoo.com>
2021-04-28 16:41:02 +00:00
import
bump nim-ssz-serialization to `3db6cc0f282708aca6c290914488edd832971d61` (#3119) This updates `nim-ssz-serialization` to `3db6cc0f282708aca6c290914488edd832971d61`. Notable changes: - Use `uint64` for `GeneralizedIndex` - Add support for building merkle multiproofs
2022-06-26 17:33:06 +00:00
ssz_serialization/[merkleization, proofs],
disentangle eth2 types from the ssz library (#2785) * reorganize ssz dependencies This PR continues the work in https://github.com/status-im/nimbus-eth2/pull/2646, https://github.com/status-im/nimbus-eth2/pull/2779 as well as past issues with serialization and type, to disentangle SSZ from eth2 and at the same time simplify imports and exports with a structured approach. The principal idea here is that when a library wants to introduce SSZ support, they do so via 3 files: * `ssz_codecs` which imports and reexports `codecs` - this covers the basic byte conversions and ensures no overloads get lost * `xxx_merkleization` imports and exports `merkleization` to specialize and get access to `hash_tree_root` and friends * `xxx_ssz_serialization` imports and exports `ssz_serialization` to specialize ssz for a specific library Those that need to interact with SSZ always import the `xxx_` versions of the modules and never `ssz` itself so as to keep imports simple and safe. This is similar to how the REST / JSON-RPC serializers are structured in that someone wanting to serialize spec types to REST-JSON will import `eth2_rest_serialization` and nothing else. * split up ssz into a core library that is independendent of eth2 types * rename `bytes_reader` to `codec` to highlight that it contains coding and decoding of bytes and native ssz types * remove tricky List init overload that causes compile issues * get rid of top-level ssz import * reenable merkleization tests * move some "standard" json serializers to spec * remove `ValidatorIndex` serialization for now * remove test_ssz_merkleization * add tests for over/underlong byte sequences * fix broken seq[byte] test - seq[byte] is not an SSZ type There are a few things this PR doesn't solve: * like #2646 this PR is weak on how to handle root and other dontSerialize fields that "sometimes" should be computed - the same problem appears in REST / JSON-RPC etc * Fix a build problem on macOS * Another way to fix the macOS builds Co-authored-by: Zahary Karadjov <zahary@gmail.com>
2021-08-18 18:57:58 +00:00
./ssz_codec,
simplify state fork access pattern (#2912) * simplify state fork access pattern * fixes * unsafeAddr needs to be dereferenced outside of case for best effect * remove hash_tree_root of ForkedXxx (doesn't make sense) * simplify state transition * fix vc * readd hash_tree_root(forkedbeaconblock) * readd htr(fhbs) as well ...and add some protections to not hash the wrong items elsewhere
2021-09-28 18:08:03 +00:00
./datatypes/[phase0, altair]
fix several warnings and hints
2019-11-18 12:48:41 +00:00
bump nim-ssz-serialization to `3db6cc0f282708aca6c290914488edd832971d61` (#3119) This updates `nim-ssz-serialization` to `3db6cc0f282708aca6c290914488edd832971d61`. Notable changes: - Use `uint64` for `GeneralizedIndex` - Add support for building merkle multiproofs
2022-06-26 17:33:06 +00:00
export ssz_codec, merkleization, proofs
simplify state fork access pattern (#2912) * simplify state fork access pattern * fixes * unsafeAddr needs to be dereferenced outside of case for best effect * remove hash_tree_root of ForkedXxx (doesn't make sense) * simplify state transition * fix vc * readd hash_tree_root(forkedbeaconblock) * readd htr(fhbs) as well ...and add some protections to not hash the wrong items elsewhere
2021-09-28 18:08:03 +00:00
cleanups (#3819) * avoid circular panda imports * move deposit merkleization helpers to spec/ * normalize validator signature helpers to spec names / params * remove redundant functions for remote signing
2022-06-29 16:53:59 +00:00
type
DepositsMerkleizer* = SszMerkleizer[DEPOSIT_CONTRACT_LIMIT]
simplify state fork access pattern (#2912) * simplify state fork access pattern * fixes * unsafeAddr needs to be dereferenced outside of case for best effect * remove hash_tree_root of ForkedXxx (doesn't make sense) * simplify state transition * fix vc * readd hash_tree_root(forkedbeaconblock) * readd htr(fhbs) as well ...and add some protections to not hash the wrong items elsewhere
2021-09-28 18:08:03 +00:00
func hash_tree_root*(x: phase0.HashedBeaconState | altair.HashedBeaconState) {.
error: "HashedBeaconState should not be hashed".}
func hash_tree_root*(x: phase0.SomeSignedBeaconBlock | altair.SomeSignedBeaconBlock) {.
error: "SignedBeaconBlock should not be hashed".}
cleanups (#3819) * avoid circular panda imports * move deposit merkleization helpers to spec/ * normalize validator signature helpers to spec names / params * remove redundant functions for remote signing
2022-06-29 16:53:59 +00:00
func depositCountU64(s: DepositContractState): uint64 =
for i in 0 .. 23:
doAssert s.deposit_count[i] == 0
uint64.fromBytesBE s.deposit_count.toOpenArray(24, 31)
func init*(T: type DepositsMerkleizer, s: DepositContractState): DepositsMerkleizer =
DepositsMerkleizer.init(s.branch, s.depositCountU64)
func toDepositContractState*(merkleizer: DepositsMerkleizer): DepositContractState =
# TODO There is an off by one discrepancy in the size of the arrays here that
# need to be investigated. It shouldn't matter as long as the tree is
# not populated to its maximum size.
result.branch[0..31] = merkleizer.getCombinedChunks[0..31]
result.deposit_count[24..31] = merkleizer.getChunkCount().toBytesBE