From 291f06d652cf458525dd7e5a5c3f7d0fe4284b3a Mon Sep 17 00:00:00 2001 From: Patrick Collins <54278053+PatrickAlphaC@users.noreply.github.com> Date: Sun, 8 Dec 2024 14:48:56 -0500 Subject: [PATCH] fix: updated to anvil-zksync from era_test_node --- .gitignore | 1 + CONTRIBUTING.md | 4 ++-- docs/source/tutorials/zksync-getting-started.rst | 4 ++-- moccasin/_sys_path_and_config_setup.py | 2 +- moccasin/constants/file_data.py | 1 + pyproject.toml | 4 ++-- tests/data/tests_project/.gitignore | 1 + tests/data/zksync_project/moccasin.toml | 2 +- uv.lock | 10 +++++----- 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 0c0e507..8a71e25 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ secrets/ secret/ .DS_Store era_test_node.log +anvil-zksync.log tests/data/complex_project/.deployments.db # All deployments, except the one in the deployment test project .deployments.db diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 00a4dd9..adb9dc8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,8 +44,8 @@ You must have the following installed to proceed with contributing to this proje ### ZKync requirements If you wish to run the ZKync tests, you'll need these as well (ran with `just test-z`) -- [era_test_node](https://github.com/matter-labs/era-test-node) - - You'll know you did it right if you can run `era_test_node --version` and you see a response like `era_test_node 0.1.0 (a178051e8 2024-09-07)` +- [anvil-zksync](https://github.com/matter-labs/anvil-zksync) + - You'll know you did it right if you can run `anvil-zksync --version` and you see a response like `anvil-zksync 0.2.1` - [era-compiler-vyper](https://github.com/matter-labs/era-compiler-vyper) - You'll know you did it right if you can run `zkvyper --version` and you see a response like `Vyper compiler for ZKync v1.5.4 (LLVM build f9f732c8ebdb88fb8cd4528482a00e4f65bcb8b7)` diff --git a/docs/source/tutorials/zksync-getting-started.rst b/docs/source/tutorials/zksync-getting-started.rst index 985f88b..1cd28c4 100644 --- a/docs/source/tutorials/zksync-getting-started.rst +++ b/docs/source/tutorials/zksync-getting-started.rst @@ -6,9 +6,9 @@ Installation To get started with ZKsync on ``moccasin``, you'll need the following: -- `era_test_node `_ +- `anvil-zksync `_ - - You'll know you did it right if you can run ``era_test_node --version`` and you see a response like ``era_test_node 0.1.0 (a178051e8 2024-09-07)`` + - You'll know you did it right if you can run ``anvil-zksync --version`` and you see a response like ``anvil-zksync 0.1.0 (a178051e8 2024-09-07)`` - `era-compiler-vyper `_ diff --git a/moccasin/_sys_path_and_config_setup.py b/moccasin/_sys_path_and_config_setup.py index 8900abc..5b70ab7 100644 --- a/moccasin/_sys_path_and_config_setup.py +++ b/moccasin/_sys_path_and_config_setup.py @@ -196,7 +196,7 @@ def _setup_network_and_account_from_config_and_cli( else: boa.env.add_account(mox_account, force_eoa=True) - # Once the era_test_node gets pranking support, we'll have to update this. + # Once the anvil-zksync gets pranking support, we'll have to update this. if not mox_account and active_network.name is ERAVM: boa.env.add_account(MoccasinAccount(private_key=ERA_DEFAULT_PRIVATE_KEY)) diff --git a/moccasin/constants/file_data.py b/moccasin/constants/file_data.py index 7d5f517..5b182a1 100644 --- a/moccasin/constants/file_data.py +++ b/moccasin/constants/file_data.py @@ -183,6 +183,7 @@ .deployments* .deployments.db era_test_node.log +anvil-zksync.log .DS_Store """ diff --git a/pyproject.toml b/pyproject.toml index c486b54..54a7bbc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "moccasin" -version = "0.3.5" +version = "0.3.6" description = "Pythonic smart contract development framework using Titanoboa" authors = [ { name = "PatrickAlphac", email = "54278053+PatrickAlphaC@users.noreply.github.com" }, @@ -9,7 +9,7 @@ authors = [ dependencies = [ "titanoboa>=v0.2.5", "python-dotenv>=1.0.1", - "titanoboa-zksync>=0.2.8", + "titanoboa-zksync>=0.2.9", "tqdm>=4.66.5", "tomlkit>=0.13.2", # For preserving comments when writing to toml diff --git a/tests/data/tests_project/.gitignore b/tests/data/tests_project/.gitignore index 2546edf..6866976 100644 --- a/tests/data/tests_project/.gitignore +++ b/tests/data/tests_project/.gitignore @@ -178,3 +178,4 @@ lib/ .deployments* .deployments.db era_test_node.log +anvil-zksync.log \ No newline at end of file diff --git a/tests/data/zksync_project/moccasin.toml b/tests/data/zksync_project/moccasin.toml index a8219ab..4ce27f0 100644 --- a/tests/data/zksync_project/moccasin.toml +++ b/tests/data/zksync_project/moccasin.toml @@ -26,7 +26,7 @@ default_account_name = "anvil1" unsafe_password_file = "$ANVIL1_PASSWORD_FILE" save_to_db = false -[networks.era_test_node] +[networks.anvil-zksync] url = "http://127.0.0.1:8011" chain_id = 260 is_zksync = true diff --git a/uv.lock b/uv.lock index 6a49646..326bd3b 100644 --- a/uv.lock +++ b/uv.lock @@ -886,7 +886,7 @@ wheels = [ [[package]] name = "moccasin" -version = "0.3.5" +version = "0.3.6" source = { editable = "." } dependencies = [ { name = "ipykernel" }, @@ -935,7 +935,7 @@ requires-dist = [ { name = "sphinx-multiversion", marker = "extra == 'docs'", specifier = ">=0.2.4" }, { name = "sphinx-tabs", marker = "extra == 'docs'", specifier = ">=3.4.5" }, { name = "titanoboa", specifier = ">=0.2.5" }, - { name = "titanoboa-zksync", specifier = ">=0.2.8" }, + { name = "titanoboa-zksync", specifier = ">=0.2.9" }, { name = "tomli-w", specifier = ">=1.0.0" }, { name = "tomlkit", specifier = ">=0.13.2" }, { name = "tqdm", specifier = ">=4.66.5" }, @@ -1712,14 +1712,14 @@ wheels = [ [[package]] name = "titanoboa-zksync" -version = "0.2.8" +version = "0.2.9" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "titanoboa" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/4f/88/6abf3125f15475ac1640ffbea737c84a714d6fd9ad4c8bc0f5e98b982545/titanoboa_zksync-0.2.8.tar.gz", hash = "sha256:c59ad609427e53ac04f210482cee9aac205d73af8594a8e800bc7a5a71cc477d", size = 25904 } +sdist = { url = "https://files.pythonhosted.org/packages/ec/7c/35d9fbc910b0b8855a77d5001d354d19e52dbfa8f0536cafe1cf49e7cabe/titanoboa_zksync-0.2.9.tar.gz", hash = "sha256:120f498f3a40f08c90d43264f8ca7d42b85d42e7977deb6abfaa4407a0711062", size = 26083 } wheels = [ - { url = "https://files.pythonhosted.org/packages/f4/88/cf5c261091a4c87a91f3d4962566d936056203e0614c0a9a242c05369fdd/titanoboa_zksync-0.2.8-py3-none-any.whl", hash = "sha256:631f3ed892183564223822a29bb2a4ee2642de5344de1d7f4e106bab3cc6715f", size = 25327 }, + { url = "https://files.pythonhosted.org/packages/c4/06/9ca1545bdafbeb3b681f65b850bf54e2c0cf25c64dff150210a2df03833a/titanoboa_zksync-0.2.9-py3-none-any.whl", hash = "sha256:ee95c2c8089519dc8579c97898e1edd02eeaef96970d68f5abbd28b365e49e18", size = 25478 }, ] [[package]]