Merge pull request #2057 from ethereum/dev

release v0.12.3
ethereum · Sep 18, 2020 · 7748c70 · 7748c70
2 parents 447b74d + 68bcc19
commit 7748c70
Show file tree

Hide file tree

Showing 89 changed files with 1,920 additions and 1,023 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -44,32 +44,19 @@ commands:
           venv_name: v22-pyspec
           reqs_checksum: cache-{{ checksum "setup.py" }}
           venv_path: ./venv
-  restore_deposit_contract_compiler_cached_venv:
-    description: "Restore the venv from cache for the deposit contract compiler"
-    steps:
-      - restore_cached_venv:
-          venv_name: v23-deposit-contract-compiler
-          reqs_checksum: cache-{{ checksum "deposit_contract/compiler/requirements.txt" }}
-  save_deposit_contract_compiler_cached_venv:
-    description: "Save the venv to cache for later use of the deposit contract compiler"
-    steps:
-      - save_cached_venv:
-          venv_name: v23-deposit-contract-compiler
-          reqs_checksum: cache-{{ checksum "deposit_contract/compiler/requirements.txt" }}
-          venv_path: ./deposit_contract/compiler/venv
   restore_deposit_contract_tester_cached_venv:
     description: "Restore the venv from cache for the deposit contract tester"
     steps:
       - restore_cached_venv:
-          venv_name: v22-deposit-contract-tester
-          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "deposit_contract/tester/requirements.txt" }}
+          venv_name: v23-deposit-contract-tester
+          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "solidity_deposit_contract/web3_tester/requirements.txt" }}
   save_deposit_contract_tester_cached_venv:
     description: "Save the venv to cache for later use of the deposit contract tester"
     steps:
       - save_cached_venv:
-          venv_name: v22-deposit-contract-tester
-          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "deposit_contract/tester/requirements.txt" }}
-          venv_path: ./deposit_contract/tester/venv
+          venv_name: v23-deposit-contract-tester
+          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "solidity_deposit_contract/web3_tester/requirements.txt" }}
+          venv_path: ./solidity_deposit_contract/web3_tester/venv
 jobs:
   checkout_specs:
     docker:
@@ -143,22 +130,54 @@ jobs:
           key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
       - restore_pyspec_cached_venv
       - run:
-          name: Run linter
+          name: Run linter for pyspec
           command: make lint
-  install_deposit_contract_compiler:
+      - run:
+          name: Run linter for test generators
+          command: make lint_generators
+  build_deposit_contract:
     docker:
-        # The deposit contract compiler is pinned to python 3.7 because of the vyper version pin.
-        - image: circleci/python:3.7
-    working_directory: ~/specs-repo
+      - image: ethereum/solc:0.6.11-alpine
+    steps:
+      - checkout
+      - run:
+          name: Install build essentials
+          command: |
+            apk update
+            apk add git make
+      - run:
+          name: Compile the contract
+          command: |
+            make compile_deposit_contract
+            git diff --color --exit-code
+      - persist_to_workspace:
+          root: .
+          paths:
+            - ./solidity_deposit_contract/deposit_contract.json
+            - ./build/combined.json
+            - ./solidity_deposit_contract/lib
+  test_deposit_contract:
+    docker:
+      - image: nixorg/nix:circleci
     steps:
+      - checkout
       - restore_cache:
-          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
-      - restore_deposit_contract_compiler_cached_venv
+          key: nix-store-test-v2
+      - attach_workspace:
+          at: /tmp/
       - run:
-          name: Install deposit contract compiler requirements
-          command: make install_deposit_contract_compiler
-      - save_deposit_contract_compiler_cached_venv
-  install_deposit_contract_tester:
+          name: Test the contract
+          command: |
+            mkdir build
+            cp -r /tmp/build/* build
+            cp -r /tmp/solidity_deposit_contract/lib/* ./solidity_deposit_contract/lib
+            cp -r /tmp/solidity_deposit_contract/deposit_contract.json ./solidity_deposit_contract/deposit_contract.json
+            nix-shell --command 'make test_deposit_contract' ./solidity_deposit_contract/shell.nix
+      - save_cache:
+          key: nix-store-test-v2
+          paths:
+            - /nix
+  install_deposit_contract_web3_tester:
     docker:
       - image: circleci/python:3.8
     working_directory: ~/specs-repo
@@ -168,20 +187,9 @@ jobs:
       - restore_deposit_contract_tester_cached_venv
       - run:
           name: Install deposit contract tester requirements
-          command: make install_deposit_contract_tester
+          command: make install_deposit_contract_web3_tester
       - save_deposit_contract_tester_cached_venv
-  test_compile_deposit_contract:
-    docker:
-      - image: circleci/python:3.7
-    working_directory: ~/specs-repo
-    steps:
-      - restore_cache:
-          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
-      - restore_deposit_contract_compiler_cached_venv
-      - run:
-          name: Run deposit contract compile test
-          command: make test_compile_deposit_contract
-  test_deposit_contract:
+  test_deposit_contract_web3_tests:
     docker:
       - image: circleci/python:3.8
     working_directory: ~/specs-repo
@@ -190,9 +198,8 @@ jobs:
           key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
       - restore_deposit_contract_tester_cached_venv
       - run:
-          name: Run deposit contract test
-          command: make test_deposit_contract
-
+          name: Run deposit contract test with web3.py
+          command: make test_deposit_contract_web3_tests
 workflows:
   version: 2.1
   test_spec:
@@ -209,15 +216,15 @@ workflows:
       - lint:
           requires:
             - test
-      - install_deposit_contract_compiler:
+      - install_deposit_contract_web3_tester:
           requires:
             - checkout_specs
-      - test_compile_deposit_contract:
+      - test_deposit_contract_web3_tests:
           requires:
-            - install_deposit_contract_compiler
-      - install_deposit_contract_tester:
-          requires:
-            - checkout_specs
+            - install_deposit_contract_web3_tester
+  build_and_test_deposit_contract:
+    jobs:
+      - build_deposit_contract
       - test_deposit_contract:
           requires:
-            - install_deposit_contract_tester
+            - build_deposit_contract
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-*.vy linguist-language=Python
+*.sol linguist-language=Solidity
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/ds-test"]
+	path = solidity_deposit_contract/lib/ds-test
+	url = https://github.com/dapphub/ds-test
diff --git a/Makefile b/Makefile
@@ -1,11 +1,14 @@
 SPEC_DIR = ./specs
 SSZ_DIR = ./ssz
 TEST_LIBS_DIR = ./tests/core
+TEST_GENERATORS_DIR = ./tests/generators
 PY_SPEC_DIR = $(TEST_LIBS_DIR)/pyspec
 TEST_VECTOR_DIR = ../eth2.0-spec-tests/tests
 GENERATOR_DIR = ./tests/generators
-DEPOSIT_CONTRACT_COMPILER_DIR = ./deposit_contract/compiler
-DEPOSIT_CONTRACT_TESTER_DIR = ./deposit_contract/tester
+SOLIDITY_DEPOSIT_CONTRACT_DIR = ./solidity_deposit_contract
+SOLIDITY_DEPOSIT_CONTRACT_SOURCE = ${SOLIDITY_DEPOSIT_CONTRACT_DIR}/deposit_contract.sol
+SOLIDITY_FILE_NAME = deposit_contract.json
+DEPOSIT_CONTRACT_TESTER_DIR = ${SOLIDITY_DEPOSIT_CONTRACT_DIR}/web3_tester
 CONFIGS_DIR = ./configs
 
 # Collect a list of generator names
@@ -25,6 +28,11 @@ COV_INDEX_FILE=$(PY_SPEC_DIR)/$(COV_HTML_OUT)/index.html
 CURRENT_DIR = ${CURDIR}
 LINTER_CONFIG_FILE = $(CURRENT_DIR)/linter.ini
 
+export DAPP_SKIP_BUILD:=1
+export DAPP_SRC:=$(SOLIDITY_DEPOSIT_CONTRACT_DIR)
+export DAPP_LIB:=$(SOLIDITY_DEPOSIT_CONTRACT_DIR)/lib
+export DAPP_JSON:=build/combined.json
+
 .PHONY: clean partial_clean all test citest lint generate_tests pyspec install_test open_cov \
         install_deposit_contract_tester test_deposit_contract install_deposit_contract_compiler \
         compile_deposit_contract test_compile_deposit_contract check_toc
@@ -38,15 +46,14 @@ partial_clean:
 	rm -rf .pytest_cache
 	rm -f .coverage
 	rm -rf $(PY_SPEC_DIR)/.pytest_cache
-	rm -rf $(DEPOSIT_CONTRACT_COMPILER_DIR)/.pytest_cache
 	rm -rf $(DEPOSIT_CONTRACT_TESTER_DIR)/.pytest_cache
 	rm -rf $(PY_SPEC_DIR)/phase0
 	rm -rf $(PY_SPEC_DIR)/phase1
 	rm -rf $(PY_SPEC_DIR)/$(COV_HTML_OUT)
 	rm -rf $(PY_SPEC_DIR)/.coverage
 	rm -rf $(PY_SPEC_DIR)/test-reports
 	rm -rf eth2spec.egg-info dist build
-
+	rm -rf build
 
 clean: partial_clean
 	rm -rf venv
@@ -86,7 +93,7 @@ find_test: pyspec
 
 citest: pyspec
 	mkdir -p tests/core/pyspec/test-reports/eth2spec; . venv/bin/activate; cd $(PY_SPEC_DIR); \
-	python -m pytest -n 4 --disable-bls --junitxml=eth2spec/test_results.xml eth2spec
+	python -m pytest -n 4 --bls-type=milagro --junitxml=eth2spec/test_results.xml eth2spec
 
 open_cov:
 	((open "$(COV_INDEX_FILE)" || xdg-open "$(COV_INDEX_FILE)") &> /dev/null) &
@@ -107,23 +114,29 @@ lint: pyspec
 	flake8  --config $(LINTER_CONFIG_FILE) ./eth2spec \
 	&& mypy --config-file $(LINTER_CONFIG_FILE) -p eth2spec.phase0 -p eth2spec.phase1
 
-install_deposit_contract_tester:
-	cd $(DEPOSIT_CONTRACT_TESTER_DIR); python3 -m venv venv; . venv/bin/activate; pip3 install -r requirements.txt
+lint_generators: pyspec
+	. venv/bin/activate; cd $(TEST_GENERATORS_DIR); \
+	flake8  --config $(LINTER_CONFIG_FILE)
 
-test_deposit_contract:
-	cd $(DEPOSIT_CONTRACT_TESTER_DIR); . venv/bin/activate; \
-	python -m pytest .
+compile_deposit_contract:
+	@cd $(SOLIDITY_DEPOSIT_CONTRACT_DIR)
+	@git submodule update --recursive --init
+	@solc --metadata-literal --optimize --optimize-runs 5000000 --bin --abi --combined-json=abi,bin,bin-runtime,srcmap,srcmap-runtime,ast,metadata,storage-layout --overwrite -o build $(SOLIDITY_DEPOSIT_CONTRACT_SOURCE) $(SOLIDITY_DEPOSIT_CONTRACT_DIR)/tests/deposit_contract.t.sol
+	@/bin/echo -n '{"abi": ' > $(SOLIDITY_FILE_NAME)
+	@cat build/DepositContract.abi >> $(SOLIDITY_FILE_NAME)
+	@/bin/echo -n ', "bytecode": "0x' >> $(SOLIDITY_FILE_NAME)
+	@cat build/DepositContract.bin >> $(SOLIDITY_FILE_NAME)
+	@/bin/echo -n '"}' >> $(SOLIDITY_FILE_NAME)
 
-install_deposit_contract_compiler:
-	cd $(DEPOSIT_CONTRACT_COMPILER_DIR); python3.7 -m venv venv; . venv/bin/activate; pip3.7 install -r requirements.txt
+test_deposit_contract:
+	dapp test -v --fuzz-runs 5
 
-compile_deposit_contract:
-	cd $(DEPOSIT_CONTRACT_COMPILER_DIR); . venv/bin/activate; \
-	python3.7 deposit_contract/compile.py ../contracts/validator_registration.vy
+install_deposit_contract_web3_tester:
+	cd $(DEPOSIT_CONTRACT_TESTER_DIR); python3 -m venv venv; . venv/bin/activate; pip3 install -r requirements.txt
 
-test_compile_deposit_contract:
-	cd $(DEPOSIT_CONTRACT_COMPILER_DIR); . venv/bin/activate; \
-	python3.7 -m pytest .
+test_deposit_contract_web3_tests:
+	cd $(DEPOSIT_CONTRACT_TESTER_DIR); . venv/bin/activate; \
+	python -m pytest .
 
 # Runs a generator, identified by param 1
 define run_generator

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Ethereum 2.0 Specifications
 
-[![Join the chat at https://discord.gg/hpFs23p](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://discord.gg/hpFs23p) [![Join the chat at https://gitter.im/ethereum/sharding](https://badges.gitter.im/ethereum/sharding.svg)](https://gitter.im/ethereum/sharding?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://discord.gg/qGpsxSA](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://discord.gg/qGpsxSA) [![Join the chat at https://gitter.im/ethereum/sharding](https://badges.gitter.im/ethereum/sharding.svg)](https://gitter.im/ethereum/sharding?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 To learn more about sharding and Ethereum 2.0 (Serenity), see the [sharding FAQ](https://eth.wiki/sharding/Sharding-FAQs) and the [research compendium](https://notes.ethereum.org/s/H1PGqDhpm).
 

diff --git a/configs/README.md b/configs/README.md
@@ -15,7 +15,7 @@ Over time, the need to sync an older state may be deprecated.
 In this case, the prefix on the new constant may be removed, and the old constant will keep a special name before completely being removed.
 
 A previous iteration of forking made use of "timelines", but this collides with the definitions used in the spec (constants for special forking slots, etc.), and was not integrated sufficiently in any of the spec tools or implementations.
-Instead, the config essentially doubles as fork definition now, e.g. changing the value for `PHASE_1_GENESIS_SLOT` changes the fork.
+Instead, the config essentially doubles as fork definition now, e.g. changing the value for `PHASE_1_FORK_SLOT` changes the fork.
 
 Another reason to prefer forking through constants is the ability to program a forking moment based on context, instead of being limited to a static slot number.
 

diff --git a/configs/mainnet/phase0.yaml b/configs/mainnet/phase0.yaml
@@ -2,6 +2,7 @@
 # Note: the intention of this file (for now) is to illustrate what a mainnet configuration could look like.
 # Some of these constants may still change before the launch of Phase 0.
 
+CONFIG_NAME: "mainnet"
 
 # Misc
 # ---------------------------------------------------------------
@@ -27,6 +28,8 @@ HYSTERESIS_QUOTIENT: 4
 HYSTERESIS_DOWNWARD_MULTIPLIER: 1
 # 5 (plus 1.25)
 HYSTERESIS_UPWARD_MULTIPLIER: 5
+# 3
+PROPORTIONAL_SLASHING_MULTIPLIER: 3
 
 
 # Fork Choice
@@ -99,8 +102,6 @@ SLOTS_PER_HISTORICAL_ROOT: 8192
 MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
 # 2**8 (= 256) epochs ~27 hours
 SHARD_COMMITTEE_PERIOD: 256
-# 2**6 (= 64) epochs ~7 hours
-MAX_EPOCHS_PER_CROSSLINK: 64
 # 2**2 (= 4) epochs 25.6 minutes
 MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
 

diff --git a/configs/mainnet/phase1.yaml b/configs/mainnet/phase1.yaml
@@ -1,11 +1,12 @@
 # Mainnet preset - phase 1
 
+CONFIG_NAME: "mainnet"
 
 # phase1-fork
 # ---------------------------------------------------------------
 PHASE_1_FORK_VERSION: 0x01000000
 # [STUB]
-PHASE_1_GENESIS_SLOT: 32
+PHASE_1_FORK_SLOT: 0
 INITIAL_ACTIVE_SHARDS: 64
 
 
@@ -69,8 +70,6 @@ EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 32768
 EPOCHS_PER_CUSTODY_PERIOD: 16384
 # 2**11 (= 2,048) epochs, ~9 days
 CUSTODY_PERIOD_TO_RANDAO_PADDING: 2048
-# 2**14 (= 16,384) epochs
-CUSTODY_RESPONSE_DEADLINE: 16384
 # 2**15 (= 32,768) epochs, ~146 days
 MAX_CHUNK_CHALLENGE_DELAY: 32768
 

diff --git a/configs/minimal/phase0.yaml b/configs/minimal/phase0.yaml
@@ -1,5 +1,6 @@
 # Minimal preset
 
+CONFIG_NAME: "minimal"
 
 # Misc
 # ---------------------------------------------------------------
@@ -26,7 +27,8 @@ HYSTERESIS_QUOTIENT: 4
 HYSTERESIS_DOWNWARD_MULTIPLIER: 1
 # 5 (plus 1.25)
 HYSTERESIS_UPWARD_MULTIPLIER: 5
-
+# 3
+PROPORTIONAL_SLASHING_MULTIPLIER: 3
 
 
 # Fork Choice
@@ -99,8 +101,6 @@ SLOTS_PER_HISTORICAL_ROOT: 64
 MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
 # [customized] higher frequency of committee turnover and faster time to acceptable voluntary exit
 SHARD_COMMITTEE_PERIOD: 64
-# [customized] fast catchup crosslinks
-MAX_EPOCHS_PER_CROSSLINK: 4
 # 2**2 (= 4) epochs
 MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
 

diff --git a/configs/minimal/phase1.yaml b/configs/minimal/phase1.yaml
@@ -1,12 +1,13 @@
 # Minimal preset - phase 1
 
+CONFIG_NAME: "minimal"
 
 # phase1-fork
 # ---------------------------------------------------------------
 # [customized] for testnet distinction
 PHASE_1_FORK_VERSION: 0x01000001
-# [customized] for testing
-PHASE_1_GENESIS_SLOT: 8
+# [STUB]
+PHASE_1_FORK_SLOT: 0
 # [customized] reduced for testing
 INITIAL_ACTIVE_SHARDS: 2
 
@@ -66,15 +67,13 @@ DOMAIN_LIGHT_AGGREGATE_AND_PROOF: 0x85000000
 # 2**1 (= 2) epochs
 RANDAO_PENALTY_EPOCHS: 2
 # [customized] quicker for testing
-EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 128
+EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 64
 # [customized] quicker for testing
-EPOCHS_PER_CUSTODY_PERIOD: 64
+EPOCHS_PER_CUSTODY_PERIOD: 32
 # [customized] quicker for testing
 CUSTODY_PERIOD_TO_RANDAO_PADDING: 8
-# [customized] quicker for testing
-CUSTODY_RESPONSE_DEADLINE: 128
 # [customize for faster testing]
-MAX_CHUNK_CHALLENGE_DELAY: 128
+MAX_CHUNK_CHALLENGE_DELAY: 64
 
 
 # Misc parameters
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		*.vy linguist-language=Python
		*.sol linguist-language=Solidity