refactor: move crate trin-execution to bin/trin-execution

ethereum · Jan 14, 2025 · d54cac8 · d54cac8
1 parent 55acea1
commit d54cac8
Show file tree

Hide file tree

Showing 56 changed files with 6 additions and 7 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -7,7 +7,6 @@
 !/bin
 !/crates
 !/testing
-!/trin-execution
 
 # include for vergen constants
 !/.git

diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,7 @@
 members = [
     "bin/portal-bridge",
     "bin/trin", 
+    "bin/trin-execution",
     "crates/ethportal-api",
     "crates/e2store",
     "crates/evm",
@@ -18,7 +19,6 @@ members = [
     "testing/ef-tests",
     "testing/ethportal-peertest",
     "testing/utp",
-    "trin-execution",
 ]
 
 default-members = ["bin/trin"]
@@ -107,7 +107,7 @@ rpc = { path = "crates/rpc"}
 trin = { path = "bin/trin"}
 trin-beacon = { path = "crates/subnetworks/beacon" }
 trin-evm = { path = "crates/evm" }
-trin-execution = { path = "trin-execution" }
+trin-execution = { path = "bin/trin-execution" }
 trin-history = { path = "crates/subnetworks/history" }
 trin-metrics = { path = "crates/metrics" }
 trin-state = { path = "crates/subnetworks/state" }

diff --git a/trin-execution/Cargo.toml → bin/trin-execution/Cargo.toml b/trin-execution/Cargo.toml → bin/trin-execution/Cargo.toml
diff --git a/trin-execution/README.md → bin/trin-execution/README.md b/trin-execution/README.md → bin/trin-execution/README.md
diff --git a/trin-execution/metrics/README.md → bin/trin-execution/metrics/README.md b/trin-execution/metrics/README.md → bin/trin-execution/metrics/README.md
diff --git a/trin-execution/metrics/compose.yaml → bin/trin-execution/metrics/compose.yaml b/trin-execution/metrics/compose.yaml → bin/trin-execution/metrics/compose.yaml
diff --git a/...-execution/metrics/grafana/dashboard.yaml → ...-execution/metrics/grafana/dashboard.yaml b/...-execution/metrics/grafana/dashboard.yaml → ...-execution/metrics/grafana/dashboard.yaml
diff --git a/...afana/dashboards/trin-execution-main.json → ...afana/dashboards/trin-execution-main.json b/...afana/dashboards/trin-execution-main.json → ...afana/dashboards/trin-execution-main.json
diff --git a/...-execution/metrics/grafana/datasource.yml → ...-execution/metrics/grafana/datasource.yml b/...-execution/metrics/grafana/datasource.yml → ...-execution/metrics/grafana/datasource.yml
diff --git a/...ecution/metrics/prometheus/prometheus.yml → ...ecution/metrics/prometheus/prometheus.yml b/...ecution/metrics/prometheus/prometheus.yml → ...ecution/metrics/prometheus/prometheus.yml
diff --git a/trin-execution/metrics/prometheus/rules.yml → ...in-execution/metrics/prometheus/rules.yml b/trin-execution/metrics/prometheus/rules.yml → ...in-execution/metrics/prometheus/rules.yml
diff --git a/...-execution/resources/genesis/mainnet.json → ...-execution/resources/genesis/mainnet.json b/...-execution/resources/genesis/mainnet.json → ...-execution/resources/genesis/mainnet.json
diff --git a/trin-execution/src/cli.rs → bin/trin-execution/src/cli.rs b/trin-execution/src/cli.rs → bin/trin-execution/src/cli.rs
diff --git a/trin-execution/src/config.rs → bin/trin-execution/src/config.rs b/trin-execution/src/config.rs → bin/trin-execution/src/config.rs
diff --git a/trin-execution/src/content.rs → bin/trin-execution/src/content.rs b/trin-execution/src/content.rs → bin/trin-execution/src/content.rs
diff --git a/trin-execution/src/engine/mod.rs → bin/trin-execution/src/engine/mod.rs b/trin-execution/src/engine/mod.rs → bin/trin-execution/src/engine/mod.rs
diff --git a/trin-execution/src/engine/rpc.rs → bin/trin-execution/src/engine/rpc.rs b/trin-execution/src/engine/rpc.rs → bin/trin-execution/src/engine/rpc.rs
diff --git a/trin-execution/src/era/beacon.rs → bin/trin-execution/src/era/beacon.rs b/trin-execution/src/era/beacon.rs → bin/trin-execution/src/era/beacon.rs
@@ -206,7 +206,7 @@ mod tests {
     #[tokio::test]
     async fn process_beacon_block() {
         let signed_beacon_block_for_execution_block_15537397 =
-            std::fs::read("../test_assets/beacon/bellatrix/ValidSignedBeaconBlock/signed_beacon_block_15537397.ssz").unwrap();
+            std::fs::read("../../test_assets/beacon/bellatrix/ValidSignedBeaconBlock/signed_beacon_block_15537397.ssz").unwrap();
         let signed_beacon_block = SignedBeaconBlock::from_ssz_bytes(
             &signed_beacon_block_for_execution_block_15537397,
             ForkName::Bellatrix,

diff --git a/trin-execution/src/era/binary_search.rs → bin/trin-execution/src/era/binary_search.rs b/trin-execution/src/era/binary_search.rs → bin/trin-execution/src/era/binary_search.rs
diff --git a/trin-execution/src/era/constants.rs → bin/trin-execution/src/era/constants.rs b/trin-execution/src/era/constants.rs → bin/trin-execution/src/era/constants.rs
diff --git a/trin-execution/src/era/manager.rs → bin/trin-execution/src/era/manager.rs b/trin-execution/src/era/manager.rs → bin/trin-execution/src/era/manager.rs
diff --git a/trin-execution/src/era/mod.rs → bin/trin-execution/src/era/mod.rs b/trin-execution/src/era/mod.rs → bin/trin-execution/src/era/mod.rs
diff --git a/trin-execution/src/era/types.rs → bin/trin-execution/src/era/types.rs b/trin-execution/src/era/types.rs → bin/trin-execution/src/era/types.rs
diff --git a/trin-execution/src/era/utils.rs → bin/trin-execution/src/era/utils.rs b/trin-execution/src/era/utils.rs → bin/trin-execution/src/era/utils.rs
diff --git a/trin-execution/src/evm/block_executor.rs → bin/trin-execution/src/evm/block_executor.rs b/trin-execution/src/evm/block_executor.rs → bin/trin-execution/src/evm/block_executor.rs
diff --git a/trin-execution/src/evm/dao_fork.rs → bin/trin-execution/src/evm/dao_fork.rs b/trin-execution/src/evm/dao_fork.rs → bin/trin-execution/src/evm/dao_fork.rs
diff --git a/trin-execution/src/evm/mod.rs → bin/trin-execution/src/evm/mod.rs b/trin-execution/src/evm/mod.rs → bin/trin-execution/src/evm/mod.rs
diff --git a/...ution/src/evm/post_block_beneficiaries.rs → ...ution/src/evm/post_block_beneficiaries.rs b/...ution/src/evm/post_block_beneficiaries.rs → ...ution/src/evm/post_block_beneficiaries.rs
diff --git a/...-execution/src/evm/pre_block_contracts.rs → ...-execution/src/evm/pre_block_contracts.rs b/...-execution/src/evm/pre_block_contracts.rs → ...-execution/src/evm/pre_block_contracts.rs
diff --git a/trin-execution/src/execution.rs → bin/trin-execution/src/execution.rs b/trin-execution/src/execution.rs → bin/trin-execution/src/execution.rs
@@ -176,7 +176,7 @@ mod tests {
         let mut trin_execution = TrinExecution::new(temp_directory.path(), StateConfig::default())
             .await
             .unwrap();
-        let raw_era1 = fs::read("../test_assets/era1/mainnet-00000-5ec1ffb8.era1").unwrap();
+        let raw_era1 = fs::read("../../test_assets/era1/mainnet-00000-5ec1ffb8.era1").unwrap();
         let processed_era = process_era1_file(raw_era1, 0).unwrap();
         for block in processed_era.blocks {
             trin_execution.process_next_block().await.unwrap();

diff --git a/trin-execution/src/lib.rs → bin/trin-execution/src/lib.rs b/trin-execution/src/lib.rs → bin/trin-execution/src/lib.rs
diff --git a/trin-execution/src/main.rs → bin/trin-execution/src/main.rs b/trin-execution/src/main.rs → bin/trin-execution/src/main.rs
diff --git a/trin-execution/src/metrics.rs → bin/trin-execution/src/metrics.rs b/trin-execution/src/metrics.rs → bin/trin-execution/src/metrics.rs
diff --git a/trin-execution/src/storage/account_db.rs → bin/trin-execution/src/storage/account_db.rs b/trin-execution/src/storage/account_db.rs → bin/trin-execution/src/storage/account_db.rs
diff --git a/trin-execution/src/storage/error.rs → bin/trin-execution/src/storage/error.rs b/trin-execution/src/storage/error.rs → bin/trin-execution/src/storage/error.rs
diff --git a/trin-execution/src/storage/evm_db.rs → bin/trin-execution/src/storage/evm_db.rs b/trin-execution/src/storage/evm_db.rs → bin/trin-execution/src/storage/evm_db.rs
diff --git a/...ecution/src/storage/execution_position.rs → ...ecution/src/storage/execution_position.rs b/...ecution/src/storage/execution_position.rs → ...ecution/src/storage/execution_position.rs
diff --git a/trin-execution/src/storage/mod.rs → bin/trin-execution/src/storage/mod.rs b/trin-execution/src/storage/mod.rs → bin/trin-execution/src/storage/mod.rs
diff --git a/trin-execution/src/storage/trie_db.rs → bin/trin-execution/src/storage/trie_db.rs b/trin-execution/src/storage/trie_db.rs → bin/trin-execution/src/storage/trie_db.rs
diff --git a/trin-execution/src/storage/utils.rs → bin/trin-execution/src/storage/utils.rs b/trin-execution/src/storage/utils.rs → bin/trin-execution/src/storage/utils.rs
diff --git a/...-execution/src/subcommands/era2/export.rs → ...-execution/src/subcommands/era2/export.rs b/...-execution/src/subcommands/era2/export.rs → ...-execution/src/subcommands/era2/export.rs
diff --git a/...-execution/src/subcommands/era2/import.rs → ...-execution/src/subcommands/era2/import.rs b/...-execution/src/subcommands/era2/import.rs → ...-execution/src/subcommands/era2/import.rs
diff --git a/trin-execution/src/subcommands/era2/mod.rs → ...rin-execution/src/subcommands/era2/mod.rs b/trin-execution/src/subcommands/era2/mod.rs → ...rin-execution/src/subcommands/era2/mod.rs
diff --git a/trin-execution/src/subcommands/era2/utils.rs → ...n-execution/src/subcommands/era2/utils.rs b/trin-execution/src/subcommands/era2/utils.rs → ...n-execution/src/subcommands/era2/utils.rs
diff --git a/trin-execution/src/subcommands/mod.rs → bin/trin-execution/src/subcommands/mod.rs b/trin-execution/src/subcommands/mod.rs → bin/trin-execution/src/subcommands/mod.rs
diff --git a/trin-execution/src/trie_walker/db.rs → bin/trin-execution/src/trie_walker/db.rs b/trin-execution/src/trie_walker/db.rs → bin/trin-execution/src/trie_walker/db.rs
diff --git a/trin-execution/src/trie_walker/filter.rs → bin/trin-execution/src/trie_walker/filter.rs b/trin-execution/src/trie_walker/filter.rs → bin/trin-execution/src/trie_walker/filter.rs
diff --git a/trin-execution/src/trie_walker/mod.rs → bin/trin-execution/src/trie_walker/mod.rs b/trin-execution/src/trie_walker/mod.rs → bin/trin-execution/src/trie_walker/mod.rs
diff --git a/trin-execution/src/types/block_to_trace.rs → ...rin-execution/src/types/block_to_trace.rs b/trin-execution/src/types/block_to_trace.rs → ...rin-execution/src/types/block_to_trace.rs
diff --git a/trin-execution/src/types/mod.rs → bin/trin-execution/src/types/mod.rs b/trin-execution/src/types/mod.rs → bin/trin-execution/src/types/mod.rs
diff --git a/trin-execution/src/types/trie_proof.rs → bin/trin-execution/src/types/trie_proof.rs b/trin-execution/src/types/trie_proof.rs → bin/trin-execution/src/types/trie_proof.rs
diff --git a/trin-execution/src/utils.rs → bin/trin-execution/src/utils.rs b/trin-execution/src/utils.rs → bin/trin-execution/src/utils.rs
diff --git a/trin-execution/tests/content_generation.rs → ...rin-execution/tests/content_generation.rs b/trin-execution/tests/content_generation.rs → ...rin-execution/tests/content_generation.rs
diff --git a/trin-execution/tests/export_import.rs → bin/trin-execution/tests/export_import.rs b/trin-execution/tests/export_import.rs → bin/trin-execution/tests/export_import.rs
diff --git a/docker/Dockerfile.bridge b/docker/Dockerfile.bridge
@@ -35,7 +35,7 @@ WORKDIR /app
 
 # copy build artifacts from build stage
 COPY --from=builder /app/target/release/trin /usr/bin/
-COPY --from=builder /app/trin-execution/resources /resources
+COPY --from=builder /app/bin/trin-execution/resources /resources
 COPY --from=builder /app/target/release/portal-bridge /usr/bin/
 
 RUN apt-get update && apt-get install libcurl4 -y

diff --git a/portal-spec-tests b/portal-spec-tests
+0 −0		tests/mainnet/beacon_chain/light_client/bootstrap.yaml
+0 −661		tests/mainnet/beacon_chain/light_client/deneb/bootstrap.yaml
+0 −56		tests/mainnet/beacon_chain/light_client/deneb/finality_update.yaml
+0 −29		tests/mainnet/beacon_chain/light_client/deneb/optimistic_update.yaml
+0 −1,380		tests/mainnet/beacon_chain/light_client/deneb/updates.yaml
+0 −0		tests/mainnet/beacon_chain/light_client/finality_update.yaml
+0 −0		tests/mainnet/beacon_chain/light_client/optimistic_update.yaml
+0 −0		tests/mainnet/beacon_chain/light_client/updates.yaml