feat: leave only binary crate

morph-dev · Jul 17, 2024 · 89fca56 · 89fca56
1 parent e77bbdb
commit 89fca56
Show file tree

Hide file tree

Showing 52 changed files with 22 additions and 1,343 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,5 @@
 [workspace]
 members = [
   "portal-verkle",
-  "portal-verkle-bridge",
 ]
 resolver = "2"
diff --git a/portal-verkle-bridge/Cargo.toml b/portal-verkle-bridge/Cargo.toml
diff --git a/portal-verkle-bridge/src/lib.rs b/portal-verkle-bridge/src/lib.rs
diff --git a/portal-verkle/Cargo.toml b/portal-verkle/Cargo.toml
@@ -2,26 +2,23 @@
 name = "portal-verkle"
 version = "0.1.0"
 edition = "2021"
-description = "The core types and functionality of the Verkle Trie for the Portal Network."
+description = "The binaries for Verkle Trie and Portal Network interaction."
 license = "MIT"
 keywords = ["ethereum", "portal-network", "verkle"]
 
 [dependencies]
-alloy-primitives = { version = "0.7", features = ["serde", "ssz", "rand"] }
-ark-ec = "0.4"
-ark-ed-on-bls12-381-bandersnatch = "0.4"
-ark-ff = "0.4"
-ark-serialize = "0.4"
-banderwagon = { git = "https://github.com/crate-crypto/rust-verkle.git", rev = "442174edeb69f7827047132306d302345df12b83", version = "0.1" }
+alloy-primitives = { version = "0.7", features = ["serde", "rlp"] }
+anyhow = "1"
+clap = { version = "4", features = ["derive"] }
 derive_more = "0.99"
-ethereum_ssz = "0.5"
-ethereum_ssz_derive = "0.5"
-once_cell = "1"
+ethportal-api = { git = "https://github.com/morph-dev/trin.git", rev = "ed9a70bab59c372b6f12bcecf6717168cefd50aa" }
+jsonrpsee = { version = "0.20", features = ["async-client", "client"] }
+portal-verkle-trie = { git = "https://github.com/morph-dev/portal-verkle.git", rev = "a65e04cf6f2ae02b06884888054540d79816caa7" }
+reqwest = { version = "0.12", features = ["json"] }
 serde = { version = "1", features = ["derive"] }
-sha2 = "0.10"
+serde_json = "1"
+serde_nested_with = "0.2"
 ssz_types = "0.6"
 thiserror = "1"
-
-[dev-dependencies]
-anyhow = "1"
-rstest = "0.21"
+tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
+verkle-core = { git = "https://github.com/morph-dev/portal-verkle.git", rev = "a65e04cf6f2ae02b06884888054540d79816caa7" }
diff --git a/...verkle-bridge/src/beacon_block_fetcher.rs → portal-verkle/src/beacon_block_fetcher.rs b/...verkle-bridge/src/beacon_block_fetcher.rs → portal-verkle/src/beacon_block_fetcher.rs
diff --git a/...kle-bridge/src/bin/fetch_beacon_blocks.rs → portal-verkle/src/bin/fetch_beacon_blocks.rs b/...kle-bridge/src/bin/fetch_beacon_blocks.rs → portal-verkle/src/bin/fetch_beacon_blocks.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use portal_verkle_bridge::beacon_block_fetcher::BeaconBlockFetcher;
+use portal_verkle::beacon_block_fetcher::BeaconBlockFetcher;
 
 const LOCALHOST_RPC_URL: &str = "http://localhost:9596/";
 

diff --git a/...bridge/src/bin/fetch_state_from_portal.rs → ...verkle/src/bin/fetch_state_from_portal.rs b/...bridge/src/bin/fetch_state_from_portal.rs → ...verkle/src/bin/fetch_state_from_portal.rs
@@ -1,6 +1,6 @@
 use anyhow::bail;
 use clap::Parser;
-use portal_verkle_bridge::{
+use portal_verkle::{
     beacon_block_fetcher::BeaconBlockFetcher, state_trie_fetcher::StateTrieFetcher,
     types::genesis::GenesisConfig,
 };

diff --git a/...verkle-bridge/src/bin/gossip_to_portal.rs → portal-verkle/src/bin/gossip_to_portal.rs b/...verkle-bridge/src/bin/gossip_to_portal.rs → portal-verkle/src/bin/gossip_to_portal.rs
@@ -10,7 +10,7 @@ use ethportal_api::{
     VerkleNetworkApiClient,
 };
 use jsonrpsee::http_client::{HttpClient, HttpClientBuilder};
-use portal_verkle_bridge::{
+use portal_verkle::{
     beacon_block_fetcher::BeaconBlockFetcher,
     evm::VerkleEvm,
     types::{genesis::GenesisConfig, state_write::StateWrites},

diff --git a/portal-verkle/src/constants.rs b/portal-verkle/src/constants.rs
diff --git a/portal-verkle/src/ec/mod.rs b/portal-verkle/src/ec/mod.rs
diff --git a/portal-verkle/src/ec/point.rs b/portal-verkle/src/ec/point.rs