Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update to zkVM v1.5.0 #8

Merged
merged 19 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cargo-license.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ jobs:
cargo-deny:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: EmbarkStudios/cargo-deny-action@1e59595bed8fc55c969333d08d7817b36888f0c5 # v1.5.5
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
18 changes: 10 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,26 @@
# These are backup files generated by rustfmt
**/*.rs.bk

# MacOS
/**/.DS_Store

# IDE
/.idea/
/.vscode/

# The LLVM framework source
/llvm/

# External compilers
/solc-bin*/*
/vyper-bin/*

# The debug and trace artifacts
# The debug, trace, benchmark artifacts
/debug/
/trace/
/**/*.json
/**/*.txt

# The dependency locks
# /Cargo.lock
# /LLVM.lock

# IDE
/.idea/
/.vscode/

# MacOS
/**/.DS_Store
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "tests"]
path = tests
url = https://github.com/matter-labs/era-compiler-tests
branch = main
branch = v1.5.0
[submodule "solidity"]
path = solidity
url = https://github.com/ethereum/solidity
branch = develop
[submodule "era-contracts"]
path = era-contracts
url = https://github.com/matter-labs/era-contracts
branch = main
branch = evm-equivalence-yul
Loading