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.

Sign up for GitHub

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: boojum integration merge main #233

Merged
merged 59 commits into from
Dec 6, 2023
Merged

feat: boojum integration merge main #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
cc00030
chore: adds proper null response to zks_batchDetails method (#152)
dutterbutter Oct 2, 2023
14a50c7
fix: add back call stacks, console logs, and correct call stack count…
MexicanAce Oct 3, 2023
b790006
feat: add eth_getStorageAt (#134)
nbaztec Oct 3, 2023
166247d
feat: add evm_snapshot/revert (#158)
nbaztec Oct 4, 2023
4f627b5
fix: update compiled smart contracts to latest (#157)
MexicanAce Oct 4, 2023
79f3dae
feat: add eth_getTransactionByBlockHashAndIndex and eth_getTransactio…
nbaztec Oct 5, 2023
f691f8c
feat: add eth_protocolVersion (#161)
nbaztec Oct 5, 2023
4e35082
feat: impl debug_traceCall (#151)
grw-ms Oct 9, 2023
98b8420
feat: Add well-known log selectors to console output (#162)
nbaztec Oct 9, 2023
32d6a0c
add aarch64-unknown-linux-gnu target (#164)
nbaztec Oct 10, 2023
124691a
feat: add rustbook (#163)
nbaztec Oct 11, 2023
9012529
fix: install mdbook for ci (#169)
nbaztec Oct 11, 2023
f806bb9
feat: impl debug_traceTransaction (#165)
grw-ms Oct 11, 2023
3ff215f
feat: impl `debug_traceBlockByHash` and `debug_traceBlockByNumber` (#…
grw-ms Oct 11, 2023
3bad022
fix: update zksync-era deps to v16.0.0 (#173)
nbaztec Oct 12, 2023
3c5f788
chore: remove hub usage in favour of gh for draft releases (#175)
dutterbutter Oct 12, 2023
85f238b
feat: add hardhat_setCode (#171)
nbaztec Oct 13, 2023
81340b1
feat: impl `zks_getTransactionDetails` (#176)
grw-ms Oct 13, 2023
d802216
feat: forbid ".only" from e2e-tests (#179)
nbaztec Oct 13, 2023
b13fa9d
feat: impl zks_getBlockDetails (#182)
grw-ms Oct 17, 2023
29bb65d
feat: support builtInWithoutSecurity option (#186)
nbaztec Oct 17, 2023
46d1b4d
feat: add zks_getBridgeContracts (#184)
nbaztec Oct 18, 2023
ee35740
feat: add zks_getBytecodeByHash (#180)
nbaztec Oct 18, 2023
1dde85d
feat: refactor logging to use tracing crate and make it dynamic (#187)
nbaztec Oct 19, 2023
512484e
feat: impl zks_getRawBlockTransactions (#185)
grw-ms Oct 19, 2023
f88cefb
fix: unit-tests fixed on main (#193)
nbaztec Oct 19, 2023
5364ad0
fix: fix forking for zksync-era@16.0.2 (#194)
nbaztec Oct 19, 2023
1ed74ea
fix: Release drafts now attach files correctly (#196)
MexicanAce Oct 19, 2023
c8fa0b1
feat: impl `zks_getAllAccountBalances` and `zks_getConfirmedTokens` (…
grw-ms Oct 25, 2023
0b4a200
fix: Update transaction type for gas estimation if one is not provide…
MexicanAce Oct 25, 2023
e9c8ee0
chore: updates zksync dep, and replaces vm with multivm crate (#199)
dutterbutter Oct 25, 2023
5477ffe
chore: fix workflows to use nightly (#203)
dutterbutter Oct 26, 2023
fae30ab
chore: refactor node namespaces (#197)
nbaztec Oct 30, 2023
c5350bf
fix: validate gas_limit and max_fee_per_gas before transaction execut…
Romsters Oct 31, 2023
96632f9
feat: add parent hash linking for blocks (#209)
Romsters Nov 1, 2023
57ddf94
chore: Update zksync-era dependency to latest (#210)
MexicanAce Nov 1, 2023
0a5c833
chore: add rust toolchain for version mgt, make inner_tx pub (#213)
dutterbutter Nov 6, 2023
a74c39c
fix: rename run_l2_tx_inner, fix panics for lib users (#214)
nbaztec Nov 7, 2023
668a2cf
feat: get block returns null for non existing blocks (#218)
vasyl-ivanchuk Nov 10, 2023
0968dac
chore: fix docs issue (#215)
dutterbutter Nov 10, 2023
eadb3a1
chore: fix rust-toolchain extension (#216)
dutterbutter Nov 10, 2023
1b2a48e
run smoke test on PRs (#219)
nbaztec Nov 13, 2023
7efa571
feat: update `multivm::vm_virtual_blocks` dependency to `multivim::vm…
aon Nov 23, 2023
134805d
bugfix: Set removed property in Logs to false (#224)
MexicanAce Nov 27, 2023
7f68fc4
feat: Implement web3_clientVersion (#223)
MexicanAce Nov 27, 2023
5307734
feat: Update event formatter and observability formatter (#226)
MexicanAce Nov 29, 2023
533053e
chore: bump cargo toml for upcoming `0.1.0-alpha.12` release (#227)
dutterbutter Nov 29, 2023
79f27e9
feat(vm): Adapt code for the latest zksync era changes (#230)
Deniallugo Nov 30, 2023
64835d2
feat: Allow to pass custom tracers to run_raw_tx (#231)
Deniallugo Dec 1, 2023
4ace3d3
Merge main
AntonD3 Dec 4, 2023
f6e5f81
latest vm
AntonD3 Dec 4, 2023
47c7e94
Merge branch 'main' into boojum-integration-merge-main
AntonD3 Dec 4, 2023
412b814
Small refactoring
AntonD3 Dec 6, 2023
478878c
System contracts 18.4.0
AntonD3 Dec 6, 2023
43f551f
EcAdd, EcMul, rebuild system contracts
AntonD3 Dec 6, 2023
f474392
Small change in system-contracts/VERSION.md
AntonD3 Dec 6, 2023
6255d2b
Update zksync-era dependency
AntonD3 Dec 6, 2023
c2bbc89
Fix test
AntonD3 Dec 6, 2023
514f9eb
Prepare to merge into main
AntonD3 Dec 6, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
tags:
- 'v*'
pull_request:
branches: [boojum-integration]
branches: [main]
workflow_dispatch:

jobs:
Expand All @@ -16,10 +16,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install rust
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-21
toolchain: nightly-2023-07-23
components: rustfmt, clippy

- uses: actions/setup-node@v3
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-21
toolchain: nightly-2023-07-23

- name: Build Code
run: make all
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/docs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,22 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-21
- name: Setup Pages
uses: actions/configure-pages@v3

- name: Install mdbook
run: cargo install mdbook

- name: Generate rust docs
run: |
echo "Generating docs..."
cargo doc --no-deps

- name: Make index.html
run: echo '<!DOCTYPE HTML>
<html lang="en-US">
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v3
- name: Set version of nightly Rust
run: rustup default nightly-2023-07-21

- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-21
- name: Install target
run: rustup target add ${{ matrix.arch }}
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: false

- name: Run cargo clean
run: cargo clean

Expand Down
35 changes: 32 additions & 3 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ name: run

on:
push:
branches: [boojum-integration]
branches: [main]
tags:
- 'v*'
pull_request:
branches: [boojum-integration]
branches: [main]
workflow_dispatch:

jobs:
test:
name: unit-tests
strategy:
matrix:
platform: [ubuntu-latest, macos-latest]
platform: [macos-latest, ubuntu-22.04-github-hosted-16core]
runs-on: ${{ matrix.platform }}

steps:
Expand All @@ -30,3 +31,31 @@ jobs:

- name: Run tests
run: cargo nextest run

smoke-test:
name: smoke-test
runs-on: ubuntu-22.04-github-hosted-16core
env:
TEST_REPO_DIR: test-repo

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
path: ${{ env.TEST_REPO_DIR }}
ref: ${{ github.event.pull_request.head.sha }}

- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-23

- name: Run smoke-test
env:
TEST_REPO: ${{ github.event.repository.name }}
TEST_REPO_DIR: "../${{ env.TEST_REPO_DIR }}"
RUST_BACKTRACE: full
run: |
git clone https://github.com/matter-labs/zkfoundry-smoke-test
cd zkfoundry-smoke-test
./smoke-test.sh
2 changes: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"ZKSYNC_HOME": "${workspaceFolder}"
},
"args": [
"--dev-use-local-contracts",
"--dev-system-contracts=local",
"run"
],
"preLaunchTask": "rebuild-contracts",
Expand Down
Loading
Loading