Skip to content

Commit

Permalink
WIP zoks integration
Browse files Browse the repository at this point in the history
  • Loading branch information
RomanBrodetski committed Dec 2, 2024
1 parent 902760b commit c9d77e4
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 77 deletions.
100 changes: 58 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ tokio-stream = "0.1.16"
# Bumping a crypto dependency like `boojum` would require us to republish all the historical packages.
circuit_encodings = { package = "circuit_encodings", version = "=0.150.16" }
circuit_sequencer_api = { package = "circuit_sequencer_api", version = "=0.150.16" }
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.30.9" }
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.30.10" }
kzg = { package = "zksync_kzg", version = "=0.150.16" }
zk_evm = { version = "=0.133.0" }
zk_evm_1_3_1 = { package = "zk_evm", version = "0.131.0-rc.2" }
Expand Down Expand Up @@ -336,6 +336,10 @@ ark-ec = { git = "https://github.com/arkworks-rs/algebra.git" }
ark-serialize = { git = "https://github.com/arkworks-rs/algebra.git" }
ark-bn254 = { git = "https://github.com/arkworks-rs/algebra.git" }
ark-std = { git = "https://github.com/arkworks-rs/std/" }
franklin-crypto = {path = "../zksync-crypto/crates/franklin-crypto"}
zksync_bellman = {path = "../zksync-crypto/crates/bellman"}
boojum = {path = "../zksync-crypto/crates/boojum"}
#franklin-crypto = {path = "../zksync-crypto/crates/franklin-crypto"}
#zksync_bellman = {path = "../zksync-crypto/crates/bellman"}
#boojum = {path = "../zksync-crypto/crates/boojum"}
zkevm_circuits = {path = "../zksync-protocol/crates/zkevm_circuits"}
zksync_kzg = {path = "../zksync-protocol/crates/kzg"}
circuit_sequencer_api = {path = "../zksync-protocol/crates/circuit_sequencer_api"}
zk_evm = {path = "../zksync-protocol/crates/zk_evm"}
1 change: 0 additions & 1 deletion core/node/zkos_state_keeper/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ pub use self::keeper::ZkosStateKeeper;

mod keeper;
mod tree;
mod single_tx_source;
mod preimage_source;
mod seal_logic;

Expand Down
30 changes: 0 additions & 30 deletions core/node/zkos_state_keeper/src/single_tx_source.rs

This file was deleted.

Binary file removed oracle.dump
Binary file not shown.

0 comments on commit c9d77e4

Please sign in to comment.