Split (1)

train · 69.7k rows

Subsets and Splits

No community queries yet

The top public SQL queries from the community will appear here once available.

in_source_id stringlengths 13 58	issue stringlengths 3 241k	before_files listlengths 0 3	after_files listlengths 0 3	pr_diff stringlengths 109 107M ⌀
pex-tool__pex-804	Release 2.0.2 On the docket: + [x] Add a test of pypi index rendering. (#799) + [x] Fix `iter_compatible_interpreters` path biasing. (#798) + [x] Fix current platform handling. #801	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.0.1'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.0.2'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 52bfe2f01..80e4b80d7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,22 @@ Release Notes ============= +2.0.2 +----- + +This is a hotfix release that fixes a bug exposed when Pex was asked to use an +interpreter with a non-canonical path as well as fixes for 'current' platform +handling in the resolver API. + +* Fix current platform handling. (#801) + `PR #801 <https://github.com/pantsbuild/pex/pull/801>`_ + +* Add a test of pypi index rendering. (#799) + `PR #799 <https://github.com/pantsbuild/pex/pull/799>`_ + +* Fix `iter_compatible_interpreters` path biasing. (#798) + `PR #798 <https://github.com/pantsbuild/pex/pull/798>`_ + 2.0.1 ----- diff --git a/pex/version.py b/pex/version.py index 7d8716be3..a698f9d1f 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '2.0.1' +__version__ = '2.0.2'
pex-tool__pex-743	Release 1.6.8 On the docket: + [x] Fixup pex re-exec during bootstrap. #741 + [x] Pex should not re-exec when the current interpreter satifies constraints #709 + [x] Pex should not lose PEX_PYTHON or PEX_PYTHON_PATH when re-exec-ing #710 + [x] Fix resolution of `setup.py` project extras. #739 Deferred: + [ ] Remove PEX_HTTP_RETRIES and push into a flag for the pex tool #94 + [ ] Sdist resolution is not always reproducible #735	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.7'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.8'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index d753c6bb2..a32083e64 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,21 @@ Release Notes ============= +1.6.8 +----- + +* Fixup pex re-exec during bootstrap. (#741) + `PR #741 <https://github.com/pantsbuild/pex/pull/741>`_ + +* Fix resolution of `setup.py` project extras. (#739) + `PR #739 <https://github.com/pantsbuild/pex/pull/739>`_ + +* Tighten up namespace declaration logic. (#732) + `PR #732 <https://github.com/pantsbuild/pex/pull/732>`_ + +* Fixup import sorting. (#731) + `PR #731 <https://github.com/pantsbuild/pex/pull/731>`_ + 1.6.7 ----- diff --git a/pex/version.py b/pex/version.py index 789a4befa..fade44a0f 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '1.6.7' +__version__ = '1.6.8'
pex-tool__pex-691	Release 1.6.4 On the docket: + [x] Restore pex.pex_bootstrapper.is_compressed API #684 + [ ] Release more flexible pex binaries. #654 + [x] If an `--interpreter-constraint` is set, it should always be honored. #656	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.3'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.4'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index c6e494f18..5979452d2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,9 +1,31 @@ Release Notes ============= +1.6.4 +----- + +This release un-breaks `lambdex <https://github.com/wickman/lambdex>`_. + +* Restore ``pex.pex_bootstrapper.is_compressed`` API. (#685) + `PR #685 <https://github.com/pantsbuild/pex/pull/685>`_ + +* Add the version of pex used to build a pex to build_properties. (#687) + `PR #687 <https://github.com/pantsbuild/pex/pull/687>`_ + +* Honor interpreter constraints even when PEX_PYTHON and PEX_PYTHON_PATH not set (#668) + `PR #668 <https://github.com/pantsbuild/pex/pull/668>`_ + 1.6.3 ----- +This release changes the behavior of the ``--interpreter-constraint`` option. +Previously, interpreter constraints were ANDed, which made it impossible to +express constraints like '>=2.7,<3' OR '>=3.6,<4'; ie: either python 2.7 or +else any python 3 release at or above 3.6. Now interpreter constraints are +ORed, which is likely a breaking change if you have scripts that pass multiple +interpreter constraints. To transition, use the native ``,`` AND operator in +your constraint expression, as used in the example above. + * Provide control over pex warning behavior. (#680) `PR #680 <https://github.com/pantsbuild/pex/pull/680>`_ diff --git a/pex/version.py b/pex/version.py index 24b3a7da7..0fc585ba9 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '1.6.3' +__version__ = '1.6.4'
pex-tool__pex-702	Release 1.6.6 On the docket: + [x] Release more flexible pex binaries. #654 + [x] If sys.executable is not on PATH a pex will re-exec itself forever. #700	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.5'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.6'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 39ebf2bce..808b715ed 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,18 @@ Release Notes ============= +1.6.6 +----- + +This is the first release including only a single PEX pex, which +supports execution under all interpreters pex supports. + +* Fix pex bootstrap interpreter selection. (#701) + `PR #701 <https://github.com/pantsbuild/pex/pull/701>`_ + +* Switch releases to a single multi-pex. (#698) + `PR #698 <https://github.com/pantsbuild/pex/pull/698>`_ + 1.6.5 ----- diff --git a/pex/version.py b/pex/version.py index b15f6cce4..3ecfde800 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '1.6.5' +__version__ = '1.6.6'
ethereum__consensus-specs-1130	BLS and testing Decided I wanted to get this out to explain the current state of testing, and collect feedback (implementers please comment) on what you need from testing, and your feelings about BLS usage in tests. # BLS and testing The two pain-points to get a pretty (and large) set of test-vectors out for clients are: - BLS Signature creation - BLS Signature verification And side-issue, but easily resolved: efficient creation of a genesis state: When BLS functionality is implemented in test-code (creation of signed deposits, and verification). Solution would be to either cache it, or create it directly, without going through the spec functions (current temporary solution on experiment branch). ## Status Talking about the status on [`spectest-deco` PR 1052](https://github.com/ethereum/eth2.0-specs/pull/1052) here, based on the `v06x` branch, where we are developing 0.6 improvements. (to be merged back into dev later) ### The testing pipeline currently looks like: - py-spec, calls BLS stub - test-helpers, don't create self-signed objects with valid signatures - py-test code, unified with test-vector-creation (see [PR 1052](https://github.com/ethereum/eth2.0-specs/pull/1052)) - py-test runner to run spec-tests, purely for assertions - test-generator running the spec-tests, passing `generator_mode=true` to each of them, making them output a test-vector. ### Pytests status: - move from `tests/` to `eth2spec/test`, i.e. part of package - removed use of `pytest` - annotated with `@spec_test` or similar (see PR 1052) - as part of test-generation effort, yay for shared effort: - expanded in block-operation testing: [coverage checklist here](https://github.com/ethereum/eth2.0-specs/issues/927) - slightly faster, less deep-copies - stuck on BLS stub (no sig creation/verification) ### Test-generation status: - BLS, SSZ-generic, SSZ-static, shuffling test generators still all in place and up to date (`v06x` branch) - `operations` test-gen uses test-package ability to output test-vectors for each test-case - but no valid signatures - lack of a definition how to handle this signature problem as a test-consumer - there are no signature-related testcases - turning BLS off would effectively let you check conformance, but it's hacky, and not remotely a good practice to have even an option for... - it's approx. ~140MB worth (iirc) of yaml encoded state-transitions, covering many edge-cases. Worth to get in the hands of implementers quick. - `sanity` tests updated and can be cleanly used for test-generation, but requires more work to define the format of the test-vectors, as they is more variety. - `epoch` processing tests also updated, also can be used, not as complete as block-processing, lower priority. ## Possible ways forward: - Simple but hacky: "turn BLS off for testing" - No "BLS off", BLS ON on client side, but only partially on spec side. Rely on signature verification not being hit before anything else during testing - valid test cases generated with valid signatures - invalid test cases marked: does it error because of BLS? And runners should check the reason for aborting processing: if it doesn't match, the test should fail. Now these pytests don't need full BLS update work, and can be released somewhat quicker - "BLS on", more work (~1 week) - slower on test-generation, but we get the best kind of test-vectors: correct, BLS verification ON. - blocker: what if a test case fails because of a signature error (test setup not creating the sig correctly), instead of a real assertion case. Spec will look correct, passes tests, but things are not right. We need to mark Sig-verification errors distinctly, so we can catch these problems when we turn BLS on in the pyspec. How: instead of `assert verify_...`, just `verify_...`, and make it raise a special `BLSVerificationError` (or something like that) - We likely still want to mark tests as "signature related" or not, so implementers can catch it easily if their code is not aborting properly before signature verification, to assure invalid inputs are not costly. A work-in-progress introduction of actual full BLS usage in the pytests is started here: [`tests-with-sigs` branch](https://github.com/ethereum/eth2.0-specs/tree/tests-with-sigs) Suggestions welcome.	[ { "content": "import sys\nimport function_puller\n\n\ndef build_phase0_spec(sourcefile, outfile):\n code_lines = []\n code_lines.append(\"\"\"\nfrom typing import (\n Any,\n Dict,\n List,\n NewType,\n Tuple,\n)\nfrom eth2spec.utils.minimal_ssz import \nfrom eth2spec.utils.bls_stub import ...	[ { "content": "import sys\nimport function_puller\n\n\ndef build_phase0_spec(sourcefile, outfile):\n code_lines = []\n code_lines.append(\"\"\"\nfrom typing import (\n Any,\n Dict,\n List,\n NewType,\n Tuple,\n)\nfrom eth2spec.utils.minimal_ssz import \nfrom eth2spec.utils.bls import \n\n\...	diff --git a/Makefile b/Makefile index 73d8adea89..86303680d3 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ install_test: cd $(PY_SPEC_DIR); python3 -m venv venv; . venv/bin/activate; pip3 install -r requirements-testing.txt; test: $(PY_SPEC_ALL_TARGETS) - cd $(PY_SPEC_DIR); . venv/bin/activate; python -m pytest . + cd $(PY_SPEC_DIR); . venv/bin/activate; python -m pytest eth2spec citest: $(PY_SPEC_ALL_TARGETS) cd $(PY_SPEC_DIR); mkdir -p test-reports/eth2spec; . venv/bin/activate; python -m pytest --junitxml=test-reports/eth2spec/test_results.xml . diff --git a/scripts/phase0/build_spec.py b/scripts/phase0/build_spec.py index da5845951d..26b0e5a8a6 100644 --- a/scripts/phase0/build_spec.py +++ b/scripts/phase0/build_spec.py @@ -13,7 +13,7 @@ def build_phase0_spec(sourcefile, outfile): Tuple, ) from eth2spec.utils.minimal_ssz import * -from eth2spec.utils.bls_stub import * +from eth2spec.utils.bls import * """) for i in (1, 2, 3, 4, 8, 32, 48, 96): diff --git a/specs/core/0_beacon-chain.md b/specs/core/0_beacon-chain.md index e56fd976cc..46c811fedb 100644 --- a/specs/core/0_beacon-chain.md +++ b/specs/core/0_beacon-chain.md @@ -1756,7 +1756,8 @@ def process_deposit(state: BeaconState, deposit: Deposit) -> None: amount = deposit.data.amount validator_pubkeys = [v.pubkey for v in state.validator_registry] if pubkey not in validator_pubkeys: - # Verify the deposit signature (proof of possession) + # Verify the deposit signature (proof of possession). + # Invalid signatures are allowed by the deposit contract, and hence included on-chain, but must not be processed. if not bls_verify(pubkey, signing_root(deposit.data), deposit.data.signature, get_domain(state, DOMAIN_DEPOSIT)): return diff --git a/specs/test_formats/README.md b/specs/test_formats/README.md index 273659ce93..d245fcfa46 100644 --- a/specs/test_formats/README.md +++ b/specs/test_formats/README.md @@ -176,6 +176,18 @@ To prevent parsing of hundreds of different YAML files to test a specific test t ... <--- more test types ``` +## Common test-case properties + +Some test-case formats share some common key-value pair patterns, and these are documented here: + +``` +bls_setting: int -- optional, can have 3 different values: + 0: (default, applies if key-value pair is absent). Free to choose either BLS ON or OFF. + Tests are generated with valid BLS data in this case, + but there is no change of outcome when running the test if BLS is ON or OFF. + 1: known as "BLS required" - if the test validity is strictly dependent on BLS being ON + 2: known as "BLS ignored" - if the test validity is strictly dependent on BLS being OFF +``` ## Note for implementers diff --git a/specs/test_formats/epoch_processing/README.md b/specs/test_formats/epoch_processing/README.md new file mode 100644 index 0000000000..6384a0eda9 --- /dev/null +++ b/specs/test_formats/epoch_processing/README.md @@ -0,0 +1,29 @@ +# Epoch processing tests + +The different epoch sub-transitions are tested individually with test handlers. +The format is similar to block-processing state-transition tests. +There is no "change" factor however, the transitions are pure functions with just the pre-state as input. +Hence, the format is shared between each test-handler. (See test condition documentation on how to run the tests.) + +## Test case format + +```yaml +description: string -- description of test case, purely for debugging purposes +bls_setting: int -- see general test-format spec. +pre: BeaconState -- state before running the sub-transition +post: BeaconState -- state after applying the epoch sub-transition. +``` + +## Condition + +A handler of the `epoch_processing` test-runner should process these cases, + calling the corresponding processing implementation. + +Sub-transitions: + +\| `sub-transition-name` \| `processing call` \| +\|-------------------------\|-----------------------------------\| +\| `crosslinks` \| `process_crosslinks(state)` \| +\| `registry_updates` \| `process_registry_updates(state)` \| + +The resulting state should match the expected `post` state. diff --git a/specs/test_formats/operations/README.md b/specs/test_formats/operations/README.md index 842dc3615f..32cf880b36 100644 --- a/specs/test_formats/operations/README.md +++ b/specs/test_formats/operations/README.md @@ -2,9 +2,34 @@ The different kinds of operations ("transactions") are tested individually with test handlers. -The tested operation kinds are: -- [`deposits`](./deposits.md) -- More tests are work-in-progress. +## Test case format +```yaml +description: string -- description of test case, purely for debugging purposes +bls_setting: int -- see general test-format spec. +pre: BeaconState -- state before applying the operation +<operation-name>: <operation-object> -- the YAML encoded operation, e.g. a "ProposerSlashing", or "Deposit". +post: BeaconState -- state after applying the operation. No value if operation processing is aborted. +``` +## Condition +A handler of the `operations` test-runner should process these cases, + calling the corresponding processing implementation. + +Operations: + +\| `operation-name` \| `operation-object` \| `input name` \| `processing call` \| +\|-------------------------\|----------------------\|----------------------\|--------------------------------------------------------\| +\| `attestation` \| `Attestation` \| `attestation` \| `process_attestation(state, attestation)` \| +\| `attester_slashing` \| `AttesterSlashing` \| `attester_slashing` \| `process_attester_slashing(state, attester_slashing)` \| +\| `block_header` \| `Block` \| `block` \| `process_block_header(state, block)` \| +\| `deposit` \| `Deposit` \| `deposit` \| `process_deposit(state, deposit)` \| +\| `proposer_slashing` \| `ProposerSlashing` \| `proposer_slashing` \| `process_proposer_slashing(state, proposer_slashing)` \| +\| `transfer` \| `Transfer` \| `transfer` \| `process_transfer(state, transfer)` \| +\| `voluntary_exit` \| `VoluntaryExit` \| `voluntary_exit` \| `process_voluntary_exit(state, voluntary_exit)` \| + +Note that `block_header` is not strictly an operation (and is a full `Block`), but processed in the same manner, and hence included here. + +The resulting state should match the expected `post` state, or if the `post` state is left blank, + the handler should reject the input operation as invalid. diff --git a/specs/test_formats/operations/deposits.md b/specs/test_formats/operations/deposits.md deleted file mode 100644 index 8f44ebb228..0000000000 --- a/specs/test_formats/operations/deposits.md +++ /dev/null @@ -1,18 +0,0 @@ -# Test format: Deposit operations - -A deposit is a form of an operation (or "transaction"), modifying the state. - -## Test case format - -```yaml -description: string -- description of test case, purely for debugging purposes -pre: BeaconState -- state before applying the deposit -deposit: Deposit -- the deposit -post: BeaconState -- state after applying the deposit. No value if deposit processing is aborted. -``` - -## Condition - -A `deposits` handler of the `operations` should process these cases, - calling the implementation of the `process_deposit(state, deposit)` functionality described in the spec. -The resulting state should match the expected `post` state, or if the `post` state is left blank, the handler should reject the inputs as invalid. diff --git a/specs/test_formats/sanity/README.md b/specs/test_formats/sanity/README.md new file mode 100644 index 0000000000..20b36208a4 --- /dev/null +++ b/specs/test_formats/sanity/README.md @@ -0,0 +1,7 @@ +# Sanity tests + +The aim of the sanity tests is to set a base-line on what really needs to pass, i.e. the essentials. + +There are two handlers, documented individually: +- [`slots`](./slots.md): transitions of one or more slots (and epoch transitions within) +- [`blocks`](./blocks.md): transitions triggered by one or more blocks diff --git a/specs/test_formats/sanity/blocks.md b/specs/test_formats/sanity/blocks.md new file mode 100644 index 0000000000..3004a6de70 --- /dev/null +++ b/specs/test_formats/sanity/blocks.md @@ -0,0 +1,18 @@ +# Sanity blocks testing + +Sanity tests to cover a series of one or more blocks being processed, aiming to cover common changes. + +## Test case format + +```yaml +description: string -- description of test case, purely for debugging purposes +bls_setting: int -- see general test-format spec. +pre: BeaconState -- state before running through the transitions triggered by the blocks. +blocks: [BeaconBlock] -- blocks to process, in given order, following the main transition function (i.e. process slot and epoch transitions in between blocks as normal) +post: BeaconState -- state after applying all the transitions triggered by the blocks. +``` + +## Condition + +The resulting state should match the expected `post` state, or if the `post` state is left blank, + the handler should reject the series of blocks as invalid. diff --git a/specs/test_formats/sanity/slots.md b/specs/test_formats/sanity/slots.md new file mode 100644 index 0000000000..81866d47b9 --- /dev/null +++ b/specs/test_formats/sanity/slots.md @@ -0,0 +1,23 @@ +# Sanity slots testing + +Sanity tests to cover a series of one or more empty-slot transitions being processed, aiming to cover common changes. + +## Test case format + +```yaml +description: string -- description of test case, purely for debugging purposes +bls_setting: int -- see general test-format spec. +pre: BeaconState -- state before running through the transitions. +slots: N -- amount of slots to process, N being a positive numer. +post: BeaconState -- state after applying all the transitions. +``` + +The transition with pure time, no blocks, is known as `state_transition_to(state, slot)` in the spec. +This runs state-caching (pure slot transition) and epoch processing (every E slots). + +To process the data, call `state_transition_to(pre, pre.slot + N)`. And see if `pre` mutated into the equivalent of `post`. + + +## Condition + +The resulting state should match the expected `post` state. diff --git a/specs/test_formats/ssz_static/core.md b/specs/test_formats/ssz_static/core.md index 1d470c3381..0f26e0f9c8 100644 --- a/specs/test_formats/ssz_static/core.md +++ b/specs/test_formats/ssz_static/core.md @@ -9,11 +9,11 @@ This test-format ensures these direct serializations are covered. ## Test case format ```yaml -type_name: string -- string, object name, formatted as in spec. E.g. "BeaconBlock" -value: dynamic -- the YAML-encoded value, of the type specified by type_name. -serialized: bytes -- string, SSZ-serialized data, hex encoded, with prefix 0x -root: bytes32 -- string, hash-tree-root of the value, hex encoded, with prefix 0x -signing_root: bytes32 -- string, signing-root of the value, hex encoded, with prefix 0x. Optional, present if type contains ``signature`` field +SomeObjectName: -- key, object name, formatted as in spec. E.g. "BeaconBlock". + value: dynamic -- the YAML-encoded value, of the type specified by type_name. + serialized: bytes -- string, SSZ-serialized data, hex encoded, with prefix 0x + root: bytes32 -- string, hash-tree-root of the value, hex encoded, with prefix 0x + signing_root: bytes32 -- string, signing-root of the value, hex encoded, with prefix 0x. Optional, present if type contains ``signature`` field ``` ## Condition diff --git a/test_generators/README.md b/test_generators/README.md index 43bf7af031..309a64bd92 100644 --- a/test_generators/README.md +++ b/test_generators/README.md @@ -58,7 +58,7 @@ It's recommended to extend the base-generator. Create a `requirements.txt` in the root of your generator directory: ``` -eth-utils==1.4.1 +eth-utils==1.6.0 ../../test_libs/gen_helpers ../../test_libs/config_helpers ../../test_libs/pyspec diff --git a/test_generators/bls/requirements.txt b/test_generators/bls/requirements.txt index 8a933d41ca..6d83bdfb59 100644 --- a/test_generators/bls/requirements.txt +++ b/test_generators/bls/requirements.txt @@ -1,3 +1,3 @@ -py-ecc==1.6.0 -eth-utils==1.4.1 +py-ecc==1.7.0 +eth-utils==1.6.0 ../../test_libs/gen_helpers diff --git a/test_generators/epoch_processing/README.md b/test_generators/epoch_processing/README.md new file mode 100644 index 0000000000..9b57875e2a --- /dev/null +++ b/test_generators/epoch_processing/README.md @@ -0,0 +1,11 @@ +# Epoch processing + +Epoch processing covers the sub-transitions during an epoch change. + +An epoch-processing test-runner can consume these sub-transition test-suites, + and handle different kinds of epoch sub-transitions by processing the cases using the specified test handler. + +Information on the format of the tests can be found in the [epoch-processing test formats documentation](../../specs/test_formats/epoch_processing/README.md). + + + diff --git a/test_generators/epoch_processing/main.py b/test_generators/epoch_processing/main.py new file mode 100644 index 0000000000..8f067e4a35 --- /dev/null +++ b/test_generators/epoch_processing/main.py @@ -0,0 +1,38 @@ +from typing import Callable, Iterable + +from eth2spec.phase0 import spec +from eth2spec.test.epoch_processing import ( + test_process_crosslinks, + test_process_registry_updates +) +from gen_base import gen_runner, gen_suite, gen_typing +from gen_from_tests.gen import generate_from_tests +from preset_loader import loader + + +def create_suite(transition_name: str, config_name: str, get_cases: Callable[[], Iterable[gen_typing.TestCase]]) \ + -> Callable[[str], gen_typing.TestSuiteOutput]: + def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput: + presets = loader.load_presets(configs_path, config_name) + spec.apply_constants_preset(presets) + + return ("%s_%s" % (transition_name, config_name), transition_name, gen_suite.render_suite( + title="%s epoch processing" % transition_name, + summary="Test suite for %s type epoch processing" % transition_name, + forks_timeline="testing", + forks=["phase0"], + config=config_name, + runner="epoch_processing", + handler=transition_name, + test_cases=get_cases())) + + return suite_definition + + +if __name__ == "__main__": + gen_runner.run_generator("epoch_processing", [ + create_suite('crosslinks', 'minimal', lambda: generate_from_tests(test_process_crosslinks)), + create_suite('crosslinks', 'mainnet', lambda: generate_from_tests(test_process_crosslinks)), + create_suite('registry_updates', 'minimal', lambda: generate_from_tests(test_process_registry_updates)), + create_suite('registry_updates', 'mainnet', lambda: generate_from_tests(test_process_registry_updates)), + ]) diff --git a/test_generators/epoch_processing/requirements.txt b/test_generators/epoch_processing/requirements.txt new file mode 100644 index 0000000000..595cee69cd --- /dev/null +++ b/test_generators/epoch_processing/requirements.txt @@ -0,0 +1,4 @@ +eth-utils==1.6.0 +../../test_libs/gen_helpers +../../test_libs/config_helpers +../../test_libs/pyspec \ No newline at end of file diff --git a/test_generators/operations/README.md b/test_generators/operations/README.md index e0b9d0e187..5cb3afc989 100644 --- a/test_generators/operations/README.md +++ b/test_generators/operations/README.md @@ -3,7 +3,6 @@ Operations (or "transactions" in previous spec iterations), are atomic changes to the state, introduced by embedding in blocks. -This generator provides a series of test suites, divided into handler, for each operation type. An operation test-runner can consume these operation test-suites, and handle different kinds of operations by processing the cases using the specified test handler. diff --git a/test_generators/operations/deposits.py b/test_generators/operations/deposits.py deleted file mode 100644 index 075ccbd5ba..0000000000 --- a/test_generators/operations/deposits.py +++ /dev/null @@ -1,180 +0,0 @@ -from eth2spec.phase0 import spec -from eth_utils import ( - to_dict, to_tuple -) -from gen_base import gen_suite, gen_typing -from preset_loader import loader -from eth2spec.debug.encode import encode -from eth2spec.utils.minimal_ssz import signing_root -from eth2spec.utils.merkle_minimal import get_merkle_root, calc_merkle_tree_from_leaves, get_merkle_proof - -from typing import List, Tuple - -import genesis -import keys -from py_ecc import bls - - -def build_deposit_data(state, - pubkey: spec.BLSPubkey, - withdrawal_cred: spec.Bytes32, - privkey: int, - amount: int): - deposit_data = spec.DepositData( - pubkey=pubkey, - withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + withdrawal_cred[1:], - amount=amount, - ) - deposit_data.proof_of_possession = bls.sign( - message_hash=signing_root(deposit_data), - privkey=privkey, - domain=spec.get_domain( - state, - spec.get_current_epoch(state), - spec.DOMAIN_DEPOSIT, - ) - ) - return deposit_data - - -def build_deposit(state, - deposit_data_leaves: List[spec.Bytes32], - pubkey: spec.BLSPubkey, - withdrawal_cred: spec.Bytes32, - privkey: int, - amount: int) -> spec.Deposit: - - deposit_data = build_deposit_data(state, pubkey, withdrawal_cred, privkey, amount) - - item = deposit_data.hash_tree_root() - index = len(deposit_data_leaves) - deposit_data_leaves.append(item) - tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves)) - proof = list(get_merkle_proof(tree, item_index=index)) - - deposit = spec.Deposit( - proof=list(proof), - index=index, - data=deposit_data, - ) - assert spec.verify_merkle_branch(item, proof, spec.DEPOSIT_CONTRACT_TREE_DEPTH, index, get_merkle_root(tuple(deposit_data_leaves))) - - return deposit - - -def build_deposit_for_index(initial_validator_count: int, index: int) -> Tuple[spec.Deposit, spec.BeaconState]: - genesis_deposits = genesis.create_deposits( - keys.pubkeys[:initial_validator_count], - keys.withdrawal_creds[:initial_validator_count] - ) - state = genesis.create_genesis_state(genesis_deposits) - - deposit_data_leaves = [dep.data.hash_tree_root() for dep in genesis_deposits] - - deposit = build_deposit( - state, - deposit_data_leaves, - keys.pubkeys[index], - keys.withdrawal_creds[index], - keys.privkeys[index], - spec.MAX_EFFECTIVE_BALANCE, - ) - - state.latest_eth1_data.deposit_root = get_merkle_root(tuple(deposit_data_leaves)) - state.latest_eth1_data.deposit_count = len(deposit_data_leaves) - - return deposit, state - - -@to_dict -def valid_deposit(): - new_dep, state = build_deposit_for_index(10, 10) - yield 'description', 'valid deposit to add new validator' - yield 'pre', encode(state, spec.BeaconState) - yield 'deposit', encode(new_dep, spec.Deposit) - spec.process_deposit(state, new_dep) - yield 'post', encode(state, spec.BeaconState) - - -@to_dict -def valid_topup(): - new_dep, state = build_deposit_for_index(10, 3) - yield 'description', 'valid deposit to top-up existing validator' - yield 'pre', encode(state, spec.BeaconState) - yield 'deposit', encode(new_dep, spec.Deposit) - spec.process_deposit(state, new_dep) - yield 'post', encode(state, spec.BeaconState) - - -@to_dict -def invalid_deposit_index(): - new_dep, state = build_deposit_for_index(10, 10) - # Mess up deposit index, 1 too small - state.deposit_index = 9 - - yield 'description', 'invalid deposit index' - yield 'pre', encode(state, spec.BeaconState) - yield 'deposit', encode(new_dep, spec.Deposit) - try: - spec.process_deposit(state, new_dep) - except AssertionError: - # expected - yield 'post', None - return - raise Exception('invalid_deposit_index has unexpectedly allowed deposit') - - -@to_dict -def invalid_deposit_proof(): - new_dep, state = build_deposit_for_index(10, 10) - # Make deposit proof invalid (at bottom of proof) - new_dep.proof[-1] = spec.ZERO_HASH - - yield 'description', 'invalid deposit proof' - yield 'pre', encode(state, spec.BeaconState) - yield 'deposit', encode(new_dep, spec.Deposit) - try: - spec.process_deposit(state, new_dep) - except AssertionError: - # expected - yield 'post', None - return - raise Exception('invalid_deposit_index has unexpectedly allowed deposit') - - -@to_tuple -def deposit_cases(): - yield valid_deposit() - yield valid_topup() - yield invalid_deposit_index() - yield invalid_deposit_proof() - - -def mini_deposits_suite(configs_path: str) -> gen_typing.TestSuiteOutput: - presets = loader.load_presets(configs_path, 'minimal') - spec.apply_constants_preset(presets) - - return ("deposit_minimal", "deposits", gen_suite.render_suite( - title="deposit operation", - summary="Test suite for deposit type operation processing", - forks_timeline="testing", - forks=["phase0"], - config="minimal", - runner="operations", - handler="deposits", - test_cases=deposit_cases())) - - -def full_deposits_suite(configs_path: str) -> gen_typing.TestSuiteOutput: - presets = loader.load_presets(configs_path, 'mainnet') - spec.apply_constants_preset(presets) - - return ("deposit_full", "deposits", gen_suite.render_suite( - title="deposit operation", - summary="Test suite for deposit type operation processing", - forks_timeline="mainnet", - forks=["phase0"], - config="mainnet", - runner="operations", - handler="deposits", - test_cases=deposit_cases())) diff --git a/test_generators/operations/genesis.py b/test_generators/operations/genesis.py deleted file mode 100644 index f4d63c10ec..0000000000 --- a/test_generators/operations/genesis.py +++ /dev/null @@ -1,44 +0,0 @@ -from eth2spec.phase0 import spec -from eth2spec.utils.merkle_minimal import get_merkle_root, calc_merkle_tree_from_leaves, get_merkle_proof -from typing import List - - -def create_genesis_state(deposits: List[spec.Deposit]) -> spec.BeaconState: - deposit_root = get_merkle_root((tuple([(dep.data.hash_tree_root()) for dep in deposits]))) - - return spec.get_genesis_beacon_state( - deposits, - genesis_time=0, - genesis_eth1_data=spec.Eth1Data( - deposit_root=deposit_root, - deposit_count=len(deposits), - block_hash=spec.ZERO_HASH, - ), - ) - - -def create_deposits(pubkeys: List[spec.BLSPubkey], withdrawal_cred: List[spec.Bytes32]) -> List[spec.Deposit]: - - # Mock proof of possession - proof_of_possession = b'\x33' * 96 - - deposit_data = [ - spec.DepositData( - pubkey=pubkeys[i], - withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + withdrawal_cred[i][1:], - amount=spec.MAX_EFFECTIVE_BALANCE, - proof_of_possession=proof_of_possession, - ) for i in range(len(pubkeys)) - ] - - # Fill tree with existing deposits - deposit_data_leaves = [data.hash_tree_root() for data in deposit_data] - tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves)) - - return [ - spec.Deposit( - proof=list(get_merkle_proof(tree, item_index=i)), - index=i, - data=deposit_data[i] - ) for i in range(len(deposit_data)) - ] diff --git a/test_generators/operations/keys.py b/test_generators/operations/keys.py deleted file mode 100644 index db4f59e0e6..0000000000 --- a/test_generators/operations/keys.py +++ /dev/null @@ -1,7 +0,0 @@ -from py_ecc import bls -from eth2spec.phase0.spec import hash - -privkeys = list(range(1, 101)) -pubkeys = [bls.privtopub(k) for k in privkeys] -# Insecure, but easier to follow -withdrawal_creds = [hash(bls.privtopub(k)) for k in privkeys] diff --git a/test_generators/operations/main.py b/test_generators/operations/main.py index 8b0a2a6d83..96c639d12d 100644 --- a/test_generators/operations/main.py +++ b/test_generators/operations/main.py @@ -1,9 +1,53 @@ -from gen_base import gen_runner +from typing import Callable, Iterable + +from eth2spec.test.block_processing import ( + test_process_attestation, + test_process_attester_slashing, + test_process_block_header, + test_process_deposit, + test_process_proposer_slashing, + test_process_transfer, + test_process_voluntary_exit +) + +from gen_base import gen_runner, gen_suite, gen_typing +from gen_from_tests.gen import generate_from_tests +from preset_loader import loader +from eth2spec.phase0 import spec + + +def create_suite(operation_name: str, config_name: str, get_cases: Callable[[], Iterable[gen_typing.TestCase]]) \ + -> Callable[[str], gen_typing.TestSuiteOutput]: + def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput: + presets = loader.load_presets(configs_path, config_name) + spec.apply_constants_preset(presets) + + return ("%s_%s" % (operation_name, config_name), operation_name, gen_suite.render_suite( + title="%s operation" % operation_name, + summary="Test suite for %s type operation processing" % operation_name, + forks_timeline="testing", + forks=["phase0"], + config=config_name, + runner="operations", + handler=operation_name, + test_cases=get_cases())) + return suite_definition -from deposits import mini_deposits_suite, full_deposits_suite if __name__ == "__main__": gen_runner.run_generator("operations", [ - mini_deposits_suite, - full_deposits_suite + create_suite('attestation', 'minimal', lambda: generate_from_tests(test_process_attestation)), + create_suite('attestation', 'mainnet', lambda: generate_from_tests(test_process_attestation)), + create_suite('attester_slashing', 'minimal', lambda: generate_from_tests(test_process_attester_slashing)), + create_suite('attester_slashing', 'mainnet', lambda: generate_from_tests(test_process_attester_slashing)), + create_suite('block_header', 'minimal', lambda: generate_from_tests(test_process_block_header)), + create_suite('block_header', 'mainnet', lambda: generate_from_tests(test_process_block_header)), + create_suite('deposit', 'minimal', lambda: generate_from_tests(test_process_deposit)), + create_suite('deposit', 'mainnet', lambda: generate_from_tests(test_process_deposit)), + create_suite('proposer_slashing', 'minimal', lambda: generate_from_tests(test_process_proposer_slashing)), + create_suite('proposer_slashing', 'mainnet', lambda: generate_from_tests(test_process_proposer_slashing)), + create_suite('transfer', 'minimal', lambda: generate_from_tests(test_process_transfer)), + create_suite('transfer', 'mainnet', lambda: generate_from_tests(test_process_transfer)), + create_suite('voluntary_exit', 'minimal', lambda: generate_from_tests(test_process_voluntary_exit)), + create_suite('voluntary_exit', 'mainnet', lambda: generate_from_tests(test_process_voluntary_exit)), ]) diff --git a/test_generators/operations/requirements.txt b/test_generators/operations/requirements.txt index dfe8535365..595cee69cd 100644 --- a/test_generators/operations/requirements.txt +++ b/test_generators/operations/requirements.txt @@ -1,5 +1,4 @@ -eth-utils==1.4.1 +eth-utils==1.6.0 ../../test_libs/gen_helpers ../../test_libs/config_helpers -../../test_libs/pyspec -py_ecc \ No newline at end of file +../../test_libs/pyspec \ No newline at end of file diff --git a/test_generators/sanity/README.md b/test_generators/sanity/README.md new file mode 100644 index 0000000000..6d2e2f30dd --- /dev/null +++ b/test_generators/sanity/README.md @@ -0,0 +1,8 @@ +# Sanity tests + +Sanity tests cover regular state-transitions in a common block-list format, to ensure the basics work. + +Information on the format of the tests can be found in the [sanity test formats documentation](../../specs/test_formats/sanity/README.md). + + + diff --git a/test_generators/sanity/main.py b/test_generators/sanity/main.py new file mode 100644 index 0000000000..bba6ed03df --- /dev/null +++ b/test_generators/sanity/main.py @@ -0,0 +1,35 @@ +from typing import Callable, Iterable + +from eth2spec.test.sanity import test_blocks, test_slots + +from gen_base import gen_runner, gen_suite, gen_typing +from gen_from_tests.gen import generate_from_tests +from preset_loader import loader +from eth2spec.phase0 import spec + + +def create_suite(handler_name: str, config_name: str, get_cases: Callable[[], Iterable[gen_typing.TestCase]]) \ + -> Callable[[str], gen_typing.TestSuiteOutput]: + def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput: + presets = loader.load_presets(configs_path, config_name) + spec.apply_constants_preset(presets) + + return ("%sanity_s_%s" % (handler_name, config_name), handler_name, gen_suite.render_suite( + title="sanity testing", + summary="Sanity test suite, %s type, generated from pytests" % handler_name, + forks_timeline="testing", + forks=["phase0"], + config=config_name, + runner="sanity", + handler=handler_name, + test_cases=get_cases())) + return suite_definition + + +if __name__ == "__main__": + gen_runner.run_generator("sanity", [ + create_suite('blocks', 'minimal', lambda: generate_from_tests(test_blocks)), + create_suite('blocks', 'mainnet', lambda: generate_from_tests(test_blocks)), + create_suite('slots', 'minimal', lambda: generate_from_tests(test_slots)), + create_suite('slots', 'mainnet', lambda: generate_from_tests(test_slots)), + ]) diff --git a/test_generators/sanity/requirements.txt b/test_generators/sanity/requirements.txt new file mode 100644 index 0000000000..595cee69cd --- /dev/null +++ b/test_generators/sanity/requirements.txt @@ -0,0 +1,4 @@ +eth-utils==1.6.0 +../../test_libs/gen_helpers +../../test_libs/config_helpers +../../test_libs/pyspec \ No newline at end of file diff --git a/test_generators/shuffling/main.py b/test_generators/shuffling/main.py index 2c4faeb8fb..bb14520e12 100644 --- a/test_generators/shuffling/main.py +++ b/test_generators/shuffling/main.py @@ -10,7 +10,7 @@ def shuffling_case(seed: spec.Bytes32, count: int): yield 'seed', '0x' + seed.hex() yield 'count', count - yield 'shuffled', [spec.get_permuted_index(i, count, seed) for i in range(count)] + yield 'shuffled', [spec.get_shuffled_index(i, count, seed) for i in range(count)] @to_tuple diff --git a/test_generators/shuffling/requirements.txt b/test_generators/shuffling/requirements.txt index 8f9bede8f3..595cee69cd 100644 --- a/test_generators/shuffling/requirements.txt +++ b/test_generators/shuffling/requirements.txt @@ -1,4 +1,4 @@ -eth-utils==1.4.1 +eth-utils==1.6.0 ../../test_libs/gen_helpers ../../test_libs/config_helpers ../../test_libs/pyspec \ No newline at end of file diff --git a/test_generators/ssz_generic/requirements.txt b/test_generators/ssz_generic/requirements.txt index 94afc9d91b..dcdb0824ff 100644 --- a/test_generators/ssz_generic/requirements.txt +++ b/test_generators/ssz_generic/requirements.txt @@ -1,4 +1,4 @@ -eth-utils==1.4.1 +eth-utils==1.6.0 ../../test_libs/gen_helpers ../../test_libs/config_helpers ssz==0.1.0a2 diff --git a/test_generators/ssz_static/main.py b/test_generators/ssz_static/main.py index 1234294db9..e8995b9185 100644 --- a/test_generators/ssz_static/main.py +++ b/test_generators/ssz_static/main.py @@ -18,10 +18,7 @@ @to_dict -def create_test_case(rng: Random, name: str, mode: random_value.RandomizationMode, chaos: bool): - typ = spec.get_ssz_type_by_name(name) - value = random_value.get_random_ssz_object(rng, typ, MAX_BYTES_LENGTH, MAX_LIST_LENGTH, mode, chaos) - yield "type_name", name +def create_test_case_contents(value, typ): yield "value", encode.encode(value, typ) yield "serialized", '0x' + serialize(value).hex() yield "root", '0x' + hash_tree_root(value).hex() @@ -29,6 +26,13 @@ def create_test_case(rng: Random, name: str, mode: random_value.RandomizationMod yield "signing_root", '0x' + signing_root(value).hex() +@to_dict +def create_test_case(rng: Random, name: str, mode: random_value.RandomizationMode, chaos: bool): + typ = spec.get_ssz_type_by_name(name) + value = random_value.get_random_ssz_object(rng, typ, MAX_BYTES_LENGTH, MAX_LIST_LENGTH, mode, chaos) + yield name, create_test_case_contents(value, typ) + + @to_tuple def ssz_static_cases(rng: Random, mode: random_value.RandomizationMode, chaos: bool, count: int): for type_name in spec.ssz_types: diff --git a/test_generators/ssz_static/requirements.txt b/test_generators/ssz_static/requirements.txt index 8f9bede8f3..595cee69cd 100644 --- a/test_generators/ssz_static/requirements.txt +++ b/test_generators/ssz_static/requirements.txt @@ -1,4 +1,4 @@ -eth-utils==1.4.1 +eth-utils==1.6.0 ../../test_libs/gen_helpers ../../test_libs/config_helpers ../../test_libs/pyspec \ No newline at end of file diff --git a/test_libs/config_helpers/requirements.txt b/test_libs/config_helpers/requirements.txt index e441a474b8..f2f208c3fb 100644 --- a/test_libs/config_helpers/requirements.txt +++ b/test_libs/config_helpers/requirements.txt @@ -1 +1 @@ -ruamel.yaml==0.15.87 +ruamel.yaml==0.15.96 diff --git a/test_libs/config_helpers/setup.py b/test_libs/config_helpers/setup.py index 90ad94ee44..9f0ea06419 100644 --- a/test_libs/config_helpers/setup.py +++ b/test_libs/config_helpers/setup.py @@ -4,6 +4,6 @@ name='config_helpers', packages=['preset_loader'], install_requires=[ - "ruamel.yaml==0.15.87" + "ruamel.yaml==0.15.96" ] ) diff --git a/test_libs/pyspec/tests/__init__.py b/test_libs/gen_helpers/gen_from_tests/__init__.py similarity index 100% rename from test_libs/pyspec/tests/__init__.py rename to test_libs/gen_helpers/gen_from_tests/__init__.py diff --git a/test_libs/gen_helpers/gen_from_tests/gen.py b/test_libs/gen_helpers/gen_from_tests/gen.py new file mode 100644 index 0000000000..e7d8011310 --- /dev/null +++ b/test_libs/gen_helpers/gen_from_tests/gen.py @@ -0,0 +1,25 @@ +from inspect import getmembers, isfunction + +def generate_from_tests(src, bls_active=True): + """ + Generate a list of test cases by running tests from the given src in generator-mode. + :param src: to retrieve tests from (discovered using inspect.getmembers) + :param bls_active: optional, to override BLS switch preference. Defaults to True. + :return: the list of test cases. + """ + fn_names = [ + name for (name, _) in getmembers(src, isfunction) + if name.startswith('test_') + ] + out = [] + print("generating test vectors from tests source: %s" % src.__name__) + for name in fn_names: + tfn = getattr(src, name) + try: + test_case = tfn(generator_mode=True, bls_active=bls_active) + # If no test case data is returned, the test is ignored. + if test_case is not None: + out.append(test_case) + except AssertionError: + print("ERROR: failed to generate vector from test: %s (src: %s)" % (name, src.__name__)) + return out diff --git a/test_libs/gen_helpers/requirements.txt b/test_libs/gen_helpers/requirements.txt index 3d6a39458e..557cae6317 100644 --- a/test_libs/gen_helpers/requirements.txt +++ b/test_libs/gen_helpers/requirements.txt @@ -1,2 +1,2 @@ -ruamel.yaml==0.15.87 -eth-utils==1.4.1 +ruamel.yaml==0.15.96 +eth-utils==1.6.0 diff --git a/test_libs/gen_helpers/setup.py b/test_libs/gen_helpers/setup.py index 5de27a6dbe..ee2c815c76 100644 --- a/test_libs/gen_helpers/setup.py +++ b/test_libs/gen_helpers/setup.py @@ -2,9 +2,9 @@ setup( name='gen_helpers', - packages=['gen_base'], + packages=['gen_base', 'gen_from_tests'], install_requires=[ - "ruamel.yaml==0.15.87", - "eth-utils==1.4.1" + "ruamel.yaml==0.15.96", + "eth-utils==1.6.0" ] ) diff --git a/test_libs/pyspec/README.md b/test_libs/pyspec/README.md index df18342100..330972e772 100644 --- a/test_libs/pyspec/README.md +++ b/test_libs/pyspec/README.md @@ -46,8 +46,9 @@ The `-B` flag may be helpful to force-overwrite the `pyspec` output after you ma Run the tests: ``` -pytest --config=minimal +pytest --config=minimal eth2spec ``` +Note the package-name, this is to locate the tests. ## Contributing diff --git a/test_libs/pyspec/eth2spec/test/__init__.py b/test_libs/pyspec/eth2spec/test/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test_libs/pyspec/eth2spec/test/block_processing/__init__.py b/test_libs/pyspec/eth2spec/test/block_processing/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_attestation.py b/test_libs/pyspec/eth2spec/test/block_processing/test_process_attestation.py new file mode 100644 index 0000000000..af6b39ef6e --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/block_processing/test_process_attestation.py @@ -0,0 +1,255 @@ +from copy import deepcopy + +import eth2spec.phase0.spec as spec +from eth2spec.phase0.spec import ( + get_current_epoch, + process_attestation +) +from eth2spec.phase0.state_transition import ( + state_transition_to, +) +from eth2spec.test.context import spec_state_test, expect_assertion_error, always_bls +from eth2spec.test.helpers.attestations import ( + get_valid_attestation, + sign_attestation, +) +from eth2spec.test.helpers.state import ( + next_epoch, + next_slot, +) +from eth2spec.test.helpers.block import apply_empty_block + + +def run_attestation_processing(state, attestation, valid=True): + """ + Run ``process_attestation``, yielding: + - pre-state ('pre') + - attestation ('attestation') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ + # yield pre-state + yield 'pre', state + + yield 'attestation', attestation + + # If the attestation is invalid, processing is aborted, and there is no post-state. + if not valid: + expect_assertion_error(lambda: process_attestation(state, attestation)) + yield 'post', None + return + + current_epoch_count = len(state.current_epoch_attestations) + previous_epoch_count = len(state.previous_epoch_attestations) + + # process attestation + process_attestation(state, attestation) + + # Make sure the attestation has been processed + if attestation.data.target_epoch == get_current_epoch(state): + assert len(state.current_epoch_attestations) == current_epoch_count + 1 + else: + assert len(state.previous_epoch_attestations) == previous_epoch_count + 1 + + # yield post-state + yield 'post', state + + +@spec_state_test +def test_success(state): + attestation = get_valid_attestation(state, signed=True) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + yield from run_attestation_processing(state, attestation) + + +@spec_state_test +def test_success_previous_epoch(state): + attestation = get_valid_attestation(state, signed=True) + next_epoch(state) + apply_empty_block(state) + + yield from run_attestation_processing(state, attestation) + + +@always_bls +@spec_state_test +def test_invalid_attestation_signature(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_before_inclusion_delay(state): + attestation = get_valid_attestation(state, signed=True) + # do not increment slot to allow for inclusion delay + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_after_epoch_slots(state): + attestation = get_valid_attestation(state, signed=True) + # increment past latest inclusion slot + state_transition_to(state, state.slot + spec.SLOTS_PER_EPOCH + 1) + apply_empty_block(state) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_old_source_epoch(state): + state.slot = spec.SLOTS_PER_EPOCH * 5 + state.finalized_epoch = 2 + state.previous_justified_epoch = 3 + state.current_justified_epoch = 4 + attestation = get_valid_attestation(state, slot=(spec.SLOTS_PER_EPOCH * 3) + 1) + + # test logic sanity check: make sure the attestation is pointing to oldest known source epoch + assert attestation.data.source_epoch == state.previous_justified_epoch + + # Now go beyond that, it will be invalid + attestation.data.source_epoch -= 1 + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_wrong_shard(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + attestation.data.shard += 1 + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_new_source_epoch(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + attestation.data.source_epoch += 1 + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_source_root_is_target_root(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + attestation.data.source_root = attestation.data.target_root + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_invalid_current_source_root(state): + state.slot = spec.SLOTS_PER_EPOCH * 5 + state.finalized_epoch = 2 + + state.previous_justified_epoch = 3 + state.previous_justified_root = b'\x01' * 32 + + state.current_justified_epoch = 4 + state.current_justified_root = b'\xff' * 32 + + attestation = get_valid_attestation(state, slot=(spec.SLOTS_PER_EPOCH * 3) + 1) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + # Test logic sanity checks: + assert state.current_justified_root != state.previous_justified_root + assert attestation.data.source_root == state.previous_justified_root + + # Make attestation source root invalid: should be previous justified, not current one + attestation.data.source_root = state.current_justified_root + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_bad_source_root(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + attestation.data.source_root = b'\x42' * 32 + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_non_zero_crosslink_data_root(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + attestation.data.crosslink_data_root = b'\x42' * 32 + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_bad_previous_crosslink(state): + next_epoch(state) + apply_empty_block(state) + + attestation = get_valid_attestation(state, signed=True) + for _ in range(spec.MIN_ATTESTATION_INCLUSION_DELAY): + next_slot(state) + apply_empty_block(state) + + state.current_crosslinks[attestation.data.shard].epoch += 10 + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_inconsistent_bitfields(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + attestation.custody_bitfield = deepcopy(attestation.aggregation_bitfield) + b'\x00' + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_non_empty_custody_bitfield(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + attestation.custody_bitfield = deepcopy(attestation.aggregation_bitfield) + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) + + +@spec_state_test +def test_empty_aggregation_bitfield(state): + attestation = get_valid_attestation(state) + state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + + attestation.aggregation_bitfield = b'\x00' * len(attestation.aggregation_bitfield) + + sign_attestation(state, attestation) + + yield from run_attestation_processing(state, attestation, False) diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_attester_slashing.py b/test_libs/pyspec/eth2spec/test/block_processing/test_process_attester_slashing.py new file mode 100644 index 0000000000..28e2322772 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/block_processing/test_process_attester_slashing.py @@ -0,0 +1,149 @@ +import eth2spec.phase0.spec as spec +from eth2spec.phase0.spec import ( + get_beacon_proposer_index, + process_attester_slashing, +) +from eth2spec.test.context import spec_state_test, expect_assertion_error, always_bls +from eth2spec.test.helpers.attestations import sign_indexed_attestation +from eth2spec.test.helpers.attester_slashings import get_valid_attester_slashing +from eth2spec.test.helpers.block import apply_empty_block +from eth2spec.test.helpers.state import ( + get_balance, + next_epoch, +) + + +def run_attester_slashing_processing(state, attester_slashing, valid=True): + """ + Run ``process_attester_slashing``, yielding: + - pre-state ('pre') + - attester_slashing ('attester_slashing') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ + + yield 'pre', state + yield 'attester_slashing', attester_slashing + + if not valid: + expect_assertion_error(lambda: process_attester_slashing(state, attester_slashing)) + yield 'post', None + return + + slashed_index = attester_slashing.attestation_1.custody_bit_0_indices[0] + pre_slashed_balance = get_balance(state, slashed_index) + + proposer_index = get_beacon_proposer_index(state) + pre_proposer_balance = get_balance(state, proposer_index) + + # Process slashing + process_attester_slashing(state, attester_slashing) + + slashed_validator = state.validator_registry[slashed_index] + + # Check slashing + assert slashed_validator.slashed + assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH + assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH + + if slashed_index != proposer_index: + # lost whistleblower reward + assert get_balance(state, slashed_index) < pre_slashed_balance + # gained whistleblower reward + assert get_balance(state, proposer_index) > pre_proposer_balance + else: + # gained rewards for all slashings, which may include others. And only lost that of themselves. + # Netto at least 0, if more people where slashed, a balance increase. + assert get_balance(state, slashed_index) >= pre_slashed_balance + + yield 'post', state + + +@spec_state_test +def test_success_double(state): + attester_slashing = get_valid_attester_slashing(state, signed_1=True, signed_2=True) + + yield from run_attester_slashing_processing(state, attester_slashing) + + +@spec_state_test +def test_success_surround(state): + next_epoch(state) + apply_empty_block(state) + + state.current_justified_epoch += 1 + attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True) + + # set attestion1 to surround attestation 2 + attester_slashing.attestation_1.data.source_epoch = attester_slashing.attestation_2.data.source_epoch - 1 + attester_slashing.attestation_1.data.target_epoch = attester_slashing.attestation_2.data.target_epoch + 1 + + sign_indexed_attestation(state, attester_slashing.attestation_1) + + yield from run_attester_slashing_processing(state, attester_slashing) + + +@always_bls +@spec_state_test +def test_invalid_sig_1(state): + attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True) + yield from run_attester_slashing_processing(state, attester_slashing, False) + + +@always_bls +@spec_state_test +def test_invalid_sig_2(state): + attester_slashing = get_valid_attester_slashing(state, signed_1=True, signed_2=False) + yield from run_attester_slashing_processing(state, attester_slashing, False) + + +@always_bls +@spec_state_test +def test_invalid_sig_1_and_2(state): + attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=False) + yield from run_attester_slashing_processing(state, attester_slashing, False) + + +@spec_state_test +def test_same_data(state): + attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True) + + attester_slashing.attestation_1.data = attester_slashing.attestation_2.data + sign_indexed_attestation(state, attester_slashing.attestation_1) + + yield from run_attester_slashing_processing(state, attester_slashing, False) + + +@spec_state_test +def test_no_double_or_surround(state): + attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True) + + attester_slashing.attestation_1.data.target_epoch += 1 + sign_indexed_attestation(state, attester_slashing.attestation_1) + + yield from run_attester_slashing_processing(state, attester_slashing, False) + + +@spec_state_test +def test_participants_already_slashed(state): + attester_slashing = get_valid_attester_slashing(state, signed_1=True, signed_2=True) + + # set all indices to slashed + attestation_1 = attester_slashing.attestation_1 + validator_indices = attestation_1.custody_bit_0_indices + attestation_1.custody_bit_1_indices + for index in validator_indices: + state.validator_registry[index].slashed = True + + yield from run_attester_slashing_processing(state, attester_slashing, False) + + +@spec_state_test +def test_custody_bit_0_and_1(state): + attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True) + + attester_slashing.attestation_1.custody_bit_1_indices = ( + attester_slashing.attestation_1.custody_bit_0_indices + ) + sign_indexed_attestation(state, attester_slashing.attestation_1) + + yield from run_attester_slashing_processing(state, attester_slashing, False) diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_block_header.py b/test_libs/pyspec/eth2spec/test/block_processing/test_process_block_header.py new file mode 100644 index 0000000000..454f557c5c --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/block_processing/test_process_block_header.py @@ -0,0 +1,87 @@ +from copy import deepcopy + +from eth2spec.phase0.spec import ( + get_beacon_proposer_index, + cache_state, + advance_slot, + process_block_header, +) +from eth2spec.test.context import spec_state_test, expect_assertion_error, always_bls +from eth2spec.test.helpers.block import ( + build_empty_block_for_next_slot, + sign_block +) +from eth2spec.test.helpers.state import next_slot + + +def prepare_state_for_header_processing(state): + cache_state(state) + advance_slot(state) + + +def run_block_header_processing(state, block, valid=True): + """ + Run ``process_block_header``, yielding: + - pre-state ('pre') + - block ('block') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ + prepare_state_for_header_processing(state) + + yield 'pre', state + yield 'block', block + + if not valid: + expect_assertion_error(lambda: process_block_header(state, block)) + yield 'post', None + return + + process_block_header(state, block) + yield 'post', state + + +@spec_state_test +def test_success_block_header(state): + block = build_empty_block_for_next_slot(state, signed=True) + yield from run_block_header_processing(state, block) + + +@always_bls +@spec_state_test +def test_invalid_sig_block_header(state): + block = build_empty_block_for_next_slot(state) + yield from run_block_header_processing(state, block, valid=False) + + +@spec_state_test +def test_invalid_slot_block_header(state): + block = build_empty_block_for_next_slot(state) + block.slot = state.slot + 2 # invalid slot + sign_block(state, block) + + yield from run_block_header_processing(state, block, valid=False) + + +@spec_state_test +def test_invalid_previous_block_root(state): + block = build_empty_block_for_next_slot(state) + block.previous_block_root = b'\12' * 32 # invalid prev root + sign_block(state, block) + + yield from run_block_header_processing(state, block, valid=False) + + +@spec_state_test +def test_proposer_slashed(state): + # use stub state to get proposer index of next slot + stub_state = deepcopy(state) + next_slot(stub_state) + proposer_index = get_beacon_proposer_index(stub_state) + + # set proposer to slashed + state.validator_registry[proposer_index].slashed = True + + block = build_empty_block_for_next_slot(state, signed=True) + + yield from run_block_header_processing(state, block, valid=False) diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_deposit.py b/test_libs/pyspec/eth2spec/test/block_processing/test_process_deposit.py new file mode 100644 index 0000000000..336af3bf73 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/block_processing/test_process_deposit.py @@ -0,0 +1,124 @@ +import eth2spec.phase0.spec as spec +from eth2spec.phase0.spec import process_deposit +from eth2spec.test.context import spec_state_test, expect_assertion_error, always_bls +from eth2spec.test.helpers.deposits import prepare_state_and_deposit, sign_deposit_data +from eth2spec.test.helpers.state import get_balance +from eth2spec.test.helpers.keys import privkeys + + +def run_deposit_processing(state, deposit, validator_index, valid=True, effective=True): + """ + Run ``process_deposit``, yielding: + - pre-state ('pre') + - deposit ('deposit') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ + pre_validator_count = len(state.validator_registry) + pre_balance = 0 + if validator_index < pre_validator_count: + pre_balance = get_balance(state, validator_index) + else: + # if it is a new validator, it should be right at the end of the current registry. + assert validator_index == pre_validator_count + + yield 'pre', state + yield 'deposit', deposit + + if not valid: + expect_assertion_error(lambda: process_deposit(state, deposit)) + yield 'post', None + return + + process_deposit(state, deposit) + + yield 'post', state + + if not effective: + assert len(state.validator_registry) == pre_validator_count + assert len(state.balances) == pre_validator_count + if validator_index < pre_validator_count: + assert get_balance(state, validator_index) == pre_balance + else: + if validator_index < pre_validator_count: + # top-up + assert len(state.validator_registry) == pre_validator_count + assert len(state.balances) == pre_validator_count + else: + # new validator + assert len(state.validator_registry) == pre_validator_count + 1 + assert len(state.balances) == pre_validator_count + 1 + assert get_balance(state, validator_index) == pre_balance + deposit.data.amount + + assert state.deposit_index == state.latest_eth1_data.deposit_count + + +@spec_state_test +def test_new_deposit(state): + # fresh deposit = next validator index = validator appended to registry + validator_index = len(state.validator_registry) + amount = spec.MAX_EFFECTIVE_BALANCE + deposit = prepare_state_and_deposit(state, validator_index, amount, signed=True) + + yield from run_deposit_processing(state, deposit, validator_index) + + +@always_bls +@spec_state_test +def test_invalid_sig_new_deposit(state): + # fresh deposit = next validator index = validator appended to registry + validator_index = len(state.validator_registry) + amount = spec.MAX_EFFECTIVE_BALANCE + deposit = prepare_state_and_deposit(state, validator_index, amount) + yield from run_deposit_processing(state, deposit, validator_index, valid=True, effective=False) + + +@spec_state_test +def test_success_top_up(state): + validator_index = 0 + amount = spec.MAX_EFFECTIVE_BALANCE // 4 + deposit = prepare_state_and_deposit(state, validator_index, amount, signed=True) + + yield from run_deposit_processing(state, deposit, validator_index) + + +@always_bls +@spec_state_test +def test_invalid_sig_top_up(state): + validator_index = 0 + amount = spec.MAX_EFFECTIVE_BALANCE // 4 + deposit = prepare_state_and_deposit(state, validator_index, amount) + + # invalid signatures, in top-ups, are allowed! + yield from run_deposit_processing(state, deposit, validator_index, valid=True, effective=True) + + +@spec_state_test +def test_wrong_index(state): + validator_index = len(state.validator_registry) + amount = spec.MAX_EFFECTIVE_BALANCE + deposit = prepare_state_and_deposit(state, validator_index, amount) + + # mess up deposit_index + deposit.index = state.deposit_index + 1 + + sign_deposit_data(state, deposit.data, privkeys[validator_index]) + + yield from run_deposit_processing(state, deposit, validator_index, valid=False) + + +# TODO: test invalid signature + + +@spec_state_test +def test_bad_merkle_proof(state): + validator_index = len(state.validator_registry) + amount = spec.MAX_EFFECTIVE_BALANCE + deposit = prepare_state_and_deposit(state, validator_index, amount) + + # mess up merkle branch + deposit.proof[-1] = spec.ZERO_HASH + + sign_deposit_data(state, deposit.data, privkeys[validator_index]) + + yield from run_deposit_processing(state, deposit, validator_index, valid=False) diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_proposer_slashing.py b/test_libs/pyspec/eth2spec/test/block_processing/test_process_proposer_slashing.py new file mode 100644 index 0000000000..07ccc25f1c --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/block_processing/test_process_proposer_slashing.py @@ -0,0 +1,137 @@ +import eth2spec.phase0.spec as spec +from eth2spec.phase0.spec import ( + get_current_epoch, + process_proposer_slashing, +) +from eth2spec.test.context import spec_state_test, expect_assertion_error, always_bls +from eth2spec.test.helpers.block_header import sign_block_header +from eth2spec.test.helpers.keys import privkeys +from eth2spec.test.helpers.proposer_slashings import get_valid_proposer_slashing +from eth2spec.test.helpers.state import get_balance + + +def run_proposer_slashing_processing(state, proposer_slashing, valid=True): + """ + Run ``process_proposer_slashing``, yielding: + - pre-state ('pre') + - proposer_slashing ('proposer_slashing') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ + + yield 'pre', state + yield 'proposer_slashing', proposer_slashing + + if not valid: + expect_assertion_error(lambda: process_proposer_slashing(state, proposer_slashing)) + yield 'post', None + return + + pre_proposer_balance = get_balance(state, proposer_slashing.proposer_index) + + process_proposer_slashing(state, proposer_slashing) + yield 'post', state + + # check if slashed + slashed_validator = state.validator_registry[proposer_slashing.proposer_index] + assert slashed_validator.slashed + assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH + assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH + + # lost whistleblower reward + assert ( + get_balance(state, proposer_slashing.proposer_index) < + pre_proposer_balance + ) + + +@spec_state_test +def test_success(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=True) + + yield from run_proposer_slashing_processing(state, proposer_slashing) + + +@always_bls +@spec_state_test +def test_invalid_sig_1(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=False, signed_2=True) + yield from run_proposer_slashing_processing(state, proposer_slashing, False) + + +@always_bls +@spec_state_test +def test_invalid_sig_2(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=False) + yield from run_proposer_slashing_processing(state, proposer_slashing, False) + + +@always_bls +@spec_state_test +def test_invalid_sig_1_and_2(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=False, signed_2=False) + yield from run_proposer_slashing_processing(state, proposer_slashing, False) + + +@spec_state_test +def test_invalid_proposer_index(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=True) + # Index just too high (by 1) + proposer_slashing.proposer_index = len(state.validator_registry) + + yield from run_proposer_slashing_processing(state, proposer_slashing, False) + + +@spec_state_test +def test_epochs_are_different(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=False) + + # set slots to be in different epochs + proposer_slashing.header_2.slot += spec.SLOTS_PER_EPOCH + sign_block_header(state, proposer_slashing.header_2, privkeys[proposer_slashing.proposer_index]) + + yield from run_proposer_slashing_processing(state, proposer_slashing, False) + + +@spec_state_test +def test_headers_are_same(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=False) + + # set headers to be the same + proposer_slashing.header_2 = proposer_slashing.header_1 + + yield from run_proposer_slashing_processing(state, proposer_slashing, False) + + +@spec_state_test +def test_proposer_is_not_activated(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=True) + + # set proposer to be not active yet + state.validator_registry[proposer_slashing.proposer_index].activation_epoch = get_current_epoch(state) + 1 + + yield from run_proposer_slashing_processing(state, proposer_slashing, False) + + +@spec_state_test +def test_proposer_is_slashed(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=True) + + # set proposer to slashed + state.validator_registry[proposer_slashing.proposer_index].slashed = True + + yield from run_proposer_slashing_processing(state, proposer_slashing, False) + + +@spec_state_test +def test_proposer_is_withdrawn(state): + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=True) + + # move 1 epoch into future, to allow for past withdrawable epoch + state.slot += spec.SLOTS_PER_EPOCH + # set proposer withdrawable_epoch in past + current_epoch = get_current_epoch(state) + proposer_index = proposer_slashing.proposer_index + state.validator_registry[proposer_index].withdrawable_epoch = current_epoch - 1 + + yield from run_proposer_slashing_processing(state, proposer_slashing, False) diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_transfer.py b/test_libs/pyspec/eth2spec/test/block_processing/test_process_transfer.py new file mode 100644 index 0000000000..83af755743 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/block_processing/test_process_transfer.py @@ -0,0 +1,172 @@ +import eth2spec.phase0.spec as spec +from eth2spec.phase0.spec import ( + get_active_validator_indices, + get_beacon_proposer_index, + get_current_epoch, + process_transfer, +) +from eth2spec.test.context import spec_state_test, expect_assertion_error, always_bls +from eth2spec.test.helpers.state import next_epoch +from eth2spec.test.helpers.block import apply_empty_block +from eth2spec.test.helpers.transfers import get_valid_transfer + + +def run_transfer_processing(state, transfer, valid=True): + """ + Run ``process_transfer``, yielding: + - pre-state ('pre') + - transfer ('transfer') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ + + proposer_index = get_beacon_proposer_index(state) + pre_transfer_sender_balance = state.balances[transfer.sender] + pre_transfer_recipient_balance = state.balances[transfer.recipient] + pre_transfer_proposer_balance = state.balances[proposer_index] + + yield 'pre', state + yield 'transfer', transfer + + if not valid: + expect_assertion_error(lambda: process_transfer(state, transfer)) + yield 'post', None + return + + process_transfer(state, transfer) + yield 'post', state + + sender_balance = state.balances[transfer.sender] + recipient_balance = state.balances[transfer.recipient] + assert sender_balance == pre_transfer_sender_balance - transfer.amount - transfer.fee + assert recipient_balance == pre_transfer_recipient_balance + transfer.amount + assert state.balances[proposer_index] == pre_transfer_proposer_balance + transfer.fee + + +@spec_state_test +def test_success_non_activated(state): + transfer = get_valid_transfer(state, signed=True) + # un-activate so validator can transfer + state.validator_registry[transfer.sender].activation_eligibility_epoch = spec.FAR_FUTURE_EPOCH + + yield from run_transfer_processing(state, transfer) + + +@spec_state_test +def test_success_withdrawable(state): + next_epoch(state) + apply_empty_block(state) + + transfer = get_valid_transfer(state, signed=True) + + # withdrawable_epoch in past so can transfer + state.validator_registry[transfer.sender].withdrawable_epoch = get_current_epoch(state) - 1 + + yield from run_transfer_processing(state, transfer) + + +@spec_state_test +def test_success_active_above_max_effective(state): + sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] + state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE + 1 + transfer = get_valid_transfer(state, sender_index=sender_index, amount=1, fee=0, signed=True) + + yield from run_transfer_processing(state, transfer) + + +@spec_state_test +def test_success_active_above_max_effective_fee(state): + sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] + state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE + 1 + transfer = get_valid_transfer(state, sender_index=sender_index, amount=0, fee=1, signed=True) + + yield from run_transfer_processing(state, transfer) + + +@always_bls +@spec_state_test +def test_invalid_signature(state): + transfer = get_valid_transfer(state) + # un-activate so validator can transfer + state.validator_registry[transfer.sender].activation_eligibility_epoch = spec.FAR_FUTURE_EPOCH + + yield from run_transfer_processing(state, transfer, False) + + +@spec_state_test +def test_active_but_transfer_past_effective_balance(state): + sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] + amount = spec.MAX_EFFECTIVE_BALANCE // 32 + state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE + transfer = get_valid_transfer(state, sender_index=sender_index, amount=amount, fee=0, signed=True) + + yield from run_transfer_processing(state, transfer, False) + + +@spec_state_test +def test_incorrect_slot(state): + transfer = get_valid_transfer(state, slot=state.slot + 1, signed=True) + # un-activate so validator can transfer + state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH + + yield from run_transfer_processing(state, transfer, False) + + +@spec_state_test +def test_insufficient_balance_for_fee(state): + sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] + state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE + transfer = get_valid_transfer(state, sender_index=sender_index, amount=0, fee=1, signed=True) + + # un-activate so validator can transfer + state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH + + yield from run_transfer_processing(state, transfer, False) + + +@spec_state_test +def test_insufficient_balance(state): + sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] + state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE + transfer = get_valid_transfer(state, sender_index=sender_index, amount=1, fee=0, signed=True) + + # un-activate so validator can transfer + state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH + + yield from run_transfer_processing(state, transfer, False) + + +@spec_state_test +def test_no_dust_sender(state): + sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] + balance = state.balances[sender_index] + transfer = get_valid_transfer(state, sender_index=sender_index, amount=balance - spec.MIN_DEPOSIT_AMOUNT + 1, fee=0, signed=True) + + # un-activate so validator can transfer + state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH + + yield from run_transfer_processing(state, transfer, False) + + +@spec_state_test +def test_no_dust_recipient(state): + sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] + state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE + 1 + transfer = get_valid_transfer(state, sender_index=sender_index, amount=1, fee=0, signed=True) + state.balances[transfer.recipient] = 0 + + # un-activate so validator can transfer + state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH + + yield from run_transfer_processing(state, transfer, False) + + +@spec_state_test +def test_invalid_pubkey(state): + transfer = get_valid_transfer(state, signed=True) + state.validator_registry[transfer.sender].withdrawal_credentials = spec.ZERO_HASH + + # un-activate so validator can transfer + state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH + + yield from run_transfer_processing(state, transfer, False) diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_voluntary_exit.py b/test_libs/pyspec/eth2spec/test/block_processing/test_process_voluntary_exit.py new file mode 100644 index 0000000000..53fb4e3f7c --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/block_processing/test_process_voluntary_exit.py @@ -0,0 +1,225 @@ +import eth2spec.phase0.spec as spec +from eth2spec.phase0.spec import ( + get_active_validator_indices, + get_churn_limit, + get_current_epoch, + process_voluntary_exit, +) +from eth2spec.test.context import spec_state_test, expect_assertion_error, always_bls +from eth2spec.test.helpers.keys import pubkey_to_privkey +from eth2spec.test.helpers.voluntary_exits import build_voluntary_exit, sign_voluntary_exit + + +def run_voluntary_exit_processing(state, voluntary_exit, valid=True): + """ + Run ``process_voluntary_exit``, yielding: + - pre-state ('pre') + - voluntary_exit ('voluntary_exit') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ + validator_index = voluntary_exit.validator_index + + yield 'pre', state + yield 'voluntary_exit', voluntary_exit + + if not valid: + expect_assertion_error(lambda: process_voluntary_exit(state, voluntary_exit)) + yield 'post', None + return + + pre_exit_epoch = state.validator_registry[validator_index].exit_epoch + + process_voluntary_exit(state, voluntary_exit) + + yield 'post', state + + assert pre_exit_epoch == spec.FAR_FUTURE_EPOCH + assert state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH + + +@spec_state_test +def test_success(state): + # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit + state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH + + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[0] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + + voluntary_exit = build_voluntary_exit(state, current_epoch, validator_index, privkey, signed=True) + + yield from run_voluntary_exit_processing(state, voluntary_exit) + + +@always_bls +@spec_state_test +def test_invalid_signature(state): + # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit + state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH + + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[0] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + + voluntary_exit = build_voluntary_exit(state, current_epoch, validator_index, privkey) + + yield from run_voluntary_exit_processing(state, voluntary_exit, False) + + +@spec_state_test +def test_success_exit_queue(state): + # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit + state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH + + current_epoch = get_current_epoch(state) + + # exit `MAX_EXITS_PER_EPOCH` + initial_indices = get_active_validator_indices(state, current_epoch)[:get_churn_limit(state)] + + # Prepare a bunch of exits, based on the current state + exit_queue = [] + for index in initial_indices: + privkey = pubkey_to_privkey[state.validator_registry[index].pubkey] + exit_queue.append(build_voluntary_exit( + state, + current_epoch, + index, + privkey, + signed=True, + )) + + # Now run all the exits + for voluntary_exit in exit_queue: + # the function yields data, but we are just interested in running it here, ignore yields. + for _ in run_voluntary_exit_processing(state, voluntary_exit): + continue + + # exit an additional validator + validator_index = get_active_validator_indices(state, current_epoch)[-1] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + voluntary_exit = build_voluntary_exit( + state, + current_epoch, + validator_index, + privkey, + signed=True, + ) + + # This is the interesting part of the test: on a pre-state with a full exit queue, + # when processing an additional exit, it results in an exit in a later epoch + yield from run_voluntary_exit_processing(state, voluntary_exit) + + assert ( + state.validator_registry[validator_index].exit_epoch == + state.validator_registry[initial_indices[0]].exit_epoch + 1 + ) + + +@spec_state_test +def test_validator_exit_in_future(state): + # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit + state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH + + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[0] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + + voluntary_exit = build_voluntary_exit( + state, + current_epoch, + validator_index, + privkey, + signed=False, + ) + voluntary_exit.epoch += 1 + sign_voluntary_exit(state, voluntary_exit, privkey) + + yield from run_voluntary_exit_processing(state, voluntary_exit, False) + + +@spec_state_test +def test_validator_invalid_validator_index(state): + # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit + state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH + + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[0] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + + voluntary_exit = build_voluntary_exit( + state, + current_epoch, + validator_index, + privkey, + signed=False, + ) + voluntary_exit.validator_index = len(state.validator_registry) + sign_voluntary_exit(state, voluntary_exit, privkey) + + yield from run_voluntary_exit_processing(state, voluntary_exit, False) + + +@spec_state_test +def test_validator_not_active(state): + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[0] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + + state.validator_registry[validator_index].activation_epoch = spec.FAR_FUTURE_EPOCH + + # build and test voluntary exit + voluntary_exit = build_voluntary_exit( + state, + current_epoch, + validator_index, + privkey, + signed=True, + ) + + yield from run_voluntary_exit_processing(state, voluntary_exit, False) + + +@spec_state_test +def test_validator_already_exited(state): + # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow validator able to exit + state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH + + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[0] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + + # but validator already has exited + state.validator_registry[validator_index].exit_epoch = current_epoch + 2 + + voluntary_exit = build_voluntary_exit( + state, + current_epoch, + validator_index, + privkey, + signed=True, + ) + + yield from run_voluntary_exit_processing(state, voluntary_exit, False) + + +@spec_state_test +def test_validator_not_active_long_enough(state): + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[0] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + + voluntary_exit = build_voluntary_exit( + state, + current_epoch, + validator_index, + privkey, + signed=True, + ) + + assert ( + current_epoch - state.validator_registry[validator_index].activation_epoch < + spec.PERSISTENT_COMMITTEE_PERIOD + ) + + yield from run_voluntary_exit_processing(state, voluntary_exit, False) diff --git a/test_libs/pyspec/eth2spec/test/conftest.py b/test_libs/pyspec/eth2spec/test/conftest.py new file mode 100644 index 0000000000..dadb0d5d06 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/conftest.py @@ -0,0 +1,36 @@ +from eth2spec.phase0 import spec + +# We import pytest only when it's present, i.e. when we are running tests. +# The test-cases themselves can be generated without installing pytest. + +def module_exists(module_name): + try: + __import__(module_name) + except ImportError: + return False + else: + return True + + +def fixture(args, kwargs): + if module_exists("pytest"): + import pytest + return pytest.fixture(args, *kwargs) + else: + def ignore(): + pass + return ignore + + +def pytest_addoption(parser): + parser.addoption( + "--config", action="store", default="minimal", help="config: make the pyspec use the specified configuration" + ) + + +@fixture(autouse=True) +def config(request): + config_name = request.config.getoption("--config") + from preset_loader import loader + presets = loader.load_presets('../../configs/', config_name) + spec.apply_constants_preset(presets) diff --git a/test_libs/pyspec/eth2spec/test/context.py b/test_libs/pyspec/eth2spec/test/context.py new file mode 100644 index 0000000000..2be9322de2 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/context.py @@ -0,0 +1,82 @@ +from eth2spec.phase0 import spec +from eth2spec.utils import bls + +from .helpers.genesis import create_genesis_state + +from .utils import spectest, with_args, with_tags + +# Provides a genesis state as first argument to the function decorated with this +with_state = with_args(lambda: [create_genesis_state(spec.SLOTS_PER_EPOCH 8)]) + + +# BLS is turned off by default for performance purposes during TESTING. +# The runner of the test can indicate the preferred setting (test generators prefer BLS to be ON). +# - Some tests are marked as BLS-requiring, and ignore this setting. +# (tests that express differences caused by BLS, e.g. invalid signatures being rejected) +# - Some other tests are marked as BLS-ignoring, and ignore this setting. +# (tests that are heavily performance impacted / require unsigned state transitions) +# - Most tests respect the BLS setting. +DEFAULT_BLS_ACTIVE = False + + +# shorthand for decorating @with_state @spectest() +def spec_state_test(fn): + return with_state(bls_switch(spectest()(fn))) + + +def expect_assertion_error(fn): + bad = False + try: + fn() + bad = True + except AssertionError: + pass + except IndexError: + # Index errors are special; the spec is not explicit on bound checking, an IndexError is like a failed assert. + pass + if bad: + raise AssertionError('expected an assertion error, but got none.') + + +# Tags a test to be ignoring BLS for it to pass. +bls_ignored = with_tags({'bls_setting': 2}) + + +def never_bls(fn): + """ + Decorator to apply on ``bls_switch`` decorator to force BLS de-activation. Useful to mark tests as BLS-ignorant. + """ + def entry(args, kw): + # override bls setting + kw['bls_active'] = False + return fn(args, *kw) + return bls_ignored(entry) + + +# Tags a test to be requiring BLS for it to pass. +bls_required = with_tags({'bls_setting': 1}) + + +def always_bls(fn): + """ + Decorator to apply on ``bls_switch`` decorator to force BLS activation. Useful to mark tests as BLS-dependent. + """ + def entry(args, *kw): + # override bls setting + kw['bls_active'] = True + return fn(args, *kw) + return bls_required(entry) + + +def bls_switch(fn): + """ + Decorator to make a function execute with BLS ON, or BLS off. + Based on an optional bool argument ``bls_active``, passed to the function at runtime. + """ + def entry(args, *kw): + old_state = bls.bls_active + bls.bls_active = kw.pop('bls_active', DEFAULT_BLS_ACTIVE) + out = fn(args, *kw) + bls.bls_active = old_state + return out + return entry diff --git a/test_libs/pyspec/eth2spec/test/epoch_processing/__init__.py b/test_libs/pyspec/eth2spec/test/epoch_processing/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test_libs/pyspec/tests/epoch_processing/test_process_crosslinks.py b/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py similarity index 62% rename from test_libs/pyspec/tests/epoch_processing/test_process_crosslinks.py rename to test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py index d6765e3a72..cfbcd18834 100644 --- a/test_libs/pyspec/tests/epoch_processing/test_process_crosslinks.py +++ b/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py @@ -1,116 +1,131 @@ from copy import deepcopy -import pytest import eth2spec.phase0.spec as spec - -from eth2spec.phase0.state_transition import ( - state_transition, -) from eth2spec.phase0.spec import ( cache_state, get_crosslink_deltas, process_crosslinks, ) -from tests.helpers import ( +from eth2spec.phase0.state_transition import ( + state_transition, +) +from eth2spec.test.context import spec_state_test +from eth2spec.test.helpers.state import ( + next_epoch, + next_slot +) +from eth2spec.test.helpers.block import apply_empty_block, sign_block +from eth2spec.test.helpers.attestations import ( add_attestation_to_state, build_empty_block_for_next_slot, fill_aggregate_attestation, get_crosslink_committee, get_valid_attestation, - next_epoch, - next_slot, - set_bitfield_bit, + sign_attestation, ) -# mark entire file as 'crosslinks' -pytestmark = pytest.mark.crosslinks - - def run_process_crosslinks(state, valid=True): + """ + Run ``process_crosslinks``, yielding: + - pre-state ('pre') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ # transition state to slot before state transition slot = state.slot + (spec.SLOTS_PER_EPOCH - state.slot % spec.SLOTS_PER_EPOCH) - 1 block = build_empty_block_for_next_slot(state) block.slot = slot + sign_block(state, block) state_transition(state, block) # cache state before epoch transition cache_state(state) - post_state = deepcopy(state) - process_crosslinks(post_state) - - return state, post_state + yield 'pre', state + process_crosslinks(state) + yield 'post', state +@spec_state_test def test_no_attestations(state): - pre_state, post_state = run_process_crosslinks(state) + yield from run_process_crosslinks(state) for shard in range(spec.SHARD_COUNT): - assert post_state.previous_crosslinks[shard] == post_state.current_crosslinks[shard] - - return pre_state, post_state + assert state.previous_crosslinks[shard] == state.current_crosslinks[shard] +@spec_state_test def test_single_crosslink_update_from_current_epoch(state): next_epoch(state) - attestation = get_valid_attestation(state) + attestation = get_valid_attestation(state, signed=True) fill_aggregate_attestation(state, attestation) add_attestation_to_state(state, attestation, state.slot + spec.MIN_ATTESTATION_INCLUSION_DELAY) assert len(state.current_epoch_attestations) == 1 - pre_state, post_state = run_process_crosslinks(state) - shard = attestation.data.shard - assert post_state.previous_crosslinks[shard] != post_state.current_crosslinks[shard] - assert pre_state.current_crosslinks[shard] != post_state.current_crosslinks[shard] + pre_crosslink = deepcopy(state.current_crosslinks[shard]) - return pre_state, post_state + yield from run_process_crosslinks(state) + assert state.previous_crosslinks[shard] != state.current_crosslinks[shard] + assert pre_crosslink != state.current_crosslinks[shard] + +@spec_state_test def test_single_crosslink_update_from_previous_epoch(state): next_epoch(state) - attestation = get_valid_attestation(state) + attestation = get_valid_attestation(state, signed=True) fill_aggregate_attestation(state, attestation) add_attestation_to_state(state, attestation, state.slot + spec.SLOTS_PER_EPOCH) assert len(state.previous_epoch_attestations) == 1 - pre_state, post_state = run_process_crosslinks(state) + shard = attestation.data.shard + pre_crosslink = deepcopy(state.current_crosslinks[shard]) + crosslink_deltas = get_crosslink_deltas(state) - shard = attestation.data.shard - assert post_state.previous_crosslinks[shard] != post_state.current_crosslinks[shard] - assert pre_state.current_crosslinks[shard] != post_state.current_crosslinks[shard] + yield from run_process_crosslinks(state) + + assert state.previous_crosslinks[shard] != state.current_crosslinks[shard] + assert pre_crosslink != state.current_crosslinks[shard] + # ensure rewarded for index in get_crosslink_committee(state, attestation.data.target_epoch, attestation.data.shard): assert crosslink_deltas[0][index] > 0 assert crosslink_deltas[1][index] == 0 - return pre_state, post_state - +@spec_state_test def test_double_late_crosslink(state): + if spec.get_epoch_committee_count(state, spec.get_current_epoch(state)) < spec.SHARD_COUNT: + print("warning: ignoring test, test-assumptions are incompatible with configuration") + return + next_epoch(state) state.slot += 4 - attestation_1 = get_valid_attestation(state) + attestation_1 = get_valid_attestation(state, signed=True) fill_aggregate_attestation(state, attestation_1) - # add attestation_1 in the next epoch + # add attestation_1 to next epoch next_epoch(state) add_attestation_to_state(state, attestation_1, state.slot + 1) for slot in range(spec.SLOTS_PER_EPOCH): attestation_2 = get_valid_attestation(state) if attestation_2.data.shard == attestation_1.data.shard: + sign_attestation(state, attestation_2) break next_slot(state) + apply_empty_block(state) + fill_aggregate_attestation(state, attestation_2) # add attestation_2 in the next epoch after attestation_1 has @@ -121,16 +136,15 @@ def test_double_late_crosslink(state): assert len(state.previous_epoch_attestations) == 1 assert len(state.current_epoch_attestations) == 0 - pre_state, post_state = run_process_crosslinks(state) crosslink_deltas = get_crosslink_deltas(state) + yield from run_process_crosslinks(state) + shard = attestation_2.data.shard # ensure that the current crosslinks were not updated by the second attestation - assert post_state.previous_crosslinks[shard] == post_state.current_crosslinks[shard] + assert state.previous_crosslinks[shard] == state.current_crosslinks[shard] # ensure no reward, only penalties for the failed crosslink for index in get_crosslink_committee(state, attestation_2.data.target_epoch, attestation_2.data.shard): assert crosslink_deltas[0][index] == 0 assert crosslink_deltas[1][index] > 0 - - return pre_state, post_state diff --git a/test_libs/pyspec/tests/epoch_processing/test_process_registry_updates.py b/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py similarity index 53% rename from test_libs/pyspec/tests/epoch_processing/test_process_registry_updates.py rename to test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py index 11f5de2ad4..71bf89c702 100644 --- a/test_libs/pyspec/tests/epoch_processing/test_process_registry_updates.py +++ b/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py @@ -1,21 +1,44 @@ -from copy import deepcopy - -import pytest - import eth2spec.phase0.spec as spec from eth2spec.phase0.spec import ( get_current_epoch, is_active_validator, + process_registry_updates ) -from tests.helpers import ( - next_epoch, -) - -# mark entire file as 'state' -pytestmark = pytest.mark.state - - +from eth2spec.phase0.state_transition import state_transition +from eth2spec.test.helpers.block import build_empty_block_for_next_slot, sign_block +from eth2spec.test.helpers.state import next_epoch +from eth2spec.test.context import spec_state_test + + +def run_process_registry_updates(state, valid=True): + """ + Run ``process_crosslinks``, yielding: + - pre-state ('pre') + - post-state ('post'). + If ``valid == False``, run expecting ``AssertionError`` + """ + # transition state to slot before state transition + slot = state.slot + (spec.SLOTS_PER_EPOCH - state.slot % spec.SLOTS_PER_EPOCH) - 1 + block = build_empty_block_for_next_slot(state) + block.slot = slot + sign_block(state, block) + state_transition(state, block) + + # cache state before epoch transition + spec.cache_state(state) + + # process components of epoch transition before registry update + spec.process_justification_and_finalization(state) + spec.process_crosslinks(state) + spec.process_rewards_and_penalties(state) + + yield 'pre', state + process_registry_updates(state) + yield 'post', state + + +@spec_state_test def test_activation(state): index = 0 assert is_active_validator(state.validator_registry[index], get_current_epoch(state)) @@ -26,12 +49,10 @@ def test_activation(state): state.validator_registry[index].effective_balance = spec.MAX_EFFECTIVE_BALANCE assert not is_active_validator(state.validator_registry[index], get_current_epoch(state)) - pre_state = deepcopy(state) - - blocks = [] for _ in range(spec.ACTIVATION_EXIT_DELAY + 1): - block = next_epoch(state) - blocks.append(block) + next_epoch(state) + + yield from run_process_registry_updates(state) assert state.validator_registry[index].activation_eligibility_epoch != spec.FAR_FUTURE_EPOCH assert state.validator_registry[index].activation_epoch != spec.FAR_FUTURE_EPOCH @@ -40,9 +61,8 @@ def test_activation(state): get_current_epoch(state), ) - return pre_state, blocks, state - +@spec_state_test def test_ejection(state): index = 0 assert is_active_validator(state.validator_registry[index], get_current_epoch(state)) @@ -51,17 +71,13 @@ def test_ejection(state): # Mock an ejection state.validator_registry[index].effective_balance = spec.EJECTION_BALANCE - pre_state = deepcopy(state) - - blocks = [] for _ in range(spec.ACTIVATION_EXIT_DELAY + 1): - block = next_epoch(state) - blocks.append(block) + next_epoch(state) + + yield from run_process_registry_updates(state) assert state.validator_registry[index].exit_epoch != spec.FAR_FUTURE_EPOCH assert not is_active_validator( state.validator_registry[index], get_current_epoch(state), ) - - return pre_state, blocks, state diff --git a/test_libs/pyspec/eth2spec/test/helpers/__init__.py b/test_libs/pyspec/eth2spec/test/helpers/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test_libs/pyspec/eth2spec/test/helpers/attestations.py b/test_libs/pyspec/eth2spec/test/helpers/attestations.py new file mode 100644 index 0000000000..b541e610f4 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/attestations.py @@ -0,0 +1,146 @@ +from typing import List + +# Access constants from spec pkg reference. +import eth2spec.phase0.spec as spec +from eth2spec.phase0.spec import ( + Attestation, + AttestationData, + AttestationDataAndCustodyBit, + get_epoch_start_slot, get_block_root, get_current_epoch, get_previous_epoch, slot_to_epoch, + get_crosslink_committee, get_domain, IndexedAttestation, get_attesting_indices, BeaconState, get_block_root_at_slot, + get_epoch_start_shard, get_epoch_committee_count) +from eth2spec.phase0.state_transition import ( + state_transition, state_transition_to +) +from eth2spec.test.helpers.bitfields import set_bitfield_bit +from eth2spec.test.helpers.block import build_empty_block_for_next_slot, sign_block +from eth2spec.test.helpers.keys import privkeys +from eth2spec.utils.bls import bls_sign, bls_aggregate_signatures +from eth2spec.utils.minimal_ssz import hash_tree_root + + +def build_attestation_data(state, slot, shard): + assert state.slot >= slot + + if slot == state.slot: + block_root = build_empty_block_for_next_slot(state).previous_block_root + else: + block_root = get_block_root_at_slot(state, slot) + + current_epoch_start_slot = get_epoch_start_slot(get_current_epoch(state)) + if slot < current_epoch_start_slot: + epoch_boundary_root = get_block_root(state, get_previous_epoch(state)) + elif slot == current_epoch_start_slot: + epoch_boundary_root = block_root + else: + epoch_boundary_root = get_block_root(state, get_current_epoch(state)) + + if slot < current_epoch_start_slot: + justified_epoch = state.previous_justified_epoch + justified_block_root = state.previous_justified_root + else: + justified_epoch = state.current_justified_epoch + justified_block_root = state.current_justified_root + + crosslinks = state.current_crosslinks if slot_to_epoch(slot) == get_current_epoch( + state) else state.previous_crosslinks + return AttestationData( + shard=shard, + beacon_block_root=block_root, + source_epoch=justified_epoch, + source_root=justified_block_root, + target_epoch=slot_to_epoch(slot), + target_root=epoch_boundary_root, + crosslink_data_root=spec.ZERO_HASH, + previous_crosslink_root=hash_tree_root(crosslinks[shard]), + ) + + +def get_valid_attestation(state, slot=None, signed=False): + if slot is None: + slot = state.slot + + epoch = slot_to_epoch(slot) + epoch_start_shard = get_epoch_start_shard(state, epoch) + committees_per_slot = get_epoch_committee_count(state, epoch) // spec.SLOTS_PER_EPOCH + shard = (epoch_start_shard + committees_per_slot (slot % spec.SLOTS_PER_EPOCH)) % spec.SHARD_COUNT + + attestation_data = build_attestation_data(state, slot, shard) + + crosslink_committee = get_crosslink_committee(state, attestation_data.target_epoch, attestation_data.shard) + + committee_size = len(crosslink_committee) + bitfield_length = (committee_size + 7) // 8 + aggregation_bitfield = b'\x00' * bitfield_length + custody_bitfield = b'\x00' * bitfield_length + attestation = Attestation( + aggregation_bitfield=aggregation_bitfield, + data=attestation_data, + custody_bitfield=custody_bitfield, + ) + fill_aggregate_attestation(state, attestation) + if signed: + sign_attestation(state, attestation) + return attestation + + +def sign_aggregate_attestation(state: BeaconState, data: AttestationData, participants: List[int]): + signatures = [] + for validator_index in participants: + privkey = privkeys[validator_index] + signatures.append( + get_attestation_signature( + state, + data, + privkey + ) + ) + + return bls_aggregate_signatures(signatures) + + +def sign_indexed_attestation(state, indexed_attestation: IndexedAttestation): + participants = indexed_attestation.custody_bit_0_indices + indexed_attestation.custody_bit_1_indices + indexed_attestation.signature = sign_aggregate_attestation(state, indexed_attestation.data, participants) + + +def sign_attestation(state, attestation: Attestation): + participants = get_attesting_indices( + state, + attestation.data, + attestation.aggregation_bitfield, + ) + + attestation.signature = sign_aggregate_attestation(state, attestation.data, participants) + + +def get_attestation_signature(state, attestation_data, privkey, custody_bit=0b0): + message_hash = AttestationDataAndCustodyBit( + data=attestation_data, + custody_bit=custody_bit, + ).hash_tree_root() + + return bls_sign( + message_hash=message_hash, + privkey=privkey, + domain=get_domain( + state=state, + domain_type=spec.DOMAIN_ATTESTATION, + message_epoch=attestation_data.target_epoch, + ) + ) + + +def fill_aggregate_attestation(state, attestation): + crosslink_committee = get_crosslink_committee(state, attestation.data.target_epoch, attestation.data.shard) + for i in range(len(crosslink_committee)): + attestation.aggregation_bitfield = set_bitfield_bit(attestation.aggregation_bitfield, i) + + +def add_attestation_to_state(state, attestation, slot): + block = build_empty_block_for_next_slot(state) + block.slot = slot + block.body.attestations.append(attestation) + state_transition_to(state, block.slot) + sign_block(state, block) + state_transition(state, block) diff --git a/test_libs/pyspec/eth2spec/test/helpers/attester_slashings.py b/test_libs/pyspec/eth2spec/test/helpers/attester_slashings.py new file mode 100644 index 0000000000..d19b41dfec --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/attester_slashings.py @@ -0,0 +1,19 @@ +from copy import deepcopy + +from eth2spec.phase0.spec import AttesterSlashing, convert_to_indexed +from eth2spec.test.helpers.attestations import get_valid_attestation, sign_attestation + + +def get_valid_attester_slashing(state, signed_1=False, signed_2=False): + attestation_1 = get_valid_attestation(state, signed=signed_1) + + attestation_2 = deepcopy(attestation_1) + attestation_2.data.target_root = b'\x01' * 32 + + if signed_2: + sign_attestation(state, attestation_2) + + return AttesterSlashing( + attestation_1=convert_to_indexed(state, attestation_1), + attestation_2=convert_to_indexed(state, attestation_2), + ) diff --git a/test_libs/pyspec/eth2spec/test/helpers/bitfields.py b/test_libs/pyspec/eth2spec/test/helpers/bitfields.py new file mode 100644 index 0000000000..7c25d073ab --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/bitfields.py @@ -0,0 +1,11 @@ +def set_bitfield_bit(bitfield, i): + """ + Set the bit in ``bitfield`` at position ``i`` to ``1``. + """ + byte_index = i // 8 + bit_index = i % 8 + return ( + bitfield[:byte_index] + + bytes([bitfield[byte_index] \| (1 << bit_index)]) + + bitfield[byte_index + 1:] + ) diff --git a/test_libs/pyspec/eth2spec/test/helpers/block.py b/test_libs/pyspec/eth2spec/test/helpers/block.py new file mode 100644 index 0000000000..81c5e9ef5b --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/block.py @@ -0,0 +1,77 @@ +from copy import deepcopy + +from eth2spec.phase0 import spec +from eth2spec.phase0.spec import get_beacon_proposer_index, slot_to_epoch, get_domain, BeaconBlock +from eth2spec.phase0.state_transition import state_transition, state_transition_to +from eth2spec.test.helpers.keys import privkeys +from eth2spec.utils.bls import bls_sign, only_with_bls +from eth2spec.utils.minimal_ssz import signing_root, hash_tree_root + + +# Fully ignore the function if BLS is off, beacon-proposer index calculation is slow. +@only_with_bls() +def sign_block(state, block, proposer_index=None): + assert state.slot <= block.slot + + if proposer_index is None: + if block.slot == state.slot: + proposer_index = get_beacon_proposer_index(state) + else: + if slot_to_epoch(state.slot) + 1 > slot_to_epoch(block.slot): + print("warning: block slot far away, and no proposer index manually given." + " Signing block is slow due to transition for proposer index calculation.") + # use stub state to get proposer index of future slot + stub_state = deepcopy(state) + state_transition_to(stub_state, block.slot) + proposer_index = get_beacon_proposer_index(stub_state) + + privkey = privkeys[proposer_index] + + block.body.randao_reveal = bls_sign( + privkey=privkey, + message_hash=hash_tree_root(slot_to_epoch(block.slot)), + domain=get_domain( + state, + message_epoch=slot_to_epoch(block.slot), + domain_type=spec.DOMAIN_RANDAO, + ) + ) + block.signature = bls_sign( + message_hash=signing_root(block), + privkey=privkey, + domain=get_domain( + state, + spec.DOMAIN_BEACON_PROPOSER, + slot_to_epoch(block.slot))) + + +def apply_empty_block(state): + """ + Transition via an empty block (on current slot, assuming no block has been applied yet). + :return: the empty block that triggered the transition. + """ + block = build_empty_block(state, signed=True) + state_transition(state, block) + return block + + +def build_empty_block(state, slot=None, signed=False): + if slot is None: + slot = state.slot + empty_block = BeaconBlock() + empty_block.slot = slot + empty_block.body.eth1_data.deposit_count = state.deposit_index + previous_block_header = deepcopy(state.latest_block_header) + if previous_block_header.state_root == spec.ZERO_HASH: + previous_block_header.state_root = state.hash_tree_root() + empty_block.previous_block_root = signing_root(previous_block_header) + + if signed: + sign_block(state, empty_block) + + return empty_block + + +def build_empty_block_for_next_slot(state, signed=False): + return build_empty_block(state, state.slot + 1, signed=signed) + diff --git a/test_libs/pyspec/eth2spec/test/helpers/block_header.py b/test_libs/pyspec/eth2spec/test/helpers/block_header.py new file mode 100644 index 0000000000..9aba62d37d --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/block_header.py @@ -0,0 +1,18 @@ +# Access constants from spec pkg reference. +import eth2spec.phase0.spec as spec + +from eth2spec.phase0.spec import get_domain +from eth2spec.utils.bls import bls_sign +from eth2spec.utils.minimal_ssz import signing_root + + +def sign_block_header(state, header, privkey): + domain = get_domain( + state=state, + domain_type=spec.DOMAIN_BEACON_PROPOSER, + ) + header.signature = bls_sign( + message_hash=signing_root(header), + privkey=privkey, + domain=domain, + ) diff --git a/test_libs/pyspec/eth2spec/test/helpers/deposits.py b/test_libs/pyspec/eth2spec/test/helpers/deposits.py new file mode 100644 index 0000000000..c5deb124e6 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/deposits.py @@ -0,0 +1,81 @@ +# Access constants from spec pkg reference. +import eth2spec.phase0.spec as spec + +from eth2spec.phase0.spec import get_domain, DepositData, verify_merkle_branch, Deposit, ZERO_HASH +from eth2spec.test.helpers.keys import pubkeys, privkeys +from eth2spec.utils.bls import bls_sign +from eth2spec.utils.merkle_minimal import calc_merkle_tree_from_leaves, get_merkle_root, get_merkle_proof +from eth2spec.utils.minimal_ssz import signing_root + + +def build_deposit_data(state, pubkey, privkey, amount, signed=False): + deposit_data = DepositData( + pubkey=pubkey, + # insecurely use pubkey as withdrawal key as well + withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + spec.hash(pubkey)[1:], + amount=amount, + ) + if signed: + sign_deposit_data(state, deposit_data, privkey) + return deposit_data + + +def sign_deposit_data(state, deposit_data, privkey): + signature = bls_sign( + message_hash=signing_root(deposit_data), + privkey=privkey, + domain=get_domain( + state, + spec.DOMAIN_DEPOSIT, + ) + ) + deposit_data.signature = signature + + +def build_deposit(state, + deposit_data_leaves, + pubkey, + privkey, + amount, + signed): + deposit_data = build_deposit_data(state, pubkey, privkey, amount, signed) + + item = deposit_data.hash_tree_root() + index = len(deposit_data_leaves) + deposit_data_leaves.append(item) + tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves)) + root = get_merkle_root((tuple(deposit_data_leaves))) + proof = list(get_merkle_proof(tree, item_index=index)) + assert verify_merkle_branch(item, proof, spec.DEPOSIT_CONTRACT_TREE_DEPTH, index, root) + + deposit = Deposit( + proof=list(proof), + index=index, + data=deposit_data, + ) + + return deposit, root, deposit_data_leaves + + +def prepare_state_and_deposit(state, validator_index, amount, signed=False): + """ + Prepare the state for the deposit, and create a deposit for the given validator, depositing the given amount. + """ + pre_validator_count = len(state.validator_registry) + # fill previous deposits with zero-hash + deposit_data_leaves = [ZERO_HASH] * pre_validator_count + + pubkey = pubkeys[validator_index] + privkey = privkeys[validator_index] + deposit, root, deposit_data_leaves = build_deposit( + state, + deposit_data_leaves, + pubkey, + privkey, + amount, + signed + ) + + state.latest_eth1_data.deposit_root = root + state.latest_eth1_data.deposit_count = len(deposit_data_leaves) + return deposit diff --git a/test_libs/pyspec/eth2spec/test/helpers/genesis.py b/test_libs/pyspec/eth2spec/test/helpers/genesis.py new file mode 100644 index 0000000000..01011cacd0 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/genesis.py @@ -0,0 +1,51 @@ +# Access constants from spec pkg reference. +import eth2spec.phase0.spec as spec + +from eth2spec.phase0.spec import Eth1Data, ZERO_HASH, get_active_validator_indices +from eth2spec.test.helpers.keys import pubkeys +from eth2spec.utils.minimal_ssz import hash_tree_root + + +def build_mock_validator(i: int, balance: int): + pubkey = pubkeys[i] + # insecurely use pubkey as withdrawal key as well + withdrawal_credentials = spec.BLS_WITHDRAWAL_PREFIX_BYTE + spec.hash(pubkey)[1:] + return spec.Validator( + pubkey=pubkeys[i], + withdrawal_credentials=withdrawal_credentials, + activation_eligibility_epoch=spec.FAR_FUTURE_EPOCH, + activation_epoch=spec.FAR_FUTURE_EPOCH, + exit_epoch=spec.FAR_FUTURE_EPOCH, + withdrawable_epoch=spec.FAR_FUTURE_EPOCH, + effective_balance=min(balance - balance % spec.EFFECTIVE_BALANCE_INCREMENT, spec.MAX_EFFECTIVE_BALANCE) + ) + + +def create_genesis_state(num_validators): + deposit_root = b'\x42' * 32 + + state = spec.BeaconState( + genesis_time=0, + deposit_index=num_validators, + latest_eth1_data=Eth1Data( + deposit_root=deposit_root, + deposit_count=num_validators, + block_hash=ZERO_HASH, + )) + + # We "hack" in the initial validators, + # as it is much faster than creating and processing genesis deposits for every single test case. + state.balances = [spec.MAX_EFFECTIVE_BALANCE] * num_validators + state.validator_registry = [build_mock_validator(i, state.balances[i]) for i in range(num_validators)] + + # Process genesis activations + for validator in state.validator_registry: + if validator.effective_balance >= spec.MAX_EFFECTIVE_BALANCE: + validator.activation_eligibility_epoch = spec.GENESIS_EPOCH + validator.activation_epoch = spec.GENESIS_EPOCH + + genesis_active_index_root = hash_tree_root(get_active_validator_indices(state, spec.GENESIS_EPOCH)) + for index in range(spec.LATEST_ACTIVE_INDEX_ROOTS_LENGTH): + state.latest_active_index_roots[index] = genesis_active_index_root + + return state diff --git a/test_libs/pyspec/eth2spec/test/helpers/keys.py b/test_libs/pyspec/eth2spec/test/helpers/keys.py new file mode 100644 index 0000000000..f47cd7c10b --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/keys.py @@ -0,0 +1,6 @@ +from py_ecc import bls +from eth2spec.phase0 import spec + +privkeys = [i + 1 for i in range(spec.SLOTS_PER_EPOCH * 16)] +pubkeys = [bls.privtopub(privkey) for privkey in privkeys] +pubkey_to_privkey = {pubkey: privkey for privkey, pubkey in zip(privkeys, pubkeys)} diff --git a/test_libs/pyspec/eth2spec/test/helpers/proposer_slashings.py b/test_libs/pyspec/eth2spec/test/helpers/proposer_slashings.py new file mode 100644 index 0000000000..dfb8895dc2 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/proposer_slashings.py @@ -0,0 +1,35 @@ +from copy import deepcopy + +from eth2spec.phase0.spec import ( + get_current_epoch, get_active_validator_indices, BeaconBlockHeader, ProposerSlashing +) +from eth2spec.test.helpers.block_header import sign_block_header +from eth2spec.test.helpers.keys import pubkey_to_privkey + + +def get_valid_proposer_slashing(state, signed_1=False, signed_2=False): + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[-1] + privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] + slot = state.slot + + header_1 = BeaconBlockHeader( + slot=slot, + previous_block_root=b'\x33' * 32, + state_root=b'\x44' * 32, + block_body_root=b'\x55' * 32, + ) + header_2 = deepcopy(header_1) + header_2.previous_block_root = b'\x99' * 32 + header_2.slot = slot + 1 + + if signed_1: + sign_block_header(state, header_1, privkey) + if signed_2: + sign_block_header(state, header_2, privkey) + + return ProposerSlashing( + proposer_index=validator_index, + header_1=header_1, + header_2=header_2, + ) diff --git a/test_libs/pyspec/eth2spec/test/helpers/state.py b/test_libs/pyspec/eth2spec/test/helpers/state.py new file mode 100644 index 0000000000..e720a9709f --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/state.py @@ -0,0 +1,31 @@ +# Access constants from spec pkg reference. +import eth2spec.phase0.spec as spec + +from eth2spec.phase0.state_transition import state_transition_to + + +def get_balance(state, index): + return state.balances[index] + + +def next_slot(state): + """ + Transition to the next slot. + """ + state_transition_to(state, state.slot + 1) + + +def next_epoch(state): + """ + Transition to the start slot of the next epoch + """ + slot = state.slot + spec.SLOTS_PER_EPOCH - (state.slot % spec.SLOTS_PER_EPOCH) + state_transition_to(state, slot) + + +def get_state_root(state, slot) -> bytes: + """ + Return the state root at a recent ``slot``. + """ + assert slot < state.slot <= slot + spec.SLOTS_PER_HISTORICAL_ROOT + return state.latest_state_roots[slot % spec.SLOTS_PER_HISTORICAL_ROOT] diff --git a/test_libs/pyspec/eth2spec/test/helpers/transfers.py b/test_libs/pyspec/eth2spec/test/helpers/transfers.py new file mode 100644 index 0000000000..2045f48ad6 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/transfers.py @@ -0,0 +1,55 @@ +# Access constants from spec pkg reference. +import eth2spec.phase0.spec as spec + +from eth2spec.phase0.spec import get_current_epoch, get_active_validator_indices, Transfer, get_domain +from eth2spec.test.helpers.keys import pubkeys, privkeys +from eth2spec.test.helpers.state import get_balance +from eth2spec.utils.bls import bls_sign +from eth2spec.utils.minimal_ssz import signing_root + + +def get_valid_transfer(state, slot=None, sender_index=None, amount=None, fee=None, signed=False): + if slot is None: + slot = state.slot + current_epoch = get_current_epoch(state) + if sender_index is None: + sender_index = get_active_validator_indices(state, current_epoch)[-1] + recipient_index = get_active_validator_indices(state, current_epoch)[0] + transfer_pubkey = pubkeys[-1] + transfer_privkey = privkeys[-1] + + if fee is None: + fee = get_balance(state, sender_index) // 32 + if amount is None: + amount = get_balance(state, sender_index) - fee + + transfer = Transfer( + sender=sender_index, + recipient=recipient_index, + amount=amount, + fee=fee, + slot=slot, + pubkey=transfer_pubkey, + ) + if signed: + sign_transfer(state, transfer, transfer_privkey) + + # ensure withdrawal_credentials reproducible + state.validator_registry[transfer.sender].withdrawal_credentials = ( + spec.BLS_WITHDRAWAL_PREFIX_BYTE + spec.hash(transfer.pubkey)[1:] + ) + + return transfer + + +def sign_transfer(state, transfer, privkey): + transfer.signature = bls_sign( + message_hash=signing_root(transfer), + privkey=privkey, + domain=get_domain( + state=state, + domain_type=spec.DOMAIN_TRANSFER, + message_epoch=get_current_epoch(state), + ) + ) + return transfer diff --git a/test_libs/pyspec/eth2spec/test/helpers/voluntary_exits.py b/test_libs/pyspec/eth2spec/test/helpers/voluntary_exits.py new file mode 100644 index 0000000000..54376d694b --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/helpers/voluntary_exits.py @@ -0,0 +1,28 @@ +# Access constants from spec pkg reference. +import eth2spec.phase0.spec as spec + +from eth2spec.phase0.spec import VoluntaryExit, get_domain +from eth2spec.utils.bls import bls_sign +from eth2spec.utils.minimal_ssz import signing_root + + +def build_voluntary_exit(state, epoch, validator_index, privkey, signed=False): + voluntary_exit = VoluntaryExit( + epoch=epoch, + validator_index=validator_index, + ) + if signed: + sign_voluntary_exit(state, voluntary_exit, privkey) + return voluntary_exit + + +def sign_voluntary_exit(state, voluntary_exit, privkey): + voluntary_exit.signature = bls_sign( + message_hash=signing_root(voluntary_exit), + privkey=privkey, + domain=get_domain( + state=state, + domain_type=spec.DOMAIN_VOLUNTARY_EXIT, + message_epoch=voluntary_exit.epoch, + ) + ) diff --git a/test_libs/pyspec/eth2spec/test/sanity/__init__.py b/test_libs/pyspec/eth2spec/test/sanity/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test_libs/pyspec/eth2spec/test/sanity/test_blocks.py b/test_libs/pyspec/eth2spec/test/sanity/test_blocks.py new file mode 100644 index 0000000000..c9aadbf2ac --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/sanity/test_blocks.py @@ -0,0 +1,408 @@ +from copy import deepcopy + +import eth2spec.phase0.spec as spec +from eth2spec.utils.bls import bls_sign + +from eth2spec.utils.minimal_ssz import signing_root +from eth2spec.phase0.spec import ( + # SSZ + VoluntaryExit, + # functions + get_active_validator_indices, + get_beacon_proposer_index, + get_block_root_at_slot, + get_current_epoch, + get_domain, +) +from eth2spec.phase0.state_transition import ( + state_transition, +) +from eth2spec.test.helpers.state import get_balance +from eth2spec.test.helpers.transfers import get_valid_transfer +from eth2spec.test.helpers.block import build_empty_block_for_next_slot, sign_block +from eth2spec.test.helpers.keys import privkeys, pubkeys +from eth2spec.test.helpers.attester_slashings import get_valid_attester_slashing +from eth2spec.test.helpers.proposer_slashings import get_valid_proposer_slashing +from eth2spec.test.helpers.attestations import get_valid_attestation +from eth2spec.test.helpers.deposits import prepare_state_and_deposit + +from eth2spec.test.context import spec_state_test, never_bls + + +@never_bls +@spec_state_test +def test_empty_block_transition(state): + pre_slot = state.slot + pre_eth1_votes = len(state.eth1_data_votes) + + yield 'pre', state + + block = build_empty_block_for_next_slot(state, signed=True) + yield 'blocks', [block], [spec.BeaconBlock] + + state_transition(state, block) + yield 'post', state + + assert len(state.eth1_data_votes) == pre_eth1_votes + 1 + assert get_block_root_at_slot(state, pre_slot) == block.previous_block_root + + +@never_bls +@spec_state_test +def test_skipped_slots(state): + pre_slot = state.slot + yield 'pre', state + + block = build_empty_block_for_next_slot(state) + block.slot += 3 + sign_block(state, block) + yield 'blocks', [block], [spec.BeaconBlock] + + state_transition(state, block) + yield 'post', state + + assert state.slot == block.slot + for slot in range(pre_slot, state.slot): + assert get_block_root_at_slot(state, slot) == block.previous_block_root + + +@spec_state_test +def test_empty_epoch_transition(state): + pre_slot = state.slot + yield 'pre', state + + block = build_empty_block_for_next_slot(state) + block.slot += spec.SLOTS_PER_EPOCH + sign_block(state, block) + yield 'blocks', [block], [spec.BeaconBlock] + + state_transition(state, block) + yield 'post', state + + assert state.slot == block.slot + for slot in range(pre_slot, state.slot): + assert get_block_root_at_slot(state, slot) == block.previous_block_root + + +# @spec_state_test +# def test_empty_epoch_transition_not_finalizing(state): +# # copy for later balance lookups. +# pre_state = deepcopy(state) +# yield 'pre', state +# +# block = build_empty_block_for_next_slot(state) +# block.slot += spec.SLOTS_PER_EPOCH * 5 +# sign_block(state, block, proposer_index=0) +# yield 'blocks', [block], [spec.BeaconBlock] +# +# state_transition(state, block) +# yield 'post', state +# +# assert state.slot == block.slot +# assert state.finalized_epoch < get_current_epoch(state) - 4 +# for index in range(len(state.validator_registry)): +# assert get_balance(state, index) < get_balance(pre_state, index) + + +@spec_state_test +def test_proposer_slashing(state): + # copy for later balance lookups. + pre_state = deepcopy(state) + proposer_slashing = get_valid_proposer_slashing(state, signed_1=True, signed_2=True) + validator_index = proposer_slashing.proposer_index + + assert not state.validator_registry[validator_index].slashed + + yield 'pre', state + + # + # Add to state via block transition + # + block = build_empty_block_for_next_slot(state) + block.body.proposer_slashings.append(proposer_slashing) + sign_block(state, block) + yield 'blocks', [block], [spec.BeaconBlock] + + state_transition(state, block) + yield 'post', state + + # check if slashed + slashed_validator = state.validator_registry[validator_index] + assert slashed_validator.slashed + assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH + assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH + # lost whistleblower reward + assert get_balance(state, validator_index) < get_balance(pre_state, validator_index) + + +@spec_state_test +def test_attester_slashing(state): + # copy for later balance lookups. + pre_state = deepcopy(state) + + attester_slashing = get_valid_attester_slashing(state, signed_1=True, signed_2=True) + validator_index = (attester_slashing.attestation_1.custody_bit_0_indices + + attester_slashing.attestation_1.custody_bit_1_indices)[0] + + assert not state.validator_registry[validator_index].slashed + + yield 'pre', state + + # + # Add to state via block transition + # + block = build_empty_block_for_next_slot(state) + block.body.attester_slashings.append(attester_slashing) + sign_block(state, block) + yield 'blocks', [block], [spec.BeaconBlock] + + state_transition(state, block) + yield 'post', state + + slashed_validator = state.validator_registry[validator_index] + assert slashed_validator.slashed + assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH + assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH + # lost whistleblower reward + assert get_balance(state, validator_index) < get_balance(pre_state, validator_index) + + proposer_index = get_beacon_proposer_index(state) + # gained whistleblower reward + assert ( + get_balance(state, proposer_index) > + get_balance(pre_state, proposer_index) + ) + + +# TODO update functions below to be like above, i.e. with @spec_state_test and yielding data to put into the test vector + +@spec_state_test +def test_deposit_in_block(state): + initial_registry_len = len(state.validator_registry) + initial_balances_len = len(state.balances) + + validator_index = len(state.validator_registry) + amount = spec.MAX_EFFECTIVE_BALANCE + deposit = prepare_state_and_deposit(state, validator_index, amount, signed=True) + + yield 'pre', state + + block = build_empty_block_for_next_slot(state) + block.body.deposits.append(deposit) + sign_block(state, block) + + yield 'blocks', [block], [spec.BeaconBlock] + + state_transition(state, block) + yield 'post', state + + assert len(state.validator_registry) == initial_registry_len + 1 + assert len(state.balances) == initial_balances_len + 1 + assert get_balance(state, validator_index) == spec.MAX_EFFECTIVE_BALANCE + assert state.validator_registry[validator_index].pubkey == pubkeys[validator_index] + + +@spec_state_test +def test_deposit_top_up(state): + validator_index = 0 + amount = spec.MAX_EFFECTIVE_BALANCE // 4 + deposit = prepare_state_and_deposit(state, validator_index, amount) + + initial_registry_len = len(state.validator_registry) + initial_balances_len = len(state.balances) + validator_pre_balance = get_balance(state, validator_index) + + yield 'pre', state + + block = build_empty_block_for_next_slot(state) + block.body.deposits.append(deposit) + sign_block(state, block) + + yield 'blocks', [block], [spec.BeaconBlock] + + state_transition(state, block) + yield 'post', state + + assert len(state.validator_registry) == initial_registry_len + assert len(state.balances) == initial_balances_len + assert get_balance(state, validator_index) == validator_pre_balance + amount + + +@spec_state_test +def test_attestation(state): + state.slot = spec.SLOTS_PER_EPOCH + + yield 'pre', state + + attestation = get_valid_attestation(state, signed=True) + + # Add to state via block transition + pre_current_attestations_len = len(state.current_epoch_attestations) + attestation_block = build_empty_block_for_next_slot(state) + attestation_block.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY + attestation_block.body.attestations.append(attestation) + sign_block(state, attestation_block) + state_transition(state, attestation_block) + + assert len(state.current_epoch_attestations) == pre_current_attestations_len + 1 + + # Epoch transition should move to previous_epoch_attestations + pre_current_attestations_root = spec.hash_tree_root(state.current_epoch_attestations) + + epoch_block = build_empty_block_for_next_slot(state) + epoch_block.slot += spec.SLOTS_PER_EPOCH + sign_block(state, epoch_block) + state_transition(state, epoch_block) + + yield 'blocks', [attestation_block, epoch_block], [spec.BeaconBlock] + yield 'post', state + + assert len(state.current_epoch_attestations) == 0 + assert spec.hash_tree_root(state.previous_epoch_attestations) == pre_current_attestations_root + + +@spec_state_test +def test_voluntary_exit(state): + validator_index = get_active_validator_indices( + state, + get_current_epoch(state) + )[-1] + + # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit + state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH + + yield 'pre', state + + voluntary_exit = VoluntaryExit( + epoch=get_current_epoch(state), + validator_index=validator_index, + ) + voluntary_exit.signature = bls_sign( + message_hash=signing_root(voluntary_exit), + privkey=privkeys[validator_index], + domain=get_domain( + state=state, + domain_type=spec.DOMAIN_VOLUNTARY_EXIT, + ) + ) + + # Add to state via block transition + initiate_exit_block = build_empty_block_for_next_slot(state) + initiate_exit_block.body.voluntary_exits.append(voluntary_exit) + sign_block(state, initiate_exit_block) + state_transition(state, initiate_exit_block) + + assert state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH + + # Process within epoch transition + exit_block = build_empty_block_for_next_slot(state) + exit_block.slot += spec.SLOTS_PER_EPOCH + sign_block(state, exit_block) + state_transition(state, exit_block) + + yield 'blocks', [initiate_exit_block, exit_block], [spec.BeaconBlock] + yield 'post', state + + assert state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH + + +@spec_state_test +def test_transfer(state): + # overwrite default 0 to test + spec.MAX_TRANSFERS = 1 + + sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] + amount = get_balance(state, sender_index) + + transfer = get_valid_transfer(state, state.slot + 1, sender_index, amount, signed=True) + recipient_index = transfer.recipient + pre_transfer_recipient_balance = get_balance(state, recipient_index) + + # un-activate so validator can transfer + state.validator_registry[sender_index].activation_eligibility_epoch = spec.FAR_FUTURE_EPOCH + + yield 'pre', state + + # Add to state via block transition + block = build_empty_block_for_next_slot(state) + block.body.transfers.append(transfer) + sign_block(state, block) + + yield 'blocks', [block], [spec.BeaconBlock] + + state_transition(state, block) + yield 'post', state + + sender_balance = get_balance(state, sender_index) + recipient_balance = get_balance(state, recipient_index) + assert sender_balance == 0 + assert recipient_balance == pre_transfer_recipient_balance + amount + + +@spec_state_test +def test_balance_driven_status_transitions(state): + current_epoch = get_current_epoch(state) + validator_index = get_active_validator_indices(state, current_epoch)[-1] + + assert state.validator_registry[validator_index].exit_epoch == spec.FAR_FUTURE_EPOCH + + # set validator balance to below ejection threshold + state.validator_registry[validator_index].effective_balance = spec.EJECTION_BALANCE + + yield 'pre', state + + # trigger epoch transition + block = build_empty_block_for_next_slot(state) + block.slot += spec.SLOTS_PER_EPOCH + sign_block(state, block) + state_transition(state, block) + + yield 'blocks', [block], [spec.BeaconBlock] + yield 'post', state + + assert state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH + + +@spec_state_test +def test_historical_batch(state): + state.slot += spec.SLOTS_PER_HISTORICAL_ROOT - (state.slot % spec.SLOTS_PER_HISTORICAL_ROOT) - 1 + pre_historical_roots_len = len(state.historical_roots) + + yield 'pre', state + + block = build_empty_block_for_next_slot(state, signed=True) + state_transition(state, block) + + yield 'blocks', [block], [spec.BeaconBlock] + yield 'post', state + + assert state.slot == block.slot + assert get_current_epoch(state) % (spec.SLOTS_PER_HISTORICAL_ROOT // spec.SLOTS_PER_EPOCH) == 0 + assert len(state.historical_roots) == pre_historical_roots_len + 1 + + +# @spec_state_test +# def test_eth1_data_votes(state): +# yield 'pre', state +# +# expected_votes = 0 +# assert len(state.eth1_data_votes) == expected_votes +# +# blocks = [] +# for _ in range(spec.SLOTS_PER_ETH1_VOTING_PERIOD - 1): +# block = build_empty_block_for_next_slot(state) +# state_transition(state, block) +# expected_votes += 1 +# assert len(state.eth1_data_votes) == expected_votes +# blocks.append(block) +# +# block = build_empty_block_for_next_slot(state) +# blocks.append(block) +# +# state_transition(state, block) +# +# yield 'blocks', [block], [spec.BeaconBlock] +# yield 'post', state +# +# assert state.slot % spec.SLOTS_PER_ETH1_VOTING_PERIOD == 0 +# assert len(state.eth1_data_votes) == 1 diff --git a/test_libs/pyspec/eth2spec/test/sanity/test_slots.py b/test_libs/pyspec/eth2spec/test/sanity/test_slots.py new file mode 100644 index 0000000000..2e5f3a5df6 --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/sanity/test_slots.py @@ -0,0 +1,58 @@ +import eth2spec.phase0.spec as spec + +from eth2spec.phase0.state_transition import state_transition_to +from eth2spec.test.helpers.state import get_state_root +from eth2spec.test.context import spec_state_test + + +@spec_state_test +def test_slots_1(state): + pre_slot = state.slot + pre_root = state.hash_tree_root() + yield 'pre', state + + slots = 1 + yield 'slots', slots + state_transition_to(state, state.slot + slots) + + yield 'post', state + assert state.slot == pre_slot + 1 + assert get_state_root(state, pre_slot) == pre_root + + +@spec_state_test +def test_slots_2(state): + yield 'pre', state + slots = 2 + yield 'slots', slots + state_transition_to(state, state.slot + slots) + yield 'post', state + + +@spec_state_test +def test_empty_epoch(state): + yield 'pre', state + slots = spec.SLOTS_PER_EPOCH + yield 'slots', slots + state_transition_to(state, state.slot + slots) + yield 'post', state + + +@spec_state_test +def test_double_empty_epoch(state): + yield 'pre', state + slots = spec.SLOTS_PER_EPOCH * 2 + yield 'slots', slots + state_transition_to(state, state.slot + slots) + yield 'post', state + + +@spec_state_test +def test_over_epoch_boundary(state): + state_transition_to(state, state.slot + (spec.SLOTS_PER_EPOCH // 2)) + yield 'pre', state + slots = spec.SLOTS_PER_EPOCH + yield 'slots', slots + state_transition_to(state, state.slot + slots) + yield 'post', state + diff --git a/test_libs/pyspec/tests/test_finality.py b/test_libs/pyspec/eth2spec/test/test_finality.py similarity index 56% rename from test_libs/pyspec/tests/test_finality.py rename to test_libs/pyspec/eth2spec/test/test_finality.py index ca048c2b2a..56f65eca9a 100644 --- a/test_libs/pyspec/tests/test_finality.py +++ b/test_libs/pyspec/eth2spec/test/test_finality.py @@ -1,24 +1,18 @@ from copy import deepcopy -import pytest - import eth2spec.phase0.spec as spec - from eth2spec.phase0.state_transition import ( state_transition, ) -from .helpers import ( - build_empty_block_for_next_slot, - fill_aggregate_attestation, +from .context import spec_state_test, never_bls +from .helpers.state import next_epoch +from .helpers.block import build_empty_block_for_next_slot, apply_empty_block +from .helpers.attestations import ( get_current_epoch, get_epoch_start_slot, get_valid_attestation, - next_epoch, ) -# mark entire file as 'state' -pytestmark = pytest.mark.state - def check_finality(state, prev_state, @@ -58,13 +52,11 @@ def next_epoch_with_attestations(state, slot_to_attest = post_state.slot - spec.MIN_ATTESTATION_INCLUSION_DELAY + 1 if slot_to_attest >= get_epoch_start_slot(get_current_epoch(post_state)): cur_attestation = get_valid_attestation(post_state, slot_to_attest) - fill_aggregate_attestation(post_state, cur_attestation) block.body.attestations.append(cur_attestation) if fill_prev_epoch: slot_to_attest = post_state.slot - spec.SLOTS_PER_EPOCH + 1 prev_attestation = get_valid_attestation(post_state, slot_to_attest) - fill_aggregate_attestation(post_state, prev_attestation) block.body.attestations.append(prev_attestation) state_transition(post_state, block) @@ -73,126 +65,140 @@ def next_epoch_with_attestations(state, return state, blocks, post_state +@never_bls +@spec_state_test def test_finality_rule_4(state): - test_state = deepcopy(state) + yield 'pre', state blocks = [] for epoch in range(4): - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, True, False) + prev_state, new_blocks, state = next_epoch_with_attestations(state, True, False) blocks += new_blocks # justification/finalization skipped at GENESIS_EPOCH if epoch == 0: - check_finality(test_state, prev_state, False, False, False) + check_finality(state, prev_state, False, False, False) # justification/finalization skipped at GENESIS_EPOCH + 1 elif epoch == 1: - check_finality(test_state, prev_state, False, False, False) + check_finality(state, prev_state, False, False, False) elif epoch == 2: - check_finality(test_state, prev_state, True, False, False) + check_finality(state, prev_state, True, False, False) elif epoch >= 3: # rule 4 of finality - check_finality(test_state, prev_state, True, True, True) - assert test_state.finalized_epoch == prev_state.current_justified_epoch - assert test_state.finalized_root == prev_state.current_justified_root + check_finality(state, prev_state, True, True, True) + assert state.finalized_epoch == prev_state.current_justified_epoch + assert state.finalized_root == prev_state.current_justified_root - return state, blocks, test_state + yield 'blocks', blocks, [spec.BeaconBlock] + yield 'post', state +@never_bls +@spec_state_test def test_finality_rule_1(state): # get past first two epochs that finality does not run on next_epoch(state) + apply_empty_block(state) next_epoch(state) + apply_empty_block(state) - pre_state = deepcopy(state) - test_state = deepcopy(state) + yield 'pre', state blocks = [] for epoch in range(3): - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, False, True) + prev_state, new_blocks, state = next_epoch_with_attestations(state, False, True) blocks += new_blocks if epoch == 0: - check_finality(test_state, prev_state, True, False, False) + check_finality(state, prev_state, True, False, False) elif epoch == 1: - check_finality(test_state, prev_state, True, True, False) + check_finality(state, prev_state, True, True, False) elif epoch == 2: # finalized by rule 1 - check_finality(test_state, prev_state, True, True, True) - assert test_state.finalized_epoch == prev_state.previous_justified_epoch - assert test_state.finalized_root == prev_state.previous_justified_root + check_finality(state, prev_state, True, True, True) + assert state.finalized_epoch == prev_state.previous_justified_epoch + assert state.finalized_root == prev_state.previous_justified_root - return pre_state, blocks, test_state + yield 'blocks', blocks, [spec.BeaconBlock] + yield 'post', state +@never_bls +@spec_state_test def test_finality_rule_2(state): # get past first two epochs that finality does not run on next_epoch(state) + apply_empty_block(state) next_epoch(state) + apply_empty_block(state) - pre_state = deepcopy(state) - test_state = deepcopy(state) + yield 'pre', state blocks = [] for epoch in range(3): if epoch == 0: - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, True, False) - check_finality(test_state, prev_state, True, False, False) + prev_state, new_blocks, state = next_epoch_with_attestations(state, True, False) + check_finality(state, prev_state, True, False, False) elif epoch == 1: - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, False, False) - check_finality(test_state, prev_state, False, True, False) + prev_state, new_blocks, state = next_epoch_with_attestations(state, False, False) + check_finality(state, prev_state, False, True, False) elif epoch == 2: - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, False, True) + prev_state, new_blocks, state = next_epoch_with_attestations(state, False, True) # finalized by rule 2 - check_finality(test_state, prev_state, True, False, True) - assert test_state.finalized_epoch == prev_state.previous_justified_epoch - assert test_state.finalized_root == prev_state.previous_justified_root + check_finality(state, prev_state, True, False, True) + assert state.finalized_epoch == prev_state.previous_justified_epoch + assert state.finalized_root == prev_state.previous_justified_root blocks += new_blocks - return pre_state, blocks, test_state + yield 'blocks', blocks, [spec.BeaconBlock] + yield 'post', state +@never_bls +@spec_state_test def test_finality_rule_3(state): """ Test scenario described here https://github.com/ethereum/eth2.0-specs/issues/611#issuecomment-463612892 """ - # get past first two epochs that finality does not run on next_epoch(state) + apply_empty_block(state) next_epoch(state) + apply_empty_block(state) - pre_state = deepcopy(state) - test_state = deepcopy(state) + yield 'pre', state blocks = [] - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, True, False) + prev_state, new_blocks, state = next_epoch_with_attestations(state, True, False) blocks += new_blocks - check_finality(test_state, prev_state, True, False, False) + check_finality(state, prev_state, True, False, False) # In epoch N, JE is set to N, prev JE is set to N-1 - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, True, False) + prev_state, new_blocks, state = next_epoch_with_attestations(state, True, False) blocks += new_blocks - check_finality(test_state, prev_state, True, True, True) + check_finality(state, prev_state, True, True, True) # In epoch N+1, JE is N, prev JE is N-1, and not enough messages get in to do anything - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, False, False) + prev_state, new_blocks, state = next_epoch_with_attestations(state, False, False) blocks += new_blocks - check_finality(test_state, prev_state, False, True, False) + check_finality(state, prev_state, False, True, False) # In epoch N+2, JE is N, prev JE is N, and enough messages from the previous epoch get in to justify N+1. # N+1 now becomes the JE. Not enough messages from epoch N+2 itself get in to justify N+2 - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, False, True) + prev_state, new_blocks, state = next_epoch_with_attestations(state, False, True) blocks += new_blocks # rule 2 - check_finality(test_state, prev_state, True, False, True) + check_finality(state, prev_state, True, False, True) # In epoch N+3, LJE is N+1, prev LJE is N, and enough messages get in to justify epochs N+2 and N+3. - prev_state, new_blocks, test_state = next_epoch_with_attestations(test_state, True, True) + prev_state, new_blocks, state = next_epoch_with_attestations(state, True, True) blocks += new_blocks # rule 3 - check_finality(test_state, prev_state, True, True, True) - assert test_state.finalized_epoch == prev_state.current_justified_epoch - assert test_state.finalized_root == prev_state.current_justified_root + check_finality(state, prev_state, True, True, True) + assert state.finalized_epoch == prev_state.current_justified_epoch + assert state.finalized_root == prev_state.current_justified_root - return pre_state, blocks, test_state + yield 'blocks', blocks, [spec.BeaconBlock] + yield 'post', state diff --git a/test_libs/pyspec/eth2spec/test/utils.py b/test_libs/pyspec/eth2spec/test/utils.py new file mode 100644 index 0000000000..b61801c3dd --- /dev/null +++ b/test_libs/pyspec/eth2spec/test/utils.py @@ -0,0 +1,80 @@ +from typing import Dict, Any, Callable, Iterable +from eth2spec.debug.encode import encode + + +def spectest(description: str = None): + def runner(fn): + # this wraps the function, to hide that the function actually is yielding data, instead of returning once. + def entry(args, kw): + # check generator mode, may be None/else. + # "pop" removes it, so it is not passed to the inner function. + if kw.pop('generator_mode', False) is True: + out = {} + if description is None: + # fall back on function name for test description + name = fn.__name__ + if name.startswith('test_'): + name = name[5:] + out['description'] = name + else: + # description can be explicit + out['description'] = description + has_contents = False + # put all generated data into a dict. + for data in fn(args, *kw): + has_contents = True + # If there is a type argument, encode it as that type. + if len(data) == 3: + (key, value, typ) = data + out[key] = encode(value, typ) + else: + # Otherwise, try to infer the type, but keep it as-is if it's not a SSZ container. + (key, value) = data + if hasattr(value.__class__, 'fields'): + out[key] = encode(value, value.__class__) + else: + out[key] = value + if has_contents: + return out + else: + return None + else: + # just complete the function, ignore all yielded data, we are not using it + for _ in fn(args, *kw): + continue + return None + return entry + return runner + + +def with_tags(tags: Dict[str, Any]): + """ + Decorator factory, adds tags (key, value) pairs to the output of the function. + Useful to build test-vector annotations with. + This decorator is applied after the ``spectest`` decorator is applied. + :param tags: dict of tags + :return: Decorator. + """ + def runner(fn): + def entry(args, *kw): + fn_out = fn(args, kw) + # do not add tags if the function is not returning a dict at all (i.e. not in generator mode) + if fn_out is None: + return None + return {tags, *fn_out} + return entry + return runner + + +def with_args(create_args: Callable[[], Iterable[Any]]): + """ + Decorator factory, adds given extra arguments to the decorated function. + :param create_args: function to create arguments with. + :return: Decorator. + """ + def runner(fn): + # this wraps the function, to hide that the function actually yielding data. + def entry(args, *kw): + return fn((list(create_args()) + list(args)), *kw) + return entry + return runner diff --git a/test_libs/pyspec/eth2spec/utils/bls.py b/test_libs/pyspec/eth2spec/utils/bls.py new file mode 100644 index 0000000000..52f1fed632 --- /dev/null +++ b/test_libs/pyspec/eth2spec/utils/bls.py @@ -0,0 +1,46 @@ +from py_ecc import bls + +# Flag to make BLS active or not. Used for testing, do not ignore BLS in production unless you know what you are doing. +bls_active = True + +STUB_SIGNATURE = b'\x11' 96 +STUB_PUBKEY = b'\x22' * 48 + + +def only_with_bls(alt_return=None): + """ + Decorator factory to make a function only run when BLS is active. Otherwise return the default. + """ + def runner(fn): + def entry(args, kw): + if bls_active: + return fn(args, *kw) + else: + return alt_return + return entry + return runner + + +@only_with_bls(alt_return=True) +def bls_verify(pubkey, message_hash, signature, domain): + return bls.verify(message_hash=message_hash, pubkey=pubkey, signature=signature, domain=domain) + + +@only_with_bls(alt_return=True) +def bls_verify_multiple(pubkeys, message_hashes, signature, domain): + return bls.verify_multiple(pubkeys, message_hashes, signature, domain) + + +@only_with_bls(alt_return=STUB_PUBKEY) +def bls_aggregate_pubkeys(pubkeys): + return bls.aggregate_pubkeys(pubkeys) + + +@only_with_bls(alt_return=STUB_SIGNATURE) +def bls_aggregate_signatures(signatures): + return bls.aggregate_signatures(signatures) + + +@only_with_bls(alt_return=STUB_SIGNATURE) +def bls_sign(message_hash, privkey, domain): + return bls.sign(message_hash=message_hash, privkey=privkey, domain=domain) diff --git a/test_libs/pyspec/eth2spec/utils/bls_stub.py b/test_libs/pyspec/eth2spec/utils/bls_stub.py deleted file mode 100644 index 108c4ef710..0000000000 --- a/test_libs/pyspec/eth2spec/utils/bls_stub.py +++ /dev/null @@ -1,12 +0,0 @@ - - -def bls_verify(pubkey, message_hash, signature, domain): - return True - - -def bls_verify_multiple(pubkeys, message_hashes, signature, domain): - return True - - -def bls_aggregate_pubkeys(pubkeys): - return b'\x42' 96 diff --git a/test_libs/pyspec/tests/block_processing/test_process_attestation.py b/test_libs/pyspec/tests/block_processing/test_process_attestation.py deleted file mode 100644 index bcf71376ce..0000000000 --- a/test_libs/pyspec/tests/block_processing/test_process_attestation.py +++ /dev/null @@ -1,155 +0,0 @@ -from copy import deepcopy -import pytest - -import eth2spec.phase0.spec as spec - -from eth2spec.phase0.state_transition import ( - state_transition, -) -from eth2spec.phase0.spec import ( - get_current_epoch, - process_attestation, - slot_to_epoch, -) -from tests.helpers import ( - build_empty_block_for_next_slot, - get_valid_attestation, - next_epoch, - next_slot, -) - - -# mark entire file as 'attestations' -pytestmark = pytest.mark.attestations - - -def run_attestation_processing(state, attestation, valid=True): - """ - Run ``process_attestation`` returning the pre and post state. - If ``valid == False``, run expecting ``AssertionError`` - """ - post_state = deepcopy(state) - - if not valid: - with pytest.raises(AssertionError): - process_attestation(post_state, attestation) - return state, None - - process_attestation(post_state, attestation) - - current_epoch = get_current_epoch(state) - if attestation.data.target_epoch == current_epoch: - assert len(post_state.current_epoch_attestations) == len(state.current_epoch_attestations) + 1 - else: - assert len(post_state.previous_epoch_attestations) == len(state.previous_epoch_attestations) + 1 - - return state, post_state - - -def test_success(state): - attestation = get_valid_attestation(state) - state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY - - pre_state, post_state = run_attestation_processing(state, attestation) - - return pre_state, attestation, post_state - - -def test_success_prevous_epoch(state): - attestation = get_valid_attestation(state) - block = build_empty_block_for_next_slot(state) - block.slot = state.slot + spec.SLOTS_PER_EPOCH - state_transition(state, block) - - pre_state, post_state = run_attestation_processing(state, attestation) - - return pre_state, attestation, post_state - - -def test_before_inclusion_delay(state): - attestation = get_valid_attestation(state) - # do not increment slot to allow for inclusion delay - - pre_state, post_state = run_attestation_processing(state, attestation, False) - - return pre_state, attestation, post_state - - -def test_after_epoch_slots(state): - attestation = get_valid_attestation(state) - block = build_empty_block_for_next_slot(state) - # increment past latest inclusion slot - block.slot = state.slot + spec.SLOTS_PER_EPOCH + 1 - state_transition(state, block) - - pre_state, post_state = run_attestation_processing(state, attestation, False) - - return pre_state, attestation, post_state - - -def test_bad_source_epoch(state): - attestation = get_valid_attestation(state) - state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY - - attestation.data.source_epoch += 10 - - pre_state, post_state = run_attestation_processing(state, attestation, False) - - return pre_state, attestation, post_state - - -def test_bad_source_root(state): - attestation = get_valid_attestation(state) - state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY - - attestation.data.source_root = b'\x42' * 32 - - pre_state, post_state = run_attestation_processing(state, attestation, False) - - return pre_state, attestation, post_state - - -def test_non_zero_crosslink_data_root(state): - attestation = get_valid_attestation(state) - state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY - - attestation.data.crosslink_data_root = b'\x42' * 32 - - pre_state, post_state = run_attestation_processing(state, attestation, False) - - return pre_state, attestation, post_state - - -def test_bad_previous_crosslink(state): - next_epoch(state) - attestation = get_valid_attestation(state) - for _ in range(spec.MIN_ATTESTATION_INCLUSION_DELAY): - next_slot(state) - - state.current_crosslinks[attestation.data.shard].epoch += 10 - - pre_state, post_state = run_attestation_processing(state, attestation, False) - - return pre_state, attestation, post_state - - -def test_non_empty_custody_bitfield(state): - attestation = get_valid_attestation(state) - state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY - - attestation.custody_bitfield = deepcopy(attestation.aggregation_bitfield) - - pre_state, post_state = run_attestation_processing(state, attestation, False) - - return pre_state, attestation, post_state - - -def test_empty_aggregation_bitfield(state): - attestation = get_valid_attestation(state) - state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY - - attestation.aggregation_bitfield = b'\x00' * len(attestation.aggregation_bitfield) - - pre_state, post_state = run_attestation_processing(state, attestation, False) - - return pre_state, attestation, post_state diff --git a/test_libs/pyspec/tests/block_processing/test_process_attester_slashing.py b/test_libs/pyspec/tests/block_processing/test_process_attester_slashing.py deleted file mode 100644 index 2ea16f13d9..0000000000 --- a/test_libs/pyspec/tests/block_processing/test_process_attester_slashing.py +++ /dev/null @@ -1,117 +0,0 @@ -from copy import deepcopy -import pytest - -import eth2spec.phase0.spec as spec -from eth2spec.phase0.spec import ( - get_beacon_proposer_index, - process_attester_slashing, -) -from tests.helpers import ( - get_balance, - get_valid_attester_slashing, - next_epoch, -) - -# mark entire file as 'attester_slashing' -pytestmark = pytest.mark.attester_slashings - - -def run_attester_slashing_processing(state, attester_slashing, valid=True): - """ - Run ``process_attester_slashing`` returning the pre and post state. - If ``valid == False``, run expecting ``AssertionError`` - """ - post_state = deepcopy(state) - - if not valid: - with pytest.raises(AssertionError): - process_attester_slashing(post_state, attester_slashing) - return state, None - - process_attester_slashing(post_state, attester_slashing) - - slashed_index = attester_slashing.attestation_1.custody_bit_0_indices[0] - slashed_validator = post_state.validator_registry[slashed_index] - assert slashed_validator.slashed - assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH - assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH - # lost whistleblower reward - assert ( - get_balance(post_state, slashed_index) < - get_balance(state, slashed_index) - ) - proposer_index = get_beacon_proposer_index(state) - # gained whistleblower reward - assert ( - get_balance(post_state, proposer_index) > - get_balance(state, proposer_index) - ) - - return state, post_state - - -def test_success_double(state): - attester_slashing = get_valid_attester_slashing(state) - - pre_state, post_state = run_attester_slashing_processing(state, attester_slashing) - - return pre_state, attester_slashing, post_state - - -def test_success_surround(state): - next_epoch(state) - state.current_justified_epoch += 1 - attester_slashing = get_valid_attester_slashing(state) - - # set attestion1 to surround attestation 2 - attester_slashing.attestation_1.data.source_epoch = attester_slashing.attestation_2.data.source_epoch - 1 - attester_slashing.attestation_1.data.target_epoch = attester_slashing.attestation_2.data.target_epoch + 1 - - pre_state, post_state = run_attester_slashing_processing(state, attester_slashing) - - return pre_state, attester_slashing, post_state - - -def test_same_data(state): - attester_slashing = get_valid_attester_slashing(state) - - attester_slashing.attestation_1.data = attester_slashing.attestation_2.data - - pre_state, post_state = run_attester_slashing_processing(state, attester_slashing, False) - - return pre_state, attester_slashing, post_state - - -def test_no_double_or_surround(state): - attester_slashing = get_valid_attester_slashing(state) - - attester_slashing.attestation_1.data.target_epoch += 1 - - pre_state, post_state = run_attester_slashing_processing(state, attester_slashing, False) - - return pre_state, attester_slashing, post_state - - -def test_participants_already_slashed(state): - attester_slashing = get_valid_attester_slashing(state) - - # set all indices to slashed - attestation_1 = attester_slashing.attestation_1 - validator_indices = attestation_1.custody_bit_0_indices + attestation_1.custody_bit_1_indices - for index in validator_indices: - state.validator_registry[index].slashed = True - - pre_state, post_state = run_attester_slashing_processing(state, attester_slashing, False) - - return pre_state, attester_slashing, post_state - - -def test_custody_bit_0_and_1(state): - attester_slashing = get_valid_attester_slashing(state) - - attester_slashing.attestation_1.custody_bit_1_indices = ( - attester_slashing.attestation_1.custody_bit_0_indices - ) - pre_state, post_state = run_attester_slashing_processing(state, attester_slashing, False) - - return pre_state, attester_slashing, post_state diff --git a/test_libs/pyspec/tests/block_processing/test_process_block_header.py b/test_libs/pyspec/tests/block_processing/test_process_block_header.py deleted file mode 100644 index b35b0a9c11..0000000000 --- a/test_libs/pyspec/tests/block_processing/test_process_block_header.py +++ /dev/null @@ -1,76 +0,0 @@ -from copy import deepcopy -import pytest - - -from eth2spec.phase0.spec import ( - get_beacon_proposer_index, - cache_state, - advance_slot, - process_block_header, -) -from tests.helpers import ( - build_empty_block_for_next_slot, - next_slot, -) - -# mark entire file as 'header' -pytestmark = pytest.mark.header - - -def prepare_state_for_header_processing(state): - cache_state(state) - advance_slot(state) - - -def run_block_header_processing(state, block, valid=True): - """ - Run ``process_block_header`` returning the pre and post state. - If ``valid == False``, run expecting ``AssertionError`` - """ - prepare_state_for_header_processing(state) - post_state = deepcopy(state) - - if not valid: - with pytest.raises(AssertionError): - process_block_header(post_state, block) - return state, None - - process_block_header(post_state, block) - return state, post_state - - -def test_success(state): - block = build_empty_block_for_next_slot(state) - pre_state, post_state = run_block_header_processing(state, block) - return state, block, post_state - - -def test_invalid_slot(state): - block = build_empty_block_for_next_slot(state) - block.slot = state.slot + 2 # invalid slot - - pre_state, post_state = run_block_header_processing(state, block, valid=False) - return pre_state, block, None - - -def test_invalid_previous_block_root(state): - block = build_empty_block_for_next_slot(state) - block.previous_block_root = b'\12' * 32 # invalid prev root - - pre_state, post_state = run_block_header_processing(state, block, valid=False) - return pre_state, block, None - - -def test_proposer_slashed(state): - # use stub state to get proposer index of next slot - stub_state = deepcopy(state) - next_slot(stub_state) - proposer_index = get_beacon_proposer_index(stub_state) - - # set proposer to slashed - state.validator_registry[proposer_index].slashed = True - - block = build_empty_block_for_next_slot(state) - - pre_state, post_state = run_block_header_processing(state, block, valid=False) - return pre_state, block, None diff --git a/test_libs/pyspec/tests/block_processing/test_process_deposit.py b/test_libs/pyspec/tests/block_processing/test_process_deposit.py deleted file mode 100644 index bbfb390efb..0000000000 --- a/test_libs/pyspec/tests/block_processing/test_process_deposit.py +++ /dev/null @@ -1,141 +0,0 @@ -from copy import deepcopy -import pytest - -import eth2spec.phase0.spec as spec - -from eth2spec.phase0.spec import ( - ZERO_HASH, - process_deposit, -) -from tests.helpers import ( - get_balance, - build_deposit, - privkeys, - pubkeys, -) - - -# mark entire file as 'deposits' -pytestmark = pytest.mark.deposits - - -def test_success(state): - pre_state = deepcopy(state) - # fill previous deposits with zero-hash - deposit_data_leaves = [ZERO_HASH] * len(pre_state.validator_registry) - - index = len(deposit_data_leaves) - pubkey = pubkeys[index] - privkey = privkeys[index] - deposit, root, deposit_data_leaves = build_deposit( - pre_state, - deposit_data_leaves, - pubkey, - privkey, - spec.MAX_EFFECTIVE_BALANCE, - ) - - pre_state.latest_eth1_data.deposit_root = root - pre_state.latest_eth1_data.deposit_count = len(deposit_data_leaves) - - post_state = deepcopy(pre_state) - - process_deposit(post_state, deposit) - - assert len(post_state.validator_registry) == len(state.validator_registry) + 1 - assert len(post_state.balances) == len(state.balances) + 1 - assert post_state.validator_registry[index].pubkey == pubkeys[index] - assert get_balance(post_state, index) == spec.MAX_EFFECTIVE_BALANCE - assert post_state.deposit_index == post_state.latest_eth1_data.deposit_count - - return pre_state, deposit, post_state - - -def test_success_top_up(state): - pre_state = deepcopy(state) - deposit_data_leaves = [ZERO_HASH] * len(pre_state.validator_registry) - - validator_index = 0 - amount = spec.MAX_EFFECTIVE_BALANCE // 4 - pubkey = pubkeys[validator_index] - privkey = privkeys[validator_index] - deposit, root, deposit_data_leaves = build_deposit( - pre_state, - deposit_data_leaves, - pubkey, - privkey, - amount, - ) - - pre_state.latest_eth1_data.deposit_root = root - pre_state.latest_eth1_data.deposit_count = len(deposit_data_leaves) - pre_balance = get_balance(pre_state, validator_index) - - post_state = deepcopy(pre_state) - - process_deposit(post_state, deposit) - - assert len(post_state.validator_registry) == len(state.validator_registry) - assert len(post_state.balances) == len(state.balances) - assert post_state.deposit_index == post_state.latest_eth1_data.deposit_count - assert get_balance(post_state, validator_index) == pre_balance + amount - - return pre_state, deposit, post_state - - -def test_wrong_index(state): - pre_state = deepcopy(state) - deposit_data_leaves = [ZERO_HASH] * len(pre_state.validator_registry) - - index = len(deposit_data_leaves) - pubkey = pubkeys[index] - privkey = privkeys[index] - deposit, root, deposit_data_leaves = build_deposit( - pre_state, - deposit_data_leaves, - pubkey, - privkey, - spec.MAX_EFFECTIVE_BALANCE, - ) - - # mess up deposit_index - deposit.index = pre_state.deposit_index + 1 - - pre_state.latest_eth1_data.deposit_root = root - pre_state.latest_eth1_data.deposit_count = len(deposit_data_leaves) - - post_state = deepcopy(pre_state) - - with pytest.raises(AssertionError): - process_deposit(post_state, deposit) - - return pre_state, deposit, None - - -def test_bad_merkle_proof(state): - pre_state = deepcopy(state) - deposit_data_leaves = [ZERO_HASH] * len(pre_state.validator_registry) - - index = len(deposit_data_leaves) - pubkey = pubkeys[index] - privkey = privkeys[index] - deposit, root, deposit_data_leaves = build_deposit( - pre_state, - deposit_data_leaves, - pubkey, - privkey, - spec.MAX_EFFECTIVE_BALANCE, - ) - - # mess up merkle branch - deposit.proof[-1] = spec.ZERO_HASH - - pre_state.latest_eth1_data.deposit_root = root - pre_state.latest_eth1_data.deposit_count = len(deposit_data_leaves) - - post_state = deepcopy(pre_state) - - with pytest.raises(AssertionError): - process_deposit(post_state, deposit) - - return pre_state, deposit, None diff --git a/test_libs/pyspec/tests/block_processing/test_process_proposer_slashing.py b/test_libs/pyspec/tests/block_processing/test_process_proposer_slashing.py deleted file mode 100644 index 4752210366..0000000000 --- a/test_libs/pyspec/tests/block_processing/test_process_proposer_slashing.py +++ /dev/null @@ -1,96 +0,0 @@ -from copy import deepcopy -import pytest - -import eth2spec.phase0.spec as spec -from eth2spec.phase0.spec import ( - get_current_epoch, - process_proposer_slashing, -) -from tests.helpers import ( - get_balance, - get_valid_proposer_slashing, -) - -# mark entire file as 'proposer_slashings' -pytestmark = pytest.mark.proposer_slashings - - -def run_proposer_slashing_processing(state, proposer_slashing, valid=True): - """ - Run ``process_proposer_slashing`` returning the pre and post state. - If ``valid == False``, run expecting ``AssertionError`` - """ - post_state = deepcopy(state) - - if not valid: - with pytest.raises(AssertionError): - process_proposer_slashing(post_state, proposer_slashing) - return state, None - - process_proposer_slashing(post_state, proposer_slashing) - - slashed_validator = post_state.validator_registry[proposer_slashing.proposer_index] - assert slashed_validator.slashed - assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH - assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH - # lost whistleblower reward - assert ( - get_balance(post_state, proposer_slashing.proposer_index) < - get_balance(state, proposer_slashing.proposer_index) - ) - - return state, post_state - - -def test_success(state): - proposer_slashing = get_valid_proposer_slashing(state) - - pre_state, post_state = run_proposer_slashing_processing(state, proposer_slashing) - - return pre_state, proposer_slashing, post_state - - -def test_epochs_are_different(state): - proposer_slashing = get_valid_proposer_slashing(state) - - # set slots to be in different epochs - proposer_slashing.header_2.slot += spec.SLOTS_PER_EPOCH - - pre_state, post_state = run_proposer_slashing_processing(state, proposer_slashing, False) - - return pre_state, proposer_slashing, post_state - - -def test_headers_are_same(state): - proposer_slashing = get_valid_proposer_slashing(state) - - # set headers to be the same - proposer_slashing.header_2 = proposer_slashing.header_1 - - pre_state, post_state = run_proposer_slashing_processing(state, proposer_slashing, False) - - return pre_state, proposer_slashing, post_state - - -def test_proposer_is_slashed(state): - proposer_slashing = get_valid_proposer_slashing(state) - - # set proposer to slashed - state.validator_registry[proposer_slashing.proposer_index].slashed = True - - pre_state, post_state = run_proposer_slashing_processing(state, proposer_slashing, False) - - return pre_state, proposer_slashing, post_state - - -def test_proposer_is_withdrawn(state): - proposer_slashing = get_valid_proposer_slashing(state) - - # set proposer withdrawable_epoch in past - current_epoch = get_current_epoch(state) - proposer_index = proposer_slashing.proposer_index - state.validator_registry[proposer_index].withdrawable_epoch = current_epoch - 1 - - pre_state, post_state = run_proposer_slashing_processing(state, proposer_slashing, False) - - return pre_state, proposer_slashing, post_state diff --git a/test_libs/pyspec/tests/block_processing/test_process_transfer.py b/test_libs/pyspec/tests/block_processing/test_process_transfer.py deleted file mode 100644 index 0eeaa77929..0000000000 --- a/test_libs/pyspec/tests/block_processing/test_process_transfer.py +++ /dev/null @@ -1,141 +0,0 @@ -from copy import deepcopy -import pytest - -import eth2spec.phase0.spec as spec - -from eth2spec.phase0.spec import ( - get_active_validator_indices, - get_beacon_proposer_index, - get_current_epoch, - process_transfer, -) -from tests.helpers import ( - get_valid_transfer, - next_epoch, -) - - -# mark entire file as 'transfers' -pytestmark = pytest.mark.transfers - - -def run_transfer_processing(state, transfer, valid=True): - """ - Run ``process_transfer`` returning the pre and post state. - If ``valid == False``, run expecting ``AssertionError`` - """ - post_state = deepcopy(state) - - if not valid: - with pytest.raises(AssertionError): - process_transfer(post_state, transfer) - return state, None - - - process_transfer(post_state, transfer) - - proposer_index = get_beacon_proposer_index(state) - pre_transfer_sender_balance = state.balances[transfer.sender] - pre_transfer_recipient_balance = state.balances[transfer.recipient] - pre_transfer_proposer_balance = state.balances[proposer_index] - sender_balance = post_state.balances[transfer.sender] - recipient_balance = post_state.balances[transfer.recipient] - assert sender_balance == pre_transfer_sender_balance - transfer.amount - transfer.fee - assert recipient_balance == pre_transfer_recipient_balance + transfer.amount - assert post_state.balances[proposer_index] == pre_transfer_proposer_balance + transfer.fee - - return state, post_state - - -def test_success_non_activated(state): - transfer = get_valid_transfer(state) - # un-activate so validator can transfer - state.validator_registry[transfer.sender].activation_eligibility_epoch = spec.FAR_FUTURE_EPOCH - - pre_state, post_state = run_transfer_processing(state, transfer) - - return pre_state, transfer, post_state - - -def test_success_withdrawable(state): - next_epoch(state) - - transfer = get_valid_transfer(state) - - # withdrawable_epoch in past so can transfer - state.validator_registry[transfer.sender].withdrawable_epoch = get_current_epoch(state) - 1 - - pre_state, post_state = run_transfer_processing(state, transfer) - - return pre_state, transfer, post_state - - -def test_success_active_above_max_effective(state): - sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] - amount = spec.MAX_EFFECTIVE_BALANCE // 32 - state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE + amount - transfer = get_valid_transfer(state, sender_index=sender_index, amount=amount, fee=0) - - pre_state, post_state = run_transfer_processing(state, transfer) - - return pre_state, transfer, post_state - - -def test_active_but_transfer_past_effective_balance(state): - sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] - amount = spec.MAX_EFFECTIVE_BALANCE // 32 - state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE - transfer = get_valid_transfer(state, sender_index=sender_index, amount=amount, fee=0) - - pre_state, post_state = run_transfer_processing(state, transfer, False) - - return pre_state, transfer, post_state - - -def test_incorrect_slot(state): - transfer = get_valid_transfer(state, slot=state.slot+1) - # un-activate so validator can transfer - state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH - - pre_state, post_state = run_transfer_processing(state, transfer, False) - - return pre_state, transfer, post_state - - -def test_insufficient_balance(state): - sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] - amount = spec.MAX_EFFECTIVE_BALANCE - state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE - transfer = get_valid_transfer(state, sender_index=sender_index, amount=amount + 1, fee=0) - - # un-activate so validator can transfer - state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH - - pre_state, post_state = run_transfer_processing(state, transfer, False) - - return pre_state, transfer, post_state - - -def test_no_dust(state): - sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1] - balance = state.balances[sender_index] - transfer = get_valid_transfer(state, sender_index=sender_index, amount=balance - spec.MIN_DEPOSIT_AMOUNT + 1, fee=0) - - # un-activate so validator can transfer - state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH - - pre_state, post_state = run_transfer_processing(state, transfer, False) - - return pre_state, transfer, post_state - - -def test_invalid_pubkey(state): - transfer = get_valid_transfer(state) - state.validator_registry[transfer.sender].withdrawal_credentials = spec.ZERO_HASH - - # un-activate so validator can transfer - state.validator_registry[transfer.sender].activation_epoch = spec.FAR_FUTURE_EPOCH - - pre_state, post_state = run_transfer_processing(state, transfer, False) - - return pre_state, transfer, post_state diff --git a/test_libs/pyspec/tests/block_processing/test_voluntary_exit.py b/test_libs/pyspec/tests/block_processing/test_voluntary_exit.py deleted file mode 100644 index c58c5238a9..0000000000 --- a/test_libs/pyspec/tests/block_processing/test_voluntary_exit.py +++ /dev/null @@ -1,163 +0,0 @@ -from copy import deepcopy -import pytest - -import eth2spec.phase0.spec as spec - -from eth2spec.phase0.spec import ( - get_active_validator_indices, - get_churn_limit, - get_current_epoch, - process_voluntary_exit, -) -from tests.helpers import ( - build_voluntary_exit, - pubkey_to_privkey, -) - - -# mark entire file as 'voluntary_exits' -pytestmark = pytest.mark.voluntary_exits - - -def run_voluntary_exit_processing(state, voluntary_exit, valid=True): - """ - Run ``process_voluntary_exit`` returning the pre and post state. - If ``valid == False``, run expecting ``AssertionError`` - """ - post_state = deepcopy(state) - - if not valid: - with pytest.raises(AssertionError): - process_voluntary_exit(post_state, voluntary_exit) - return state, None - - process_voluntary_exit(post_state, voluntary_exit) - - validator_index = voluntary_exit.validator_index - assert state.validator_registry[validator_index].exit_epoch == spec.FAR_FUTURE_EPOCH - assert post_state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH - - return state, post_state - - -def test_success(state): - # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit - state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH - - current_epoch = get_current_epoch(state) - validator_index = get_active_validator_indices(state, current_epoch)[0] - privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] - - voluntary_exit = build_voluntary_exit( - state, - current_epoch, - validator_index, - privkey, - ) - - pre_state, post_state = run_voluntary_exit_processing(state, voluntary_exit) - return pre_state, voluntary_exit, post_state - - -def test_success_exit_queue(state): - # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit - state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH - - current_epoch = get_current_epoch(state) - - # exit `MAX_EXITS_PER_EPOCH` - initial_indices = get_active_validator_indices(state, current_epoch)[:get_churn_limit(state)] - post_state = state - for index in initial_indices: - privkey = pubkey_to_privkey[state.validator_registry[index].pubkey] - voluntary_exit = build_voluntary_exit( - state, - current_epoch, - index, - privkey, - ) - - pre_state, post_state = run_voluntary_exit_processing(post_state, voluntary_exit) - - # exit an additional validator - validator_index = get_active_validator_indices(state, current_epoch)[-1] - privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] - voluntary_exit = build_voluntary_exit( - state, - current_epoch, - validator_index, - privkey, - ) - - pre_state, post_state = run_voluntary_exit_processing(post_state, voluntary_exit) - - assert ( - post_state.validator_registry[validator_index].exit_epoch == - post_state.validator_registry[initial_indices[0]].exit_epoch + 1 - ) - - return pre_state, voluntary_exit, post_state - - -def test_validator_not_active(state): - current_epoch = get_current_epoch(state) - validator_index = get_active_validator_indices(state, current_epoch)[0] - privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] - - state.validator_registry[validator_index].activation_epoch = spec.FAR_FUTURE_EPOCH - - # - # build and test voluntary exit - # - voluntary_exit = build_voluntary_exit( - state, - current_epoch, - validator_index, - privkey, - ) - - pre_state, post_state = run_voluntary_exit_processing(state, voluntary_exit, False) - return pre_state, voluntary_exit, post_state - - -def test_validator_already_exited(state): - # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow validator able to exit - state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH - - current_epoch = get_current_epoch(state) - validator_index = get_active_validator_indices(state, current_epoch)[0] - privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] - - # but validator already has exited - state.validator_registry[validator_index].exit_epoch = current_epoch + 2 - - voluntary_exit = build_voluntary_exit( - state, - current_epoch, - validator_index, - privkey, - ) - - pre_state, post_state = run_voluntary_exit_processing(state, voluntary_exit, False) - return pre_state, voluntary_exit, post_state - - -def test_validator_not_active_long_enough(state): - current_epoch = get_current_epoch(state) - validator_index = get_active_validator_indices(state, current_epoch)[0] - privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] - - voluntary_exit = build_voluntary_exit( - state, - current_epoch, - validator_index, - privkey, - ) - - assert ( - current_epoch - state.validator_registry[validator_index].activation_epoch < - spec.PERSISTENT_COMMITTEE_PERIOD - ) - - pre_state, post_state = run_voluntary_exit_processing(state, voluntary_exit, False) - return pre_state, voluntary_exit, post_state diff --git a/test_libs/pyspec/tests/conftest.py b/test_libs/pyspec/tests/conftest.py deleted file mode 100644 index 9840dc7b20..0000000000 --- a/test_libs/pyspec/tests/conftest.py +++ /dev/null @@ -1,36 +0,0 @@ -import pytest - -from eth2spec.phase0 import spec -from preset_loader import loader - -from .helpers import ( - create_genesis_state, -) - - -def pytest_addoption(parser): - parser.addoption( - "--config", action="store", default="minimal", help="config: make the pyspec use the specified configuration" - ) - - -@pytest.fixture(autouse=True) -def config(request): - config_name = request.config.getoption("--config") - presets = loader.load_presets('../../configs/', config_name) - spec.apply_constants_preset(presets) - - -@pytest.fixture -def num_validators(config): - return spec.SLOTS_PER_EPOCH * 8 - - -@pytest.fixture -def deposit_data_leaves(): - return list() - - -@pytest.fixture -def state(num_validators, deposit_data_leaves): - return create_genesis_state(num_validators, deposit_data_leaves) diff --git a/test_libs/pyspec/tests/helpers.py b/test_libs/pyspec/tests/helpers.py deleted file mode 100644 index 3b9b6904d5..0000000000 --- a/test_libs/pyspec/tests/helpers.py +++ /dev/null @@ -1,422 +0,0 @@ -from copy import deepcopy - -from py_ecc import bls - -from eth2spec.phase0.state_transition import ( - state_transition, -) -import eth2spec.phase0.spec as spec -from eth2spec.utils.minimal_ssz import signing_root -from eth2spec.phase0.spec import ( - # constants - ZERO_HASH, - # SSZ - Attestation, - AttestationData, - AttestationDataAndCustodyBit, - AttesterSlashing, - BeaconBlock, - BeaconBlockHeader, - Deposit, - DepositData, - Eth1Data, - ProposerSlashing, - Transfer, - VoluntaryExit, - # functions - convert_to_indexed, - get_active_validator_indices, - get_attesting_indices, - get_block_root, - get_block_root_at_slot, - get_crosslink_committee, - get_current_epoch, - get_domain, - get_epoch_start_slot, - get_genesis_beacon_state, - get_previous_epoch, - get_shard_delta, - hash_tree_root, - slot_to_epoch, - verify_merkle_branch, - hash, -) -from eth2spec.utils.merkle_minimal import ( - calc_merkle_tree_from_leaves, - get_merkle_proof, - get_merkle_root, -) - - -privkeys = [i + 1 for i in range(1024)] -pubkeys = [bls.privtopub(privkey) for privkey in privkeys] -pubkey_to_privkey = {pubkey: privkey for privkey, pubkey in zip(privkeys, pubkeys)} - - -def get_balance(state, index): - return state.balances[index] - - -def set_bitfield_bit(bitfield, i): - """ - Set the bit in ``bitfield`` at position ``i`` to ``1``. - """ - byte_index = i // 8 - bit_index = i % 8 - return ( - bitfield[:byte_index] + - bytes([bitfield[byte_index] \| (1 << bit_index)]) + - bitfield[byte_index+1:] - ) - - -def create_mock_genesis_validator_deposits(num_validators, deposit_data_leaves=None): - if not deposit_data_leaves: - deposit_data_leaves = [] - signature = b'\x33' * 96 - - deposit_data_list = [] - for i in range(num_validators): - pubkey = pubkeys[i] - deposit_data = DepositData( - pubkey=pubkey, - # insecurely use pubkey as withdrawal key as well - withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(pubkey)[1:], - amount=spec.MAX_EFFECTIVE_BALANCE, - signature=signature, - ) - item = deposit_data.hash_tree_root() - deposit_data_leaves.append(item) - tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves)) - root = get_merkle_root((tuple(deposit_data_leaves))) - proof = list(get_merkle_proof(tree, item_index=i)) - assert verify_merkle_branch(item, proof, spec.DEPOSIT_CONTRACT_TREE_DEPTH, i, root) - deposit_data_list.append(deposit_data) - - genesis_validator_deposits = [] - for i in range(num_validators): - genesis_validator_deposits.append(Deposit( - proof=list(get_merkle_proof(tree, item_index=i)), - index=i, - data=deposit_data_list[i] - )) - return genesis_validator_deposits, root - - -def create_genesis_state(num_validators, deposit_data_leaves=None): - initial_deposits, deposit_root = create_mock_genesis_validator_deposits( - num_validators, - deposit_data_leaves, - ) - return get_genesis_beacon_state( - initial_deposits, - genesis_time=0, - genesis_eth1_data=Eth1Data( - deposit_root=deposit_root, - deposit_count=len(initial_deposits), - block_hash=spec.ZERO_HASH, - ), - ) - - -def build_empty_block_for_next_slot(state): - empty_block = BeaconBlock() - empty_block.slot = state.slot + 1 - empty_block.body.eth1_data.deposit_count = state.deposit_index - previous_block_header = deepcopy(state.latest_block_header) - if previous_block_header.state_root == spec.ZERO_HASH: - previous_block_header.state_root = state.hash_tree_root() - empty_block.previous_block_root = signing_root(previous_block_header) - return empty_block - - -def build_deposit_data(state, pubkey, privkey, amount): - deposit_data = DepositData( - pubkey=pubkey, - # insecurely use pubkey as withdrawal key as well - withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(pubkey)[1:], - amount=amount, - ) - signature = bls.sign( - message_hash=signing_root(deposit_data), - privkey=privkey, - domain=get_domain( - state, - spec.DOMAIN_DEPOSIT, - ) - ) - deposit_data.signature = signature - return deposit_data - - -def build_attestation_data(state, slot, shard): - assert state.slot >= slot - - if slot == state.slot: - block_root = build_empty_block_for_next_slot(state).previous_block_root - else: - block_root = get_block_root_at_slot(state, slot) - - current_epoch_start_slot = get_epoch_start_slot(get_current_epoch(state)) - if slot < current_epoch_start_slot: - epoch_boundary_root = get_block_root(state, get_previous_epoch(state)) - elif slot == current_epoch_start_slot: - epoch_boundary_root = block_root - else: - epoch_boundary_root = get_block_root(state, get_current_epoch(state)) - - if slot < current_epoch_start_slot: - justified_epoch = state.previous_justified_epoch - justified_block_root = state.previous_justified_root - else: - justified_epoch = state.current_justified_epoch - justified_block_root = state.current_justified_root - - crosslinks = state.current_crosslinks if slot_to_epoch(slot) == get_current_epoch(state) else state.previous_crosslinks - return AttestationData( - shard=shard, - beacon_block_root=block_root, - source_epoch=justified_epoch, - source_root=justified_block_root, - target_epoch=slot_to_epoch(slot), - target_root=epoch_boundary_root, - crosslink_data_root=spec.ZERO_HASH, - previous_crosslink_root=hash_tree_root(crosslinks[shard]), - ) - - -def build_voluntary_exit(state, epoch, validator_index, privkey): - voluntary_exit = VoluntaryExit( - epoch=epoch, - validator_index=validator_index, - ) - voluntary_exit.signature = bls.sign( - message_hash=signing_root(voluntary_exit), - privkey=privkey, - domain=get_domain( - state=state, - domain_type=spec.DOMAIN_VOLUNTARY_EXIT, - message_epoch=epoch, - ) - ) - - return voluntary_exit - - -def build_deposit(state, - deposit_data_leaves, - pubkey, - privkey, - amount): - deposit_data = build_deposit_data(state, pubkey, privkey, amount) - - item = deposit_data.hash_tree_root() - index = len(deposit_data_leaves) - deposit_data_leaves.append(item) - tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves)) - root = get_merkle_root((tuple(deposit_data_leaves))) - proof = list(get_merkle_proof(tree, item_index=index)) - assert verify_merkle_branch(item, proof, spec.DEPOSIT_CONTRACT_TREE_DEPTH, index, root) - - deposit = Deposit( - proof=list(proof), - index=index, - data=deposit_data, - ) - - return deposit, root, deposit_data_leaves - - -def get_valid_proposer_slashing(state): - current_epoch = get_current_epoch(state) - validator_index = get_active_validator_indices(state, current_epoch)[-1] - privkey = pubkey_to_privkey[state.validator_registry[validator_index].pubkey] - slot = state.slot - - header_1 = BeaconBlockHeader( - slot=slot, - previous_block_root=ZERO_HASH, - state_root=ZERO_HASH, - block_body_root=ZERO_HASH, - ) - header_2 = deepcopy(header_1) - header_2.previous_block_root = b'\x02' * 32 - header_2.slot = slot + 1 - - domain = get_domain( - state=state, - domain_type=spec.DOMAIN_BEACON_PROPOSER, - ) - header_1.signature = bls.sign( - message_hash=signing_root(header_1), - privkey=privkey, - domain=domain, - ) - header_2.signature = bls.sign( - message_hash=signing_root(header_2), - privkey=privkey, - domain=domain, - ) - - return ProposerSlashing( - proposer_index=validator_index, - header_1=header_1, - header_2=header_2, - ) - - -def get_valid_attester_slashing(state): - attestation_1 = get_valid_attestation(state) - attestation_2 = deepcopy(attestation_1) - attestation_2.data.target_root = b'\x01' * 32 - - return AttesterSlashing( - attestation_1=convert_to_indexed(state, attestation_1), - attestation_2=convert_to_indexed(state, attestation_2), - ) - - -def get_valid_attestation(state, slot=None): - if slot is None: - slot = state.slot - - if slot_to_epoch(slot) == get_current_epoch(state): - shard = (state.latest_start_shard + slot) % spec.SLOTS_PER_EPOCH - else: - previous_shard_delta = get_shard_delta(state, get_previous_epoch(state)) - shard = (state.latest_start_shard - previous_shard_delta + slot) % spec.SHARD_COUNT - - attestation_data = build_attestation_data(state, slot, shard) - - crosslink_committee = get_crosslink_committee(state, attestation_data.target_epoch, attestation_data.shard) - - committee_size = len(crosslink_committee) - bitfield_length = (committee_size + 7) // 8 - aggregation_bitfield = b'\xC0' + b'\x00' * (bitfield_length - 1) - custody_bitfield = b'\x00' * bitfield_length - attestation = Attestation( - aggregation_bitfield=aggregation_bitfield, - data=attestation_data, - custody_bitfield=custody_bitfield, - ) - participants = get_attesting_indices( - state, - attestation.data, - attestation.aggregation_bitfield, - ) - assert len(participants) == 2 - - signatures = [] - for validator_index in participants: - privkey = privkeys[validator_index] - signatures.append( - get_attestation_signature( - state, - attestation.data, - privkey - ) - ) - - attestation.aggregation_signature = bls.aggregate_signatures(signatures) - return attestation - - -def get_valid_transfer(state, slot=None, sender_index=None, amount=None, fee=None): - if slot is None: - slot = state.slot - current_epoch = get_current_epoch(state) - if sender_index is None: - sender_index = get_active_validator_indices(state, current_epoch)[-1] - recipient_index = get_active_validator_indices(state, current_epoch)[0] - transfer_pubkey = pubkeys[-1] - transfer_privkey = privkeys[-1] - - if fee is None: - fee = get_balance(state, sender_index) // 32 - if amount is None: - amount = get_balance(state, sender_index) - fee - - transfer = Transfer( - sender=sender_index, - recipient=recipient_index, - amount=amount, - fee=fee, - slot=slot, - pubkey=transfer_pubkey, - signature=ZERO_HASH, - ) - transfer.signature = bls.sign( - message_hash=signing_root(transfer), - privkey=transfer_privkey, - domain=get_domain( - state=state, - domain_type=spec.DOMAIN_TRANSFER, - message_epoch=get_current_epoch(state), - ) - ) - - # ensure withdrawal_credentials reproducable - state.validator_registry[transfer.sender].withdrawal_credentials = ( - spec.BLS_WITHDRAWAL_PREFIX_BYTE + spec.hash(transfer.pubkey)[1:] - ) - - return transfer - - -def get_attestation_signature(state, attestation_data, privkey, custody_bit=0b0): - message_hash = AttestationDataAndCustodyBit( - data=attestation_data, - custody_bit=custody_bit, - ).hash_tree_root() - - return bls.sign( - message_hash=message_hash, - privkey=privkey, - domain=get_domain( - state=state, - domain_type=spec.DOMAIN_ATTESTATION, - message_epoch=attestation_data.target_epoch, - ) - ) - - -def fill_aggregate_attestation(state, attestation): - crosslink_committee = get_crosslink_committee(state, attestation.data.target_epoch, attestation.data.shard) - for i in range(len(crosslink_committee)): - attestation.aggregation_bitfield = set_bitfield_bit(attestation.aggregation_bitfield, i) - - -def add_attestation_to_state(state, attestation, slot): - block = build_empty_block_for_next_slot(state) - block.slot = slot - block.body.attestations.append(attestation) - state_transition(state, block) - - -def next_slot(state): - """ - Transition to the next slot via an empty block. - Return the empty block that triggered the transition. - """ - block = build_empty_block_for_next_slot(state) - state_transition(state, block) - return block - - -def next_epoch(state): - """ - Transition to the start slot of the next epoch via an empty block. - Return the empty block that triggered the transition. - """ - block = build_empty_block_for_next_slot(state) - block.slot += spec.SLOTS_PER_EPOCH - (state.slot % spec.SLOTS_PER_EPOCH) - state_transition(state, block) - return block - - -def get_state_root(state, slot) -> bytes: - """ - Return the state root at a recent ``slot``. - """ - assert slot < state.slot <= slot + spec.SLOTS_PER_HISTORICAL_ROOT - return state.latest_state_roots[slot % spec.SLOTS_PER_HISTORICAL_ROOT] diff --git a/test_libs/pyspec/tests/test_sanity.py b/test_libs/pyspec/tests/test_sanity.py deleted file mode 100644 index 1b4d20f4c5..0000000000 --- a/test_libs/pyspec/tests/test_sanity.py +++ /dev/null @@ -1,438 +0,0 @@ -from copy import deepcopy - -import pytest - -from py_ecc import bls -import eth2spec.phase0.spec as spec - -from eth2spec.utils.minimal_ssz import signing_root -from eth2spec.phase0.spec import ( - # constants - ZERO_HASH, - SLOTS_PER_HISTORICAL_ROOT, - # SSZ - Deposit, - Transfer, - VoluntaryExit, - # functions - get_active_validator_indices, - get_beacon_proposer_index, - get_block_root_at_slot, - get_current_epoch, - get_domain, - advance_slot, - cache_state, - verify_merkle_branch, - hash, -) -from eth2spec.phase0.state_transition import ( - state_transition, -) -from eth2spec.utils.merkle_minimal import ( - calc_merkle_tree_from_leaves, - get_merkle_proof, - get_merkle_root, -) -from .helpers import ( - get_balance, - build_deposit_data, - build_empty_block_for_next_slot, - fill_aggregate_attestation, - get_state_root, - get_valid_attestation, - get_valid_attester_slashing, - get_valid_proposer_slashing, - next_slot, - privkeys, - pubkeys, -) - - -# mark entire file as 'sanity' -pytestmark = pytest.mark.sanity - - -def test_slot_transition(state): - test_state = deepcopy(state) - cache_state(test_state) - advance_slot(test_state) - assert test_state.slot == state.slot + 1 - assert get_state_root(test_state, state.slot) == state.hash_tree_root() - return test_state - - -def test_empty_block_transition(state): - test_state = deepcopy(state) - - block = build_empty_block_for_next_slot(test_state) - state_transition(test_state, block) - - assert len(test_state.eth1_data_votes) == len(state.eth1_data_votes) + 1 - assert get_block_root_at_slot(test_state, state.slot) == block.previous_block_root - - return state, [block], test_state - - -def test_skipped_slots(state): - test_state = deepcopy(state) - block = build_empty_block_for_next_slot(test_state) - block.slot += 3 - - state_transition(test_state, block) - - assert test_state.slot == block.slot - for slot in range(state.slot, test_state.slot): - assert get_block_root_at_slot(test_state, slot) == block.previous_block_root - - return state, [block], test_state - - -def test_empty_epoch_transition(state): - test_state = deepcopy(state) - block = build_empty_block_for_next_slot(test_state) - block.slot += spec.SLOTS_PER_EPOCH - - state_transition(test_state, block) - - assert test_state.slot == block.slot - for slot in range(state.slot, test_state.slot): - assert get_block_root_at_slot(test_state, slot) == block.previous_block_root - - return state, [block], test_state - - -def test_empty_epoch_transition_not_finalizing(state): - test_state = deepcopy(state) - block = build_empty_block_for_next_slot(test_state) - block.slot += spec.SLOTS_PER_EPOCH * 5 - - state_transition(test_state, block) - - assert test_state.slot == block.slot - assert test_state.finalized_epoch < get_current_epoch(test_state) - 4 - for index in range(len(test_state.validator_registry)): - assert get_balance(test_state, index) < get_balance(state, index) - - return state, [block], test_state - - -def test_proposer_slashing(state): - test_state = deepcopy(state) - proposer_slashing = get_valid_proposer_slashing(state) - validator_index = proposer_slashing.proposer_index - - # - # Add to state via block transition - # - block = build_empty_block_for_next_slot(test_state) - block.body.proposer_slashings.append(proposer_slashing) - state_transition(test_state, block) - - assert not state.validator_registry[validator_index].slashed - - slashed_validator = test_state.validator_registry[validator_index] - assert slashed_validator.slashed - assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH - assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH - # lost whistleblower reward - assert get_balance(test_state, validator_index) < get_balance(state, validator_index) - - return state, [block], test_state - - -def test_attester_slashing(state): - test_state = deepcopy(state) - attester_slashing = get_valid_attester_slashing(state) - validator_index = attester_slashing.attestation_1.custody_bit_0_indices[0] - - # - # Add to state via block transition - # - block = build_empty_block_for_next_slot(test_state) - block.body.attester_slashings.append(attester_slashing) - state_transition(test_state, block) - - assert not state.validator_registry[validator_index].slashed - - slashed_validator = test_state.validator_registry[validator_index] - assert slashed_validator.slashed - assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH - assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH - # lost whistleblower reward - assert get_balance(test_state, validator_index) < get_balance(state, validator_index) - - proposer_index = get_beacon_proposer_index(test_state) - # gained whistleblower reward - assert ( - get_balance(test_state, proposer_index) > - get_balance(state, proposer_index) - ) - - return state, [block], test_state - - -def test_deposit_in_block(state): - pre_state = deepcopy(state) - test_deposit_data_leaves = [ZERO_HASH] * len(pre_state.validator_registry) - - index = len(test_deposit_data_leaves) - pubkey = pubkeys[index] - privkey = privkeys[index] - deposit_data = build_deposit_data(pre_state, pubkey, privkey, spec.MAX_EFFECTIVE_BALANCE) - - item = deposit_data.hash_tree_root() - test_deposit_data_leaves.append(item) - tree = calc_merkle_tree_from_leaves(tuple(test_deposit_data_leaves)) - root = get_merkle_root((tuple(test_deposit_data_leaves))) - proof = list(get_merkle_proof(tree, item_index=index)) - assert verify_merkle_branch(item, proof, spec.DEPOSIT_CONTRACT_TREE_DEPTH, index, root) - - deposit = Deposit( - proof=list(proof), - index=index, - data=deposit_data, - ) - - pre_state.latest_eth1_data.deposit_root = root - pre_state.latest_eth1_data.deposit_count = len(test_deposit_data_leaves) - post_state = deepcopy(pre_state) - block = build_empty_block_for_next_slot(post_state) - block.body.deposits.append(deposit) - - state_transition(post_state, block) - assert len(post_state.validator_registry) == len(state.validator_registry) + 1 - assert len(post_state.balances) == len(state.balances) + 1 - assert get_balance(post_state, index) == spec.MAX_EFFECTIVE_BALANCE - assert post_state.validator_registry[index].pubkey == pubkeys[index] - - return pre_state, [block], post_state - - -def test_deposit_top_up(state): - pre_state = deepcopy(state) - test_deposit_data_leaves = [ZERO_HASH] * len(pre_state.validator_registry) - - validator_index = 0 - amount = spec.MAX_EFFECTIVE_BALANCE // 4 - pubkey = pubkeys[validator_index] - privkey = privkeys[validator_index] - deposit_data = build_deposit_data(pre_state, pubkey, privkey, amount) - - merkle_index = len(test_deposit_data_leaves) - item = deposit_data.hash_tree_root() - test_deposit_data_leaves.append(item) - tree = calc_merkle_tree_from_leaves(tuple(test_deposit_data_leaves)) - root = get_merkle_root((tuple(test_deposit_data_leaves))) - proof = list(get_merkle_proof(tree, item_index=merkle_index)) - assert verify_merkle_branch(item, proof, spec.DEPOSIT_CONTRACT_TREE_DEPTH, merkle_index, root) - - deposit = Deposit( - proof=list(proof), - index=merkle_index, - data=deposit_data, - ) - - pre_state.latest_eth1_data.deposit_root = root - pre_state.latest_eth1_data.deposit_count = len(test_deposit_data_leaves) - block = build_empty_block_for_next_slot(pre_state) - block.body.deposits.append(deposit) - - pre_balance = get_balance(pre_state, validator_index) - post_state = deepcopy(pre_state) - state_transition(post_state, block) - assert len(post_state.validator_registry) == len(pre_state.validator_registry) - assert len(post_state.balances) == len(pre_state.balances) - assert get_balance(post_state, validator_index) == pre_balance + amount - - return pre_state, [block], post_state - - -def test_attestation(state): - state.slot = spec.SLOTS_PER_EPOCH - test_state = deepcopy(state) - attestation = get_valid_attestation(state) - - # - # Add to state via block transition - # - attestation_block = build_empty_block_for_next_slot(test_state) - attestation_block.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY - attestation_block.body.attestations.append(attestation) - state_transition(test_state, attestation_block) - - assert len(test_state.current_epoch_attestations) == len(state.current_epoch_attestations) + 1 - - - # - # Epoch transition should move to previous_epoch_attestations - # - pre_current_epoch_attestations = deepcopy(test_state.current_epoch_attestations) - - epoch_block = build_empty_block_for_next_slot(test_state) - epoch_block.slot += spec.SLOTS_PER_EPOCH - state_transition(test_state, epoch_block) - - assert len(test_state.current_epoch_attestations) == 0 - assert test_state.previous_epoch_attestations == pre_current_epoch_attestations - - return state, [attestation_block, epoch_block], test_state - - -def test_voluntary_exit(state): - pre_state = deepcopy(state) - validator_index = get_active_validator_indices( - pre_state, - get_current_epoch(pre_state) - )[-1] - - # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit - pre_state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH - - post_state = deepcopy(pre_state) - - voluntary_exit = VoluntaryExit( - epoch=get_current_epoch(pre_state), - validator_index=validator_index, - ) - voluntary_exit.signature = bls.sign( - message_hash=signing_root(voluntary_exit), - privkey=privkeys[validator_index], - domain=get_domain( - state=pre_state, - domain_type=spec.DOMAIN_VOLUNTARY_EXIT, - ) - ) - - # - # Add to state via block transition - # - initiate_exit_block = build_empty_block_for_next_slot(post_state) - initiate_exit_block.body.voluntary_exits.append(voluntary_exit) - state_transition(post_state, initiate_exit_block) - - assert post_state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH - - # - # Process within epoch transition - # - exit_block = build_empty_block_for_next_slot(post_state) - exit_block.slot += spec.SLOTS_PER_EPOCH - state_transition(post_state, exit_block) - - assert post_state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH - - return pre_state, [initiate_exit_block, exit_block], post_state - - -def test_transfer(state): - # overwrite default 0 to test - spec.MAX_TRANSFERS = 1 - - pre_state = deepcopy(state) - current_epoch = get_current_epoch(pre_state) - sender_index = get_active_validator_indices(pre_state, current_epoch)[-1] - recipient_index = get_active_validator_indices(pre_state, current_epoch)[0] - transfer_pubkey = pubkeys[-1] - transfer_privkey = privkeys[-1] - amount = get_balance(pre_state, sender_index) - pre_transfer_recipient_balance = get_balance(pre_state, recipient_index) - transfer = Transfer( - sender=sender_index, - recipient=recipient_index, - amount=amount, - fee=0, - slot=pre_state.slot + 1, - pubkey=transfer_pubkey, - ) - transfer.signature = bls.sign( - message_hash=signing_root(transfer), - privkey=transfer_privkey, - domain=get_domain( - state=pre_state, - domain_type=spec.DOMAIN_TRANSFER, - ) - ) - - # ensure withdrawal_credentials reproducable - pre_state.validator_registry[sender_index].withdrawal_credentials = ( - spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(transfer_pubkey)[1:] - ) - # un-activate so validator can transfer - pre_state.validator_registry[sender_index].activation_eligibility_epoch = spec.FAR_FUTURE_EPOCH - - post_state = deepcopy(pre_state) - # - # Add to state via block transition - # - block = build_empty_block_for_next_slot(post_state) - block.body.transfers.append(transfer) - state_transition(post_state, block) - - sender_balance = get_balance(post_state, sender_index) - recipient_balance = get_balance(post_state, recipient_index) - assert sender_balance == 0 - assert recipient_balance == pre_transfer_recipient_balance + amount - - return pre_state, [block], post_state - - -def test_balance_driven_status_transitions(state): - current_epoch = get_current_epoch(state) - validator_index = get_active_validator_indices(state, current_epoch)[-1] - - assert state.validator_registry[validator_index].exit_epoch == spec.FAR_FUTURE_EPOCH - - # set validator balance to below ejection threshold - state.validator_registry[validator_index].effective_balance = spec.EJECTION_BALANCE - - post_state = deepcopy(state) - # - # trigger epoch transition - # - block = build_empty_block_for_next_slot(post_state) - block.slot += spec.SLOTS_PER_EPOCH - state_transition(post_state, block) - - assert post_state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH - - return state, [block], post_state - - -def test_historical_batch(state): - state.slot += spec.SLOTS_PER_HISTORICAL_ROOT - (state.slot % spec.SLOTS_PER_HISTORICAL_ROOT) - 1 - - post_state = deepcopy(state) - - block = build_empty_block_for_next_slot(post_state) - - state_transition(post_state, block) - - assert post_state.slot == block.slot - assert get_current_epoch(post_state) % (spec.SLOTS_PER_HISTORICAL_ROOT // spec.SLOTS_PER_EPOCH) == 0 - assert len(post_state.historical_roots) == len(state.historical_roots) + 1 - - return state, [block], post_state - - -def test_eth1_data_votes(state): - post_state = deepcopy(state) - - expected_votes = 0 - assert len(state.eth1_data_votes) == expected_votes - - blocks = [] - for _ in range(spec.SLOTS_PER_ETH1_VOTING_PERIOD - 1): - block = build_empty_block_for_next_slot(post_state) - state_transition(post_state, block) - expected_votes += 1 - assert len(post_state.eth1_data_votes) == expected_votes - blocks.append(block) - - block = build_empty_block_for_next_slot(post_state) - state_transition(post_state, block) - blocks.append(block) - - assert post_state.slot % spec.SLOTS_PER_ETH1_VOTING_PERIOD == 0 - assert len(post_state.eth1_data_votes) == 1 - - return state, blocks, post_state
pex-tool__pex-822	Release 2.0.3 On the docket: + [x] Pex should trust any host passed via `--index` or `--find-links`. #812 + [x] A cache should always be used by `pex.resolver.resolve`. #809 + [x] Use the resolve cache to skip installs. #815 + [x] Parallelize resolve. #818 + [x] Cache sdist & local project builds #817 + [x] Unify resolve and runtime wheel caches. #820	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.0.2'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.0.3'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 80e4b80d7..42a5e1252 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,26 @@ Release Notes ============= +2.0.3 +----- + +This release fixes a regression in handling explicitly requested `--index` or +`--find-links` http (insecure) repos. In addition, performance of the pex 2.x +resolver is brought in line with the 1.x resolver in all cases and improved in +most cases. + +* Unify PEX buildtime and runtime wheel caches. #821 + `PR #821 <https://github.com/pantsbuild/pex/pull/821>`_ + +* Parallelize resolve. (#819) + `PR #819 <https://github.com/pantsbuild/pex/pull/819>`_ + +* Use the resolve cache to skip installs. (#815) + `PR #815 <https://github.com/pantsbuild/pex/pull/815>`_ + +* Implicitly trust explicitly requested repos. (#813) + `PR #813 <https://github.com/pantsbuild/pex/pull/813>`_ + 2.0.2 ----- diff --git a/pex/version.py b/pex/version.py index a698f9d1f..f77cc369d 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '2.0.2' +__version__ = '2.0.3'
mabel-dev__opteryx-1641	🪲 Python 3.9 tests stalling ### Thank you for taking the time to report a problem with Opteryx. _To help us to respond to your request we ask that you try to provide the below detail about the bug._ Describe the bug _A clear and specific description of what the bug is. What the error, incorrect or unexpected behaviour was._ Expected behaviour _A clear and concise description of what you expected to happen._ Sample Code/Statement _If you can, please submit the SQL statement or Python code snippet, or a representative example using the sample datasets._ ~~~sql ~~~ Additional context _Add any other context about the problem here, for example what you have done to try to diagnose or workaround the problem._	[ { "content": "__build__ = 477\n\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agre...	[ { "content": "__build__ = 482\n\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agre...	diff --git a/.github/workflows/regression_suite.yaml b/.github/workflows/regression_suite.yaml index ef2373725..dac54768e 100644 --- a/.github/workflows/regression_suite.yaml +++ b/.github/workflows/regression_suite.yaml @@ -11,7 +11,7 @@ jobs: max-parallel: 4 fail-fast: false matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/regression_suite_mac_x86.yaml b/.github/workflows/regression_suite_mac_x86.yaml index ecde26602..d50d52d62 100644 --- a/.github/workflows/regression_suite_mac_x86.yaml +++ b/.github/workflows/regression_suite_mac_x86.yaml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.9', '3.10', '3.11'] + python-version: ['3.10', '3.11'] os: ['macos-latest'] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/regression_suite_windows.yaml b/.github/workflows/regression_suite_windows.yaml index 488f85140..f5e13c483 100644 --- a/.github/workflows/regression_suite_windows.yaml +++ b/.github/workflows/regression_suite_windows.yaml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.9', '3.10', '3.11'] + python-version: ['3.10', '3.11'] os: ['windows-latest'] runs-on: ${{ matrix.os }} steps: diff --git a/opteryx/__version__.py b/opteryx/__version__.py index ff5d4c87b..25008bb66 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -1,4 +1,4 @@ -__build__ = 477 +__build__ = 482 # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/misc/test_documentation.py b/tests/misc/test_documentation.py index fbc138621..e7ae5d67a 100644 --- a/tests/misc/test_documentation.py +++ b/tests/misc/test_documentation.py @@ -8,8 +8,10 @@ sys.path.insert(1, os.path.join(sys.path[0], "../..")) from tests.tools import download_file +from tests.tools import is_version, skip_if +@skip_if(is_version("3.9")) def test_documentation_connect_example(): import opteryx @@ -24,6 +26,7 @@ def test_documentation_connect_example(): conn.close() +@skip_if(is_version("3.9")) def test_readme_1(): import opteryx @@ -31,6 +34,7 @@ def test_readme_1(): result.head() +@skip_if(is_version("3.9")) def test_readme_2(): import pandas @@ -44,6 +48,7 @@ def test_readme_2(): aggregated_df.head() +@skip_if(is_version("3.9")) def test_readme_3(): import opteryx @@ -57,6 +62,7 @@ def test_readme_3(): result.head() +@skip_if(is_version("3.9")) def test_readme_4(): import opteryx from opteryx.connectors import GcpCloudStorageConnector @@ -68,6 +74,7 @@ def test_readme_4(): result.head() +@skip_if(is_version("3.9")) def test_readme_5(): import opteryx from opteryx.connectors import SqlConnector @@ -90,12 +97,14 @@ def test_readme_5(): result.head() +@skip_if(is_version("3.9")) def test_get_started(): import opteryx result = opteryx.query("SELECT * FROM $planets;").arrow() +@skip_if(is_version("3.9")) def test_python_client(): import opteryx @@ -136,6 +145,7 @@ def test_python_client(): ).fetchall() +@skip_if(is_version("3.9")) def test_pandas_integration_input(): import pandas @@ -155,12 +165,14 @@ def test_pandas_integration_input(): results = opteryx.query("SELECT * FROM nephews").arrow() +@skip_if(is_version("3.9")) def test_pandas_integration_output(): import opteryx dataframe = opteryx.query("SELECT * FROM $planets").pandas() +@skip_if(is_version("3.9")) def test_polars_integration_input(): import polars @@ -180,12 +192,14 @@ def test_polars_integration_input(): results = opteryx.query("SELECT * FROM nephews").arrow() +@skip_if(is_version("3.9")) def test_polars_integration_output(): import opteryx dataframe = opteryx.query("SELECT * FROM $planets").polars() +@skip_if(is_version("3.9")) def test_permissions_example(): import opteryx @@ -200,6 +214,7 @@ def test_permissions_example(): print("User does not have permission to execute this query") +@skip_if(is_version("3.9")) def test_role_based_permissions(): import opteryx @@ -226,6 +241,7 @@ def get_user_permissions(user_roles): assert perms == {"Query", "Execute", "Analyze"} +@skip_if(is_version("3.9")) def test_membership_permissions(): import opteryx diff --git a/tests/plan_optimization/test_fold_all_constants.py b/tests/plan_optimization/test_fold_all_constants.py index 67591ab63..61124b475 100644 --- a/tests/plan_optimization/test_fold_all_constants.py +++ b/tests/plan_optimization/test_fold_all_constants.py @@ -5,8 +5,10 @@ import numpy import opteryx +from tests.tools import is_version, skip_if +@skip_if(is_version("3.9")) def test_we_dont_fold_random(): SQL = "SELECT random() AS r FROM GENERATE_SERIES(5000) AS g"
pex-tool__pex-910	Release 2.1.5 On the docket: + [x] Kill `Pip.spawn_install_wheel` `overwrite` arg. #907 + [x] Silence pip warnings about Python 2.7. #908	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.4'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.5'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 8d19aed0e..80c591fe1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,18 @@ Release Notes ============= +2.1.5 +----- + +* Silence pip warnings about Python 2.7. (#908) + `PR #908 <https://github.com/pantsbuild/pexpull/908>`_ + +* Kill `Pip.spawn_install_wheel` `overwrite` arg. (#907) + `PR #907 <https://github.com/pantsbuild/pexpull/907>`_ + +* Show pex-root from env as default in help output (#901) + `PR #901 <https://github.com/pantsbuild/pexpull/901>`_ + 2.1.4 ----- diff --git a/pex/version.py b/pex/version.py index 3860dbc2e..3e0c53016 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '2.1.4' +__version__ = '2.1.5'
mabel-dev__opteryx-1695	✨ Memory Pool Optimizations ### Thanks for stopping by to let us know something could be better! Is your feature request related to a problem? Please describe. _A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]_ Describe the solution you'd like _A clear and concise description of what you want to happen._ Describe alternatives you've considered _A clear and concise description of any alternative solutions or features you've considered._ Additional context _Add any other context or screenshots about the feature request here._	[ { "content": "__build__ = 527\n\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agre...	[ { "content": "__build__ = 532\n\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agre...	diff --git a/opteryx/__version__.py b/opteryx/__version__.py index a2313e19e..f9db5e2cc 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -1,4 +1,4 @@ -__build__ = 527 +__build__ = 532 # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/opteryx/compiled/structures/memory_pool.pyx b/opteryx/compiled/structures/memory_pool.pyx index 538b79869..449ff55d7 100644 --- a/opteryx/compiled/structures/memory_pool.pyx +++ b/opteryx/compiled/structures/memory_pool.pyx @@ -1,6 +1,10 @@ # cython: language_level=3 # cython: nonecheck=False # cython: cdivision=True +# cython: initializedcheck=False +# cython: infer_types=True +# cython: wraparound=True +# cython: boundscheck=False from libc.stdlib cimport malloc, free from libc.string cimport memcpy @@ -81,24 +85,26 @@ cdef class MemoryPool: cdef vector[MemorySegment] sorted_segments self.l1_compaction += 1 - i = 1 n = len(self.free_segments) + if n <= 1: + return - sorted_segments = sorted(self.free_segments, key=lambda x: x["start"]) - new_free_segments = [sorted_segments[0]] + # Sort the free segments by start attribute + self.free_segments = sorted(self.free_segments, key=lambda x: x["start"]) + new_free_segments = [self.free_segments[0]] - for segment in sorted_segments[1:]: + for segment in self.free_segments[1:]: last_segment = new_free_segments[-1] if last_segment.start + last_segment.length == segment.start: # If adjacent, merge by extending the last segment - last_segment.length += segment.length - new_free_segments[-1] = last_segment + new_free_segments[-1] = MemorySegment(last_segment.start, last_segment.length + segment.length) else: # If not adjacent, just add the segment to the new list new_free_segments.append(segment) self.free_segments = new_free_segments + def _level2_compaction(self): """ Aggressively compacts by pushing all free memory to the end (Level 2 compaction). @@ -134,7 +140,6 @@ cdef class MemoryPool: # special case for 0 byte segments if len_data == 0: new_segment = MemorySegment(0, 0) - ref_id = random_int() self.used_segments[ref_id] = new_segment self.commits += 1 return ref_id @@ -179,7 +184,7 @@ cdef class MemoryPool: segment = self.used_segments[ref_id] if zero_copy != 0: - raw_data = <char[:segment.length]> char_ptr + raw_data = <char[:segment.length]> (char_ptr + segment.start) data = memoryview(raw_data) # Create a memoryview from the raw data else: data = PyBytes_FromStringAndSize(char_ptr + segment.start, segment.length) @@ -188,7 +193,6 @@ cdef class MemoryPool: raise ValueError("Invalid reference ID.") post_read_segment = self.used_segments[ref_id] if post_read_segment.start != segment.start or post_read_segment.length != segment.length: - with self.lock: self.read_locks += 1 @@ -197,11 +201,10 @@ cdef class MemoryPool: segment = self.used_segments[ref_id] if zero_copy != 0: - raw_data = <char[:segment.length]> char_ptr + raw_data = <char[:segment.length]> (char_ptr + segment.start) data = memoryview(raw_data) # Create a memoryview from the raw data else: return PyBytes_FromStringAndSize(char_ptr + segment.start, segment.length) - return data def read_and_release(self, long ref_id, int zero_copy = 1): @@ -219,7 +222,7 @@ cdef class MemoryPool: self.free_segments.push_back(segment) if zero_copy != 0: - raw_data = <char[:segment.length]> char_ptr + raw_data = <char[:segment.length]> (char_ptr + segment.start) return memoryview(raw_data) # Create a memoryview from the raw data else: return PyBytes_FromStringAndSize(char_ptr + segment.start, segment.length) diff --git a/tests/misc/test_memory_pool.py b/tests/misc/test_memory_pool.py index a8f32a88d..b6dcfcb67 100644 --- a/tests/misc/test_memory_pool.py +++ b/tests/misc/test_memory_pool.py @@ -73,7 +73,8 @@ def test_compaction(): mp.release(ref1) ref3 = mp.commit(b"Third") # Ensure that the third commit succeeds after compaction, despite the first segment being released - assert mp.read(ref3, False) == b"Third" + data = mp.read(ref3, False) + assert data == b"Third" def test_multiple_commits_and_reads(): @@ -94,6 +95,119 @@ def test_overlapping_writes(): assert mp.read(ref2, False) == b"abcde" assert mp.read(ref3, False) == b"XYZ" +def test_overlapping_writes_memcopy(): + mp = MemoryPool(size=20) + ref1 = mp.commit(b"12345") + ref2 = mp.commit(b"abcde") + mp.release(ref1) + ref3 = mp.commit(b"XYZ") + # Test if the new write overlaps correctly and does not corrupt other data + r2_memcopy = bytes(mp.read(ref2, True)) + r2_no_memcopy = mp.read(ref2, False) + r3_memcopy = bytes(mp.read(ref3, True)) + r3_no_memcopy = mp.read(ref3, False) + + assert r2_memcopy == r2_no_memcopy == b"abcde", f"{r2_memcopy} / {r2_no_memcopy} / abcde" + assert r3_memcopy == r3_no_memcopy == b"XYZ", f"{r3_memcopy} / {r3_no_memcopy} / XYZ" + +def test_zero_copy_vs_copy_reads(): + mp = MemoryPool(size=30) + + # Initial commits + ref1 = mp.commit(b"12345") + ref2 = mp.commit(b"abcde") + ref3 = mp.commit(b"ABCDE") + + # Release one segment to create free space + mp.release(ref1) + + # Commit more data to fill the pool + ref4 = mp.commit(b"XYZ") + ref5 = mp.commit(b"7890") + + # Additional activity + ref6 = mp.commit(b"LMNOP") + mp.release(ref3) + ref7 = mp.commit(b"qrst") + mp.release(ref2) + ref8 = mp.commit(b"uvwxyz") + + # Reading segments with and without zero-copy + r4_memcopy = bytes(mp.read(ref4, True)) + r4_no_memcopy = mp.read(ref4, False) + r5_memcopy = bytes(mp.read(ref5, True)) + r5_no_memcopy = mp.read(ref5, False) + r6_memcopy = bytes(mp.read(ref6, True)) + r6_no_memcopy = mp.read(ref6, False) + r7_memcopy = bytes(mp.read(ref7, True)) + r7_no_memcopy = mp.read(ref7, False) + r8_memcopy = bytes(mp.read(ref8, True)) + r8_no_memcopy = mp.read(ref8, False) + + assert r4_memcopy == r4_no_memcopy == b"XYZ", f"{r4_memcopy} / {r4_no_memcopy} / XYZ" + assert r5_memcopy == r5_no_memcopy == b"7890", f"{r5_memcopy} / {r5_no_memcopy} / 7890" + assert r6_memcopy == r6_no_memcopy == b"LMNOP", f"{r6_memcopy} / {r6_no_memcopy} / LMNOP" + assert r7_memcopy == r7_no_memcopy == b"qrst", f"{r7_memcopy} / {r7_no_memcopy} / qrst" + assert r8_memcopy == r8_no_memcopy == b"uvwxyz", f"{r8_memcopy} / {r8_no_memcopy} / uvwxyz" + + +def test_zero_copy_vs_copy_reads_and_release(): + mp = MemoryPool(size=30) + + # Initial commits + ref1 = mp.commit(b"12345") + ref2 = mp.commit(b"abcde") + ref3 = mp.commit(b"ABCDE") + + # Release one segment to create free space + mp.release(ref1) + + # Commit more data to fill the pool + ref4 = mp.commit(b"XYZ") + ref5 = mp.commit(b"7890") + + # Additional activity + ref6 = mp.commit(b"LMNOP") + mp.release(ref3) + ref7 = mp.commit(b"qrst") + mp.release(ref2) + ref8 = mp.commit(b"uvwxyz") + + # Reading segments with and without zero-copy, alternating read and read_and_release + # read no zero copy, release zero copy + r4_read_no_memcopy = bytes(mp.read(ref4, False)) + r4_release_memcopy = bytes(mp.read_and_release(ref4, True)) + + # read zero copy, release no zero copy + r5_read_memcopy = bytes(mp.read(ref5, True)) + r5_release_no_memcopy = bytes(mp.read_and_release(ref5, False)) + + # read zero copy, release zero copy + r6_read_memcopy = bytes(mp.read(ref6, True)) + r6_release_memcopy = bytes(mp.read_and_release(ref6, True)) + + # read no zero copy, release no zero copy + r7_read_no_memcopy = bytes(mp.read(ref7, False)) + r7_release_no_memcopy = bytes(mp.read_and_release(ref7, False)) + + # read zero copy, release zero copy + r8_read_memcopy = bytes(mp.read(ref8, True)) + r8_release_memcopy = bytes(mp.read_and_release(ref8, True)) + + assert r4_read_no_memcopy == r4_release_memcopy == b"XYZ", f"{r4_read_no_memcopy} / {r4_release_memcopy} / XYZ" + assert r5_read_memcopy == r5_release_no_memcopy == b"7890", f"{r5_read_memcopy} / {r5_release_no_memcopy} / 7890" + assert r6_read_memcopy == r6_release_memcopy == b"LMNOP", f"{r6_read_memcopy} / {r6_release_memcopy} / LMNOP" + assert r7_read_no_memcopy == r7_release_no_memcopy == b"qrst", f"{r7_read_no_memcopy} / {r7_release_no_memcopy} / qrst" + assert r8_read_memcopy == r8_release_memcopy == b"uvwxyz", f"{r8_read_memcopy} / {r8_release_memcopy} / uvwxyz" + + # Ensure that the segments are released and available for new commits + ref9 = mp.commit(b"newdata") + r9_memcopy = bytes(mp.read(ref9, True)) + r9_no_memcopy = mp.read(ref9, False) + + assert r9_memcopy == r9_no_memcopy == b"newdata", f"{r9_memcopy} / {r9_no_memcopy} / newdata" + + def test_pool_exhaustion_and_compaction(): mp = MemoryPool(size=20) @@ -375,5 +489,5 @@ def test_return_types(): if __name__ == "__main__": # pragma: no cover from tests.tools import run_tests - + test_compaction_effectiveness() run_tests() diff --git a/tests/tools.py b/tests/tools.py index 19afe1ce4..8788fa848 100644 --- a/tests/tools.py +++ b/tests/tools.py @@ -137,7 +137,7 @@ def run_tests(): for index, method in enumerate(test_methods): start_time = time.monotonic_ns() test_name = f"\033[38;2;255;184;108m{(index + 1):04}\033[0m \033[38;2;189;147;249m{str(method.__name__)}\033[0m" - print(test_name.ljust(display_width - 20), end="") + print(test_name.ljust(display_width - 20), end="", flush=True) error = None output = "" try:
gammapy__gammapy-5151	Defaults for `methods` in signature of `SafeMaskMaker.__init__` is confusing ``` def __init__( self, methods=("aeff-default",), aeff_percent=10, bias_percent=10, position=None, fixed_offset=None, offset_max="3 deg", irfs="DL4", ): ``` In the signature of the `SafeMaskMaker`, the methods arguments is defaults to `("aeff-default",)` which is confusing because the coma is necessary for the code to work. If one don't put the coma while using a tuple, in the code latter, the instruction `set(methods)` will give back `{'-', 'a', 'd', 'e', 'f', 'l', 't', 'u'}`. To make it less confusing I think it would be good change the tuple to a list, for which `set(["aeff-default"])` give back `{'aeff-default'}`.	[ { "content": "# Licensed under a 3-clause BSD style license - see LICENSE.rst\nimport logging\nimport numpy as np\nfrom astropy import units as u\nfrom astropy.coordinates import Angle\nfrom gammapy.irf import EDispKernelMap\nfrom gammapy.maps import Map\nfrom gammapy.modeling.models import TemplateSpectralMode...	[ { "content": "# Licensed under a 3-clause BSD style license - see LICENSE.rst\nimport logging\nimport numpy as np\nfrom astropy import units as u\nfrom astropy.coordinates import Angle\nfrom gammapy.irf import EDispKernelMap\nfrom gammapy.maps import Map\nfrom gammapy.modeling.models import TemplateSpectralMode...	diff --git a/gammapy/makers/safe.py b/gammapy/makers/safe.py index 09c381c9f1..73d9b60b8c 100644 --- a/gammapy/makers/safe.py +++ b/gammapy/makers/safe.py @@ -62,7 +62,7 @@ class SafeMaskMaker(Maker): def __init__( self, - methods=("aeff-default",), + methods=["aeff-default"], aeff_percent=10, bias_percent=10, position=None,
pex-tool__pex-797	Release 2.0.1 On the docket: + [x] pex --index-url=... fails in 2.0.0 #794	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.0.0'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.0.1'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 2b97c531c..52bfe2f01 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,15 @@ Release Notes ============= +2.0.1 +----- + +This is a htofix release that fixes a bug when specifying a custom index +(`-i`/`--index`/`--index-url`) via the CLI. + +* Fix #794 issue by add missing return statement in __str__ (#795) + `PR #795 <https://github.com/pantsbuild/pex/pull/795>`_ + 2.0.0 ----- diff --git a/pex/version.py b/pex/version.py index 772804dc4..7d8716be3 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '2.0.0' +__version__ = '2.0.1'
pex-tool__pex-891	Release 2.1.3 On the docket: + [x] Error eagerly if an interpreter binary doesn't exist #886 + [x] The pip-powered resolve in pex 2 will re-tokenize --find-links pages on each transitive requirement #887	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.2'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.3'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index ea14e891f..a8a961167 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,23 @@ Release Notes ============= +2.1.3 +----- + +This release fixes a performance regression in which pip +would re-tokenize --find-links pages unnecessarily. +The parsed pages are now cached in a pip patch that has +also been submitted upstream. + +* Revendor pip (#890) + `PR #890 <https://github.com/pantsbuild/pex/pull/890>`_ + +* Add a clear_cache() method to PythonInterpreter. (#885) + `PR #885 <https://github.com/pantsbuild/pex/pull/885>`_ + +* Error eagerly if an interpreter binary doesn't exist. (#886) + `PR #886 <https://github.com/pantsbuild/pex/pull/886>`_ + 2.1.2 ----- diff --git a/pex/version.py b/pex/version.py index b75078c50..393c14b99 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '2.1.2' +__version__ = '2.1.3'
pex-tool__pex-836	Release 2.1.0 On the docket: The prime motivator: + [x] Pex does not download foreign abi3 wheels correctly #823 Changes to support the above as well as others: + [x] Fix pex resolving for foreign platforms. #835 + [x] Use pypa/packaging. #831 + [x] Upgrade vendored setuptools to 42.0.2. #832 + [x] De-vendor pex just once per version. #833 + [x] Support VCS urls for vendoring. #834 + [x] Support python 3.8 in CI. #829 + [x] Fix pex resolution to respect --ignore-errors. #828 + [x] Kill `pkg_resources` finders monkey-patching. #827 + [x] Use flit to distribute pex. #826 + [x] Cleanup extras_require. #825	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.0.3'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.0'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 42a5e1252..330d89a06 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,49 @@ Release Notes ============= +2.1.0 +----- + +This release restores and improves support for building and running +multiplatform pexes. Foreign `linux` platform builds now include +`manylinux2014` compatible wheels by default and foreign CPython pexes now +resolve `abi3` wheels correctly. In addition, error messages at both buildtime +and runtime related to resolution of dependencies are more informative. + +Pex 2.1.0 should be considered the first Pex 2-series release that fully +replaces and improves upon Pex 1-series functionality. + + Fix pex resolving for foreign platforms. (#835) + `PR #835 <https://github.com/pantsbuild/pex/pull/835>`_ + +* Use pypa/packaging. (#831) + `PR #831 <https://github.com/pantsbuild/pex/pull/831>`_ + +* Upgrade vendored setuptools to 42.0.2. (#832) + `PR #832 <https://github.com/pantsbuild/pex/pull/832>`_ + `PR #1830 <https://github.com/pypa/setuptools/pull/1830>`_ + +* De-vendor pex just once per version. (#833) + `PR #833 <https://github.com/pantsbuild/pex/pull/833>`_ + +* Support VCS urls for vendoring. (#834) + `PR #834 <https://github.com/pantsbuild/pex/pull/834>`_ + +* Support python 3.8 in CI. (#829) + `PR #829 <https://github.com/pantsbuild/pex/pull/829>`_ + +* Fix pex resolution to respect --ignore-errors. (#828) + `PR #828 <https://github.com/pantsbuild/pex/pull/828>`_ + +* Kill `pkg_resources` finders monkey-patching. (#827) + `PR #827 <https://github.com/pantsbuild/pex/pull/827>`_ + +* Use flit to distribute pex. (#826) + `PR #826 <https://github.com/pantsbuild/pex/pull/826>`_ + +* Cleanup extras_require. (#825) + `PR #825 <https://github.com/pantsbuild/pex/pull/825>`_ + 2.0.3 ----- diff --git a/pex/version.py b/pex/version.py index f77cc369d..befdccbff 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '2.0.3' +__version__ = '2.1.0'
pex-tool__pex-945	Release 2.1.8 On the docket: + [x] Cache pip.pex. #937 + [x] Ensure the interpreter path is a file #938 + [x] Support an unzip toggle for PEXes. #939 + [x] Better support unzip mode PEXes. #941	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.7'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.8'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 199e0d5db..b306c05b0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,27 @@ Release Notes ============= +2.1.8 +----- + +This release brings enhanced performance when using the Pex CLI or API to resolve requirements and +improved performance for many PEXed applications when specifying the `--unzip` option. PEXes built +with `--unzip` will first unzip themselves into the Pex cache if not unzipped there already and +then re-execute themselves from there. This can improve startup latency. Pex itself now uses this +mode in our [PEX release](https://github.com/pantsbuild/pex/releases/download/v2.1.8/pex). + +* Better support unzip mode PEXes. (#941) + `PR #941 <https://github.com/pantsbuild/pex/pull/941>`_ + +* Support an unzip toggle for PEXes. (#939) + `PR #939 <https://github.com/pantsbuild/pex/pull/939>`_ + +* Ensure the interpreter path is a file (#938) + `PR #938 <https://github.com/pantsbuild/pex/pull/938>`_ + +* Cache pip.pex. (#937) + `PR #937 <https://github.com/pantsbuild/pex/pull/937>`_ + 2.1.7 ----- diff --git a/pex/version.py b/pex/version.py index 930579c1a..b24b6e806 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '2.1.7' +__version__ = '2.1.8'
fossasia__open-event-server-2429	Add filter "Checked In" and "Not checked in" to attendees In order to easily sort "checked in" and "not checked-in" it would be good to have the relevant options in the filters next to "completed, pending, expired". ![screenshot from 2016-08-23 08 33 47](https://cloud.githubusercontent.com/assets/1583873/17882481/fa7ee8d6-690c-11e6-8a08-5177c6e070f1.png)	[ { "content": "# -- coding: utf-8 --\n\n##\n# Module for helper static variables\n##\n\n# Event Licences\n\nEVENT_LICENCES = {\n # Licence Name : ( Long Name, Description, Licence URL, Licence Logo, Licence Compact Logo )\n 'All rights reserved': (\n 'All rights reserved',\n u'The copyright...	[ { "content": "# -- coding: utf-8 --\n\n##\n# Module for helper static variables\n##\n\n# Event Licences\n\nEVENT_LICENCES = {\n # Licence Name : ( Long Name, Description, Licence URL, Licence Logo, Licence Compact Logo )\n 'All rights reserved': (\n 'All rights reserved',\n u'The copyright...	diff --git a/app/helpers/static.py b/app/helpers/static.py index 2de510161d..67a0b9635c 100644 --- a/app/helpers/static.py +++ b/app/helpers/static.py @@ -210,7 +210,7 @@ ('SGD', True, True), ('THB', True, True), ('TWD', True, True), - + ('USD', True, True), } # Event Images with Event Topics and Subtopics diff --git a/app/templates/gentelella/admin/event/tickets/attendees.html b/app/templates/gentelella/admin/event/tickets/attendees.html index 566cbfe9d7..df2bbf6422 100644 --- a/app/templates/gentelella/admin/event/tickets/attendees.html +++ b/app/templates/gentelella/admin/event/tickets/attendees.html @@ -57,6 +57,13 @@ <label class="btn btn-default btn-responsive"> <input type="radio" name="show_state" autocomplete="off" value="Expired"> Expired </label> + <label class="btn btn-default btn-responsive"> + <input type="radio" name="show_state" autocomplete="off" value="checked_in"> Checked In + </label> + <label class="btn btn-default btn-responsive"> + <input type="radio" name="show_state" autocomplete="off" value="not_checked_in"> Not Checked In + </label> + </div> </div> @@ -131,7 +138,7 @@ <h3>View Attendees</h3> {% if order.status == 'completed' %} {% if holder.checked_in %} <button class="btn btn-warning holder-check-in-toggle" data-holder-id="{{ holder.id }}"> - Undo + Undo </button> {% else %} <button class="btn btn-success holder-check-in-toggle" data-holder-id="{{ holder.id }}"> @@ -155,10 +162,13 @@ <h3>View Attendees</h3> $.fn.dataTable.ext.search.push( function (settings, data, dataIndex) { var user_option = $("input[name=show_state]:checked").val(); - console.log(data); var state = data[2].trim() \|\| 'pending'; if (user_option === "all") { return true; + } else if (user_option === 'checked_in') { + return data[8].trim().indexOf('Undo') !== -1 + } else if (user_option === 'not_checked_in') { + return data[8].trim().indexOf('Check In') !== -1 } else if (user_option === state) { return true; } @@ -214,11 +224,16 @@ <h3>View Attendees</h3> success: function (result) { $btn.prop("disabled", false); if (result.status === "ok") { - if(result.checked_in) { + if (result.checked_in) { $btn.html("Undo").removeClass("btn-success").addClass("btn-warning"); } else { $btn.html('<i class="fa fa-check fa-fw"></i> Check In').removeClass("btn-warning").addClass("btn-success"); } + var row = table.row($btn.closest('tr')); + var data = row.data(); + data[8] = $btn.text(); + row.invalidate(); + table.draw(); } else { $btn.html(oldText); createSnackbar("There was an error while processing.", "Try Again", function () { diff --git a/app/templates/gentelella/admin/event/wizard/step-1.html b/app/templates/gentelella/admin/event/wizard/step-1.html index ff1c92ac7d..36049c8342 100644 --- a/app/templates/gentelella/admin/event/wizard/step-1.html +++ b/app/templates/gentelella/admin/event/wizard/step-1.html @@ -1503,12 +1503,11 @@ <h3 class="modal-title">Bank Instructions</h3> } }; } - var $stripeConnectedMessage = $("#stripe-connected-message"); $(".stripe-connect").click(function (e) { e.preventDefault(); $.oauthpopup({ - path: "https://connect.stripe.com/oauth/authorize?response_type=code&client_id={{ settings.stripe_client_id }}&scope=read_write&redirect_uri={{ url_for('ticketing.stripe_callback', _external=true) }}", + path: "https://connect.stripe.com/oauth/authorize?response_type=code&client_id={{ key_settings.stripe_client_id }}&scope=read_write&redirect_uri={{ url_for('ticketing.stripe_callback', _external=true) }}", callback: function () { // TODO Disallow test accounts. Only accept live accounts. if (1 \|\| window.oauth_response.live_mode) {
Uberspace__lab-28	Change project name to lab in config	[ { "content": "#!/usr/bin/env python3\n# -- coding: utf-8 --\n#\n# Uberspace 7 lab documentation build configuration file, created by\n# sphinx-quickstart on Tue Feb 13 12:19:29 2018.\n#\n# This file is execfile()d with the current directory set to its\n# containing dir.\n#\n# Note that not all possible config...	[ { "content": "#!/usr/bin/env python3\n# -- coding: utf-8 --\n#\n# Uberspace 7 lab documentation build configuration file, created by\n# sphinx-quickstart on Tue Feb 13 12:19:29 2018.\n#\n# This file is execfile()d with the current directory set to its\n# containing dir.\n#\n# Note that not all possible config...	diff --git a/source/_templates/breadcrumbs.html b/source/_templates/breadcrumbs.html index 39d3706f..81a84c88 100755 --- a/source/_templates/breadcrumbs.html +++ b/source/_templates/breadcrumbs.html @@ -32,7 +32,7 @@ <ul class="wy-breadcrumbs"> {% block breadcrumbs %} - <li><a href="{{ pathto(master_doc) }}">{{ _('Manual') }}</a> »</li> + <li><a href="{{ pathto(master_doc) }}">{{ _('Lab') }}</a> »</li> {% for doc in parents %} <li><a href="{{ doc.link\|e }}">{{ doc.title }}</a> »</li> {% endfor %} diff --git a/source/conf.py b/source/conf.py index eea6ac81..e04ec227 100644 --- a/source/conf.py +++ b/source/conf.py @@ -47,7 +47,7 @@ master_doc = 'index' # General information about the project. -project = 'Uberspace 7 Lab' +project = 'UberLab' copyright = '2018, uberspace.de' author = 'uberspace.de'
pennersr__django-allauth-2388	Error when 500 template contains a django-allauth template tag Error message: - `AttributeError: 'NoneType' object has no attribute 'POST'` How to reproduce: 1) Create a 500 template (`500.html` in your template directory) that includes a template tag from django-allauth. For me, it was `Google Sign In` button: ```html <!--500.html--> {% load socialaccount %} <a class="nav-link" href="{% provider_login_url 'google' %}">Log In</a> ``` 2. Add an endpoint that is handled by Django's default 500 handler (`handler500` in `django.conf.urls`, which by default points to `django.views.defaults.server_error`) ```python # urls.py from django.conf.urls import handler500 urlpatterns = [ # ... path('500/', handler500, name='500'), # ... ] ``` - The handler (`server_error`) renders the template: `return HttpResponseServerError(template.render())` - `render` in `allauth/socialaccount/templatetags/socialaccount.py` is called - `get_request_param` in `allauth/utils.py` is called in the line `next = get_request_param(request, 'next')` - `return request.POST.get(param) or request.GET.get(param, default)` in `get_request_param` causes an error because `request` is `None` in this case Solution: - Add a guard statement to the function `get_request_param` in `allauth/utils.py` - before a patch: Use a custom 500 handler instead of Django's default 500 handler	[ { "content": "import base64\nimport importlib\nimport json\nimport random\nimport re\nimport string\nimport unicodedata\nfrom collections import OrderedDict\n\nfrom django.contrib.auth import get_user_model\nfrom django.contrib.sites.models import Site\nfrom django.core.exceptions import ImproperlyConfigured\nf...	[ { "content": "import base64\nimport importlib\nimport json\nimport random\nimport re\nimport string\nimport unicodedata\nfrom collections import OrderedDict\n\nfrom django.contrib.auth import get_user_model\nfrom django.contrib.sites.models import Site\nfrom django.core.exceptions import ImproperlyConfigured\nf...	diff --git a/AUTHORS b/AUTHORS index 588e9b7a77..642ae957c4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -66,6 +66,7 @@ Jeff Triplett Jeremy Satterfield Jerome Leclanche Jesse Gerard Brands +Jihoon Park Jiyoon Ha Joe Vanderstelt John Bazik diff --git a/allauth/utils.py b/allauth/utils.py index fe366eae8e..d2c58cda68 100644 --- a/allauth/utils.py +++ b/allauth/utils.py @@ -299,4 +299,6 @@ def get_form_class(forms, form_id, default_form): def get_request_param(request, param, default=None): + if request is None: + return default return request.POST.get(param) or request.GET.get(param, default)
hylang__hy-1343	REPL history is lost on (quit) REPL history is not flushed to disk if the REPL is exited using `(quit)`. A workaround is to remember to use `CTRL-D` to exit the REPL. Would be nice if `(quit)` also worked.	[ { "content": "# Copyright 2017 the authors.\n# This file is part of Hy, which is free software licensed under the Expat\n# license. See the LICENSE.\n\nimport contextlib\nimport os\nimport re\nimport sys\n\nimport hy.macros\nimport hy.compiler\nfrom hy._compat import builtins, string_types\n\n\ndocomplete = Tru...	[ { "content": "# Copyright 2017 the authors.\n# This file is part of Hy, which is free software licensed under the Expat\n# license. See the LICENSE.\n\nimport contextlib\nimport os\nimport re\nimport sys\n\nimport hy.macros\nimport hy.compiler\nfrom hy._compat import builtins, string_types\n\n\ndocomplete = Tru...	diff --git a/NEWS b/NEWS index 3785792ec..300db30e5 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,8 @@ Changes from 0.13.0 * String literals should no longer be interpreted as special forms or macros * Tag macros (née sharp macros) whose names begin with `!` are no longer mistaken for shebang lines + * Fixed a bug where REPL history wasn't saved if you quit the REPL with + `(quit)` or `(exit)` Changes from 0.12.1 diff --git a/hy/completer.py b/hy/completer.py index 0d9c906e9..c4de45cca 100644 --- a/hy/completer.py +++ b/hy/completer.py @@ -124,7 +124,8 @@ def completion(completer=None): readline.parse_and_bind(readline_bind) - yield - - if docomplete: - readline.write_history_file(history) + try: + yield + finally: + if docomplete: + readline.write_history_file(history)
google-research__text-to-text-transfer-transformer-351	Unable to import tensorflow_gcs_config in t5_trivia colab notebook Upon running line `import tensorflow_gcs_config` (in t5_trivia colab notebook, setup section) I get this error, ``` --------------------------------------------------------------------------- NotImplementedError Traceback (most recent call last) <ipython-input-2-3bb7f36f8553> in <module>() ----> 1 import tensorflow_gcs_config 1 frames /usr/local/lib/python3.6/dist-packages/tensorflow_gcs_config/__init__.py in _load_library(filename, lib) 55 raise NotImplementedError( 56 "unable to open file: " + ---> 57 "{}, from paths: {}\ncaused by: {}".format(filename, filenames, errs)) 58 59 _gcs_config_so = _load_library("_gcs_config_ops.so") NotImplementedError: unable to open file: _gcs_config_ops.so, from paths: ['/usr/local/lib/python3.6/dist-packages/tensorflow_gcs_config/_gcs_config_ops.so'] caused by: ['/usr/local/lib/python3.6/dist-packages/tensorflow_gcs_config/_gcs_config_ops.so: undefined symbol: _ZN10tensorflow15OpKernelContext5inputEN4absl11string_viewEPPKNS_6TensorE'] ``` `tf.__version__` is '2.3.0'	[ { "content": "# Copyright 2020 The T5 Authors.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by appl...	[ { "content": "# Copyright 2020 The T5 Authors.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by appl...	diff --git a/t5/version.py b/t5/version.py index f3b47b22..e50b2461 100644 --- a/t5/version.py +++ b/t5/version.py @@ -18,4 +18,4 @@ Stored in a separate file so that setup.py can reference the version without pulling in all the dependencies in __init__.py. """ -__version__ = '0.6.3' +__version__ = '0.6.4'
espnet__espnet-913	matplotlib.use('Agg') fail It result in plot fail ``` _tkinter.TclError: no display name and no $DISPLAY environment variable ``` I fixed this by applying a patch on `espnet/nets/pytorch_backend/transformer/plot.py` ``` @@ -1,5 +1,6 @@ import logging - +import matplotlib +matplotlib.use('Agg') import matplotlib.pyplot as plt from espnet.asr import asr_utils ```	[ { "content": "import logging\n\nimport matplotlib.pyplot as plt\n\nfrom espnet.asr import asr_utils\n\n\ndef _plot_and_save_attention(att_w, filename):\n # dynamically import matplotlib due to not found error\n from matplotlib.ticker import MaxNLocator\n import os\n d = os.path.dirname(filename)\n ...	[ { "content": "import logging\n\nfrom espnet.asr import asr_utils\nimport matplotlib.pyplot as plt\n\n\ndef _plot_and_save_attention(att_w, filename):\n # dynamically import matplotlib due to not found error\n from matplotlib.ticker import MaxNLocator\n import os\n d = os.path.dirname(filename)\n ...	diff --git a/espnet/nets/pytorch_backend/transformer/plot.py b/espnet/nets/pytorch_backend/transformer/plot.py index 66985df55e0..af5f0ef6e68 100644 --- a/espnet/nets/pytorch_backend/transformer/plot.py +++ b/espnet/nets/pytorch_backend/transformer/plot.py @@ -1,8 +1,7 @@ import logging -import matplotlib.pyplot as plt - from espnet.asr import asr_utils +import matplotlib.pyplot as plt def _plot_and_save_attention(att_w, filename):
mkdocs__mkdocs-1921	Unexpected behaviour with page.is_homepage Starting a new site and rolling my own theme. Came across some slightly odd behaviour. Mkdocs version 1.0.4 Python version 3.7.1 Expected: `page.is_homepage` evaluates to True on the home (index.md) of the site, and false on all other pages. Actual: `page.is_homepage` evaluates to True on the home (index.md), and on any other index.md that is included in the nav object without nesting. Examples: The unexpected result: ``` nav: - Home: index.md <--- page.is_homepage evaluates to True - About: about.md <--- page.is_homepage evaluates to False - Projects: projects/index.md <--- page.is_homepage evaluates to True ``` Changing the filename causes it to evaluate to false: ``` nav: - Home: index.md <--- page.is_homepage evaluates to True - About: about.md <--- page.is_homepage evaluates to False - Projects: projects/test.md <--- page.is_homepage evaluates to False ``` If I tweak it a bit, so that the sections are nested, then it evaluates to false as I'd expect: ``` nav: - About: - About: about.md <--- page.is_homepage evaluates to False - Projects: - Project home: projects/index.md <--- page.is_homepage evaluates to False ``` This feels like a bug - especially as simply changing the markdown file name causes the behaviour to change.	[ { "content": "# coding: utf-8\n\nfrom __future__ import unicode_literals\n\nimport os\nimport io\nimport datetime\nimport logging\n\nimport markdown\nfrom markdown.extensions import Extension\nfrom markdown.treeprocessors import Treeprocessor\nfrom markdown.util import AMP_SUBSTITUTE\n\nfrom mkdocs.structure.to...	[ { "content": "# coding: utf-8\n\nfrom __future__ import unicode_literals\n\nimport os\nimport io\nimport datetime\nimport logging\n\nimport markdown\nfrom markdown.extensions import Extension\nfrom markdown.treeprocessors import Treeprocessor\nfrom markdown.util import AMP_SUBSTITUTE\n\nfrom mkdocs.structure.to...	diff --git a/docs/about/release-notes.md b/docs/about/release-notes.md index bb33917c3d..35564ffab2 100644 --- a/docs/about/release-notes.md +++ b/docs/about/release-notes.md @@ -56,6 +56,7 @@ your global navigation uses more than one level, things will likely be broken. ### Other Changes and Additions to Version 1.1 +* Bugfix: Ensure nested index pages do not get identified as the homepage (#1919). * Bugfix: Properly identify deployment version (#1879). * Bugfix: Properly build `ValidationError` message for `custom_dir` (#1849). * Bugfix: Exclude Markdown files and READMEs from theme (#1766). diff --git a/mkdocs/structure/pages.py b/mkdocs/structure/pages.py index b032d7799b..a15a28a83e 100644 --- a/mkdocs/structure/pages.py +++ b/mkdocs/structure/pages.py @@ -93,7 +93,7 @@ def is_top_level(self): @property def is_homepage(self): - return self.is_top_level and self.is_index + return self.is_top_level and self.is_index and self.file.url == '.' @property def url(self): diff --git a/mkdocs/tests/structure/page_tests.py b/mkdocs/tests/structure/page_tests.py index f229c8cbe5..fd015eadf2 100644 --- a/mkdocs/tests/structure/page_tests.py +++ b/mkdocs/tests/structure/page_tests.py @@ -70,6 +70,54 @@ def test_nested_index_page(self): self.assertEqual(pg.title, 'Foo') self.assertEqual(pg.toc, []) + def test_nested_index_page_no_parent(self): + cfg = load_config(docs_dir=self.DOCS_DIR) + fl = File('sub1/index.md', cfg['docs_dir'], cfg['site_dir'], cfg['use_directory_urls']) + pg = Page('Foo', fl, cfg) + pg.parent = None # non-homepage at nav root level; see #1919. + self.assertEqual(pg.url, 'sub1/') + self.assertEqual(pg.abs_url, None) + self.assertEqual(pg.canonical_url, None) + self.assertEqual(pg.edit_url, None) + self.assertEqual(pg.file, fl) + self.assertEqual(pg.content, None) + self.assertFalse(pg.is_homepage) + self.assertTrue(pg.is_index) + self.assertTrue(pg.is_page) + self.assertFalse(pg.is_section) + self.assertTrue(pg.is_top_level) + self.assertEqual(pg.markdown, None) + self.assertEqual(pg.meta, {}) + self.assertEqual(pg.next_page, None) + self.assertEqual(pg.parent, None) + self.assertEqual(pg.previous_page, None) + self.assertEqual(pg.title, 'Foo') + self.assertEqual(pg.toc, []) + + def test_nested_index_page_no_parent_no_directory_urls(self): + cfg = load_config(docs_dir=self.DOCS_DIR, use_directory_urls=False) + fl = File('sub1/index.md', cfg['docs_dir'], cfg['site_dir'], cfg['use_directory_urls']) + pg = Page('Foo', fl, cfg) + pg.parent = None # non-homepage at nav root level; see #1919. + self.assertEqual(pg.url, 'sub1/index.html') + self.assertEqual(pg.abs_url, None) + self.assertEqual(pg.canonical_url, None) + self.assertEqual(pg.edit_url, None) + self.assertEqual(pg.file, fl) + self.assertEqual(pg.content, None) + self.assertFalse(pg.is_homepage) + self.assertTrue(pg.is_index) + self.assertTrue(pg.is_page) + self.assertFalse(pg.is_section) + self.assertTrue(pg.is_top_level) + self.assertEqual(pg.markdown, None) + self.assertEqual(pg.meta, {}) + self.assertEqual(pg.next_page, None) + self.assertEqual(pg.parent, None) + self.assertEqual(pg.previous_page, None) + self.assertEqual(pg.title, 'Foo') + self.assertEqual(pg.toc, []) + def test_nested_nonindex_page(self): cfg = load_config(docs_dir=self.DOCS_DIR) fl = File('sub1/non-index.md', cfg['docs_dir'], cfg['site_dir'], cfg['use_directory_urls'])
pex-tool__pex-975	Release 2.1.10 On the docket: + [x] Improve Pex packaging. (#961) + [x] Make the interpreter cache deterministic. (#960) + [x] Fix deprecation warning for `rU` mode (#956) + [x] Fix runtime resolve error message generation. (#955) + [x] Kill dead code. (#954) + [x] Many Pex tests fail under Python 2.7 in CI #967 + [x] Add a `--local` mode for packaging the Pex PEX. #971 + [x] Split Pex resolve API. (#970) + [x] Can't run PEX file when a dependency's wheel includes a build tag #964 + [x] Expose network configuration in pex options. #803	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.9'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.1.10'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 12c003ef3..bc1013393 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,53 @@ Release Notes ============= +2.1.10 +------ + +This release focuses on the resolver API and resolution performance. Pex 2 resolving using Pip is +now at least at performance parity with Pex 1 in all studied cases and most often is 5% to 10% +faster. + +As part of the resolution performance work, Pip networking configuration is now exposed via Pex CLI +options and the ``NetworkConfiguration`` API type / new ``resolver.resolve`` API parameter. + +With network configuration now wired up, the ``PEX_HTTP_RETRIES`` and ``PEX_HTTP_TIMEOUT`` env var +support in Pex 1 that was never wired into Pex 2 is now dropped in favor of passing ``--retries`` +and ``--timeout`` via the CLI (See: `Issue #94 <https://github.com/pantsbuild/pex/issues/94>`_) + +* Expose Pip network configuration. (#974) + `PR #974 <https://github.com/pantsbuild/pex/pull/974>`_ + +* Restore handling for bad wheel filenames to ``.can_add()`` (#973) + `PR #973 <https://github.com/pantsbuild/pex/pull/973>`_ + +* Fix wheel filename parsing in PEXEnvironment.can_add (#965) + `PR #965 <https://github.com/pantsbuild/pex/pull/965>`_ + +* Split Pex resolve API. (#970) + `PR #970 <https://github.com/pantsbuild/pex/pull/970>`_ + +* Add a ``--local`` mode for packaging the Pex PEX. (#971) + `PR #971 <https://github.com/pantsbuild/pex/pull/971>`_ + +* Constrain the virtualenv version used by tox. (#968) + `PR #968 <https://github.com/pantsbuild/pex/pull/968>`_ + +* Improve Pex packaging. (#961) + `PR #961 <https://github.com/pantsbuild/pex/pull/961>`_ + +* Make the interpreter cache deterministic. (#960) + `PR #960 <https://github.com/pantsbuild/pex/pull/960>`_ + +* Fix deprecation warning for ``rU`` mode (#956) + `PR #956 <https://github.com/pantsbuild/pex/pull/956>`_ + +* Fix runtime resolve error message generation. (#955) + `PR #955 <https://github.com/pantsbuild/pex/pull/955>`_ + +* Kill dead code. (#954) + `PR #954 <https://github.com/pantsbuild/pex/pull/954>`_ + 2.1.9 ----- diff --git a/pex/version.py b/pex/version.py index a6ec8e0ae..ef5420cfc 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '2.1.9' +__version__ = '2.1.10'
numba__numba-1356	Use CPython allocator in NRT NRT should optionally use the CPython memory allocation functions (when imported from CPython). This would allow Numba-allocated memory to be seen by other utilities such as `sys.getallocatedblocks()`, `sys.debugmallocstats()`, and `tracemalloc`.	[ { "content": "from __future__ import print_function, absolute_import, division\n\nfrom collections import namedtuple\n\nfrom . import atomicops\nfrom llvmlite import binding as ll\n\nfrom numba.utils import finalize as _finalize\nfrom . import _nrt_python as _nrt\n\n_nrt_mstats = namedtuple(\"nrt_mstats\", [\"a...	[ { "content": "from __future__ import print_function, absolute_import, division\n\nfrom collections import namedtuple\n\nfrom . import atomicops\nfrom llvmlite import binding as ll\n\nfrom numba.utils import finalize as _finalize\nfrom . import _nrt_python as _nrt\n\n_nrt_mstats = namedtuple(\"nrt_mstats\", [\"a...	diff --git a/numba/_pymodule.h b/numba/_pymodule.h index 89787ce4d6d..182817a0aa1 100644 --- a/numba/_pymodule.h +++ b/numba/_pymodule.h @@ -38,8 +38,9 @@ #define Py_uhash_t unsigned long #endif -#if PY_MAJOR_VERSION < 3 \|\| (PY_MAJOR_VERSION == 3 && Py_MINOR_VERSION < 4) +#if PY_MAJOR_VERSION < 3 \|\| (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 4) #define PyMem_RawMalloc malloc + #define PyMem_RawRealloc realloc #define PyMem_RawFree free #endif diff --git a/numba/runtime/_nrt_python.c b/numba/runtime/_nrt_python.c index 218ca957f30..f1b00e73f50 100644 --- a/numba/runtime/_nrt_python.c +++ b/numba/runtime/_nrt_python.c @@ -20,6 +20,14 @@ memsys_shutdown(PyObject self, PyObject args) { Py_RETURN_NONE; } +static PyObject * +memsys_use_cpython_allocator(PyObject self, PyObject args) { + NRT_MemSys_set_allocator(PyMem_RawMalloc, + PyMem_RawRealloc, + PyMem_RawFree); + Py_RETURN_NONE; +} + static PyObject* memsys_set_atomic_inc_dec(PyObject self, PyObject args) { @@ -518,6 +526,7 @@ NRT_decref(MemInfo* mi) { static PyMethodDef ext_methods[] = { #define declmethod(func) { #func , ( PyCFunction )func , METH_VARARGS , NULL } #define declmethod_noargs(func) { #func , ( PyCFunction )func , METH_NOARGS, NULL } + declmethod_noargs(memsys_use_cpython_allocator), declmethod_noargs(memsys_shutdown), declmethod(memsys_set_atomic_inc_dec), declmethod(memsys_set_atomic_cas), diff --git a/numba/runtime/nrt.c b/numba/runtime/nrt.c index f68f80e805a..220b2ec22dd 100644 --- a/numba/runtime/nrt.c +++ b/numba/runtime/nrt.c @@ -22,6 +22,21 @@ struct MemInfo { }; +/* + * Misc helpers. + / + +static void nrt_fatal_error(const char msg) +{ + fprintf(stderr, "Fatal Numba error: %s\n", msg); + fflush(stderr); /* it helps in Windows debug build / + +#if defined(MS_WINDOWS) && defined(_DEBUG) + DebugBreak(); +#endif + abort(); +} + / * Global resources. / @@ -35,6 +50,12 @@ struct MemSys{ int shutting; / Stats / size_t stats_alloc, stats_free, stats_mi_alloc, stats_mi_free; + / System allocation functions / + struct { + NRT_malloc_func malloc; + NRT_realloc_func realloc; + NRT_free_func free; + } allocator; }; / The Memory System object / @@ -42,6 +63,10 @@ static MemSys TheMSys; void NRT_MemSys_init(void) { memset(&TheMSys, 0, sizeof(MemSys)); + / Bind to libc allocator / + TheMSys.allocator.malloc = malloc; + TheMSys.allocator.realloc = realloc; + TheMSys.allocator.free = free; } void NRT_MemSys_shutdown(void) { @@ -54,6 +79,22 @@ void NRT_MemSys_shutdown(void) { NRT_MemSys_set_atomic_cas_stub(); } +void NRT_MemSys_set_allocator(NRT_malloc_func malloc_func, + NRT_realloc_func realloc_func, + NRT_free_func free_func) +{ + if ((malloc_func != TheMSys.allocator.malloc \|\| + realloc_func != TheMSys.allocator.realloc \|\| + free_func != TheMSys.allocator.free) && + (TheMSys.stats_alloc != TheMSys.stats_free \|\| + TheMSys.stats_mi_alloc != TheMSys.stats_mi_free)) { + nrt_fatal_error("cannot change allocator while blocks are allocated"); + } + TheMSys.allocator.malloc = malloc_func; + TheMSys.allocator.realloc = realloc_func; + TheMSys.allocator.free = free_func; +} + void NRT_MemSys_set_atomic_inc_dec(atomic_inc_dec_func inc, atomic_inc_dec_func dec) { @@ -122,17 +163,6 @@ void NRT_MemSys_set_atomic_cas_stub(void) { NRT_MemSys_set_atomic_cas(nrt_testing_atomic_cas); } -static void nrt_fatal_error(const char msg) -{ - fprintf(stderr, "Fatal Numba error: %s\n", msg); - fflush(stderr); /* it helps in Windows debug build / - -#if defined(MS_WINDOWS) && defined(_DEBUG) - DebugBreak(); -#endif - abort(); -} - / * The MemInfo structure. @@ -328,14 +358,14 @@ void NRT_MemInfo_varsize_realloc(MemInfo mi, size_t size) / void NRT_Allocate(size_t size) { - void ptr = malloc(size); + void ptr = TheMSys.allocator.malloc(size); NRT_Debug(nrt_debug_print("NRT_Allocate bytes=%zu ptr=%p\n", size, ptr)); TheMSys.atomic_inc(&TheMSys.stats_alloc); return ptr; } void NRT_Reallocate(void ptr, size_t size) { - void new_ptr = realloc(ptr, size); + void new_ptr = TheMSys.allocator.realloc(ptr, size); NRT_Debug(nrt_debug_print("NRT_Reallocate bytes=%zu ptr=%p -> %p\n", size, ptr, new_ptr)); return new_ptr; @@ -343,6 +373,6 @@ void NRT_Reallocate(void ptr, size_t size) { void NRT_Free(void ptr) { NRT_Debug(nrt_debug_print("NRT_Free %p\n", ptr)); - free(ptr); + TheMSys.allocator.free(ptr); TheMSys.atomic_inc(&TheMSys.stats_free); } diff --git a/numba/runtime/nrt.h b/numba/runtime/nrt.h index 5c2cfe5432d..10510ec1acb 100644 --- a/numba/runtime/nrt.h +++ b/numba/runtime/nrt.h @@ -36,6 +36,11 @@ typedef int (atomic_cas_func)(void * volatile ptr, void cmp, void repl, typedef struct MemInfo MemInfo; typedef struct MemSys MemSys; +typedef void (NRT_malloc_func)(size_t size); +typedef void (NRT_realloc_func)(void ptr, size_t new_size); +typedef void (NRT_free_func)(void ptr); + + /* Memory System API / / Initialize the memory system / @@ -44,6 +49,11 @@ void NRT_MemSys_init(void); / Shutdown the memory system / void NRT_MemSys_shutdown(void); +/ + * Register the system allocation functions + / +void NRT_MemSys_set_allocator(NRT_malloc_func, NRT_realloc_func, NRT_free_func); + / * Register the atomic increment and decrement functions / diff --git a/numba/runtime/nrt.py b/numba/runtime/nrt.py index b337a18f30e..721cf769db4 100644 --- a/numba/runtime/nrt.py +++ b/numba/runtime/nrt.py @@ -98,7 +98,8 @@ def get_allocation_stats(self): # Alias to _nrt_python._MemInfo MemInfo = _nrt._MemInfo -# Create uninitialized runtime +# Create runtime +_nrt.memsys_use_cpython_allocator() rtsys = _Runtime() # Install finalizer diff --git a/numba/tests/test_nrt.py b/numba/tests/test_nrt.py index 94f957f793d..6e1b2add502 100644 --- a/numba/tests/test_nrt.py +++ b/numba/tests/test_nrt.py @@ -1,7 +1,13 @@ from __future__ import absolute_import, division, print_function +import math +import os +import sys + import numpy as np + from numba import unittest_support as unittest +from numba import njit from numba.runtime import rtsys from numba.config import PYVERSION from .support import MemoryLeakMixin @@ -164,15 +170,71 @@ def test_buffer(self): # consumed by another thread. +@unittest.skipUnless(sys.version_info >= (3, 4), + "need Python 3.4+ for the tracemalloc module") +class TestTracemalloc(unittest.TestCase): + """ + Test NRT-allocated memory can be tracked by tracemalloc. + """ + + def measure_memory_diff(self, func): + import tracemalloc + tracemalloc.start() + try: + before = tracemalloc.take_snapshot() + # Keep the result and only delete it after taking a snapshot + res = func() + after = tracemalloc.take_snapshot() + del res + return after.compare_to(before, 'lineno') + finally: + tracemalloc.stop() + + def test_snapshot(self): + N = 1000000 + dtype = np.int8 + + @njit + def alloc_nrt_memory(): + """ + Allocate and return a large array. + """ + return np.empty(N, dtype) + + def keep_memory(): + return alloc_nrt_memory() + + def release_memory(): + alloc_nrt_memory() + + alloc_lineno = keep_memory.__code__.co_firstlineno + 1 + + # Warmup JIT + alloc_nrt_memory() + + # The large NRT-allocated array should appear topmost in the diff + diff = self.measure_memory_diff(keep_memory) + stat = diff[0] + # There is a slight overhead, so the allocated size won't exactly be N + self.assertGreaterEqual(stat.size, N) + self.assertLess(stat.size, N 1.01) + frame = stat.traceback[0] + self.assertEqual(os.path.basename(frame.filename), "test_nrt.py") + self.assertEqual(frame.lineno, alloc_lineno) + + # If NRT memory is released before taking a snapshot, it shouldn't + # appear. + diff = self.measure_memory_diff(release_memory) + stat = diff[0] + # Something else appears, but nothing the magnitude of N + self.assertLess(stat.size, N * 0.01) + + class TestNRTIssue(MemoryLeakMixin, unittest.TestCase): def test_issue_with_refct_op_pruning(self): """ GitHub Issue #1244 https://github.com/numba/numba/issues/1244 """ - from numba import njit - import numpy as np - import math - @njit def calculate_2D_vector_mag(vector): x, y = vector
DjangoGirls__djangogirls-785	return paginator.Paginator(self._items(), self.limit) Sentry Issue: [DJANGO-GIRLS-WEBSITE-3V](https://sentry.io/organizations/django-girls/issues/3236790374/?referrer=github_integration) ``` return paginator.Paginator(self._items(), self.limit) ```	[ { "content": "from django.contrib.sitemaps import Sitemap\n\nfrom .models import Story\n\n\nclass BlogSiteMap(Sitemap):\n priority = 0.5\n\n def items(self):\n return Story.objects.all()\n\n def location(self, item):\n url = item.post_url\n if url is not None and 'http://' in url:\...	[ { "content": "from django.contrib.sitemaps import Sitemap\n\nfrom .models import Story\n\n\nclass BlogSiteMap(Sitemap):\n priority = 0.5\n\n def items(self):\n return Story.objects.all().order_by('-created')\n\n def location(self, item):\n url = item.post_url\n if url is not None a...	diff --git a/story/sitemap.py b/story/sitemap.py index 95f2d36b2..44a8eb71f 100644 --- a/story/sitemap.py +++ b/story/sitemap.py @@ -7,7 +7,7 @@ class BlogSiteMap(Sitemap): priority = 0.5 def items(self): - return Story.objects.all() + return Story.objects.all().order_by('-created') def location(self, item): url = item.post_url
mlcommons__GaNDLF-537	Radiology DataLoader takes up a lot memory during certain conditions Describe the bug During sanity checking of subjects, the queue construction seems to take up a lot of memory. To Reproduce Steps to reproduce the behavior: 1. Have a ridiculous number of subjects on a small machine (e.g., 10k on a machine with 16G RAM) 2. Start training on rad mode 4. See error sometime during/after queue construction: ```bash ## last message Constructing queue for train data: 100%\|██████████\| 8681/8681 [07:57<00:00, 18.19it/s] ## failure with message related to exceeded RAM usage ``` Expected behavior There should not be any failure at this stage. Screenshots N.A> GaNDLF Version <!-- Put the output of the following command: python -c 'import GANDLF as g;print(g.__version__)' --> 0.0.16-dev Desktop (please complete the following information): CentOS 7 Additional context N.A.	[ { "content": "#!/usr/bin/env python\n\n\"\"\"The setup script.\"\"\"\n\n\nimport os\nfrom setuptools import setup, find_packages\nfrom setuptools.command.install import install\nfrom setuptools.command.develop import develop\nfrom setuptools.command.egg_info import egg_info\n\nwith open(\"README.md\") as readme...	[ { "content": "#!/usr/bin/env python\n\n\"\"\"The setup script.\"\"\"\n\n\nimport os\nfrom setuptools import setup, find_packages\nfrom setuptools.command.install import install\nfrom setuptools.command.develop import develop\nfrom setuptools.command.egg_info import egg_info\n\nwith open(\"README.md\") as readme...	diff --git a/setup.py b/setup.py index 74d1422d8..46241f78e 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ def run(self): "numpy==1.22.0", "scipy", "SimpleITK!=2.0.*", + "SimpleITK!=2.2.1", # https://github.com/mlcommons/GaNDLF/issues/536 "torchvision", "tqdm", "torchio==0.18.75",
pex-tool__pex-792	Release 2.0.0 On the docket: + [x] Use pip for resolving and building distributions. #788 + [x] Pex defaults to reproduceable builds. #791 That one issue closes out a slew of others, partially documented in #686.	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.12'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '2.0.0'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index ae7de56f8..2b97c531c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,58 @@ Release Notes ============= +2.0.0 +----- + +Pex 2.0.0 is cut on the advent of a large, mostly internal change for typical +use cases: it now uses vendored pip to perform resolves and wheel builds. This +fixes a large number of compatibility and correctness bugs as well as gaining +feature support from pip including handling manylinux2010 and manylinux2014 as +well as VCS requirements and support for PEP-517 & PEP-518 builds. + +API changes to be wary of: + +* The egg distribution format is no longer supported. +* The deprecated ``--interpreter-cache-dir`` CLI option was removed. +* The ``--cache-ttl`` CLI option and ``cache_ttl`` resolver API argument were + removed. +* The resolver API replaced ``fetchers`` with a list of ``indexes`` and a list + of ``find_links`` repos. +* The resolver API removed (http) ``context`` which is now automatically + handled. +* The resolver API removed ``precedence`` which is now pip default precedence: + wheels when available and not ruled out via the ``--no-wheel`` CLI option or + ``use_wheel=False`` API argument. +* The ``--platform`` CLI option and ``platform`` resolver API argument now must + be full platform strings that include platform, implementation, version and + abi; e.g.: ``--platform=macosx-10.13-x86_64-cp-36-m``. +* The ``--manylinux`` CLI option and ``use_manylinux`` resolver API argument + were removed. Instead, to resolve manylinux wheels for a foreign platform, + specify the manylinux platform to target with an explicit ``--platform`` CLI + flag or ``platform`` resolver API argument; e.g.: + ``--platform=manylinux2010-x86_64-cp-36-m``. + +In addition, Pex 2.0.0 now builds reproduceable pexes by default; ie: + +* Python modules embedded in the pex are not pre-compiled (pass --compile if + you want this). +* The timestamps for Pex file zip entries default to midnight on + January 1, 1980 (pass --use-system-time to change this). + +This finishes off the effort tracked by +`Issue #716 <https://github.com/pantsbuild/pex/pull/718>`_ + +Changes in this release: + +* Pex defaults to reproduceable builds. (#791) + `PR #791 <https://github.com/pantsbuild/pex/pull/791>`_ + +* Use pip for resolving and building distributions. (#788) + `PR #788 <https://github.com/pantsbuild/pex/pull/788>`_ + +* Bias selecting the current interpreter. (#783) + `PR #783 <https://github.com/pantsbuild/pex/pull/783>`_ + 1.6.12 ------ diff --git a/pex/version.py b/pex/version.py index 23734e89b..772804dc4 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '1.6.12' +__version__ = '2.0.0'
pex-tool__pex-1191	Release 2.1.26 On the docket: + [x] Pex requirement parsing is tripped up by files in the CWD with the same name as requirements' project names. #1188	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.25\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.26\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index f63fa42fa..03ecea3f8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,15 @@ Release Notes ============= +2.1.26 +------ + +This is a hotfix release that fixes requirement parsing when there is a local file in the CWD with +the same name as the project name of a remote requirement to be resolved. + +* Requirement parsing handles local non-dist files. (#1190) + `PR #1190 <https://github.com/pantsbuild/pex/pull/1190>`_ + 2.1.25 ------ diff --git a/pex/version.py b/pex/version.py index d89e91f46..d49dc67b8 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.25" +__version__ = "2.1.26"
pex-tool__pex-1139	Release 2.1.22 On the docket: + [x] Fix `--help-variables` docs. #1113 + [x] pex binary hangs on startup at atomic_directory #1119 + [x] pex vendoring does not (always) isolate itself from a colliding setuptools install in site-packages #1031 + [x] Remove long deprecated support for _pex module. #1135	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.21\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.22\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index c7101cdd1..9a14e88b8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,76 @@ Release Notes ============= +2.1.22 +------ + +This release fixes a deadlock that could be experienced when building +PEX files in highly concurrent environments in addition to fixing +`pex --help-variables` output. + +A new suite of PEX tools is now available in Pex itself and any PEXes +built with the new `--include-tools` option. Use +`PEX_TOOLS=1 pex --help` to find out more about the available tools and +their usage. + +Finally, the long deprecated exposure of the Pex APIs through `_pex` has +been removed. To use the Pex APIs you must include pex as a dependency +in your PEX file. + +* Add a dependency graph tool. (#1132) + `PR #1132 <https://github.com/pantsbuild/pex/pull/1132>`_ + +* Add a venv tool. (#1128) + `PR #1128 <https://github.com/pantsbuild/pex/pull/1128>`_ + +* Remove long deprecated support for _pex module. (#1135) + `PR #1135 <https://github.com/pantsbuild/pex/pull/1135>`_ + +* Add an interpreter tool. (#1131) + `PR #1131 <https://github.com/pantsbuild/pex/pull/1131>`_ + +* Escape venvs unless PEX_INHERIT_PATH is requested. (#1130) + `PR #1130 <https://github.com/pantsbuild/pex/pull/1130>`_ + +* Improve `PythonInterpreter` venv support. (#1129) + `PR #1129 <https://github.com/pantsbuild/pex/pull/1129>`_ + +* Add support for PEX runtime tools & an info tool. (#1127) + `PR #1127 <https://github.com/pantsbuild/pex/pull/1127>`_ + +* Exclusive atomic_directory always unlocks. (#1126) + `PR #1126 <https://github.com/pantsbuild/pex/pull/1126>`_ + +* Fix `PythonInterpreter` binary normalization. (#1125) + `PR #1125 <https://github.com/pantsbuild/pex/pull/1125>`_ + +* Add a `requires_dists` function. (#1122) + `PR #1122 <https://github.com/pantsbuild/pex/pull/1122>`_ + +* Add an `is_exe` helper. (#1123) + `PR #1123 <https://github.com/pantsbuild/pex/pull/1123>`_ + +* Fix req parsing for local archives & projects. (#1121) + `PR #1121 <https://github.com/pantsbuild/pex/pull/1121>`_ + +* Improve PEXEnvironment constructor ergonomics. (#1120) + `PR #1120 <https://github.com/pantsbuild/pex/pull/1120>`_ + +* Fix `safe_open` for single element relative paths. (#1118) + `PR #1118 <https://github.com/pantsbuild/pex/pull/1118>`_ + +* Add URLFetcher IT. (#1116) + `PR #1116 <https://github.com/pantsbuild/pex/pull/1116>`_ + +* Implement full featured requirment parsing. (#1114) + `PR #1114 <https://github.com/pantsbuild/pex/pull/1114>`_ + +* Fix `--help-variables` docs. (#1113) + `PR #1113 <https://github.com/pantsbuild/pex/pull/1113>`_ + +* Switch from optparse to argparse. (#1083) + `PR #1083 <https://github.com/pantsbuild/pex/pull/1083>`_ + 2.1.21 ------ diff --git a/pex/version.py b/pex/version.py index 8b44b5e28..16163f6f4 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.21" +__version__ = "2.1.22"
pex-tool__pex-777	Release 1.6.12 On the docket: + [x] PythonInterpreter: support python binary names with single letter suffixes #769 + [x] Pex should support some form of verifiably reproducible resolve. #772	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.11'\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = '1.6.12'\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 6c2163b2d..ae7de56f8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,18 @@ Release Notes ============= +1.6.12 +------ + +This release adds the `--intransitive` option to support pre-resolved requirements +lists and allows for python binaries built under Gentoo naming conventions. + +* Add an --intransitive option. (#775) + `PR #775 <https://github.com/pantsbuild/pex/pull/775>`_ + +* PythonInterpreter: support python binary names with single letter suffixes (#769) + `PR #769 <https://github.com/pantsbuild/pex/pull/769>`_ + 1.6.11 ------ diff --git a/pex/version.py b/pex/version.py index 255088057..23734e89b 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '1.6.11' +__version__ = '1.6.12'
pex-tool__pex-1750	Release 2.1.85 On the docket: + [x] PEX interpreters should support all underlying Python interpreter options. #1745	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.84\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.85\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 0edc4617a..3ecf6a075 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,21 @@ Release Notes ============= +2.1.85 +------ + +This PyCon US 2022 release brings full support for Python interpreter +emulation when a PEX is run in interpreter mode (without an entry point +or else when forced via ``PEX_INTERPRETER=1``). + +A special thank you to Loren Arthur for contributing the fix in the +Pantsbuild sprint at PyCon. + +* PEX interpreters should support all underlying Python interpreter options. (#1745) + `Issue #1745 <https://github.com/pantsbuild/pex/issues/1745>`_ + `PR #1746 <https://github.com/pantsbuild/pex/pull/1746>`_ + `PR #1748 <https://github.com/pantsbuild/pex/pull/1748>`_ + 2.1.84 ------ diff --git a/pex/version.py b/pex/version.py index be294c41c..62a251651 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.84" +__version__ = "2.1.85"
pex-tool__pex-1709	Release 2.1.77 On the docket: + [x] Fix pathologic lock creation slowness. #1707 + [x] Support uncompressed PEXes. (#1705)	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.76\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.77\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 1e0fb931f..2f87648a4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,10 +1,23 @@ Release Notes ============= +2.1.77 +------ + +This release fixes pathologically slow cases of lock creation as well as +introducing support for ``--no-compression`` to allow picking the the +time-space tradeoff you want for your PEX zips. + +* Fix pathologic lock creation slowness. (#1707) + `PR #1707 <https://github.com/pantsbuild/pex/pull/1707>`_ + +* Support uncompressed PEXes. (#1705) + `PR #1705 <https://github.com/pantsbuild/pex/pull/1705>`_ + 2.1.76 ------ -This release finalizes spurious deadlock handling in `--lock` resolves +This release finalizes spurious deadlock handling in ``--lock`` resolves worked around in #1694 in Pex 2.1.75. * Fix lock_resolver to use BSD file locks. (#1702) diff --git a/pex/version.py b/pex/version.py index 75d3da9cc..f8a647e8e 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.76" +__version__ = "2.1.77"
pex-tool__pex-1679	Release 2.1.73 On the docket: + [x] Unexpected distribution hash #1683 + [x] Pex fails to parse wheel tags correctly when resolving from a lock. #1676 + [x] `pex3 lock create --style universal` does not fully patch ambient interpreter properties. #1681	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.72\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.73\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index da8f81916..b2b079c4a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,27 @@ Release Notes ============= +2.1.73 +------ + +This is a hotfix for various PEX issues: + +#. ``--requirements-pex`` handling was broken by #1661 in the 2.1.71 + release and is now fixed. +#. Creating ``universal`` locks now works using any interpreter when the + resolver version is the ``pip-2020-resolver``. +#. Building PEXes with ``--lock`` resolves that contain wheels with + build tags in their names now works. + +* Fix ``--requirements-pex``. (#1684) + `PR #1684 <https://github.com/pantsbuild/pex/pull/1684>`_ + +* Fix universal locks for the ``pip-2020-resolver``. (#1682) + `PR #1682 <https://github.com/pantsbuild/pex/pull/1682>`_ + +* Fix ``--lock`` resolve wheel tag parsing. (#1678) + `PR #1678 <https://github.com/pantsbuild/pex/pull/1678>`_ + 2.1.72 ------ diff --git a/pex/version.py b/pex/version.py index 1cf91c0a8..a1e0ffe02 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.72" +__version__ = "2.1.73"
pex-tool__pex-1275	Release 2.1.34 On the docket: + [x] Allow command-line arguments to be read from a file #1271 + [x] Issue when running a module inside pex file #1018 + [x] Guard against concurrent re-imports. #1270 + [x] Ensure Pip logs to stderr. #1268	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.33\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.34\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 0e5749f8f..b2a99154a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,26 @@ Release Notes ============= +2.1.34 +------ + +Beyond bugfixes for a few important edge cases, this release includes +new support for @argfiles on the command line from @jjhelmus. These +can be useful to overcome command line length limitations. See: +https://docs.python.org/3/library/argparse.html#fromfile-prefix-chars. + +* Allow cli arguments to be specified in a file (#1273) + `PR #1273 <https://github.com/pantsbuild/pex/pull/1273>`_ + +* Fix module entrypoints. (#1274) + `PR #1274 <https://github.com/pantsbuild/pants/pull/1274>`_ + +* Guard against concurrent re-imports. (#1270) + `PR #1270 <https://github.com/pantsbuild/pants/pull/1270>`_ + +* Ensure Pip logs to stderr. (#1268) + `PR #1268 <https://github.com/pantsbuild/pants/pull/1268>`_ + 2.1.33 ------ diff --git a/pex/version.py b/pex/version.py index c20716d59..ee3ef65c4 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.33" +__version__ = "2.1.34"
pex-tool__pex-1450	Release 2.1.50 On the docket: + [x] Fix zipapp layout identification. #1448	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.49\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.50\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 4cf9ec11a..f05e62f6f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,17 @@ Release Notes ============= +2.1.50 +------ + +This is another hotfix of the 2.1.48 release's ``--layout`` feature that +fixes identification of ``--layout zipapp`` PEXes that have had their +execute mode bit turned off. A notable example is the Pex PEX when +downloaded from https://github.com/pantsbuild/pex/releases. + +* Fix zipapp layout identification. (#1448) + `PR #1448 <https://github.com/pantsbuild/pex/pull/1448>`_ + 2.1.49 ------ diff --git a/pex/version.py b/pex/version.py index 3977ea4eb..fed40855d 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.49" +__version__ = "2.1.50"
pex-tool__pex-1148	PexInfo.copy does not copy its collection attributes. The copy method was oversimplified in #1127 and now only copies the dict backing the non-collection attributes of PexInfo.	[ { "content": "# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\nfrom __future__ import absolute_import\n\nimport json\nimport os\n\nfrom pex import pex_warnings\nfrom pex.common import can_write_dir, open_zip, safe_mkdtemp\nfro...	[ { "content": "# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\nfrom __future__ import absolute_import\n\nimport json\nimport os\n\nfrom pex import pex_warnings\nfrom pex.common import can_write_dir, open_zip, safe_mkdtemp\nfro...	diff --git a/pex/pex_info.py b/pex/pex_info.py index 24c2bf524..5a9dcb43c 100644 --- a/pex/pex_info.py +++ b/pex/pex_info.py @@ -394,7 +394,7 @@ def dump(self): def copy(self): # type: () -> PexInfo - return PexInfo(self._pex_info) + return PexInfo(self.as_json_dict()) @staticmethod def _merge_split(*paths): diff --git a/tests/test_pex_info.py b/tests/test_pex_info.py index ee613697f..aea4e23b2 100644 --- a/tests/test_pex_info.py +++ b/tests/test_pex_info.py @@ -7,6 +7,7 @@ import pytest from pex.common import temporary_dir +from pex.inherit_path import InheritPath from pex.orderedset import OrderedSet from pex.pex_info import PexInfo from pex.pex_warnings import PEXWarning @@ -142,3 +143,31 @@ def test_pex_root_set_unwriteable(): assert isinstance(message, PEXWarning) assert pex_root in str(message) assert pex_info.pex_root in str(message) + + +def test_copy(): + # type: () -> None + default_info = PexInfo.default() + default_info_copy = default_info.copy() + assert default_info is not default_info_copy + assert default_info.dump() == default_info_copy.dump() + + info = PexInfo.default() + info.unzip = True + info.code_hash = "foo" + info.inherit_path = InheritPath.FALLBACK + info.add_requirement("bar==1") + info.add_requirement("baz==2") + info.add_distribution("bar.whl", "bar-sha") + info.add_distribution("baz.whl", "baz-sha") + info.add_interpreter_constraint(">=2.7.18") + info.add_interpreter_constraint("CPython==2.7.9") + info_copy = info.copy() + + assert info_copy.unzip is True + assert "foo" == info_copy.code_hash + assert InheritPath.FALLBACK == info_copy.inherit_path + assert OrderedSet(["bar==1", "baz==2"]) == info_copy.requirements + assert {"bar.whl": "bar-sha", "baz.whl": "baz-sha"} == info_copy.distributions + assert {">=2.7.18", "CPython==2.7.9"} == set(info_copy.interpreter_constraints) + assert info.dump() == info_copy.dump()
pex-tool__pex-1377	Release 2.1.43 On the docket: + [x] Support more verbose output for interpreter info. (#1347) + [x] Fix Pex emitting warnings about its Pip PEX venv. (#1351) + [x] Fix execution modes. (#1353) + [x] Warn for PEX env vars unsupported by venv. (#1354) + [x] Do not suppress pex output in bidst_pex (#1358) + [x] Using --platform manylinux2010 includes pyarrow wheel for manylinux2014 #1355 + [x] Fix --no-manylinux. #1365 + [x] Environment markers are incorrectly evaluated for --platform resolves. #1366 + [x] Pex probes wheel metadata incorrectly. #1375	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.42\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.43\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index fd894df7f..713eaf4ec 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,39 @@ Release Notes ============= +2.1.43 +------ + +* Fix dist-info metadata discovery. (#1376) + `PR #1376 <https://github.com/pantsbuild/pex/pull/1376>`_ + +* Fix ``--platform`` resolve handling of env markers. (#1367) + `PR #1367 <https://github.com/pantsbuild/pex/pull/1367>`_ + +* Fix ``--no-manylinux``. (#1365) + `PR #1365 <https://github.com/pantsbuild/pex/pull/1365>`_ + +* Allow ``--platform`` resolves for current interpreter. (#1364) + `PR #1364 <https://github.com/pantsbuild/pex/pull/1364>`_ + +* Do not suppress pex output in bidst_pex (#1358) + `PR #1358 <https://github.com/pantsbuild/pex/pull/1358>`_ + +* Warn for PEX env vars unsupported by venv. (#1354) + `PR #1354 <https://github.com/pantsbuild/pex/pull/1354>`_ + +* Fix execution modes. (#1353) + `PR #1353 <https://github.com/pantsbuild/pex/pull/1353>`_ + +* Fix Pex emitting warnings about its Pip PEX venv. (#1351) + `PR #1351 <https://github.com/pantsbuild/pex/pull/1351>`_ + +* Support more verbose output for interpreter info. (#1347) + `PR #1347 <https://github.com/pantsbuild/pex/pull/1347>`_ + +* Fix typo in recipes.rst (#1342) + `PR #1342 <https://github.com/pantsbuild/pex/pull/1342>`_ + 2.1.42 ------ diff --git a/pex/version.py b/pex/version.py index 5d2cd4dfc..4c1b8de5b 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.42" +__version__ = "2.1.43"
pex-tool__pex-1838	Release 2.1.96 On the docket: + [x] PEX_EXTRA_SYS_PATH propagation can break subprocesses run against other venvs. #1836	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.95\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.96\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index a66e2c6c4..bd4f2b4fe 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,16 @@ Release Notes ============= +2.1.96 +------ + +This is a hotfix release that fixes ``--venv`` mode +``PEX_EXTRA_SYS_PATH`` propogation introduced in Pex 2.1.95 to only +apply to ``sys.executable`` and not other Pythons. + +* Fix ``--venv`` ``PEX PEX_EXTRA_SYS_PATH`` propagation. (#1837) + `PR #1837 <https://github.com/pantsbuild/pex/pull/1837>`_ + 2.1.95 ------ diff --git a/pex/version.py b/pex/version.py index 40153e391..26a429cb9 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.95" +__version__ = "2.1.96"
pex-tool__pex-1140	Release 2.1.23 On the docket: + [x] Upgrade Pex to Pip 20.3.1. #1133	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.22\"\n", "path": "pex/version.py" } ]	[ { "content": "# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).\n# Licensed under the Apache License, Version 2.0 (see LICENSE).\n\n__version__ = \"2.1.23\"\n", "path": "pex/version.py" } ]	diff --git a/CHANGES.rst b/CHANGES.rst index 9a14e88b8..3e999fa51 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,21 @@ Release Notes ============= +2.1.23 +------ + +This release upgrades Pex to the latest Pip which includes support for +the new 2020-resolver (see: +https://pip.pypa.io/en/stable/user_guide/#resolver-changes-2020) as well +as support for macOS BigSur. Although this release defaults to the +legacy resolver behavior, the next release will deprecate the legacy +resolver and support for the legacy resolver will later be removed to +allow continuing Pip upgrades going forward. To switch to the new +resolver, use: `--resolver-version pip-2020-resolver`. + +* Upgrade Pex to Pip 20.3.1. (#1133) + `PR #1133 <https://github.com/pantsbuild/pex/pull/1133>`_ + 2.1.22 ------ diff --git a/pex/version.py b/pex/version.py index 16163f6f4..10a632ad9 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,4 +1,4 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = "2.1.22" +__version__ = "2.1.23"
rotki__rotki-2262	Wrong Binance asset mapping for STX ## Problem Definition This was reported by a user via email. They own some STX in binance. For Rotki STX is Stox (https://www.coingecko.com/en/coins/stox) but in Binance it's another token not called Stacks (https://www.coingecko.com/en/coins/stack). We support it in Rotki as blockstacks (STX-2) so we just need to change the binance mapping. ## Task Fix the binance mapping.	[ { "content": "from dataclasses import dataclass, field\nfrom functools import total_ordering\nfrom typing import Any, Optional, Type, TypeVar\n\nfrom rotkehlchen.assets.resolver import AssetResolver\nfrom rotkehlchen.errors import DeserializationError, UnknownAsset, UnsupportedAsset\nfrom rotkehlchen.typing imp...	[ { "content": "from dataclasses import dataclass, field\nfrom functools import total_ordering\nfrom typing import Any, Optional, Type, TypeVar\n\nfrom rotkehlchen.assets.resolver import AssetResolver\nfrom rotkehlchen.errors import DeserializationError, UnknownAsset, UnsupportedAsset\nfrom rotkehlchen.typing imp...	diff --git a/docs/changelog.rst b/docs/changelog.rst index a5f1e33579..cd069973b1 100755 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :bug:`2261` Users who had STX in Binance should now see it mapped properly to blockstack and not stox. * :bug:`-` Users will now see the total worth contained in the card for bigger amounts. * :bug:`2239` Amounts in the dashboard should now appear in single line for users. * :bug:`2244` Fix edge case where using a cryptocompare api key could result in the all coins endpoint to error if no cache already existed. diff --git a/rotkehlchen/assets/asset.py b/rotkehlchen/assets/asset.py index 9253a63d18..d76c8f1fda 100644 --- a/rotkehlchen/assets/asset.py +++ b/rotkehlchen/assets/asset.py @@ -154,6 +154,8 @@ 'SOL-2': 'SOL', # BETH is the eth staked in beacon chain 'ETH2': 'BETH', + # STX is Blockstack in Binance + 'STX-2': 'STX', } WORLD_TO_BITFINEX = { diff --git a/rotkehlchen/data/all_assets.json b/rotkehlchen/data/all_assets.json index 886fd48332..5aa997e462 100644 --- a/rotkehlchen/data/all_assets.json +++ b/rotkehlchen/data/all_assets.json @@ -11140,6 +11140,7 @@ }, "STX": { "coingecko": "stox", + "cryptocompare": "STOX", "ethereum_address": "0x006BeA43Baa3f7A6f765F14f10A1a1b08334EF45", "ethereum_token_decimals": 18, "name": "Stox", @@ -11149,7 +11150,7 @@ }, "STX-2": { "coingecko": "blockstack", - "cryptocompare": "BSTX", + "cryptocompare": "STX", "name": "Blockstack", "started": 1572048000, "symbol": "STX", diff --git a/rotkehlchen/data/all_assets.meta b/rotkehlchen/data/all_assets.meta index 79efc18417..79e8195bbd 100644 --- a/rotkehlchen/data/all_assets.meta +++ b/rotkehlchen/data/all_assets.meta @@ -1 +1 @@ -{"md5": "6499628db3b6996da07eb0e19741d8c0", "version": 48} +{"md5": "9d34eb6018b8d6013b4cb3fd8af22edf", "version": 48} diff --git a/rotkehlchen/tests/unit/test_assets.py b/rotkehlchen/tests/unit/test_assets.py index 9594df7ab8..cf76d74938 100644 --- a/rotkehlchen/tests/unit/test_assets.py +++ b/rotkehlchen/tests/unit/test_assets.py @@ -186,7 +186,7 @@ def test_coingecko_identifiers_are_reachable(data_dir): def test_assets_json_meta(): """Test that all_assets.json md5 matches and that if md5 changes since last time then version is also bumped""" - last_meta = {'md5': '6499628db3b6996da07eb0e19741d8c0', 'version': 48} + last_meta = {'md5': '9d34eb6018b8d6013b4cb3fd8af22edf', 'version': 48} data_dir = Path(__file__).resolve().parent.parent.parent / 'data' data_md5 = file_md5(data_dir / 'all_assets.json')
projectmesa__mesa-1437	v1.1.0 Safford Release Milestone: https://github.com/projectmesa/mesa/milestone/31 Highlighted changes: - #1376 > 6x perf speedup for add/remove agent in `ContinuousSpace` - #1391 correctness fix for `SimultaneousActivation` and `StagedActivation` - #1399 make `self.running = True` optional. We need to tell existing users that initializing this is no longer necessary, and so, reducing the boilerplate code - #1435 Allow user-specified local dir to be served by Tornado. Needed by Mesa-Geo - #1413 Allow batch_run to take arbitrary parameters	[ { "content": "\"\"\"\nMesa Agent-Based Modeling Framework\n\nCore Objects: Model, and Agent.\n\n\"\"\"\nimport datetime\n\nfrom mesa.model import Model\nfrom mesa.agent import Agent\n\nimport mesa.time as time\nimport mesa.space as space\nimport mesa.flat.visualization as visualization\nfrom mesa.datacollection...	[ { "content": "\"\"\"\nMesa Agent-Based Modeling Framework\n\nCore Objects: Model, and Agent.\n\n\"\"\"\nimport datetime\n\nfrom mesa.model import Model\nfrom mesa.agent import Agent\n\nimport mesa.time as time\nimport mesa.space as space\nimport mesa.flat.visualization as visualization\nfrom mesa.datacollection...	diff --git a/HISTORY.rst b/HISTORY.rst index 640c93a0c59..55afb0b1840 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,59 @@ Release History --------------- +1.1.0 (2022-10-10) Safford +++++++++++++++++++++++++++ + +Special notes + +* Perf: ContinuousSpace: speed-up add/remove agents #1376. This is a ~6x performance improvement for add/remove. +* fix: time: Recompute agent_keys between stages #1391. This is a correctness fix for ``SimultaneousActivation`` and ``StagedActivation`` when agents are being removed during simulation. +* ModularServer: Always set model.running = True on reset #1399. With this change, specifying ``self.running = True`` in your model ``__init__`` is now optional. Mesa's visualization server will automatically sets it to ``True`` in the beginning of a simulation. +* feat: Allow user-specified local dir to be served by Tornado #1435. This simplifies the usage of ``ModularServer`` in Mesa-Geo. +* Allow batch_run to take arbitrary parameters #1413. With this change, you can finally use any arbitrary Python objects as ``batch_run`` parameters, where previously they are restricted to hashable objects only. +* Prevent seed and random from being shared between instances #1439. With this fix, a model instance has their own isolated RNG. + +Improvements + +* CI Updates + * ci: Cancel previous obsolete runs #1378 + * ci: update black to prevent click error #1382 + * Add "falsy" to .codespellignore #1412 + * Upgrade pre-commit CI (with pyupgrade and syntax checks) #1422 +* Tests + * test: RandomActivationByType: Test adding agents with duplicate ID #1392 +* Dependency updates + * Update Pipfile.lock (dependencies) #1398 + * Update Pipfile.lock (dependencies) #1408 + * Update Pipfile.lock (dependencies) #1434 +* Docs + * docs: Add Tim Pope's guideline for proper Git commit msg #1379 + * readme: Improve the pip install for Git repo instruction #1416 + * Docs: Remove trailing whitespaces #1421 + * Fixes #1423 - fixes build badge in docs #1424 +* Refactors + * refactor: Apply pyupgrade --py37-plus #1429 + * refactor ModularServer (moving code into __init__) #1403 +* Perf: ContinuousSpace: speed-up add/remove agents #1376 +* Remove monospace formatting for hyperlinks #1388 +* ModularServer: Always set model.running = True on reset #1399 +* Allow batch_run to take arbitrary parameters #1413 +* ModularServer: Put new optional arg port last #1432 +* feat: Allow user-specified local dir to be served by Tornado #1435 +* Improve and measure speed of clamp function #1440 + +Fixes + +* Fix stray " in modular_template.html #1380 +* Fix zoom on network visualisation #1381 +* Fix broken monospace links #1387 +* fix: Ensure agent id is unique in RandomActivationByType.add #1386 +* fix: time: Recompute agent_keys between stages #1391 +* Fix batchrunner progress bar #1395 +* Fix stray " in visualisation dropdown labels #1409 +* space: Fix type error for Python < 3.9 #1430 +* Prevent seed and random from being shared between instances #1439 + 1.0.0 (2022-07-06) Quartzsite +++++++++++++++++++++++++++++++++++++++++++ diff --git a/mesa/__init__.py b/mesa/__init__.py index 64b3ea6fc0d..b5d5c7a7d03 100644 --- a/mesa/__init__.py +++ b/mesa/__init__.py @@ -26,6 +26,6 @@ ] __title__ = "mesa" -__version__ = "1.0.0" +__version__ = "1.1.0" __license__ = "Apache 2.0" __copyright__ = f"Copyright {datetime.date.today().year} Project Mesa Team"