From 05344aabca3c9bc02cdcc8745cee0f9c4e8db25f Mon Sep 17 00:00:00 2001 From: Rodolfo P A <6721075+rodoufu@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:24:20 -0300 Subject: [PATCH 1/3] Using workspace dependencies --- Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index af6ee42..8b53c77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,12 @@ members = [ "market_making" ] +[workspace.dependencies] +anchor-lang = "0.28.0" +anyhow = "1.0.71" +spl-associated-token-account = "1" +tokio = "~1.14.1" + [profile.release] overflow-checks = true lto = "fat" From 2ccd3d8fcb6b4ae4161fa38ee4ba980c5297c522 Mon Sep 17 00:00:00 2001 From: Rodolfo P A <6721075+rodoufu@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:37:12 -0300 Subject: [PATCH 2/3] Using workspace dependencies --- Cargo.toml | 6 ++++++ cli/Cargo.toml | 20 ++++++++++---------- market_making/Cargo.toml | 14 +++++++------- programs/lb_clmm/Cargo.toml | 8 ++++---- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8b53c77..a87dc64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,13 @@ members = [ [workspace.dependencies] anchor-lang = "0.28.0" +anchor-spl = "0.28.0" +anchor-client = "0.28.0" anyhow = "1.0.71" +clap = "4.3.3" +mpl-token-metadata = "3.0.1" +proptest = "1.2.0" +shellexpand = "3.1.0" spl-associated-token-account = "1" tokio = "~1.14.1" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index aa681f8..5d9a772 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -8,18 +8,18 @@ authors = ["tian "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anchor-lang = "0.28.0" -anchor-spl = "0.28.0" -anchor-client={version="0.28.0", features=["async"]} -clap = { version = "4.3.3", features = ["derive"] } -anyhow = "1.0.71" -shellexpand = "3.1.0" +anchor-lang.workspace = true +anchor-spl.workspace = true +anchor-client = { workspace = true, features=["async"] } +clap = { workspace = true, features = ["derive"] } +anyhow.workspace = true +shellexpand.workspace = true rust_decimal = { version = "1.31.0", features = ["maths"] } lb_clmm = { path = "../programs/lb_clmm", features = ["cpi"] } -spl-associated-token-account = "1" -mpl-token-metadata = "3.0.1" +spl-associated-token-account.workspace = true +mpl-token-metadata.workspace = true rand = "0.8.5" -tokio = {version = "~1.14.1", features = ["full", "parking_lot"]} +tokio = { workspace = true, features = ["full", "parking_lot"] } [dev-dependencies] -proptest = "1.2.0" \ No newline at end of file +proptest.workspace = true \ No newline at end of file diff --git a/market_making/Cargo.toml b/market_making/Cargo.toml index c5246c1..90e5445 100644 --- a/market_making/Cargo.toml +++ b/market_making/Cargo.toml @@ -6,22 +6,22 @@ edition = "2021" authors = ["andrew "] [dependencies] -tokio = {version = "~1.14.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } hyper = { version = "0.14.17", features = ["full"] } routerify = "3" ureq = { version = "2.0.0", features = ["json"]} -anchor-client={version="0.28.0", features=["async"]} +anchor-client = { workspace = true, features=["async"] } anchor-spl="0.28.0" -anchor-lang="0.28.0" +anchor-lang.workspace = true env_logger="0.9.0" log="0.4.17" -clap = { version = "4.3.3", features = ["derive"] } -shellexpand = "3.1.0" -anyhow = "1.0.71" +clap = { workspace = true, features = ["derive"] } +shellexpand.workspace = true +anyhow.workspace = true lb_clmm = { path = "../programs/lb_clmm", features = ["cpi"] } serde_json = "1.0.48" serde = { version = "1.0.104", features = ["derive"] } -spl-associated-token-account = "1" +spl-associated-token-account.workspace = true solana-transaction-status="1.16.12" bs58 = "0.5.0" chrono="0.4.31" diff --git a/programs/lb_clmm/Cargo.toml b/programs/lb_clmm/Cargo.toml index 61f8449..c861b9b 100644 --- a/programs/lb_clmm/Cargo.toml +++ b/programs/lb_clmm/Cargo.toml @@ -19,19 +19,19 @@ alpha-access = [] test-bpf = [] [dependencies] -anchor-lang = { version = "0.28.0", features = ["event-cpi"] } -anchor-spl = "0.28.0" +anchor-lang = { workspace = true, features = ["event-cpi"] } +anchor-spl.workspace = true uint = "0.8.5" bytemuck = { version = "1.13.1", features = ["derive", "min_const_generics"] } ruint = "1.3.0" num-traits = "0.2.16" num-integer = "0.1.45" -mpl-token-metadata = "3.0.1" +mpl-token-metadata.workspace = true solana-program = "1.16.0" num_enum = "0.7.1" [dev-dependencies] -proptest = "1.2.0" +proptest.workspace = true rand = "0.7.3" solana-program-test = "1.16.0" solana-sdk = "1.16.0" From 693da544aa339b0c85652a862553eb5276524aa9 Mon Sep 17 00:00:00 2001 From: Rodolfo P A <6721075+rodoufu@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:02:50 -0300 Subject: [PATCH 3/3] Update Cargo.toml --- market_making/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/market_making/Cargo.toml b/market_making/Cargo.toml index 90e5445..8d7c7ab 100644 --- a/market_making/Cargo.toml +++ b/market_making/Cargo.toml @@ -11,7 +11,7 @@ hyper = { version = "0.14.17", features = ["full"] } routerify = "3" ureq = { version = "2.0.0", features = ["json"]} anchor-client = { workspace = true, features=["async"] } -anchor-spl="0.28.0" +anchor-spl.workspace = true anchor-lang.workspace = true env_logger="0.9.0" log="0.4.17"