revert previous commit
This commit is contained in:
Dustin Brody
parent
ef92529feb
commit
164d171bd9
|
|
@ -133,7 +133,6 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
|
|||
OK: 9/9 Fail: 0/9 Skip: 0/9
|
||||
## Official - Sanity - Blocks [Preset: mainnet]
|
||||
```diff
|
||||
+ [Invalid] expected_deposit_in_block OK
|
||||
+ [Invalid] invalid_block_sig OK
|
||||
+ [Invalid] invalid_proposer_index_sig_from_expected_proposer OK
|
||||
+ [Invalid] invalid_proposer_index_sig_from_proposer_index OK
|
||||
|
|
@ -141,7 +140,6 @@ OK: 9/9 Fail: 0/9 Skip: 0/9
|
|||
+ [Invalid] prev_slot_block_transition OK
|
||||
+ [Invalid] zero_block_sig OK
|
||||
+ [Valid] attestation OK
|
||||
+ [Valid] attester_slashing OK
|
||||
+ [Valid] balance_driven_status_transitions OK
|
||||
+ [Valid] deposit_in_block OK
|
||||
+ [Valid] deposit_top_up OK
|
||||
|
|
@ -155,7 +153,7 @@ OK: 9/9 Fail: 0/9 Skip: 0/9
|
|||
+ [Valid] skipped_slots OK
|
||||
+ [Valid] voluntary_exit OK
|
||||
```
|
||||
OK: 21/21 Fail: 0/21 Skip: 0/21
|
||||
OK: 19/19 Fail: 0/19 Skip: 0/19
|
||||
## Official - Sanity - Slots [Preset: mainnet]
|
||||
```diff
|
||||
+ Slots - double_empty_epoch OK
|
||||
|
|
@ -167,4 +165,4 @@ OK: 21/21 Fail: 0/21 Skip: 0/21
|
|||
OK: 5/5 Fail: 0/5 Skip: 0/5
|
||||
|
||||
---TOTAL---
|
||||
OK: 117/117 Fail: 0/117 Skip: 0/117
|
||||
OK: 115/115 Fail: 0/115 Skip: 0/115
|
||||
|
|
|
|||
|
|
@ -133,7 +133,6 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
|
|||
OK: 9/9 Fail: 0/9 Skip: 0/9
|
||||
## Official - Sanity - Blocks [Preset: minimal]
|
||||
```diff
|
||||
+ [Invalid] expected_deposit_in_block OK
|
||||
+ [Invalid] invalid_block_sig OK
|
||||
+ [Invalid] invalid_proposer_index_sig_from_expected_proposer OK
|
||||
+ [Invalid] invalid_proposer_index_sig_from_proposer_index OK
|
||||
|
|
@ -141,7 +140,6 @@ OK: 9/9 Fail: 0/9 Skip: 0/9
|
|||
+ [Invalid] prev_slot_block_transition OK
|
||||
+ [Invalid] zero_block_sig OK
|
||||
+ [Valid] attestation OK
|
||||
+ [Valid] attester_slashing OK
|
||||
+ [Valid] balance_driven_status_transitions OK
|
||||
+ [Valid] deposit_in_block OK
|
||||
+ [Valid] deposit_top_up OK
|
||||
|
|
@ -158,7 +156,7 @@ OK: 9/9 Fail: 0/9 Skip: 0/9
|
|||
+ [Valid] skipped_slots OK
|
||||
+ [Valid] voluntary_exit OK
|
||||
```
|
||||
OK: 24/24 Fail: 0/24 Skip: 0/24
|
||||
OK: 22/22 Fail: 0/22 Skip: 0/22
|
||||
## Official - Sanity - Slots [Preset: minimal]
|
||||
```diff
|
||||
+ Slots - double_empty_epoch OK
|
||||
|
|
@ -170,4 +168,4 @@ OK: 24/24 Fail: 0/24 Skip: 0/24
|
|||
OK: 5/5 Fail: 0/5 Skip: 0/5
|
||||
|
||||
---TOTAL---
|
||||
OK: 120/120 Fail: 0/120 Skip: 0/120
|
||||
OK: 118/118 Fail: 0/118 Skip: 0/118
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ proc is_valid_indexed_attestation*(
|
|||
return false
|
||||
|
||||
# Verify indices are sorted and unique
|
||||
if indices != sorted(toHashSet(indices).toSeq, system.cmp):
|
||||
if indices != sorted(toSet(indices).toSeq, system.cmp):
|
||||
notice "indexed attestation: indices not sorted"
|
||||
return false
|
||||
|
||||
|
|
|
|||
|
|
@ -297,17 +297,9 @@ proc processAttestations(
|
|||
|
||||
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.4/specs/core/0_beacon-chain.md#deposits
|
||||
proc processDeposits(state: var BeaconState, blck: BeaconBlock,
|
||||
flags: UpdateFlags): bool {.nbench.} =
|
||||
let
|
||||
num_deposits = len(blck.body.deposits).int64
|
||||
req_deposits = min(MAX_DEPOSITS,
|
||||
state.eth1_data.deposit_count.int64 - state.eth1_deposit_index.int64)
|
||||
if not (num_deposits == req_deposits):
|
||||
notice "processDeposits: incorrect number of deposits",
|
||||
num_deposits = num_deposits,
|
||||
req_deposits = req_deposits,
|
||||
deposit_count = state.eth1_data.deposit_count,
|
||||
deposit_index = state.eth1_deposit_index
|
||||
flags: UpdateFlags): bool {.nbench.}=
|
||||
if not (len(blck.body.deposits) <= MAX_DEPOSITS):
|
||||
notice "processDeposits: too many deposits"
|
||||
return false
|
||||
|
||||
for deposit in blck.body.deposits:
|
||||
|
|
|
|||
|
|
@ -58,12 +58,22 @@ proc runTest(identifier: string) =
|
|||
|
||||
# check: stateRef.hash_tree_root() == postRef.hash_tree_root()
|
||||
if not postRef.isNil:
|
||||
when false:
|
||||
reportDiff(stateRef, postRef)
|
||||
doAssert stateRef.hash_tree_root() == postRef.hash_tree_root()
|
||||
reportDiff(stateRef, postRef)
|
||||
|
||||
`testImpl _ blck _ identifier`()
|
||||
|
||||
suiteReport "Official - Sanity - Blocks " & preset():
|
||||
# Failing due to signature checking in indexed validation checking pending
|
||||
# 0.10 BLS verification API with new domain handling.
|
||||
const expected_failures =
|
||||
[
|
||||
"attester_slashing",
|
||||
# TODO: regression BLS v0.10.1 to fix
|
||||
"expected_deposit_in_block",
|
||||
]
|
||||
|
||||
for kind, path in walkDir(SanityBlocksDir, true):
|
||||
if path in expected_failures:
|
||||
echo "Skipping test: ", path
|
||||
continue
|
||||
runTest(path)
|
||||
|
|
|
|||
|
|
@ -117,11 +117,7 @@ proc addTestBlock*(
|
|||
state,
|
||||
parent_root,
|
||||
randao_reveal,
|
||||
# Keep deposit counts internally consistent.
|
||||
Eth1Data(
|
||||
deposit_root: eth1_data.deposit_root,
|
||||
deposit_count: state.eth1_deposit_index + deposits.len.uint64,
|
||||
block_hash: eth1_data.block_hash),
|
||||
eth1_data,
|
||||
graffiti,
|
||||
attestations,
|
||||
deposits)
|
||||
|
|
|
|||
Loading…
Reference in New Issue