diff --git a/Cargo.lock b/Cargo.lock index 6e04c98d96..e0952ce1bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -958,7 +958,6 @@ dependencies = [ name = "drift" version = "2.145.1" dependencies = [ - "ahash 0.8.6", "anchor-lang", "anchor-spl", "arrayref", @@ -970,7 +969,6 @@ dependencies = [ "drift-macros", "enumflags2", "hex", - "num-derive 0.3.3", "num-integer", "num-traits", "openbook-v2-light", @@ -986,7 +984,6 @@ dependencies = [ "static_assertions", "switchboard", "switchboard-on-demand", - "thiserror", "uint", ] @@ -1840,7 +1837,6 @@ name = "pyth" version = "0.1.0" dependencies = [ "anchor-lang", - "arrayref", "bytemuck", ] @@ -1879,7 +1875,7 @@ dependencies = [ [[package]] name = "pyth-solana-receiver-sdk" version = "0.3.0" -source = "git+https://github.com/drift-labs/pyth-crosschain?rev=3e8a24ecd0bcf22b787313e2020f4186bb22c729#3e8a24ecd0bcf22b787313e2020f4186bb22c729" +source = "git+https://github.com/drift-labs/pyth-crosschain?rev=d790d1cb4da873a949cf33ff70349b7614b232eb#d790d1cb4da873a949cf33ff70349b7614b232eb" dependencies = [ "anchor-lang", "hex", @@ -1890,7 +1886,7 @@ dependencies = [ [[package]] name = "pythnet-sdk" version = "2.1.0" -source = "git+https://github.com/drift-labs/pyth-crosschain?rev=3e8a24ecd0bcf22b787313e2020f4186bb22c729#3e8a24ecd0bcf22b787313e2020f4186bb22c729" +source = "git+https://github.com/drift-labs/pyth-crosschain?rev=d790d1cb4da873a949cf33ff70349b7614b232eb#d790d1cb4da873a949cf33ff70349b7614b232eb" dependencies = [ "anchor-lang", "bincode", @@ -2972,7 +2968,6 @@ dependencies = [ "anchor-lang", "anchor-spl", "bytemuck", - "solana-program", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 766930deab..f686c06993 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,7 @@ members = [ exclude = [ "deps/serum-dex" ] +resolver = "2" [profile.release] lto = "fat" diff --git a/programs/drift/Cargo.toml b/programs/drift/Cargo.toml index b2730356e9..d64706801f 100644 --- a/programs/drift/Cargo.toml +++ b/programs/drift/Cargo.toml @@ -23,15 +23,13 @@ solana-program = "1.16" anchor-spl = { version = "0.29.0", features = [] } pyth-client = "0.2.2" pyth-lazer-solana-contract = { git = "https://github.com/drift-labs/pyth-crosschain", rev = "d790d1cb4da873a949cf33ff70349b7614b232eb", features = ["no-entrypoint"]} -pythnet-sdk = { git = "https://github.com/drift-labs/pyth-crosschain", rev = "3e8a24ecd0bcf22b787313e2020f4186bb22c729"} -pyth-solana-receiver-sdk = { git = "https://github.com/drift-labs/pyth-crosschain", rev = "3e8a24ecd0bcf22b787313e2020f4186bb22c729"} +pythnet-sdk = { git = "https://github.com/drift-labs/pyth-crosschain", rev = "d790d1cb4da873a949cf33ff70349b7614b232eb"} +pyth-solana-receiver-sdk = { git = "https://github.com/drift-labs/pyth-crosschain", rev = "d790d1cb4da873a949cf33ff70349b7614b232eb"} bytemuck = { version = "1.4.0" } borsh = "0.10.3" hex = "0.4.3" num-traits = "0.2" uint = { version = "0.9.1", default-features = false } -num-derive = "0.3" -thiserror = "1.0" num-integer = "0.1.44" arrayref = "0.3.6" base64 = "0.13.0" @@ -43,7 +41,6 @@ static_assertions = "1.1.0" drift-macros = { git = "https://github.com/drift-labs/drift-macros.git", rev = "c57d87" } switchboard = { path = "../switchboard", features = ["no-entrypoint"] } openbook-v2-light = { path = "../openbook_v2", features = ["no-entrypoint"] } -ahash = "=0.8.6" switchboard-on-demand = { path = "../switchboard-on-demand", features = ["no-entrypoint"] } byteorder = "1.4.3" diff --git a/programs/pyth/Cargo.toml b/programs/pyth/Cargo.toml index 1acd07ab7f..ed1b1b8e28 100644 --- a/programs/pyth/Cargo.toml +++ b/programs/pyth/Cargo.toml @@ -18,5 +18,4 @@ anchor-test= [] [dependencies] anchor-lang = "0.29.0" -arrayref = "0.3.6" bytemuck = { version = "1.4.0" } diff --git a/programs/token_faucet/Cargo.toml b/programs/token_faucet/Cargo.toml index 249906b2cb..d553fdc158 100644 --- a/programs/token_faucet/Cargo.toml +++ b/programs/token_faucet/Cargo.toml @@ -16,6 +16,5 @@ anchor-test= [] [dependencies] anchor-lang = "0.29.0" -solana-program = "1.16" anchor-spl = "0.29.0" bytemuck = { version = "1.4.0" } \ No newline at end of file