Resolve merge conflicts

This commit is contained in:
Eitan Seri- Levi
2026-02-26 13:19:00 -08:00
92 changed files with 2146 additions and 3426 deletions

View File

@@ -6,18 +6,18 @@ edition = { workspace = true }
autotests = false
[features]
arbitrary-fuzz = ["types/arbitrary-fuzz", "eip_3076/arbitrary-fuzz"]
arbitrary-fuzz = ["dep:arbitrary", "types/arbitrary-fuzz", "eip_3076/arbitrary-fuzz"]
portable = ["types/portable"]
[dependencies]
arbitrary = { workspace = true, features = ["derive"] }
arbitrary = { workspace = true, features = ["derive"], optional = true }
bls = { workspace = true }
eip_3076 = { workspace = true, features = ["json"] }
ethereum_serde_utils = { workspace = true }
filesystem = { workspace = true }
fixed_bytes = { workspace = true }
r2d2 = { workspace = true }
r2d2_sqlite = "0.21.0"
r2d2_sqlite = "0.32"
rusqlite = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }