Skip to content

Commit

Permalink
Merge pull request #23 from DanielSchiavini/dependencies
Browse files Browse the repository at this point in the history
chore: update zkvyper
  • Loading branch information
DanielSchiavini authored Oct 17, 2024
2 parents 7a8af01 + b9d8e83 commit 068cbce
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.6/linux-amd64/zkvyper-linux-amd64-musl-v1.5.6 \
--silent --output /usr/local/bin/zkvyper && \
chmod +x /usr/local/bin/zkvyper && \
zkvyper --version
Expand Down
7 changes: 6 additions & 1 deletion boa_zksync/compiler_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion boa_zksync/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.6/linux-amd64/zkvyper-linux-amd64-musl-v1.5.6", # noqa: E501
destination="/usr/local/bin/zkvyper",
):
"""
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
10 changes: 5 additions & 5 deletions tests/test_boa_loads.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,18 @@ 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",
" [449] Unknown contract 0x000000000000000000000000000000000000800B.0xa225efcb",
" [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>",
]


Expand Down

0 comments on commit 068cbce

Please sign in to comment.