Skip to content

Commit

Permalink
feat : remove duplicate secp256r1 (#76)
Browse files Browse the repository at this point in the history
closes #42

---------

Co-authored-by: = <=>
  • Loading branch information
mahmudsudo authored Nov 6, 2024
1 parent 2fbdeae commit 820c180
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 299 deletions.
60 changes: 1 addition & 59 deletions Cargo.lock

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

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
members = [
"bin/odyssey/",
"crates/node",
"crates/precompile",
"crates/e2e-tests",
"crates/wallet",
"crates/walltime",
Expand Down Expand Up @@ -136,7 +135,6 @@ strip = false
[workspace.dependencies]
# odyssey
odyssey-node = { path = "crates/node" }
odyssey-precompile = { path = "crates/precompile" }
odyssey-wallet = { path = "crates/wallet" }
odyssey-walltime = { path = "crates/walltime" }

Expand Down Expand Up @@ -190,6 +188,7 @@ reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", rev =
reth-network = { git = "https://github.com/paradigmxyz/reth.git", rev = "e98a050" }
reth-network-types = { git = "https://github.com/paradigmxyz/reth.git", rev = "e98a050" }
reth-chain-state = { git = "https://github.com/paradigmxyz/reth.git", rev = "e98a050" }
revm-precompile ={version= "14.0.0",features=["secp256r1"]}

# metrics
metrics = "0.23.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords.workspace = true
categories.workspace = true

[dependencies]
odyssey-precompile.workspace = true
revm-precompile.workspace = true
reth-cli.workspace = true
reth-node-api.workspace = true
reth-node-builder.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/node/src/evm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
//! implementation.
//!
//! This currently configures the instructions defined in [EIP3074-instructions](https://github.com/paradigmxyz/eip3074-instructions), and the
//! precompiles defined by [`odyssey_precompile`].
//! precompiles defined by [`revm_precompile`].
use alloy_primitives::{Address, Bytes, TxKind, U256};
use odyssey_precompile::secp256r1;
use reth_chainspec::{ChainSpec, EthereumHardfork, Head};
use reth_node_api::{ConfigureEvm, ConfigureEvmEnv, NextBlockEnvAttributes};
use reth_optimism_chainspec::OpChainSpec;
Expand All @@ -31,6 +30,7 @@ use reth_revm::{
},
ContextPrecompiles, Database, Evm, EvmBuilder, GetInspector,
};
use revm_precompile::secp256r1;
use std::sync::Arc;

/// Custom EVM configuration
Expand Down
25 changes: 0 additions & 25 deletions crates/precompile/Cargo.toml

This file was deleted.

3 changes: 0 additions & 3 deletions crates/precompile/src/addresses.rs

This file was deleted.

14 changes: 0 additions & 14 deletions crates/precompile/src/lib.rs

This file was deleted.

Loading

0 comments on commit 820c180

Please sign in to comment.