primitivefinance · 0xJepsen · Feb 16, 2024 · Feb 15, 2024 · Feb 16, 2024
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,15 +10,14 @@ authors = ["Primitive Bits, Inc."]
 
 [[bin]]
 name = "excalibur"
-path = "bin/src/main.rs"
+path = "bin/main.rs"
 
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [workspace.dependencies]
 # Local
 bindings = { path = "./crates/bindings", version = "0.1.0" }
-analysis = { path = "./crates/analysis", version = "0.1.0" }
 clients = { path = "./crates/clients", version = "0.1.0" }
 sim = { path = "./crates/sim", version = "0.1.0" }
 datatypes = { path = "./crates/datatypes", version = "0.1.0" }
@@ -31,31 +30,20 @@ ethers = { version = "=2.0.13", features = ["ws", "openssl", "rustls"] }
 ethers-core = "2.0.4"
 
 # ethereum types
-revm = { version = "=3.5.0", features = ["ethersdb", "std", "serde"] }
-revm-primitives = { version = "=1.3.0" }
-alloy-primitives = { version = "0.5.0", features = ["serde"] }
-alloy-sol-types = "0.5.2"
-alloy-providers = { git = "https://github.com/alloy-rs/alloy.git", rev = "0ba6b61" }
-alloy-networks = { git = "https://github.com/alloy-rs/alloy.git", rev = "0ba6b61" }
-alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy.git", rev = "0ba6b61", features = [
-    "pubsub",
-    "ws",
-    "reqwest",
-] }
-alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "0ba6b61" }
-alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy.git", rev = "0ba6b61" }
-alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "0ba6b61" }
-alloy-rlp = "0.3"
-alloy-pubsub = { git = "https://github.com/alloy-rs/alloy.git", rev = "0ba6b61" }
-alloy-signer = { git = "https://github.com/alloy-rs/alloy.git", rev = "0ba6b61" }
+revm = { version = "5.0.0", features = ["ethersdb", "std", "serde"] }
+revm-primitives = { version = "2.0.0" }
+alloy-primitives = { version = "0.6.3", features = ["serde"] }
+alloy-sol-types = "0.6.3"
 
-reqwest = "=0.11.23"
+# Can we fix this so that we point to actual versions?
+alloy-rlp = "0.3"
+reqwest = "0.11.24"
 
 ## Config and parsing
 serde = "=1.0.196"
 serde_json = "=1.0.113"
-serde_with = { version = "=3.4.0", features = ["chrono_0_4"] }
-config = "0.13.3"
+serde_with = { version = "3.6.1", features = ["chrono_0_4"] }
+config = "0.14.0"
 
 ## Async
 tokio = { version = "=1.36.0", features = ["macros", "full"] }
@@ -69,38 +57,34 @@ tracing-futures = { version = "=0.2.5", default-features = false }
 anyhow = "=1.0.79"
 thiserror = "=1.0.57"
 
-itertools = "=0.12.0"
+itertools = "0.12.1"
 rand = "=0.8.5"
-bytesize = "=1.2.0"
+bytesize = "1.3.0"
 dotenv = "=0.15.0"
-uuid = { version = "=1.6.1", features = ["v4", "serde"] }
+uuid = { version = "1.7.0", features = ["v4", "serde"] }
+clap = { version = "4.5.0", features = ["derive"] }
 
 # Visualization
 plotters = "=0.3.5"
 
 # math
-RustQuant = { version = "=0.0.42", features = ["seedable"] }
+RustQuant = { version = "0.0.45", features = ["seedable"] }
 statrs = "=0.16.0"
 reikna = "=0.12.3"
 
 # Storage
 linked-hash-map = "=0.5.6"
 directories-next = "=2.0.0"
-criterion = "=0.5.1"
 
 # time
-chrono = { version = "=0.4.31", features = ["serde"] }
+chrono = { version = "0.4.34", features = ["serde"] }
 
 [dependencies]
 datatypes.workspace = true
 clients.workspace = true
 cfmm_math.workspace = true
 sim.workspace = true
-
-clap = { version = "=4.4.14", features = ["derive"] }
-
-criterion.workspace = true
-analysis.workspace = true
+clap.workspace = true
 
 tokio.workspace = true
 tracing.workspace = true
@@ -146,15 +130,7 @@ revm-primitives.workspace = true
 # alloy
 alloy-primitives.workspace = true
 alloy-sol-types.workspace = true
-alloy-providers.workspace = true
-alloy-networks.workspace = true
-alloy-rpc-client.workspace = true
-alloy-rpc-types.workspace = true
-alloy-transport-ws.workspace = true
 alloy-rlp.workspace = true
-alloy-pubsub.workspace = true
-alloy-transport-http.workspace = true
-alloy-signer.workspace = true
 reqwest.workspace = true
 
 # workspace deps

diff --git a/bin/Cargo.toml b/bin/Cargo.toml
diff --git a/bin/src/app.rs → bin/app.rs b/bin/src/app.rs → bin/app.rs
diff --git a/bin/src/components/button.rs → bin/components/button.rs b/bin/src/components/button.rs → bin/components/button.rs
diff --git a/bin/src/components/chart/mod.rs → bin/components/chart/mod.rs b/bin/src/components/chart/mod.rs → bin/components/chart/mod.rs
diff --git a/bin/src/components/input.rs → bin/components/input.rs b/bin/src/components/input.rs → bin/components/input.rs
diff --git a/bin/src/components/logos.rs → bin/components/logos.rs b/bin/src/components/logos.rs → bin/components/logos.rs
@@ -13,22 +13,22 @@ use crate::components::styles::MINT_500;
 
 /// Placeholder for the Excalibur logo.
 #[allow(dead_code)]
-const EXCALIBUR_LOGO: &[u8] = include_bytes!("../../../assets/logos/excalibur_logo.png");
+const EXCALIBUR_LOGO: &[u8] = include_bytes!("../../assets/logos/excalibur_logo.png");
 
 #[allow(dead_code)]
 pub fn excalibur_logo() -> icon::Icon {
     icon::from_file_data(EXCALIBUR_LOGO, None).unwrap()
 }
 
-const EXCALIBUR_LOGO_2: &[u8] = include_bytes!("../../../assets/logos/daggeremoji.png");
+const EXCALIBUR_LOGO_2: &[u8] = include_bytes!("../../assets/logos/daggeremoji.png");
 
 pub fn excalibur_logo_2() -> icon::Icon {
     icon::from_file_data(EXCALIBUR_LOGO_2, None).unwrap()
 }
 
-const ETHER_LOGO: &[u8] = include_bytes!("../../../assets/logos/ethtokenicon.svg");
-const USDC_LOGO: &[u8] = include_bytes!("../../../assets/logos/usdcvector.svg");
-const LP_LOGO: &[u8] = include_bytes!("../../../assets/logos/ethusdclp.svg");
+const ETHER_LOGO: &[u8] = include_bytes!("../../assets/logos/ethtokenicon.svg");
+const USDC_LOGO: &[u8] = include_bytes!("../../assets/logos/usdcvector.svg");
+const LP_LOGO: &[u8] = include_bytes!("../../assets/logos/ethusdclp.svg");
 
 pub fn ether_logo() -> iced::widget::svg::Handle {
     svg::Handle::from_memory(ETHER_LOGO)

diff --git a/bin/src/components/mod.rs → bin/components/mod.rs b/bin/src/components/mod.rs → bin/components/mod.rs
diff --git a/bin/src/components/progress.rs → bin/components/progress.rs b/bin/src/components/progress.rs → bin/components/progress.rs
diff --git a/bin/src/components/select.rs → bin/components/select.rs b/bin/src/components/select.rs → bin/components/select.rs
diff --git a/bin/src/components/styles.rs → bin/components/styles.rs b/bin/src/components/styles.rs → bin/components/styles.rs
diff --git a/bin/src/components/system.rs → bin/components/system.rs b/bin/src/components/system.rs → bin/components/system.rs
diff --git a/bin/src/components/tables/builder.rs → bin/components/tables/builder.rs b/bin/src/components/tables/builder.rs → bin/components/tables/builder.rs
diff --git a/bin/src/components/tables/cells/input.rs → bin/components/tables/cells/input.rs b/bin/src/components/tables/cells/input.rs → bin/components/tables/cells/input.rs
diff --git a/bin/src/components/tables/cells/mod.rs → bin/components/tables/cells/mod.rs b/bin/src/components/tables/cells/mod.rs → bin/components/tables/cells/mod.rs
diff --git a/bin/src/components/tables/cells/select.rs → bin/components/tables/cells/select.rs b/bin/src/components/tables/cells/select.rs → bin/components/tables/cells/select.rs
diff --git a/bin/src/components/tables/cells/toggle.rs → bin/components/tables/cells/toggle.rs b/bin/src/components/tables/cells/toggle.rs → bin/components/tables/cells/toggle.rs
diff --git a/bin/src/components/tables/columns/mod.rs → bin/components/tables/columns/mod.rs b/bin/src/components/tables/columns/mod.rs → bin/components/tables/columns/mod.rs
diff --git a/bin/src/components/tables/mod.rs → bin/components/tables/mod.rs b/bin/src/components/tables/mod.rs → bin/components/tables/mod.rs
diff --git a/bin/src/components/tables/rows/mod.rs → bin/components/tables/rows/mod.rs b/bin/src/components/tables/rows/mod.rs → bin/components/tables/rows/mod.rs
diff --git a/bin/src/controller/empty.rs → bin/controller/empty.rs b/bin/src/controller/empty.rs → bin/controller/empty.rs
diff --git a/bin/src/controller/exit.rs → bin/controller/exit.rs b/bin/src/controller/exit.rs → bin/controller/exit.rs
diff --git a/bin/src/controller/mod.rs → bin/controller/mod.rs b/bin/src/controller/mod.rs → bin/controller/mod.rs
diff --git a/bin/src/controller/portfolio/mod.rs → bin/controller/portfolio/mod.rs b/bin/src/controller/portfolio/mod.rs → bin/controller/portfolio/mod.rs
diff --git a/...controller/portfolio/monolithic/create.rs → ...controller/portfolio/monolithic/create.rs b/...controller/portfolio/monolithic/create.rs → ...controller/portfolio/monolithic/create.rs
diff --git a/...troller/portfolio/monolithic/inventory.rs → ...troller/portfolio/monolithic/inventory.rs b/...troller/portfolio/monolithic/inventory.rs → ...troller/portfolio/monolithic/inventory.rs
diff --git a/...ontroller/portfolio/monolithic/metrics.rs → ...ontroller/portfolio/monolithic/metrics.rs b/...ontroller/portfolio/monolithic/metrics.rs → ...ontroller/portfolio/monolithic/metrics.rs
diff --git a/...rc/controller/portfolio/monolithic/mod.rs → bin/controller/portfolio/monolithic/mod.rs b/...rc/controller/portfolio/monolithic/mod.rs → bin/controller/portfolio/monolithic/mod.rs
@@ -12,7 +12,10 @@ use clients::protocol::{LogNormalF64, PoolInitParamsF64};
 use datatypes::portfolio::coin::Coin;
 use iced::{futures::TryFutureExt, subscription, Padding};
 use sim::{from_ethers_u256, to_ethers_address, to_ethers_u256};
-use RustQuant::stochastics::{GeometricBrownianMotion, StochasticProcess, Trajectories};
+use RustQuant::{
+    models::GeometricBrownianMotion,
+    stochastics::{StochasticProcess, Trajectories},
+};
 
 use self::{
     create::{FormView, LiquidityTypes, Times},

diff --git a/...roller/portfolio/monolithic/tx_history.rs → ...roller/portfolio/monolithic/tx_history.rs b/...roller/portfolio/monolithic/tx_history.rs → ...roller/portfolio/monolithic/tx_history.rs
diff --git a/...c/controller/portfolio/monolithic/view.rs → bin/controller/portfolio/monolithic/view.rs b/...c/controller/portfolio/monolithic/view.rs → bin/controller/portfolio/monolithic/view.rs
diff --git a/bin/src/controller/settings/contacts.rs → bin/controller/settings/contacts.rs b/bin/src/controller/settings/contacts.rs → bin/controller/settings/contacts.rs
diff --git a/bin/src/controller/settings/mod.rs → bin/controller/settings/mod.rs b/bin/src/controller/settings/mod.rs → bin/controller/settings/mod.rs
diff --git a/bin/src/controller/settings/rpc.rs → bin/controller/settings/rpc.rs b/bin/src/controller/settings/rpc.rs → bin/controller/settings/rpc.rs
diff --git a/bin/src/controller/settings/signers.rs → bin/controller/settings/signers.rs b/bin/src/controller/settings/signers.rs → bin/controller/settings/signers.rs
diff --git a/bin/src/loader.rs → bin/loader.rs b/bin/src/loader.rs → bin/loader.rs
@@ -357,7 +357,7 @@ pub async fn connect_to_server() -> anyhow::Result<()> {
     Ok(())
 }
 
-pub const DAGGER_SQUARE_FONT_BYTES: &[u8] = include_bytes!("../../assets/fonts/DAGGERSQUARE.otf");
+pub const DAGGER_SQUARE_FONT_BYTES: &[u8] = include_bytes!("../assets/fonts/DAGGERSQUARE.otf");
 
 impl Loader {
     /// Creates a new Loader with the given flags and returns a tuple of the

diff --git a/bin/src/main.rs → bin/main.rs b/bin/src/main.rs → bin/main.rs
diff --git a/bin/src/middleware.rs → bin/middleware.rs b/bin/src/middleware.rs → bin/middleware.rs
diff --git a/bin/src/model/contacts/classification.rs → bin/model/contacts/classification.rs b/bin/src/model/contacts/classification.rs → bin/model/contacts/classification.rs
diff --git a/bin/src/model/contacts/list.rs → bin/model/contacts/list.rs b/bin/src/model/contacts/list.rs → bin/model/contacts/list.rs
diff --git a/bin/src/model/contacts/mod.rs → bin/model/contacts/mod.rs b/bin/src/model/contacts/mod.rs → bin/model/contacts/mod.rs
diff --git a/bin/src/model/mod.rs → bin/model/mod.rs b/bin/src/model/mod.rs → bin/model/mod.rs
diff --git a/bin/src/model/portfolio.rs → bin/model/portfolio.rs b/bin/src/model/portfolio.rs → bin/model/portfolio.rs
diff --git a/bin/src/model/rpcs/mod.rs → bin/model/rpcs/mod.rs b/bin/src/model/rpcs/mod.rs → bin/model/rpcs/mod.rs
diff --git a/bin/src/model/user.rs → bin/model/user.rs b/bin/src/model/user.rs → bin/model/user.rs
diff --git a/bin/src/tracer.rs → bin/tracer.rs b/bin/src/tracer.rs → bin/tracer.rs
diff --git a/bin/src/view/mod.rs → bin/view/mod.rs b/bin/src/view/mod.rs → bin/view/mod.rs
diff --git a/bin/src/view/portfolio_view.rs → bin/view/portfolio_view.rs b/bin/src/view/portfolio_view.rs → bin/view/portfolio_view.rs
diff --git a/bin/src/view/sidebar.rs → bin/view/sidebar.rs b/bin/src/view/sidebar.rs → bin/view/sidebar.rs