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(types): Added KZG info needed for 4844 blobs #894

Merged
merged 40 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b53da43
adding kzg types
koloz193 Jan 15, 2024
a307d1c
updated info construction and build out test
koloz193 Jan 17, 2024
fd34e2f
swapped from keccak to sha for versioned hash
koloz193 Jan 18, 2024
26146da
fixing test data
koloz193 Jan 19, 2024
842fb5f
fixed test with real blob data
koloz193 Jan 19, 2024
1d07514
fixed dereferencing
koloz193 Jan 19, 2024
0e15e81
removed dependency on trusted setup file
koloz193 Jan 19, 2024
469b9b4
updated for spellcheck/linter
koloz193 Jan 19, 2024
24fc492
added comments
koloz193 Jan 22, 2024
bbcfef2
switch over to harness kzg
koloz193 Jan 25, 2024
f21210f
migrated to harness for kzg
koloz193 Jan 26, 2024
93f5975
lint
koloz193 Jan 26, 2024
dc45b72
spellcheck fixes
koloz193 Jan 26, 2024
10d34a2
fixed tests
koloz193 Jan 29, 2024
070a9d0
bump shlex version
koloz193 Jan 29, 2024
6703798
lint fix
koloz193 Jan 29, 2024
891f1e0
swap closure for fn
koloz193 Jan 29, 2024
78b8fbe
Merge pull request #952 from matter-labs/zk_harness_kzg
koloz193 Jan 29, 2024
51c601b
Merge branch 'main' into zk-4844-kzg-info
koloz193 Jan 29, 2024
6829bef
update prover cargo lock
koloz193 Jan 29, 2024
5dc9ffa
use nom for byte parsing
koloz193 Jan 29, 2024
6ee4dd9
removed local dependency
koloz193 Jan 29, 2024
d364a9f
remove unused trusted setup file
koloz193 Jan 29, 2024
472109c
update comment
koloz193 Jan 29, 2024
7e4824b
address pr comments
koloz193 Jan 30, 2024
c8d2a91
Merge branch 'main' into zk-4844-kzg-info
koloz193 Jan 30, 2024
dbe7487
Merge branch 'main' into zk-4844-kzg-info
koloz193 Jan 31, 2024
4dd1e3f
moved kzg info to l1_contract_interface
koloz193 Jan 31, 2024
5f75a0f
removed array slices feature
koloz193 Jan 31, 2024
70c6dd3
revert blocks dal change
koloz193 Jan 31, 2024
0e2cae3
address pr comments on structure
koloz193 Feb 1, 2024
4092dd2
bump harness version
koloz193 Feb 1, 2024
0e565fa
remove extra ref
koloz193 Feb 1, 2024
fb4da7a
bump cargo lock
koloz193 Feb 5, 2024
6ea6f65
Merge branch 'main' into zk-4844-kzg-info
koloz193 Feb 5, 2024
664aff4
allow dead code until integrated with batch commitment
koloz193 Feb 5, 2024
6d6b27b
undo changes
koloz193 Feb 5, 2024
97187b9
linter fix
koloz193 Feb 5, 2024
ade6317
change to concat
koloz193 Feb 5, 2024
ec69b55
undo cargo lock and rename crate
koloz193 Feb 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1,595 changes: 803 additions & 792 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/lib/dal/src/blocks_dal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2218,7 +2218,7 @@ impl BlocksDal<'_, '_> {
)
WHERE
l1_batch_number IS NULL
AND fee_account_address = '\x0000000000000000000000000000000000000000'::bytea
AND fee_account_address = 'x0000000000000000000000000000000000000000'::bytea
"#
)
.execute(self.storage.conn())
Expand Down Expand Up @@ -2258,7 +2258,7 @@ impl BlocksDal<'_, '_> {
WHERE
l1_batches.number = miniblocks.l1_batch_number
AND miniblocks.number BETWEEN $1 AND $2
AND miniblocks.fee_account_address = '\x0000000000000000000000000000000000000000'::bytea
AND miniblocks.fee_account_address = 'x0000000000000000000000000000000000000000'::bytea
"#,
numbers.start().0 as i64,
numbers.end().0 as i64
Expand Down
13 changes: 12 additions & 1 deletion core/lib/l1_contract_interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,15 @@ zksync_prover_interface = { path = "../prover_interface" }
# Used to serialize proof data
codegen = { git = "https://github.com/matter-labs/solidity_plonk_verifier.git", branch = "dev" }
# Used to calculate commitment for vk from the old L1 verifier contract (backward comatibility needs)
zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
zkevm_test_harness_1_3_1 = { package = "zkevm_test_harness", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
koloz193 marked this conversation as resolved.
Show resolved Hide resolved

# Used to calculate the kzg commitment and proofs
zkevm_test_harness_1_4_1 = { package = "zkevm_test_harness", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.1" }
sha2 = "0.10.8"
sha3 = "0.10.8"

[dev-dependencies]
hex = "0.4"
serde = "1.0.90"
serde_json = "1.0.0"
serde_with = { version = "1", features = ["base64", "hex"] }