Skip to content

Commit

Permalink
Merge branch 'refs/heads/feat/poseidon-bn254' into feat/rkyv
Browse files Browse the repository at this point in the history
  • Loading branch information
lightsing committed Aug 28, 2024
2 parents defb544 + 0d91d0b commit 6c5d935
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 13 deletions.
47 changes: 35 additions & 12 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion eth-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ bincode.workspace = true
default = ["warn-unimplemented", "secp256k1", "poseidon-bn254/halo2curves_v1"]
warn-unimplemented = []
secp256k1 = ["halo2curves"]
poseidon-bn254 = ["poseidon-bn254/halo2curves_v1"]
poseidon-bn254 = ["poseidon-bn254/bn254"]
scroll = ["revm-precompile/scroll", "revm-primitives/scroll"]

# trace heap allocation related feature switches
Expand Down

0 comments on commit 6c5d935

Please sign in to comment.