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

Rlp decode #13

Draft
wants to merge 6 commits into
base: ref-scroll-stable
Choose a base branch
from
Draft
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
519 changes: 471 additions & 48 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions bus-mapping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ gadgets = { path = "../gadgets" }
keccak256 = { path = "../keccak256" }
mock = { path = "../mock", optional = true }

ethers-core = "0.17.0"
ethers-signers = "0.17.0"
ethers-providers = "0.17.0"
ethers-core = "1.0.2"
ethers-signers = "1.0.2"
ethers-providers = "1.0.2"
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
itertools = "0.10"
lazy_static = "1.4"
Expand Down
7 changes: 4 additions & 3 deletions circuit-benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ eth-types = { path = "../eth-types" }
env_logger = "0.9"
log="0.4"
tokio = { version = "1.13", features = ["macros", "rt-multi-thread"] }
ethers-signers = "0.17.0"
ethers = { version = "0.17.0", features = ["ethers-solc"] }
ethers-signers = "1.0.2"
ethers = "1.0.2"
mock = { path="../mock" }
rand_chacha = "0.3"
url="2.2.2"

[features]
default = []
default = ["benches"]
benches = []
onephase = []
4 changes: 2 additions & 2 deletions eth-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ authors = ["The appliedzkp team"]
license = "MIT OR Apache-2.0"

[dependencies]
ethers-core = "0.17.0"
ethers-signers = "0.17.0"
ethers-core = "1.0.2"
ethers-signers = "1.0.2"
hex = "0.4"
lazy_static = "1.4"
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
Expand Down
4 changes: 2 additions & 2 deletions mock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ eth-types = { path = "../eth-types" }
external-tracer = { path = "../external-tracer" }
lazy_static = "1.4"
itertools = "0.10.3"
ethers-signers = "0.17.0"
ethers-core = "0.17.0"
ethers-signers = "1.0.2"
ethers-core = "1.0.2"
rand_chacha = "0.3"
rand = "0.8"
8 changes: 8 additions & 0 deletions mock/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ lazy_static! {
.gas_price(word!("0x4d2"))
.input(Bytes::from(b"hello"))
.build(),
MockTransaction::default()
.transaction_idx(7u64)
.from(AddrOrWallet::random(&mut rng))
.to(AddrOrWallet::Addr(Address::zero()))
.nonce(word!("0x1234"))
.value(word!("0x54321"))
.gas_price(word!("0x100000000000"))
.build(),
]
};
}
Expand Down
4 changes: 2 additions & 2 deletions testool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ bus-mapping = { path = "../bus-mapping" }
clap = { version = "3.1", features = ["derive"] }
env_logger = "0.9"
eth-types = { path="../eth-types" }
ethers-core = "0.17.0"
ethers-signers = "0.17.0"
ethers-core = "1.0.2"
ethers-signers = "1.0.2"
external-tracer = { path="../external-tracer" }
glob = "0.3"
handlebars = "4.3"
Expand Down
10 changes: 6 additions & 4 deletions zkevm-circuits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ license = "MIT OR Apache-2.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
ark-std = { version = "0.3", features = ["print-trace"] }
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
num = "0.4"
sha3 = "0.10"
array-init = "2.0.0"
bus-mapping = { path = "../bus-mapping" }
eth-types = { path = "../eth-types" }
gadgets = { path = "../gadgets" }
ethers-core = "0.17.0"
ethers-signers = { version = "0.17.0", optional = true }
ethers-core = "1.0.2"
ethers-signers = { version = "1.0.2", optional = true }
mock = { path = "../mock", optional = true }
strum = "0.24"
strum_macros = "0.24"
Expand Down Expand Up @@ -44,17 +45,18 @@ rayon = "1.5"
once_cell = "1.17.0"

[dev-dependencies]
ark-std = { version = "0.3", features = ["print-trace"] }
bus-mapping = { path = "../bus-mapping", features = ["test"] }
criterion = "0.3"
ctor = "0.1.22"
ethers-signers = "0.17.0"
ethers-signers = "1.0.2"
hex = "0.4.3"
itertools = "0.10.1"
mock = { path = "../mock" }
pretty_assertions = "1.0.0"

[features]
default = ["test", "test-circuits", "onephase", "enable-sign-verify"]
default = ["test", "test-circuits"]
test = ["ethers-signers", "mock"]
test-circuits = []
warn-unimplemented = ["eth-types/warn-unimplemented"]
Expand Down
Loading