Skip to content

Commit 820c180

Browse files
authored
feat : remove duplicate secp256r1 (#76)
closes #42 --------- Co-authored-by: = <=>
1 parent 2fbdeae commit 820c180

File tree

8 files changed

+5
-299
lines changed

8 files changed

+5
-299
lines changed

Cargo.lock

Lines changed: 1 addition & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
members = [
33
"bin/odyssey/",
44
"crates/node",
5-
"crates/precompile",
65
"crates/e2e-tests",
76
"crates/wallet",
87
"crates/walltime",
@@ -136,7 +135,6 @@ strip = false
136135
[workspace.dependencies]
137136
# odyssey
138137
odyssey-node = { path = "crates/node" }
139-
odyssey-precompile = { path = "crates/precompile" }
140138
odyssey-wallet = { path = "crates/wallet" }
141139
odyssey-walltime = { path = "crates/walltime" }
142140

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

194193
# metrics
195194
metrics = "0.23.0"

crates/node/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ keywords.workspace = true
1010
categories.workspace = true
1111

1212
[dependencies]
13-
odyssey-precompile.workspace = true
13+
revm-precompile.workspace = true
1414
reth-cli.workspace = true
1515
reth-node-api.workspace = true
1616
reth-node-builder.workspace = true

crates/node/src/evm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
//! implementation.
99
//!
1010
//! This currently configures the instructions defined in [EIP3074-instructions](https://github.com/paradigmxyz/eip3074-instructions), and the
11-
//! precompiles defined by [`odyssey_precompile`].
11+
//! precompiles defined by [`revm_precompile`].
1212
1313
use alloy_primitives::{Address, Bytes, TxKind, U256};
14-
use odyssey_precompile::secp256r1;
1514
use reth_chainspec::{ChainSpec, EthereumHardfork, Head};
1615
use reth_node_api::{ConfigureEvm, ConfigureEvmEnv, NextBlockEnvAttributes};
1716
use reth_optimism_chainspec::OpChainSpec;
@@ -31,6 +30,7 @@ use reth_revm::{
3130
},
3231
ContextPrecompiles, Database, Evm, EvmBuilder, GetInspector,
3332
};
33+
use revm_precompile::secp256r1;
3434
use std::sync::Arc;
3535

3636
/// Custom EVM configuration

crates/precompile/Cargo.toml

Lines changed: 0 additions & 25 deletions
This file was deleted.

crates/precompile/src/addresses.rs

Lines changed: 0 additions & 3 deletions
This file was deleted.

crates/precompile/src/lib.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)