Fixed protocol parameters for sandboxed node (#361)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.11.2](https://github.com/baking-bad/pytezos/compare/3.11.1...3.11.2) (2024-02-22)
+
+### Fixed
+
+* Fixed protocol parameters for sandboxed node
+
 ## [3.11.1](https://github.com/baking-bad/pytezos/compare/3.11.0...3.11.1) (2024-02-07)
 
 ### Added

README.md

@@ -39,7 +39,7 @@
 
 ## Installation
 
-Make sure you have Python 3.8+ installed and set as default in the system.  
+Make sure you have Python 3.8 to 3.11 installed and set as default in the system.  
 
 You also need to install cryptographic packages before installing the library/building the project:
 

requirements.dev.txt

@@ -1,6 +1,6 @@
 alabaster==0.7.13 ; python_version >= "3.8" and python_version < "3.12"
-anyio==4.2.0 ; python_version >= "3.8" and python_version < "3.12"
-appnope==0.1.3 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Darwin" or sys_platform == "darwin")
+anyio==4.3.0 ; python_version >= "3.8" and python_version < "3.12"
+appnope==0.1.4 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Darwin" or sys_platform == "darwin")
 argon2-cffi-bindings==21.2.0 ; python_version >= "3.8" and python_version < "3.12"
 argon2-cffi==23.1.0 ; python_version >= "3.8" and python_version < "3.12"
 arrow==1.3.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -10,7 +10,7 @@ babel==2.14.0 ; python_version >= "3.8" and python_version < "3.12"
 backcall==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
 base58==2.1.1 ; python_version >= "3.8" and python_version < "3.12"
 beautifulsoup4==4.12.3 ; python_version >= "3.8" and python_version < "3.12"
-black==24.1.1 ; python_version >= "3.8" and python_version < "3.12"
+black==24.2.0 ; python_version >= "3.8" and python_version < "3.12"
 bleach==6.1.0 ; python_version >= "3.8" and python_version < "3.12"
 bump2version==1.0.1 ; python_version >= "3.8" and python_version < "3.12"
 cached-property==1.5.2 ; python_version >= "3.8" and python_version < "3.12"
@@ -22,10 +22,10 @@ charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.12"
 click==8.1.7 ; python_version >= "3.8" and python_version < "3.12"
 colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Windows" or sys_platform == "win32")
 comm==0.2.1 ; python_version >= "3.8" and python_version < "3.12"
-coverage[toml]==7.4.1 ; python_version >= "3.8" and python_version < "3.12"
+coverage[toml]==7.4.2 ; python_version >= "3.8" and python_version < "3.12"
 cryptography==41.0.7 ; python_version >= "3.8" and python_version < "3.12"
 cytoolz==0.12.3 ; python_version >= "3.8" and python_version < "3.12" and implementation_name == "cpython"
-debugpy==1.8.0 ; python_version >= "3.8" and python_version < "3.12"
+debugpy==1.8.1 ; python_version >= "3.8" and python_version < "3.12"
 decorator==5.1.1 ; python_version >= "3.8" and python_version < "3.12"
 defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.12"
 deprecation==2.1.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -47,7 +47,7 @@ imagesize==1.4.1 ; python_version >= "3.8" and python_version < "3.12"
 importlib-metadata==7.0.1 ; python_version >= "3.8" and python_version < "3.10"
 importlib-resources==6.1.1 ; python_version >= "3.8" and python_version < "3.9"
 iniconfig==2.0.0 ; python_version >= "3.8" and python_version < "3.12"
-ipykernel==6.29.0 ; python_version >= "3.8" and python_version < "3.12"
+ipykernel==6.29.2 ; python_version >= "3.8" and python_version < "3.12"
 ipython-genutils==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
 ipython==8.12.3 ; python_version >= "3.8" and python_version < "3.12"
 isoduration==20.11.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -72,11 +72,11 @@ mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
 mypy==1.8.0 ; python_version >= "3.8" and python_version < "3.12"
 nbclassic==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
 nbclient==0.9.0 ; python_version >= "3.8" and python_version < "3.12"
-nbconvert==7.14.2 ; python_version >= "3.8" and python_version < "3.12"
+nbconvert==7.16.1 ; python_version >= "3.8" and python_version < "3.12"
 nbformat==5.9.2 ; python_version >= "3.8" and python_version < "3.12"
 nest-asyncio==1.6.0 ; python_version >= "3.8" and python_version < "3.12"
 netstruct==1.1.2 ; python_version >= "3.8" and python_version < "3.12"
-notebook-shim==0.2.3 ; python_version >= "3.8" and python_version < "3.12"
+notebook-shim==0.2.4 ; python_version >= "3.8" and python_version < "3.12"
 notebook==6.5.6 ; python_version >= "3.8" and python_version < "3.12"
 overrides==7.7.0 ; python_version >= "3.8" and python_version < "3.12"
 packaging==23.2 ; python_version >= "3.8" and python_version < "3.12"
@@ -90,7 +90,7 @@ pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9
 platformdirs==4.2.0 ; python_version >= "3.8" and python_version < "3.12"
 pluggy==1.4.0 ; python_version >= "3.8" and python_version < "3.12"
 ply==3.11 ; python_version >= "3.8" and python_version < "3.12"
-prometheus-client==0.19.0 ; python_version >= "3.8" and python_version < "3.12"
+prometheus-client==0.20.0 ; python_version >= "3.8" and python_version < "3.12"
 prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.12"
 psutil==5.9.8 ; python_version >= "3.8" and python_version < "3.12"
 ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "3.12" and (os_name != "nt" or sys_platform != "win32")
@@ -102,7 +102,7 @@ pygments==2.17.2 ; python_version >= "3.8" and python_version < "3.12"
 pysodium==0.7.17 ; python_version >= "3.8" and python_version < "3.12"
 pytest-cov==4.1.0 ; python_version >= "3.8" and python_version < "3.12"
 pytest-xdist==3.5.0 ; python_version >= "3.8" and python_version < "3.12"
-pytest==8.0.0 ; python_version >= "3.8" and python_version < "3.12"
+pytest==8.0.1 ; python_version >= "3.8" and python_version < "3.12"
 python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12"
 python-json-logger==2.0.7 ; python_version >= "3.8" and python_version < "3.12"
 pytz==2024.1 ; python_version >= "3.8" and python_version < "3.9"
@@ -114,11 +114,11 @@ referencing==0.33.0 ; python_version >= "3.8" and python_version < "3.12"
 requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
 rfc3339-validator==0.1.4 ; python_version >= "3.8" and python_version < "3.12"
 rfc3986-validator==0.1.1 ; python_version >= "3.8" and python_version < "3.12"
-rpds-py==0.17.1 ; python_version >= "3.8" and python_version < "3.12"
-ruff==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
+rpds-py==0.18.0 ; python_version >= "3.8" and python_version < "3.12"
+ruff==0.2.2 ; python_version >= "3.8" and python_version < "3.12"
 secp256k1==0.14.0 ; python_version >= "3.8" and python_version < "3.12"
 send2trash==1.8.2 ; python_version >= "3.8" and python_version < "3.12"
-setuptools==69.0.3 ; python_version >= "3.8" and python_version < "3.12"
+setuptools==69.1.0 ; python_version >= "3.8" and python_version < "3.12"
 simple-bson==0.0.3 ; python_version >= "3.8" and python_version < "3.12"
 simplejson==3.19.2 ; python_version >= "3.8" and python_version < "3.12"
 six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -146,17 +146,17 @@ tinycss2==1.2.1 ; python_version >= "3.8" and python_version < "3.12"
 tomli==2.0.1 ; python_version >= "3.8" and python_full_version <= "3.11.0a6"
 toolz==0.12.1 ; python_version >= "3.8" and python_version < "3.12" and (implementation_name == "pypy" or implementation_name == "cpython")
 tornado==6.4 ; python_version >= "3.8" and python_version < "3.12"
-tqdm==4.66.1 ; python_version >= "3.8" and python_version < "3.12"
+tqdm==4.66.2 ; python_version >= "3.8" and python_version < "3.12"
 traitlets==5.14.1 ; python_version >= "3.8" and python_version < "3.12"
 types-python-dateutil==2.8.19.20240106 ; python_version >= "3.8" and python_version < "3.12"
 types-pyyaml==6.0.12.12 ; python_version >= "3.8" and python_version < "3.12"
-types-requests==2.31.0.20240125 ; python_version >= "3.8" and python_version < "3.12"
-types-setuptools==69.0.0.20240125 ; python_version >= "3.8" and python_version < "3.12"
-types-simplejson==3.19.0.2 ; python_version >= "3.8" and python_version < "3.12"
+types-requests==2.31.0.20240218 ; python_version >= "3.8" and python_version < "3.12"
+types-setuptools==69.1.0.20240217 ; python_version >= "3.8" and python_version < "3.12"
+types-simplejson==3.19.0.20240218 ; python_version >= "3.8" and python_version < "3.12"
 types-tabulate==0.9.0.20240106 ; python_version >= "3.8" and python_version < "3.12"
 typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12"
 uri-template==1.3.0 ; python_version >= "3.8" and python_version < "3.12"
-urllib3==2.2.0 ; python_version >= "3.8" and python_version < "3.12"
+urllib3==2.2.1 ; python_version >= "3.8" and python_version < "3.12"
 wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.12"
 webcolors==1.13 ; python_version >= "3.8" and python_version < "3.12"
 webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12"

requirements.slim.txt

@@ -33,19 +33,19 @@ python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12"
 pywin32==306 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32"
 referencing==0.33.0 ; python_version >= "3.8" and python_version < "3.12"
 requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
-rpds-py==0.17.1 ; python_version >= "3.8" and python_version < "3.12"
+rpds-py==0.18.0 ; python_version >= "3.8" and python_version < "3.12"
 secp256k1==0.14.0 ; python_version >= "3.8" and python_version < "3.12"
-setuptools==69.0.3 ; python_version >= "3.8" and python_version < "3.12"
+setuptools==69.1.0 ; python_version >= "3.8" and python_version < "3.12"
 simple-bson==0.0.3 ; python_version >= "3.8" and python_version < "3.12"
 simplejson==3.19.2 ; python_version >= "3.8" and python_version < "3.12"
 six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
 strict-rfc3339==0.7 ; python_version >= "3.8" and python_version < "3.12"
 tabulate==0.9.0 ; python_version >= "3.8" and python_version < "3.12"
 testcontainers==3.7.1 ; python_version >= "3.8" and python_version < "3.12"
 toolz==0.12.1 ; python_version >= "3.8" and python_version < "3.12" and (implementation_name == "pypy" or implementation_name == "cpython")
-tqdm==4.66.1 ; python_version >= "3.8" and python_version < "3.12"
+tqdm==4.66.2 ; python_version >= "3.8" and python_version < "3.12"
 typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12"
-urllib3==2.2.0 ; python_version >= "3.8" and python_version < "3.12"
+urllib3==2.2.1 ; python_version >= "3.8" and python_version < "3.12"
 websocket-client==1.7.0 ; python_version >= "3.8" and python_version < "3.12"
 wrapt==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
 zipp==3.17.0 ; python_version >= "3.8" and python_version < "3.9"

requirements.txt

@@ -1,5 +1,5 @@
-anyio==4.2.0 ; python_version >= "3.8" and python_version < "3.12"
-appnope==0.1.3 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Darwin" or sys_platform == "darwin")
+anyio==4.3.0 ; python_version >= "3.8" and python_version < "3.12"
+appnope==0.1.4 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Darwin" or sys_platform == "darwin")
 argon2-cffi-bindings==21.2.0 ; python_version >= "3.8" and python_version < "3.12"
 argon2-cffi==23.1.0 ; python_version >= "3.8" and python_version < "3.12"
 arrow==1.3.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -19,7 +19,7 @@ colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and (platf
 comm==0.2.1 ; python_version >= "3.8" and python_version < "3.12"
 cryptography==41.0.7 ; python_version >= "3.8" and python_version < "3.12"
 cytoolz==0.12.3 ; python_version >= "3.8" and python_version < "3.12" and implementation_name == "cpython"
-debugpy==1.8.0 ; python_version >= "3.8" and python_version < "3.12"
+debugpy==1.8.1 ; python_version >= "3.8" and python_version < "3.12"
 decorator==5.1.1 ; python_version >= "3.8" and python_version < "3.12"
 defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.12"
 deprecation==2.1.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -36,7 +36,7 @@ fqdn==1.5.1 ; python_version >= "3.8" and python_version < "3.12"
 idna==3.6 ; python_version >= "3.8" and python_version < "3.12"
 importlib-metadata==7.0.1 ; python_version >= "3.8" and python_version < "3.10"
 importlib-resources==6.1.1 ; python_version >= "3.8" and python_version < "3.9"
-ipykernel==6.29.0 ; python_version >= "3.8" and python_version < "3.12"
+ipykernel==6.29.2 ; python_version >= "3.8" and python_version < "3.12"
 ipython-genutils==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
 ipython==8.12.3 ; python_version >= "3.8" and python_version < "3.12"
 isoduration==20.11.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -59,11 +59,11 @@ mnemonic==0.20 ; python_version >= "3.8" and python_version < "3.12"
 mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
 nbclassic==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
 nbclient==0.9.0 ; python_version >= "3.8" and python_version < "3.12"
-nbconvert==7.14.2 ; python_version >= "3.8" and python_version < "3.12"
+nbconvert==7.16.1 ; python_version >= "3.8" and python_version < "3.12"
 nbformat==5.9.2 ; python_version >= "3.8" and python_version < "3.12"
 nest-asyncio==1.6.0 ; python_version >= "3.8" and python_version < "3.12"
 netstruct==1.1.2 ; python_version >= "3.8" and python_version < "3.12"
-notebook-shim==0.2.3 ; python_version >= "3.8" and python_version < "3.12"
+notebook-shim==0.2.4 ; python_version >= "3.8" and python_version < "3.12"
 notebook==6.5.6 ; python_version >= "3.8" and python_version < "3.12"
 overrides==7.7.0 ; python_version >= "3.8" and python_version < "3.12"
 packaging==23.2 ; python_version >= "3.8" and python_version < "3.12"
@@ -74,7 +74,7 @@ pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "3.12"
 pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9"
 platformdirs==4.2.0 ; python_version >= "3.8" and python_version < "3.12"
 ply==3.11 ; python_version >= "3.8" and python_version < "3.12"
-prometheus-client==0.19.0 ; python_version >= "3.8" and python_version < "3.12"
+prometheus-client==0.20.0 ; python_version >= "3.8" and python_version < "3.12"
 prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.12"
 psutil==5.9.8 ; python_version >= "3.8" and python_version < "3.12"
 ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "3.12" and (os_name != "nt" or sys_platform != "win32")
@@ -94,10 +94,10 @@ referencing==0.33.0 ; python_version >= "3.8" and python_version < "3.12"
 requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
 rfc3339-validator==0.1.4 ; python_version >= "3.8" and python_version < "3.12"
 rfc3986-validator==0.1.1 ; python_version >= "3.8" and python_version < "3.12"
-rpds-py==0.17.1 ; python_version >= "3.8" and python_version < "3.12"
+rpds-py==0.18.0 ; python_version >= "3.8" and python_version < "3.12"
 secp256k1==0.14.0 ; python_version >= "3.8" and python_version < "3.12"
 send2trash==1.8.2 ; python_version >= "3.8" and python_version < "3.12"
-setuptools==69.0.3 ; python_version >= "3.8" and python_version < "3.12"
+setuptools==69.1.0 ; python_version >= "3.8" and python_version < "3.12"
 simple-bson==0.0.3 ; python_version >= "3.8" and python_version < "3.12"
 simplejson==3.19.2 ; python_version >= "3.8" and python_version < "3.12"
 six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -111,12 +111,12 @@ testcontainers==3.7.1 ; python_version >= "3.8" and python_version < "3.12"
 tinycss2==1.2.1 ; python_version >= "3.8" and python_version < "3.12"
 toolz==0.12.1 ; python_version >= "3.8" and python_version < "3.12" and (implementation_name == "pypy" or implementation_name == "cpython")
 tornado==6.4 ; python_version >= "3.8" and python_version < "3.12"
-tqdm==4.66.1 ; python_version >= "3.8" and python_version < "3.12"
+tqdm==4.66.2 ; python_version >= "3.8" and python_version < "3.12"
 traitlets==5.14.1 ; python_version >= "3.8" and python_version < "3.12"
 types-python-dateutil==2.8.19.20240106 ; python_version >= "3.8" and python_version < "3.12"
 typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12"
 uri-template==1.3.0 ; python_version >= "3.8" and python_version < "3.12"
-urllib3==2.2.0 ; python_version >= "3.8" and python_version < "3.12"
+urllib3==2.2.1 ; python_version >= "3.8" and python_version < "3.12"
 wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.12"
 webcolors==1.13 ; python_version >= "3.8" and python_version < "3.12"
 webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12"

src/pytezos/cli/cli.py

@@ -31,7 +31,7 @@
 from pytezos.sandbox.node import TEZOS_NODE_PORT
 from pytezos.sandbox.node import SandboxedNodeContainer
 from pytezos.sandbox.node import get_next_baker_key
-from pytezos.sandbox.parameters import KATHMANDU
+from pytezos.sandbox.parameters import protocol_hashes
 
 kernel_js_path = join(dirname(dirname(__file__)), 'assets', 'kernel.js')
 kernel_json = {
@@ -340,7 +340,7 @@ def smartpy_compile(
 
 @cli.command(help='Run containerized sandbox node')
 @click.option('--image', type=str, help='Docker image to use', default=DOCKER_IMAGE)
-@click.option('--protocol', type=click.Choice(['kathmandu']), help='Protocol to use', default='kathmandu')
+@click.option('--protocol', type=click.Choice(['oxford']), help='Protocol to use', default='oxford')
 @click.option('--port', '-p', type=int, help='Port to expose', default=TEZOS_NODE_PORT)
 @click.option('--interval', '-i', type=float, help='Interval between baked blocks (in seconds)', default=1.0)
 @click.option('--blocks', '-b', type=int, help='Number of blocks to bake before exit')
@@ -353,9 +353,7 @@ def sandbox(
     interval: float,
     blocks: int,
 ):
-    protocol_hash = {
-        'kathmandu': KATHMANDU,
-    }[protocol]
+    protocol_hash = protocol_hashes[protocol]
 
     node = SandboxedNodeContainer(image=image, port=port)
     with node:

src/pytezos/sandbox/node.py

@@ -22,9 +22,9 @@
 from pytezos.sandbox.parameters import LATEST
 from pytezos.sandbox.parameters import sandbox_addresses
 
-DOCKER_IMAGE = 'bakingbad/sandboxed-node:v19.0-1'
-MAX_ATTEMPTS = 100
-ATTEMPT_DELAY = 0.1
+DOCKER_IMAGE = 'bakingbad/sandboxed-node:v19.1-2'
+MAX_ATTEMPTS = 60
+ATTEMPT_DELAY = 0.5
 TEZOS_NODE_PORT = 8732
 
 

src/pytezos/sandbox/parameters.py

@@ -16,6 +16,20 @@
 OXFORD = 'ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH'
 LATEST = OXFORD
 
+protocol_hashes = {
+    'edo': EDO,
+    'florence': FLORENCE,
+    'granada': GRANADA,
+    'hangzhou': HANGZHOU,
+    'ithaca': ITHACA,
+    'jakarta': JAKARTA,
+    'kathmandu': KATHMANDU,
+    'lima': LIMA,
+    'mumbai': MUMBAI,
+    'nairobi': NAIROBI,
+    'oxford': OXFORD,
+}
+
 protocol_version = {
     EDO: 8,
     FLORENCE: 9,
@@ -64,6 +78,7 @@
     'bootstrap1': 'tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx',
 }
 
+# https://gitlab.com/tezos/tezos/-/blob/master/src/proto_018_Proxford/lib_parameters/default_parameters.ml#L283
 sandbox_params: Dict[str, Any] = {
     # NOTE: Built-in accounts
     'bootstrap_accounts': [
@@ -81,17 +96,20 @@
         ],
     ],
     # NOTE: Shorter cycles and voting periods
-    'preserved_cycles': 0,
+    'preserved_cycles': 2,
     'blocks_per_cycle': 8,
     'blocks_per_commitment': 4,
-    'nonce_revelation_threshold': 1,
-    'blocks_per_stake_snapshot': 8,
-    'cycles_per_voting_period': 64,
+    'nonce_revelation_threshold': 4,
+    'blocks_per_stake_snapshot': 4,
+    'cycles_per_voting_period': 8,
     'proof_of_work_threshold': str((1 << 63) - 1),
-    # NOTE: Faster block time. Otherwise, fails with round_of_past_timestamp/malformed_period. Yes, it's a string.
+    'vdf_difficulty': '50000',
     'minimal_block_delay': '1',
-    # NOTE: proto.018-Proxford.validate.block.not_enough_attestations
+    'delay_increment_per_round': '1',
+    'consensus_committee_size': 256,
     'consensus_threshold': 0,
+    'limit_of_delegation_over_baking': 19,
+    'max_operations_time_to_live': 8,
 }
 
 # NOTE: https://rpc.tzkt.io/oxfordnet/chains/main/blocks/head/context/constants/parametric