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: direct db onto zktrie #38

Merged
merged 44 commits into from
Aug 30, 2024
Merged

feat: direct db onto zktrie #38

merged 44 commits into from
Aug 30, 2024

Conversation

lightsing
Copy link
Member

No description provided.

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/database.rs
#	src/utils/ext.rs
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/bin/trace-verifier/commands/run_file.rs
#	src/bin/trace-verifier/commands/run_rpc.rs
#	src/bin/trace-verifier/utils.rs
#	src/executor/mod.rs
#	src/lib.rs
…hunk-hash

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/bin/trace-verifier/commands/run_rpc.rs
#	src/database.rs
#	src/executor/builder.rs
#	src/executor/mod.rs
#	src/utils/ext/imp/archived_block_trace_v2.rs
#	src/utils/ext/imp/blanket.rs
#	src/utils/ext/imp/block_trace.rs
#	src/utils/ext/imp/block_trace_v2.rs
#	src/utils/ext/imp/mod.rs
#	src/utils/ext/mod.rs
#	src/utils/mod.rs
…hunk-hash

# Conflicts:
#	src/bin/trace-verifier/commands/run_file.rs
#	src/bin/trace-verifier/commands/run_rpc.rs
#	src/bin/trace-verifier/utils.rs
# Conflicts:
#	Cargo.lock
#	Cargo.toml
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/bin/trace-verifier/commands/run_file.rs
#	src/bin/trace-verifier/main.rs
…etrics

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/bin/trace-verifier/commands/run_file.rs
#	src/bin/trace-verifier/commands/run_rpc.rs
#	src/bin/trace-verifier/utils.rs
#	src/database.rs
#	src/executor/builder.rs
#	src/executor/mod.rs
#	src/lib.rs
#	src/utils/ext/mod.rs
@lightsing lightsing changed the base branch from master to feat/metrics August 29, 2024 08:02
Base automatically changed from feat/metrics to master August 30, 2024 04:37
…irect-db

# Conflicts:
#	Cargo.toml
#	src/bin/trace-verifier/utils.rs
#	src/database.rs
#	src/executor/mod.rs
#	src/utils/ext/mod.rs
#	src/utils/mod.rs
@lightsing lightsing merged commit e8cd701 into master Aug 30, 2024
4 checks passed
@lightsing lightsing deleted the feat/direct-db branch August 30, 2024 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant