Activate telos feature on revm when needed

telosnetwork · Apr 28, 2024 · 7edd2fc · 7edd2fc
1 parent 7bb43e7
commit 7edd2fc
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -171,8 +171,8 @@ reth-transaction-pool = { path = "crates/transaction-pool" }
 reth-trie = { path = "crates/trie" }
 
 # revm
-revm = { git = "https://github.com/telosnetwork/telos-revm", branch = "telos-main", features = ["std", "secp256k1", "telos"], default-features = false }
-revm-primitives = { git = "https://github.com/telosnetwork/telos-revm", branch = "telos-main", features = ["std", "telos"], default-features = false }
+revm = { git = "https://github.com/telosnetwork/telos-revm", branch = "telos-main", features = ["std", "secp256k1"], default-features = false }
+revm-primitives = { git = "https://github.com/telosnetwork/telos-revm", branch = "telos-main", features = ["std"], default-features = false }
 revm-inspectors = { git = "https://github.com/telosnetwork/telos-evm-inspectors", branch = "telos-main" }
 
 # eth

diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -186,6 +186,16 @@ telos = [
     "reth-provider/telos",
     "reth-consensus-common/telos",
     "reth-stages/telos",
+    "reth-node-api/telos",
+    "reth-payload-builder/telos",
+    "reth-node-ethereum/telos",
+    "reth-basic-payload-builder/telos",
+    "reth-ethereum-payload-builder/telos",
+    "reth-optimism-payload-builder/telos",
+    "reth-revm/telos",
+    "reth-transaction-pool/telos",
+    "reth-trie/telos",
+    "reth-rpc-types-compat/telos"
 ]
 
 [[bin]]

diff --git a/crates/node-api/Cargo.toml b/crates/node-api/Cargo.toml
@@ -20,3 +20,9 @@ revm.workspace = true
 
 # io
 serde.workspace = true
+
+[features]
+telos = [
+    "revm/telos",
+    "revm-primitives/telos",
+]
diff --git a/crates/node-ethereum/Cargo.toml b/crates/node-ethereum/Cargo.toml
@@ -35,4 +35,7 @@ reth-db.workspace = true
 [features]
 # This is a workaround for reth-cli crate to allow this as mandatory dependency without breaking the build even if unused.
 # This makes managing features and testing workspace easier because clippy always builds all members if --workspace is provided
-optimism = []
+optimism = []
+telos = [
+    "revm/telos",
+]
diff --git a/crates/payload/basic/Cargo.toml b/crates/payload/basic/Cargo.toml
@@ -36,4 +36,9 @@ reth-metrics.workspace = true
 metrics.workspace = true
 
 # misc
-tracing.workspace = true
+tracing.workspace = true
+
+[features]
+telos = [
+    "revm/telos",
+]
diff --git a/crates/payload/builder/Cargo.toml b/crates/payload/builder/Cargo.toml
@@ -56,3 +56,7 @@ optimism = [
   "reth-interfaces/optimism",
   "reth-transaction-pool/optimism",
 ]
+telos = [
+  "revm/telos",
+  "revm-primitives/telos",
+]
diff --git a/crates/payload/ethereum/Cargo.toml b/crates/payload/ethereum/Cargo.toml
@@ -30,3 +30,6 @@ tracing.workspace = true
 # This is a workaround for reth-cli crate to allow this as mandatory dependency without breaking the build even if unused.
 # This makes managing features and testing workspace easier because clippy always builds all members if --workspace is provided
 optimism = []
+telos = [
+    "revm/telos",
+]
diff --git a/crates/payload/optimism/Cargo.toml b/crates/payload/optimism/Cargo.toml
@@ -38,3 +38,6 @@ optimism = [
     "reth-provider/optimism",
     "reth-payload-builder/optimism",
 ]
+telos = [
+    "revm/telos",
+]
diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -111,7 +111,10 @@ optimism = [
     "reth-ethereum-forks/optimism",
     "revm/optimism",
 ]
-telos = []
+telos = [
+    "revm/telos",
+    "revm-primitives/telos",
+]
 test-utils = ["dep:plain_hasher", "dep:hash-db", "dep:ethers-core"]
 
 [[bench]]

diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml
@@ -38,3 +38,6 @@ optimism = [
   "reth-interfaces/optimism",
 ]
 js-tracer = ["revm-inspectors/js-tracer"]
+telos = [
+  "revm/telos",
+]
diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml
@@ -109,4 +109,6 @@ optimism = [
 telos = [
     "dep:reth-telos",
     "reth-rpc-types-compat/telos",
+    "revm/telos",
+    "revm-primitives/telos",
 ]
diff --git a/crates/stages/Cargo.toml b/crates/stages/Cargo.toml
@@ -83,7 +83,9 @@ serde_json.workspace = true
 
 [features]
 test-utils = ["reth-interfaces/test-utils", "reth-db/test-utils"]
-telos = []
+telos = [
+    "revm/telos",
+]
 
 [[bench]]
 name = "criterion"

diff --git a/crates/storage/provider/Cargo.toml b/crates/storage/provider/Cargo.toml
@@ -62,4 +62,6 @@ rand.workspace = true
 [features]
 test-utils = ["alloy-rlp", "reth-db/test-utils"]
 optimism = ["reth-primitives/optimism", "reth-interfaces/optimism"]
-telos = []
+telos = [
+    "revm/telos",
+]
diff --git a/crates/transaction-pool/Cargo.toml b/crates/transaction-pool/Cargo.toml
@@ -81,6 +81,9 @@ optimism = [
     "reth-provider/optimism",
     "revm/optimism",
 ]
+telos = [
+    "revm/telos",
+]
 
 [[bench]]
 name = "truncate"

diff --git a/crates/trie/Cargo.toml b/crates/trie/Cargo.toml
@@ -53,6 +53,9 @@ criterion.workspace = true
 
 [features]
 test-utils = ["triehash"]
+telos = [
+    "revm/telos",
+]
 
 [[bench]]
 name = "prefix_set"