6886 Commits

Author SHA1 Message Date
Etan Kissling
65649c0383
use correct timestamp for empty ExecutionPayload
There are two similar functions to compute the timestamp for a given
beacon chain slot. `compute_time_at_slot` is used for processing Eth1
votes, and does not take into account `GENESIS_TIME`. The other one,
`compute_timestamp_at_slot`, is used everywhere else. When processing
`ExecutionPayload`, the `merge/beacon-chain.md` spec uses the latter,
`compute_timestamp_at_slot`, to verify the timestamp. However, in the
test code, `build_empty_execution_payload` uses `compute_time_at_slot`.
This patch changes the test to use the same function for creating the
timestamp that is later used to verify it. Note that `GENESIS_TIME` is 0
so there is no practical difference.
2021-10-01 14:52:30 +02:00
Danny Ryan
f221674be4
Merge pull request #2634 from ethereum/fix-initialize-merge-state
Fix `initialize_beacon_state_from_eth1` previous_version
2021-09-30 16:08:10 -06:00
Hsiao-Wei Wang
1f7040b42b
Make previous_version=current_version 2021-09-30 16:41:05 +08:00
Danny Ryan
ac2c010dbd
Merge pull request #2633 from terencechain/patch-128
Expand If_and_only_if in `execute_payload`
2021-09-28 11:19:49 -06:00
Hsiao-Wei Wang
2d169adfc7
Fix initialize_beacon_state_from_eth1 previous_version 2021-09-29 01:10:09 +08:00
terence tsao
2ea262f7d6
Update specs/merge/beacon-chain.md
Co-authored-by: Hsiao-Wei Wang <hsiaowei.eth@gmail.com>
2021-09-28 07:53:29 -07:00
Hsiao-Wei Wang
31ba031b06
Merge pull request #2632 from paulhauner/patch-28
Add "P2P Networking" to "Merge" section
2021-09-28 15:40:12 +08:00
terence tsao
6d81440b10
Fix a comment typo in execute_payload 2021-09-27 21:19:03 -07:00
Paul Hauner
da7b3cef8f
Add "P2P Networking" to "Merge" section 2021-09-28 09:15:59 +10:00
Danny Ryan
cc92c2a629
Merge pull request #2617 from lsankar4033/terminal_blockhash_override_2
Add terminal block hash override
2021-09-27 11:47:58 -06:00
Danny Ryan
795d14793e
Merge pull request #2623 from fredriksvantes/patch-3
pip no longer invoked by an old script wrapper.
2021-09-27 11:27:10 -06:00
Danny Ryan
757ad7851a
Merge branch 'dev' into terminal_blockhash_override_2 2021-09-27 11:24:48 -06:00
Danny Ryan
d34b79f4de
Merge pull request #2630 from ethereum/tests/merge-clean-up
#2598 + cleanups
2021-09-27 11:23:30 -06:00
Danny Ryan
334e3138fa
Merge pull request #2628 from ethereum/bump-version
bump VERSION.txt to 1.1.0
2021-09-27 11:14:37 -06:00
Hsiao-Wei Wang
ef51e1cfb9
Change mainnet TERMINAL_TOTAL_DIFFICULTY placeholder to 2**256-2**10 to avoid overflow 2021-09-28 01:02:53 +08:00
Danny Ryan
08ea4348c5
Merge branch 'dev' into terminal_blockhash_override_2 2021-09-27 11:01:10 -06:00
Hsiao-Wei Wang
5ab2824427
Clean up, refactor test_transition.py 2021-09-28 00:59:03 +08:00
Diederik Loerakker
2a98d4c517
Merge pull request #2629 from etan-status/build-proof-test
merkle proof test generator
2021-09-27 18:22:04 +02:00
Hsiao-Wei Wang
2fa595f784
Apply the trivial suggestions 2021-09-28 00:17:18 +08:00
protolambda
bd8c978965
move merkle tests, output proof.yaml, update format 2021-09-27 18:07:59 +02:00
Etan Kissling
e7317e2283
merkle proof test generator
Building merkle proofs is required functionality for implementing light
client sync. Although the spec currently only defines a function to
verify merkle proofs (`is_valid_merkle_branch`) there are still a few
PySpec unit tests that produce merkle proofs. This patch adds a new
generator to extract test vectors from those static unit tests, so that
light client implementations can validate their merkle proof logic.
2021-09-27 17:34:51 +02:00
Danny Ryan
c8d05c60ec
Apply suggestions from code review 2021-09-27 08:23:02 -06:00
Danny Ryan
42ef3548e1
bump VERSION.txt to 1.1.0 2021-09-27 08:01:27 -06:00
Danny Ryan
adfcb79815
Merge pull request #2625 from ethereum/altair-fork
add ALTAIR_FORK_EPOCH for mainnet configuration
2021-09-27 07:57:09 -06:00
Dmitrii Shmatko
deb4dbd9c8 Make empty pow_block hash generation Python 3.8 compatible 2021-09-25 01:26:01 +03:00
Danny Ryan
30fe7ba110
Merge pull request #2627 from ethDreamer/function_rename
Fixed Validation Conditions (Function Renamed)
2021-09-24 15:19:11 -06:00
Danny Ryan
463c234b8a
Merge pull request #2626 from ethereum/bump-version
bump version to v1.1.0-beta.5
2021-09-24 13:16:37 -06:00
Mark Mackey
8a76a4143d Fixed Validation Conditions (Function Renamed) 2021-09-24 14:15:42 -05:00
lsankar4033
9353c71a6d Fix spelling 2021-09-24 11:57:58 -07:00
Danny Ryan
af5eef37b2
fix am/pm issue 2021-09-24 12:29:34 -06:00
Danny Ryan
7b0e7ceafa
Update configs/mainnet.yaml
Co-authored-by: terence tsao <terence@prysmaticlabs.com>
2021-09-24 12:28:46 -06:00
Danny Ryan
8d5106808f
bump version to v1.1.0-beta.5 2021-09-24 12:26:40 -06:00
Danny Ryan
9f037180ba
add ALTAIR_FORK_EPOCH for mainnet configuration 2021-09-24 12:14:39 -06:00
Dmitrii Shmatko
f8b3a67152 Fixed test_on_merge_block tests 2021-09-24 21:06:02 +03:00
Dmitrii Shmatko
457b0396dd update PowBlock generation with random hash 2021-09-24 20:25:18 +03:00
Fredrik Svantes
0b808b5c5a
pip no longer invoked by an old script wrapper.
while debugging an error I encountered while running setup.py I also saw pip.main was used to installed packages. installing packages through pip.main (pip.main(["install", RUAMEL_YAML_VERSION])) is not recommended, and will be removed from future versions of pip.

https://github.com/pypa/pip/issues/5599
https://pip.pypa.io/en/latest/user_guide/#using-pip-from-your-program
2021-09-24 16:33:14 +02:00
Danny Ryan
995e928f42
Merge pull request #2621 from ethDreamer/fix_gossip_block_validation_conditions
Modify Merge Gossip Block Validation Conditions
2021-09-24 06:33:05 -06:00
Danny Ryan
a48a6f46c4
fix lint 2021-09-24 06:32:08 -06:00
Danny Ryan
35a42c9d45
Apply suggestions from code review 2021-09-24 06:23:59 -06:00
Danny Ryan
d7665681a2
simplify merge block gossip conditions 2021-09-24 06:08:01 -06:00
Danny Ryan
940d6b1cc5
Merge pull request #2613 from mkalinin/execution-engine-update
Update execution engine calls
2021-09-24 05:57:27 -06:00
Danny Ryan
3f885c6c0a
Merge pull request #2622 from fredriksvantes/patch-2
No longer importing "Paragraph"
2021-09-24 05:45:59 -06:00
Fredrik Svantes
e0eec44e34
No longer importing "Paragraph"
removed Paragraph from being imported from marko.ext.gfm.elements as it is not being used
2021-09-24 12:45:37 +02:00
Mikhail Kalinin
11840ce51f Map EE calls on the PoS events defined in EIP-3675 2021-09-24 16:31:09 +06:00
lsankar4033
c9c7ab7289 Add back newlines in configs 2021-09-23 16:51:20 -07:00
Danny Ryan
5a4e568d2d
Merge pull request #2620 from ethDreamer/altair_p2p_link_fix
Fixed Altair p2p-interface.md Link
2021-09-23 14:50:36 -06:00
Dmitrii Shmatko
f3f1c86a57 Fixed imports in merge tests 2021-09-23 23:13:04 +03:00
Dmitrii Shmatko
1ecfc4016c Polishing merge tests 2021-09-23 23:10:29 +03:00
Dmitrii Shmatko
8ae078a4f5 Merge branch 'dev' into tests/merge 2021-09-23 22:24:33 +03:00
Dmitrii Shmatko
239653ea01 Fixed lint errors for test_on_merge_block.py 2021-09-23 22:24:02 +03:00