Update Octez to 20.0 (#365)

Co-authored-by: Igor Sereda <[email protected]>
baking-bad · Jun 11, 2024 · c5e57a2 · c5e57a2
1 parent 5528644
commit c5e57a2
Show file tree

Hide file tree

Showing 11 changed files with 164 additions and 182 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.12.1](https://github.com/baking-bad/pytezos/compare/3.12.0...3.12.1) (2024-06-11)
+
+### Changed
+
+* Octez binaries updated to v20.0-3
+
 ## [3.12.0](https://github.com/baking-bad/pytezos/compare/3.11.3...3.12.0) (2024-05-27)
 
 ### Added

diff --git a/Makefile b/Makefile
@@ -77,21 +77,6 @@ image:             ## Build Docker image
 	docker buildx build . --file pytezos.dockerfile -t pytezos:${TAG} --load
 	docker buildx build . --file michelson-kernel.dockerfile -t michelson-kernel:${TAG} --load
 
-release-patch:     ## Release patch version
-	bumpversion patch
-	git push --tags
-	git push
-
-release-minor:     ## Release minor version
-	bumpversion minor
-	git push --tags
-	git push
-
-release-major:     ## Release major version
-	bumpversion major
-	git push --tags
-	git push
-
 clean:             ## Remove all files from .gitignore except for `.venv`
 	git clean -xdf --exclude=".venv"
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytezos"
-version = "3.12.0"
+version = "3.12.1"
 description = "Python toolkit for Tezos"
 license = "MIT"
 authors = [
@@ -70,7 +70,6 @@ simple-bson = "^0.0.3"
 
 [tool.poetry.dev-dependencies]
 black = "*"
-bump2version = "*"
 diff-cover = "*"
 isort = "*"
 mypy = "*"

diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -12,18 +12,17 @@ base58==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 beautifulsoup4==4.12.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
 black==24.4.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 bleach==6.1.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
-bump2version==1.0.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cached-property==1.5.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cattrs==23.2.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
-certifi==2024.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
+certifi==2024.6.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cffi==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 chardet==5.2.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 charset-normalizer==3.3.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 click==8.1.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
 colorama==0.4.6 ; python_full_version >= "3.8.1" and python_version < "3.13" and (platform_system == "Windows" or sys_platform == "win32")
 comm==0.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
-coverage[toml]==7.5.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
-cryptography==42.0.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
+coverage[toml]==7.5.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
+cryptography==42.0.8 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cytoolz==0.12.3 ; python_full_version >= "3.8.1" and python_version < "3.13" and implementation_name == "cpython"
 debugpy==1.8.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 decorator==5.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
@@ -62,7 +61,7 @@ jupyter-client==7.4.9 ; python_full_version >= "3.8.1" and python_version < "3.1
 jupyter-core==5.7.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 jupyter-events==0.10.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 jupyter-server-terminals==0.5.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
-jupyter-server==2.14.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
+jupyter-server==2.14.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 jupyterlab-pygments==0.3.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 markupsafe==2.1.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
 matplotlib-inline==0.1.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
@@ -91,7 +90,7 @@ platformdirs==4.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 pluggy==1.5.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 ply==3.11 ; python_full_version >= "3.8.1" and python_version < "3.13"
 prometheus-client==0.20.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
-prompt-toolkit==3.0.43 ; python_full_version >= "3.8.1" and python_version < "3.13"
+prompt-toolkit==3.0.46 ; python_full_version >= "3.8.1" and python_version < "3.13"
 psutil==5.9.8 ; python_full_version >= "3.8.1" and python_version < "3.13"
 ptyprocess==0.7.0 ; python_full_version >= "3.8.1" and python_version < "3.13" and (os_name != "nt" or sys_platform != "win32")
 pure-eval==0.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
@@ -101,7 +100,7 @@ pygments==2.18.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 pysodium==0.7.17 ; python_full_version >= "3.8.1" and python_version < "3.13"
 pytest-cov==5.0.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 pytest-xdist==3.6.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
-pytest==8.2.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
+pytest==8.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 python-dateutil==2.9.0.post0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 python-json-logger==2.0.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
 pytz==2024.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
@@ -114,7 +113,7 @@ requests==2.31.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 rfc3339-validator==0.1.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
 rfc3986-validator==0.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 rpds-py==0.18.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
-ruff==0.4.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
+ruff==0.4.8 ; python_full_version >= "3.8.1" and python_version < "3.13"
 secp256k1==0.14.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 send2trash==1.8.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
 setuptools==69.5.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
@@ -149,16 +148,16 @@ tqdm==4.66.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
 traitlets==5.14.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
 types-python-dateutil==2.9.0.20240316 ; python_full_version >= "3.8.1" and python_version < "3.13"
 types-pyyaml==6.0.12.20240311 ; python_full_version >= "3.8.1" and python_version < "3.13"
-types-requests==2.32.0.20240523 ; python_full_version >= "3.8.1" and python_version < "3.13"
+types-requests==2.32.0.20240602 ; python_full_version >= "3.8.1" and python_version < "3.13"
 types-setuptools==70.0.0.20240524 ; python_full_version >= "3.8.1" and python_version < "3.13"
 types-simplejson==3.19.0.20240310 ; python_full_version >= "3.8.1" and python_version < "3.13"
 types-tabulate==0.9.0.20240106 ; python_full_version >= "3.8.1" and python_version < "3.13"
-typing-extensions==4.12.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
+typing-extensions==4.12.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 uri-template==1.3.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 urllib3==2.2.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 wcwidth==0.2.13 ; python_full_version >= "3.8.1" and python_version < "3.13"
 webcolors==1.13 ; python_full_version >= "3.8.1" and python_version < "3.13"
 webencodings==0.5.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 websocket-client==1.8.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 wrapt==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
-zipp==3.19.0 ; python_full_version >= "3.8.1" and python_version < "3.10"
+zipp==3.19.2 ; python_full_version >= "3.8.1" and python_version < "3.10"
diff --git a/requirements.slim.txt b/requirements.slim.txt
@@ -2,12 +2,12 @@ attrs==23.2.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 base58==2.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cached-property==1.5.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cattrs==23.2.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
-certifi==2024.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
+certifi==2024.6.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cffi==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 charset-normalizer==3.3.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 click==8.1.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
 colorama==0.4.6 ; python_full_version >= "3.8.1" and python_version < "3.13" and platform_system == "Windows"
-cryptography==42.0.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
+cryptography==42.0.8 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cytoolz==0.12.3 ; python_full_version >= "3.8.1" and python_version < "3.13" and implementation_name == "cpython"
 deprecation==2.1.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 docker==6.1.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
@@ -43,8 +43,8 @@ tabulate==0.9.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 testcontainers==3.7.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 toolz==0.12.1 ; python_full_version >= "3.8.1" and python_version < "3.13" and (implementation_name == "pypy" or implementation_name == "cpython")
 tqdm==4.66.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
-typing-extensions==4.12.0 ; python_full_version >= "3.8.1" and python_version < "3.11"
+typing-extensions==4.12.1 ; python_full_version >= "3.8.1" and python_version < "3.11"
 urllib3==2.2.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 websocket-client==1.8.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 wrapt==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
-zipp==3.19.0 ; python_full_version >= "3.8.1" and python_version < "3.9"
+zipp==3.19.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
diff --git a/requirements.txt b/requirements.txt
@@ -11,13 +11,13 @@ beautifulsoup4==4.12.3 ; python_full_version >= "3.8.1" and python_version < "3.
 bleach==6.1.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cached-property==1.5.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cattrs==23.2.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
-certifi==2024.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
+certifi==2024.6.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cffi==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 charset-normalizer==3.3.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 click==8.1.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
 colorama==0.4.6 ; python_full_version >= "3.8.1" and python_version < "3.13" and (platform_system == "Windows" or sys_platform == "win32")
 comm==0.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
-cryptography==42.0.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
+cryptography==42.0.8 ; python_full_version >= "3.8.1" and python_version < "3.13"
 cytoolz==0.12.3 ; python_full_version >= "3.8.1" and python_version < "3.13" and implementation_name == "cpython"
 debugpy==1.8.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 decorator==5.1.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
@@ -50,7 +50,7 @@ jupyter-client==7.4.9 ; python_full_version >= "3.8.1" and python_version < "3.1
 jupyter-core==5.7.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 jupyter-events==0.10.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 jupyter-server-terminals==0.5.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
-jupyter-server==2.14.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
+jupyter-server==2.14.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 jupyterlab-pygments==0.3.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 markupsafe==2.1.5 ; python_full_version >= "3.8.1" and python_version < "3.13"
 matplotlib-inline==0.1.7 ; python_full_version >= "3.8.1" and python_version < "3.13"
@@ -74,7 +74,7 @@ pkgutil-resolve-name==1.3.10 ; python_full_version >= "3.8.1" and python_version
 platformdirs==4.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
 ply==3.11 ; python_full_version >= "3.8.1" and python_version < "3.13"
 prometheus-client==0.20.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
-prompt-toolkit==3.0.43 ; python_full_version >= "3.8.1" and python_version < "3.13"
+prompt-toolkit==3.0.46 ; python_full_version >= "3.8.1" and python_version < "3.13"
 psutil==5.9.8 ; python_full_version >= "3.8.1" and python_version < "3.13"
 ptyprocess==0.7.0 ; python_full_version >= "3.8.1" and python_version < "3.13" and (os_name != "nt" or sys_platform != "win32")
 pure-eval==0.2.2 ; python_full_version >= "3.8.1" and python_version < "3.13"
@@ -112,12 +112,12 @@ tornado==6.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
 tqdm==4.66.4 ; python_full_version >= "3.8.1" and python_version < "3.13"
 traitlets==5.14.3 ; python_full_version >= "3.8.1" and python_version < "3.13"
 types-python-dateutil==2.9.0.20240316 ; python_full_version >= "3.8.1" and python_version < "3.13"
-typing-extensions==4.12.0 ; python_full_version >= "3.8.1" and python_version < "3.11"
+typing-extensions==4.12.1 ; python_full_version >= "3.8.1" and python_version < "3.11"
 uri-template==1.3.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 urllib3==2.2.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 wcwidth==0.2.13 ; python_full_version >= "3.8.1" and python_version < "3.13"
 webcolors==1.13 ; python_full_version >= "3.8.1" and python_version < "3.13"
 webencodings==0.5.1 ; python_full_version >= "3.8.1" and python_version < "3.13"
 websocket-client==1.8.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
 wrapt==1.16.0 ; python_full_version >= "3.8.1" and python_version < "3.13"
-zipp==3.19.0 ; python_full_version >= "3.8.1" and python_version < "3.10"
+zipp==3.19.2 ; python_full_version >= "3.8.1" and python_version < "3.10"
diff --git a/src/michelson_kernel/__init__.py b/src/michelson_kernel/__init__.py
@@ -1 +1,3 @@
-__version__ = '3.12.0'
+import importlib.metadata
+
+__version__ = importlib.metadata.version('pytezos')
diff --git a/src/pytezos/__init__.py b/src/pytezos/__init__.py
@@ -10,6 +10,8 @@
 And follow the interactive documentation.
 """
 
+import importlib.metadata
+
 from pytezos.client import PyTezosClient
 from pytezos.contract.interface import Contract
 from pytezos.contract.interface import ContractInterface
@@ -24,6 +26,6 @@
 from pytezos.michelson.types.base import Undefined
 from pytezos.michelson.types.core import Unit
 
-__version__ = '3.12.0'
+__version__ = importlib.metadata.version('pytezos')
 
 pytezos = PyTezosClient()
diff --git a/src/pytezos/sandbox/node.py b/src/pytezos/sandbox/node.py
@@ -22,7 +22,7 @@
 from pytezos.sandbox.parameters import LATEST
 from pytezos.sandbox.parameters import sandbox_addresses
 
-DOCKER_IMAGE = 'bakingbad/sandboxed-node:v20.0-rc1-1'
+DOCKER_IMAGE = 'bakingbad/sandboxed-node:v20.0-3'
 MAX_ATTEMPTS = 60
 ATTEMPT_DELAY = 0.5
 TEZOS_NODE_PORT = 8732

diff --git a/src/pytezos/sandbox/parameters.py b/src/pytezos/sandbox/parameters.py
@@ -14,7 +14,7 @@
 MUMBAI = 'PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1'
 NAIROBI = 'PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf'
 OXFORD = 'ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH'
-PARIS = 'PtParisBQscdCm6Cfow6ndeU6wKJyA3aV1j4D3gQBQMsTQyJCrz'
+PARIS = 'PtParisBxoLz5gzMmn3d9WBQNoPSZakgnkMC2VNuQ3KXfUtUQeZ'
 LATEST = PARIS
 
 protocol_hashes = {