From 253b7ff29632193056e1459af64684a3412b13a0 Mon Sep 17 00:00:00 2001 From: Daniel Schiavini Date: Tue, 15 Oct 2024 10:59:01 +0200 Subject: [PATCH 1/4] chore: update zkvyper --- .github/workflows/test.yaml | 2 +- boa_zksync/util.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6b70586..2e92eda 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,7 @@ jobs: echo "Installing zkvyper and era_test_node" # Install zkvyper and era_test_node from binary repositories - curl --location https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.4/linux-amd64/zkvyper-linux-amd64-musl-v1.5.4 \ + curl --location https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.5/linux-amd64/zkvyper-linux-amd64-musl-v1.5.5 \ --silent --output /usr/local/bin/zkvyper && \ chmod +x /usr/local/bin/zkvyper && \ zkvyper --version diff --git a/boa_zksync/util.py b/boa_zksync/util.py index 79b7211..a8364f9 100644 --- a/boa_zksync/util.py +++ b/boa_zksync/util.py @@ -39,7 +39,7 @@ def stop_subprocess(proc: Popen[bytes]): def install_zkvyper_compiler( - source="https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.4/linux-amd64/zkvyper-linux-amd64-musl-v1.5.4", # noqa: E501 + source="https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.5/linux-amd64/zkvyper-linux-amd64-musl-v1.5.5", # noqa: E501 destination="/usr/local/bin/zkvyper", ): """ diff --git a/pyproject.toml b/pyproject.toml index 7378a5a..649caf7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "titanoboa-zksync" -version = "0.2.4" +version = "0.2.5" description = "A Zksync plugin for the Titanoboa Vyper interpreter" license = { file = "LICENSE" } readme = "README.md" From 4a11093f286315ff34ef82358bdcdb5bd67ff361 Mon Sep 17 00:00:00 2001 From: Daniel Schiavini Date: Thu, 17 Oct 2024 10:09:14 +0200 Subject: [PATCH 2/4] chore: update zkvyper again --- .github/workflows/test.yaml | 2 +- boa_zksync/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2e92eda..f89c88e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,7 @@ jobs: echo "Installing zkvyper and era_test_node" # Install zkvyper and era_test_node from binary repositories - curl --location https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.5/linux-amd64/zkvyper-linux-amd64-musl-v1.5.5 \ + curl --location https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.6/linux-amd64/zkvyper-linux-amd64-musl-v1.5.6 \ --silent --output /usr/local/bin/zkvyper && \ chmod +x /usr/local/bin/zkvyper && \ zkvyper --version diff --git a/boa_zksync/util.py b/boa_zksync/util.py index a8364f9..9477a00 100644 --- a/boa_zksync/util.py +++ b/boa_zksync/util.py @@ -39,7 +39,7 @@ def stop_subprocess(proc: Popen[bytes]): def install_zkvyper_compiler( - source="https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.5/linux-amd64/zkvyper-linux-amd64-musl-v1.5.5", # noqa: E501 + source="https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.6/linux-amd64/zkvyper-linux-amd64-musl-v1.5.6", # noqa: E501 destination="/usr/local/bin/zkvyper", ): """ From 3798b74a575dd1ca170cbd4d3b5bbce7504df39e Mon Sep 17 00:00:00 2001 From: Daniel Schiavini Date: Thu, 17 Oct 2024 10:33:51 +0200 Subject: [PATCH 3/4] fix: exclude project_metadata --- boa_zksync/compiler_utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/boa_zksync/compiler_utils.py b/boa_zksync/compiler_utils.py index 2494c04..e3721b8 100644 --- a/boa_zksync/compiler_utils.py +++ b/boa_zksync/compiler_utils.py @@ -80,7 +80,12 @@ def get_compiler_output(output): # from the compiler. Assuming key names could change and also assuming that the # number of keys could change, this method breaks if any of that happens: - excluded_keys = {"version", "zk_version", "__VYPER_MINIMAL_PROXY_CONTRACT"} + excluded_keys = { + "version", + "zk_version", + "__VYPER_MINIMAL_PROXY_CONTRACT", + "project_metadata", + } contract_keys = set(output.keys()) - excluded_keys if len(contract_keys) != 1: From b9d8e83004a1a5ba4073df8bb04d4800671335e4 Mon Sep 17 00:00:00 2001 From: Daniel Schiavini Date: Thu, 17 Oct 2024 11:37:38 +0200 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20lower=20=E2=9B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_boa_loads.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_boa_loads.py b/tests/test_boa_loads.py index 55426c7..f8a2702 100644 --- a/tests/test_boa_loads.py +++ b/tests/test_boa_loads.py @@ -139,8 +139,8 @@ def get_name_of(addr: HasName) -> String[32]: ) assert isinstance(call_trace, TraceFrame) assert str(call_trace).split("\n") == [ - f'[E] [24523] CallerContract.get_name_of(addr = "{called_addr}") <0x>', - " [E] [23592] Unknown contract 0x0000000000000000000000000000000000008002.0x4de2e468", + f'[E] [24505] CallerContract.get_name_of(addr = "{called_addr}") <0x>', + " [E] [23574] Unknown contract 0x0000000000000000000000000000000000008002.0x4de2e468", " [566] Unknown contract 0x000000000000000000000000000000000000800B.0x29f172ad", " [1909] Unknown contract 0x000000000000000000000000000000000000800B.0x06bed036", " [159] Unknown contract 0x0000000000000000000000000000000000008010.0x00000000", @@ -148,9 +148,9 @@ def get_name_of(addr: HasName) -> String[32]: " [2226] Unknown contract 0x0000000000000000000000000000000000008002.0x4de2e468", " [427] Unknown contract 0x000000000000000000000000000000000000800B.0xa851ae78", " [398] Unknown contract 0x0000000000000000000000000000000000008004.0xe516761e", - " [E] [2566] Unknown contract 0x0000000000000000000000000000000000008009.0xb47fade1", - f' [E] [1383] CallerContract.get_name_of(addr = "{called_addr}") <0x>', - " [E] [403] CalledContract.name() <0x>", + " [E] [2548] Unknown contract 0x0000000000000000000000000000000000008009.0xb47fade1", + f' [E] [1365] CallerContract.get_name_of(addr = "{called_addr}") <0x>', + " [E] [397] CalledContract.name() <0x>", ]