Skip to content

Commit

Permalink
Merge pull request #30 from vyperlang/dependencies
Browse files Browse the repository at this point in the history
chore: update zkvyper and era test node
  • Loading branch information
DanielSchiavini authored Nov 4, 2024
2 parents 5fd13c0 + cbf76a2 commit e7e07e8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ 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.6/linux-amd64/zkvyper-linux-amd64-musl-v1.5.6 \
curl --location https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.7/linux-amd64/zkvyper-linux-amd64-musl-v1.5.7 \
--silent --output /usr/local/bin/zkvyper && \
chmod +x /usr/local/bin/zkvyper && \
zkvyper --version
curl --location https://github.com/matter-labs/era-test-node/releases/download/v0.1.0-alpha.29/era_test_node-v0.1.0-alpha.29-x86_64-unknown-linux-gnu.tar.gz \
curl --location https://github.com/matter-labs/era-test-node/releases/download/v0.1.0-alpha.30/era_test_node-v0.1.0-alpha.30-x86_64-unknown-linux-gnu.tar.gz \
--silent --output era_test_node.tar.gz && \
tar --extract --file=era_test_node.tar.gz && \
mv era_test_node /usr/local/bin/era_test_node && \
Expand Down
7 changes: 1 addition & 6 deletions boa_zksync/compiler_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,7 @@ 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",
"project_metadata",
}
excluded_keys = {"version", "zk_version", "__VYPER_MINIMAL_PROXY_CONTRACT", "extra_data"}
contract_keys = set(output.keys()) - excluded_keys

if len(contract_keys) != 1:
Expand Down
4 changes: 2 additions & 2 deletions 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.6/linux-amd64/zkvyper-linux-amd64-musl-v1.5.6", # noqa: E501
source="https://raw.githubusercontent.com/matter-labs/zkvyper-bin/v1.5.7/linux-amd64/zkvyper-linux-amd64-musl-v1.5.7", # noqa: E501
destination="/usr/local/bin/zkvyper",
):
"""
Expand All @@ -58,7 +58,7 @@ def install_zkvyper_compiler(


def install_era_test_node(
source="https://github.com/matter-labs/era-test-node/releases/download/v0.1.0-alpha.29/era_test_node-v0.1.0-alpha.29-x86_64-unknown-linux-gnu.tar.gz", # noqa: E501
source="https://github.com/matter-labs/era-test-node/releases/download/v0.1.0-alpha.30/era_test_node-v0.1.0-alpha.30-x86_64-unknown-linux-gnu.tar.gz", # noqa: E501
destination="/usr/local/bin/era_test_node",
):
"""
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.6"
version = "0.2.7"
description = "A Zksync plugin for the Titanoboa Vyper interpreter"
license = { file = "LICENSE" }
readme = "README.md"
Expand Down

0 comments on commit e7e07e8

Please sign in to comment.