Cleaning

Makefile

@@ -54,7 +54,7 @@ partial_clean:
 	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

deposit_contract/README.md

@@ -1,38 +0,0 @@
-# Deposit contract
-
-## How to set up the testing environment?
-
-Under the `eth2.0-specs` directory, execute:
-
-```sh
-make install_deposit_contract_tester
-```
-
-## How to compile the contract?
-
-```sh
-make compile_deposit_contract
-```
-
-The compiler dependencies can be installed with:
-
-```sh
-make install_deposit_contract_compiler
-```
-
-Note that this requires python 3.7 to be installed. The pinned vyper version will not work on 3.8.
-
-The ABI and bytecode will be updated at [`contracts/validator_registration.json`](./contracts/validator_registration.json).
-
-
-## How to run tests?
-
-For running the contract tests:
-```sh
-make test_deposit_contract
-```
-
-For testing the compiler output against the expected formally-verified bytecode:
-```sh
-make test_compile_deposit_contract
-```

deposit_contract/compiler/deposit_contract/compile.py

@@ -1,31 +0,0 @@
-import argparse
-import json
-import os
-
-from vyper import compiler
-
-DIR = os.path.dirname(__file__)
-
-
-def generate_compiled_json(file_path: str):
-    deposit_contract_code = open(file_path).read()
-    abi = compiler.mk_full_signature(deposit_contract_code)
-    bytecode = compiler.compile_code(deposit_contract_code)['bytecode']
-    contract_json = {
-        'abi': abi,
-        'bytecode': bytecode,
-    }
-    # write json
-    basename = os.path.basename(file_path)
-    dirname = os.path.dirname(file_path)
-    contract_name = basename.split('.')[0]
-    with open(dirname + "/{}.json".format(contract_name), 'w') as f_write:
-        json.dump(contract_json, f_write)
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument("path", type=str, help="the path of the contract")
-    args = parser.parse_args()
-    path = args.path
-    generate_compiled_json(path)

deposit_contract/compiler/deposit_contract/test_compile.py

@@ -1,29 +0,0 @@
-from vyper import compiler
-
-import json
-import os
-
-DIR = os.path.dirname(__file__)
-
-
-def get_deposit_contract_code():
-    file_path = os.path.join(DIR, '../../contracts/validator_registration.vy')
-    deposit_contract_code = open(file_path).read()
-    return deposit_contract_code
-
-
-def get_deposit_contract_json():
-    file_path = os.path.join(DIR, '../../contracts/validator_registration.json')
-    deposit_contract_json = open(file_path).read()
-    return json.loads(deposit_contract_json)
-
-
-def test_compile_deposit_contract():
-    compiled_deposit_contract_json = get_deposit_contract_json()
-
-    deposit_contract_code = get_deposit_contract_code()
-    abi = compiler.mk_full_signature(deposit_contract_code)
-    bytecode = compiler.compile_code(deposit_contract_code)['bytecode']
-
-    assert abi == compiled_deposit_contract_json["abi"]
-    assert bytecode == compiled_deposit_contract_json["bytecode"]

deposit_contract/compiler/requirements.txt

@@ -1,7 +0,0 @@
-# Vyper beta version used to generate the bytecode that was then formally verified.
-# On top of this beta version, a later change was backported, and included in the formal verification:
-#   https://github.com/vyperlang/vyper/issues/1761
-# The resulting vyper version is pinned and maintained as protected branch.
-git+https://github.com/vyperlang/vyper@1761-HOTFIX-v0.1.0-beta.13
-
-pytest==3.6.1

deposit_contract/compiler/setup.py

@@ -1,10 +0,0 @@
-from distutils.core import setup
-
-setup(
-    name='deposit_contract_compiler',
-    packages=['deposit_contract'],
-    package_dir={"": "."},
-    python_requires="3.7",  # pinned vyper compiler stops working after 3.7. See vyper issue 1835.
-    tests_requires=["pytest==3.6.1"],
-    install_requires=[],  # see requirements.txt file
-)

deposit_contract/contracts/validator_registration.vy

@@ -1,110 +0,0 @@
-# Vyper target 0.1.0b13.hotfix1761
-MIN_DEPOSIT_AMOUNT: constant(uint256) = 1000000000  # Gwei
-DEPOSIT_CONTRACT_TREE_DEPTH: constant(uint256) = 32
-MAX_DEPOSIT_COUNT: constant(uint256) = 4294967295 # 2**DEPOSIT_CONTRACT_TREE_DEPTH - 1
-PUBKEY_LENGTH: constant(uint256) = 48  # bytes
-WITHDRAWAL_CREDENTIALS_LENGTH: constant(uint256) = 32  # bytes
-SIGNATURE_LENGTH: constant(uint256) = 96  # bytes
-AMOUNT_LENGTH: constant(uint256) = 8  # bytes
-
-DepositEvent: event({
-    pubkey: bytes[48],
-    withdrawal_credentials: bytes[32],
-    amount: bytes[8],
-    signature: bytes[96],
-    index: bytes[8],
-})
-
-branch: bytes32[DEPOSIT_CONTRACT_TREE_DEPTH]
-deposit_count: uint256
-
-# Compute hashes in empty sparse Merkle tree
-zero_hashes: bytes32[DEPOSIT_CONTRACT_TREE_DEPTH]
-@public
-def __init__():
-    for i in range(DEPOSIT_CONTRACT_TREE_DEPTH - 1):
-        self.zero_hashes[i + 1] = sha256(concat(self.zero_hashes[i], self.zero_hashes[i]))
-
-
-@private
-@constant
-def to_little_endian_64(value: uint256) -> bytes[8]:
-    # Reversing bytes using bitwise uint256 manipulations
-    # Note: array accesses of bytes[] are not currently supported in Vyper
-    # Note: this function is only called when `value < 2**64`
-    y: uint256 = 0
-    x: uint256 = value
-    for _ in range(8):
-        y = shift(y, 8)
-        y = y + bitwise_and(x, 255)
-        x = shift(x, -8)
-    return slice(convert(y, bytes32), start=24, len=8)
-
-
-@public
-@constant
-def get_deposit_root() -> bytes32:
-    zero_bytes32: bytes32 = 0x0000000000000000000000000000000000000000000000000000000000000000
-    node: bytes32 = zero_bytes32
-    size: uint256 = self.deposit_count
-    for height in range(DEPOSIT_CONTRACT_TREE_DEPTH):
-        if bitwise_and(size, 1) == 1:  # More gas efficient than `size % 2 == 1`
-            node = sha256(concat(self.branch[height], node))
-        else:
-            node = sha256(concat(node, self.zero_hashes[height]))
-        size /= 2
-    return sha256(concat(node, self.to_little_endian_64(self.deposit_count), slice(zero_bytes32, start=0, len=24)))
-
-
-@public
-@constant
-def get_deposit_count() -> bytes[8]:
-    return self.to_little_endian_64(self.deposit_count)
-
-
-@payable
-@public
-def deposit(pubkey: bytes[PUBKEY_LENGTH],
-            withdrawal_credentials: bytes[WITHDRAWAL_CREDENTIALS_LENGTH],
-            signature: bytes[SIGNATURE_LENGTH],
-            deposit_data_root: bytes32):
-    # Avoid overflowing the Merkle tree (and prevent edge case in computing `self.branch`)
-    assert self.deposit_count < MAX_DEPOSIT_COUNT
-
-    # Check deposit amount
-    deposit_amount: uint256 = msg.value / as_wei_value(1, "gwei")
-    assert deposit_amount >= MIN_DEPOSIT_AMOUNT
-
-    # Length checks for safety
-    assert len(pubkey) == PUBKEY_LENGTH
-    assert len(withdrawal_credentials) == WITHDRAWAL_CREDENTIALS_LENGTH
-    assert len(signature) == SIGNATURE_LENGTH
-
-    # Emit `DepositEvent` log
-    amount: bytes[8] = self.to_little_endian_64(deposit_amount)
-    log.DepositEvent(pubkey, withdrawal_credentials, amount, signature, self.to_little_endian_64(self.deposit_count))
-
-    # Compute deposit data root (`DepositData` hash tree root)
-    zero_bytes32: bytes32 = 0x0000000000000000000000000000000000000000000000000000000000000000
-    pubkey_root: bytes32 = sha256(concat(pubkey, slice(zero_bytes32, start=0, len=64 - PUBKEY_LENGTH)))
-    signature_root: bytes32 = sha256(concat(
-        sha256(slice(signature, start=0, len=64)),
-        sha256(concat(slice(signature, start=64, len=SIGNATURE_LENGTH - 64), zero_bytes32)),
-    ))
-    node: bytes32 = sha256(concat(
-        sha256(concat(pubkey_root, withdrawal_credentials)),
-        sha256(concat(amount, slice(zero_bytes32, start=0, len=32 - AMOUNT_LENGTH), signature_root)),
-    ))
-    # Verify computed and expected deposit data roots match
-    assert node == deposit_data_root
-
-    # Add deposit data root to Merkle tree (update a single `branch` node)
-    self.deposit_count += 1
-    size: uint256 = self.deposit_count
-    for height in range(DEPOSIT_CONTRACT_TREE_DEPTH):
-        if bitwise_and(size, 1) == 1:  # More gas efficient than `size % 2 == 1`
-            self.branch[height] = node
-            break
-        node = sha256(concat(self.branch[height], node))
-        size /= 2
-

solidity_deposit_contract/LICENSE

@@ -1,116 +0,0 @@
-CC0 1.0 Universal
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator and
-subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the
-purpose of contributing to a commons of creative, cultural and scientific
-works ("Commons") that the public can reliably and without fear of later
-claims of infringement build upon, modify, incorporate in other works, reuse
-and redistribute as freely as possible in any form whatsoever and for any
-purposes, including without limitation commercial purposes. These owners may
-contribute to the Commons to promote the ideal of a free culture and the
-further production of creative, cultural and scientific works, or to gain
-reputation or greater distribution for their Work in part through the use and
-efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation
-of additional consideration or compensation, the person associating CC0 with a
-Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-and publicly distribute the Work under its terms, with knowledge of his or her
-Copyright and Related Rights in the Work and the meaning and intended legal
-effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not limited
-to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display, communicate,
-  and translate a Work;
-
-  ii. moral rights retained by the original author(s) and/or performer(s);
-
-  iii. publicity and privacy rights pertaining to a person's image or likeness
-  depicted in a Work;
-
-  iv. rights protecting against unfair competition in regards to a Work,
-  subject to the limitations in paragraph 4(a), below;
-
-  v. rights protecting the extraction, dissemination, use and reuse of data in
-  a Work;
-
-  vi. database rights (such as those arising under Directive 96/9/EC of the
-  European Parliament and of the Council of 11 March 1996 on the legal
-  protection of databases, and under any national implementation thereof,
-  including any amended or successor version of such directive); and
-
-  vii. other similar, equivalent or corresponding rights throughout the world
-  based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention of,
-applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-and Related Rights and associated claims and causes of action, whether now
-known or unknown (including existing as well as future claims and causes of
-action), in the Work (i) in all territories worldwide, (ii) for the maximum
-duration provided by applicable law or treaty (including future time
-extensions), (iii) in any current or future medium and for any number of
-copies, and (iv) for any purpose whatsoever, including without limitation
-commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
-the Waiver for the benefit of each member of the public at large and to the
-detriment of Affirmer's heirs and successors, fully intending that such Waiver
-shall not be subject to revocation, rescission, cancellation, termination, or
-any other legal or equitable action to disrupt the quiet enjoyment of the Work
-by the public as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason be
-judged legally invalid or ineffective under applicable law, then the Waiver
-shall be preserved to the maximum extent permitted taking into account
-Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
-is so judged Affirmer hereby grants to each affected person a royalty-free,
-non transferable, non sublicensable, non exclusive, irrevocable and
-unconditional license to exercise Affirmer's Copyright and Related Rights in
-the Work (i) in all territories worldwide, (ii) for the maximum duration
-provided by applicable law or treaty (including future time extensions), (iii)
-in any current or future medium and for any number of copies, and (iv) for any
-purpose whatsoever, including without limitation commercial, advertising or
-promotional purposes (the "License"). The License shall be deemed effective as
-of the date CC0 was applied by Affirmer to the Work. Should any part of the
-License for any reason be judged legally invalid or ineffective under
-applicable law, such partial invalidity or ineffectiveness shall not
-invalidate the remainder of the License, and in such case Affirmer hereby
-affirms that he or she will not (i) exercise any of his or her remaining
-Copyright and Related Rights in the Work or (ii) assert any associated claims
-and causes of action with respect to the Work, in either case contrary to
-Affirmer's express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
-  a. No trademark or patent rights held by Affirmer are waived, abandoned,
-  surrendered, licensed or otherwise affected by this document.
-
-  b. Affirmer offers the Work as-is and makes no representations or warranties
-  of any kind concerning the Work, express, implied, statutory or otherwise,
-  including without limitation warranties of title, merchantability, fitness
-  for a particular purpose, non infringement, or the absence of latent or
-  other defects, accuracy, or the present or absence of errors, whether or not
-  discoverable, all to the greatest extent permissible under applicable law.
-
-  c. Affirmer disclaims responsibility for clearing rights of other persons
-  that may apply to the Work or any use thereof, including without limitation
-  any person's Copyright and Related Rights in the Work. Further, Affirmer
-  disclaims responsibility for obtaining any necessary consents, permissions
-  or other rights required for any use of the Work.
-
-  d. Affirmer understands and acknowledges that Creative Commons is not a
-  party to this document and has no duty or obligation with respect to this
-  CC0 or use of the Work.
-
-For more information, please see
-<http://creativecommons.org/publicdomain/zero/1.0/>

solidity_deposit_contract/Makefile

@@ -1,22 +0,0 @@
-all: compile
-
-clean:
-	@rm -rf build
-	@rm -f deposit_contract.json
-
-# Note: using /bin/echo for macOS support
-compile: clean
-	@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 deposit_contract.sol tests/deposit_contract.t.sol
-	@/bin/echo -n '{"abi": ' > deposit_contract.json
-	@cat build/DepositContract.abi >> deposit_contract.json
-	@/bin/echo -n ', "bytecode": "0x' >> deposit_contract.json
-	@cat build/DepositContract.bin >> deposit_contract.json
-	@/bin/echo -n '"}' >> deposit_contract.json
-
-export DAPP_SKIP_BUILD:=1
-export DAPP_SRC:=.
-export DAPP_JSON:=build/combined.json
-
-test:
-	dapp test -v --fuzz-runs 5

solidity_deposit_contract/README.md

@@ -1,22 +1,16 @@
 # eth2-deposit-contract
 
-This is a port of the [Vyper Eth 2.0 deposit contract](https://github.com/ethereum/eth2.0-specs/blob/dev/deposit_contract/contracts/validator_registration.vy) to Solidity.
+This is a port of the [Vyper Eth 2.0 deposit contract](https://github.com/ethereum/eth2.0-specs/blob/v0.12.2/deposit_contract/contracts/validator_registration.vy) to Solidity.
 
 The original motivation was to run the SMTChecker and the new Yul IR generator option (`--ir`) in the compiler.
 
 As of June 2020, this contract (the version tagged as `r1`) has been verified and is considered for adoption.
 See this [blog post](https://blog.ethereum.org/2020/06/23/eth2-quick-update-no-12/) for more information.
 
-## Using this with the tests
+## Running web3 tests
-
-1. Create the `deposit_contract.json` by running `make` (this requires `solc` to be in the path)
-2. Download [eth2.0-specs](https://github.com/ethereum/eth2.0-specs)
-3. Replace `eth2.0-specs/deposit_contract/contracts/validator_registration.json` with `deposit_contract.json`
-4. In the `eth2.0-specs` directory run `make install_deposit_contract_tester` to install the tools needed (make sure to have Python 3.7 and pip installed)
-5. Finally in the `eth2.0-specs` directory run `make test_deposit_contract` to execute the tests
-
-The Makefile currently compiles the code without optimisations. To enable optimisations add `--optimize` to the `solc` line.
 
+1. In the `eth2.0-specs` directory run `make install_deposit_contract_web3_tester` to install the tools needed (make sure to have Python 3.7 and pip installed)
+2. In the `eth2.0-specs` directory run `make test_deposit_contract_web3_tests` to execute the tests
 
 ## Running randomized `dapp` tests:
 

solidity_deposit_contract/circle.yml

@@ -1,77 +0,0 @@
-version: 2.1
-
-jobs:
-  build:
-    docker:
-      - 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
-            git diff --color --exit-code
-      - persist_to_workspace:
-          root: .
-          paths:
-            - deposit_contract.json
-            - build/combined.json
-            - lib
-
-  spectest:
-    docker:
-      - image: cimg/python:3.8.1
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /tmp/
-      - run:
-          name: Update python3
-          command: |
-            sudo apt-get update
-            sudo apt-get install -y python3-venv
-      - run:
-          name: Install eth2.0-specs tests
-          command: |
-            git clone https://github.com/ethereum/eth2.0-specs --single-branch --branch v0.11.2
-            cp -f /tmp/deposit_contract.json eth2.0-specs/deposit_contract/contracts/validator_registration.json
-            cd eth2.0-specs
-            make install_deposit_contract_tester
-      - run:
-          name: Run eth2.0-specs tests
-          command: |
-            cd eth2.0-specs
-            make test_deposit_contract
-
-  test:
-    docker:
-      - image: nixorg/nix:circleci
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /tmp/
-      - run:
-          name: Test the contract
-          command: |
-            mkdir build
-            cp -r /tmp/build/* build
-            cp -r /tmp/lib/* lib
-            nix-shell --command 'make test'
-
-workflows:
-  version: 2
-
-  build_and_test:
-    jobs:
-      - build
-      - spectest:
-          requires:
-            - build
-      - test:
-          requires:
-            - spectest