diff --git a/.circleci/config.yml b/.circleci/config.yml index ef59b41cdb..ac889e408d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,7 +109,7 @@ geth_steps: &geth_steps name: build geth if missing command: | mkdir -p $HOME/.ethash - pip install --user py-geth>=3.3.0 + pip install --user py-geth>=3.4.0 export GOROOT=/usr/local/go echo $GETH_VERSION export GETH_BINARY="$HOME/.py-geth/geth-$GETH_VERSION/bin/geth" @@ -287,7 +287,7 @@ jobs: - image: circleci/python:3.6 environment: TOXENV: py36-integration-goethereum-ipc - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 py36-integration-goethereum-http: <<: *geth_steps @@ -295,7 +295,7 @@ jobs: - image: circleci/python:3.6 environment: TOXENV: py36-integration-goethereum-http - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 py36-integration-goethereum-ws: <<: *geth_steps @@ -303,7 +303,7 @@ jobs: - image: circleci/python:3.6 environment: TOXENV: py36-integration-goethereum-ws - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 # py36-integration-parity-ipc: # <<: *parity_steps @@ -379,7 +379,7 @@ jobs: - image: circleci/python:3.7 environment: TOXENV: py37-integration-goethereum-ipc - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 py37-integration-goethereum-http: <<: *geth_steps @@ -387,7 +387,7 @@ jobs: - image: circleci/python:3.7 environment: TOXENV: py37-integration-goethereum-http - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 py37-integration-goethereum-ws: <<: *geth_steps @@ -395,7 +395,7 @@ jobs: - image: circleci/python:3.7 environment: TOXENV: py37-integration-goethereum-ws - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 # py37-integration-parity-ipc: # <<: *parity_steps @@ -476,7 +476,7 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-integration-goethereum-ipc - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 py38-integration-goethereum-http: <<: *geth_steps @@ -484,7 +484,7 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-integration-goethereum-http - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 py38-integration-goethereum-ws: <<: *geth_steps @@ -492,7 +492,7 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-integration-goethereum-ws - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 # py38-integration-parity-ipc: # <<: *parity_steps @@ -568,7 +568,7 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-integration-goethereum-ipc - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 py39-integration-goethereum-http: <<: *geth_steps @@ -576,7 +576,7 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-integration-goethereum-http - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 py39-integration-goethereum-ws: <<: *geth_steps @@ -584,7 +584,7 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-integration-goethereum-ws - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 # py39-integration-parity-ipc: # <<: *parity_steps @@ -634,7 +634,7 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: benchmark - GETH_VERSION: v1.10.5 + GETH_VERSION: v1.10.6 workflows: version: 2.1 diff --git a/docs/contributing.rst b/docs/contributing.rst index eb23e2c8d9..8299ea4143 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -309,13 +309,13 @@ Geth Fixtures .. code:: sh - $ python -m geth.install v1.10.5 + $ python -m geth.install v1.10.6 2. Specify the Geth binary and run the fixture creation script (from within the web3.py directory): .. code:: sh - $ GETH_BINARY=~/.py-geth/geth-v1.10.5/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.5-fixture + $ GETH_BINARY=~/.py-geth/geth-v1.10.6/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.6-fixture 3. The output of this script is your fixture, a zip file, which is now stored in ``/tests/integration/``. Update the ``/tests/integration/go_ethereum/conftest.py`` file to point to this new fixture. Delete the old fixture. diff --git a/newsfragments/2085.misc.rst b/newsfragments/2085.misc.rst new file mode 100644 index 0000000000..9dfb8b89ef --- /dev/null +++ b/newsfragments/2085.misc.rst @@ -0,0 +1 @@ +Support for geth v1.10.6 \ No newline at end of file diff --git a/setup.py b/setup.py index 6e70ccc2f4..01c3055e3b 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ extras_require = { 'tester': [ "eth-tester[py-evm]==v0.5.0-beta.4", - "py-geth>=3.3.0,<4", + "py-geth>=3.4.0,<4", ], 'linter': [ "flake8==3.8.3", @@ -21,7 +21,7 @@ "click>=5.1", "configparser==3.5.0", "contextlib2>=0.5.4", - "py-geth>=3.3.0,<4", + "py-geth>=3.4.0,<4", "py-solc>=0.4.0", "pytest>=4.4.0,<5.0.0", "sphinx>=3.0,<4", diff --git a/tests/integration/geth-1.10.5-fixture.zip b/tests/integration/geth-1.10.5-fixture.zip deleted file mode 100644 index 872a8d3a4e..0000000000 Binary files a/tests/integration/geth-1.10.5-fixture.zip and /dev/null differ diff --git a/tests/integration/geth-1.10.6-fixture.zip b/tests/integration/geth-1.10.6-fixture.zip new file mode 100644 index 0000000000..00f69ffcb8 Binary files /dev/null and b/tests/integration/geth-1.10.6-fixture.zip differ diff --git a/tests/integration/go_ethereum/conftest.py b/tests/integration/go_ethereum/conftest.py index 7aba0e89bc..cb4be4357f 100644 --- a/tests/integration/go_ethereum/conftest.py +++ b/tests/integration/go_ethereum/conftest.py @@ -19,7 +19,7 @@ KEYFILE_PW = 'web3py-test' -GETH_FIXTURE_ZIP = 'geth-1.10.5-fixture.zip' +GETH_FIXTURE_ZIP = 'geth-1.10.6-fixture.zip' @pytest.fixture(scope='module') diff --git a/web3/tools/benchmark/node.py b/web3/tools/benchmark/node.py index c9e182eaef..214884974d 100644 --- a/web3/tools/benchmark/node.py +++ b/web3/tools/benchmark/node.py @@ -24,7 +24,7 @@ kill_proc_gracefully, ) -GETH_FIXTURE_ZIP = "geth-1.10.5-fixture.zip" +GETH_FIXTURE_ZIP = "geth-1.10.6-fixture.zip" class GethBenchmarkFixture: