From 41c3f47fc619b700fd8c89f4db289ebfb5a3d928 Mon Sep 17 00:00:00 2001 From: soundsonacid Date: Fri, 1 Mar 2024 12:15:32 -0600 Subject: [PATCH 1/2] update drift & driftrs --- Cargo.lock | 6 ++-- programs/jit-proxy/Cargo.toml | 2 +- rust/Cargo.lock | 56 +++++++++++++++++++++++++++++++---- rust/Cargo.toml | 4 +-- 4 files changed, 57 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ca8eb5f..b52b1ba7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -636,8 +636,8 @@ dependencies = [ [[package]] name = "drift" -version = "2.53.0" -source = "git+https://github.com/drift-labs/protocol-v2.git?tag=v2.53.0#376187a77283ae8095027a48e4a75a2511c33b12" +version = "2.66.0" +source = "git+https://github.com/drift-labs/protocol-v2.git?tag=v2.66.0#83ce0fb2a11550d6fc52c5029420454a310dee1d" dependencies = [ "anchor-lang", "anchor-spl", @@ -1236,7 +1236,7 @@ dependencies = [ [[package]] name = "phoenix-v1" version = "0.2.4" -source = "git+https://github.com/drift-labs/phoenix-v1?rev=4c65c9#4c65c97cd62493e27425ea2830447c833152bed1" +source = "git+https://github.com/drift-labs/phoenix-v1?rev=bf6b84#bf6b8447047aa16485d8d976528e43f5d53331d9" dependencies = [ "borsh", "bytemuck", diff --git a/programs/jit-proxy/Cargo.toml b/programs/jit-proxy/Cargo.toml index f712f757..5ddef1ca 100644 --- a/programs/jit-proxy/Cargo.toml +++ b/programs/jit-proxy/Cargo.toml @@ -17,5 +17,5 @@ default = [] anchor-lang = "0.27.0" anchor-spl = "0.27.0" bytemuck = { version = "1.4.0" } -drift = { git = "https://github.com/drift-labs/protocol-v2.git", tag = "v2.53.0", features = ["cpi", "mainnet-beta"]} +drift = { git = "https://github.com/drift-labs/protocol-v2.git", tag = "v2.66.0", features = ["cpi", "mainnet-beta"]} static_assertions = "1.1.0" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 6d2d6e43..0433df5b 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1077,7 +1077,33 @@ dependencies = [ "num-derive", "num-integer", "num-traits", - "phoenix-v1", + "phoenix-v1 0.2.4 (git+https://github.com/drift-labs/phoenix-v1?rev=4c65c9)", + "pyth-client", + "serum_dex", + "solana-program", + "solana-security-txt", + "static_assertions", + "thiserror", + "uint", +] + +[[package]] +name = "drift" +version = "2.66.0" +source = "git+https://github.com/drift-labs/protocol-v2.git?tag=v2.66.0#83ce0fb2a11550d6fc52c5029420454a310dee1d" +dependencies = [ + "anchor-lang", + "anchor-spl", + "arrayref", + "base64 0.13.1", + "borsh", + "bytemuck", + "drift-macros", + "enumflags2", + "num-derive", + "num-integer", + "num-traits", + "phoenix-v1 0.2.4 (git+https://github.com/drift-labs/phoenix-v1?rev=bf6b84)", "pyth-client", "serum_dex", "solana-program", @@ -1099,12 +1125,12 @@ dependencies = [ [[package]] name = "drift-sdk" version = "0.1.0" -source = "git+https://github.com/circuit-research/protocol-v2?branch=cargo-add-sdk#e2746d5420399e43b1e8ec990d764ced322bfd5d" +source = "git+https://github.com/drift-labs/drift-rs#5aa2a79ee8ea1a9537f774d5d5cc368bd597df50" dependencies = [ "anchor-lang", "base64 0.13.1", "bytemuck", - "drift", + "drift 2.66.0", "env_logger 0.10.2", "fnv", "futures-util", @@ -1861,7 +1887,7 @@ dependencies = [ "anchor-lang", "anchor-spl", "bytemuck", - "drift", + "drift 2.53.0", "static_assertions", ] @@ -2451,6 +2477,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "phoenix-v1" +version = "0.2.4" +source = "git+https://github.com/drift-labs/phoenix-v1?rev=bf6b84#bf6b8447047aa16485d8d976528e43f5d53331d9" +dependencies = [ + "borsh", + "bytemuck", + "ellipsis-macros", + "itertools 0.10.5", + "lib-sokoban", + "num_enum", + "shank", + "solana-program", + "solana-security-txt", + "spl-associated-token-account", + "spl-token", + "static_assertions", + "thiserror", +] + [[package]] name = "pin-project-lite" version = "0.2.13" @@ -2883,7 +2929,7 @@ dependencies = [ "async-trait", "dashmap", "dotenv", - "drift", + "drift 2.66.0", "drift-sdk", "env_logger 0.10.2", "futures", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 22755237..3ccc06ac 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" anchor-client = "0.27.0" jit-proxy = { git = "https://github.com/drift-labs/jit-proxy", version = "0.10.2" } solana-sdk = "1.14.16" -drift-sdk = { git = "https://github.com/circuit-research/protocol-v2", branch = "cargo-add-sdk" } +drift-sdk = { git = "https://github.com/drift-labs/drift-rs", commit = "5aa2a79" } tokio = { version = "1.35.1", features = ["full"] } -drift = { git = "https://github.com/drift-labs/protocol-v2.git", tag = "v2.53.0", features = ["mainnet-beta"]} +drift = { git = "https://github.com/drift-labs/protocol-v2.git", tag = "v2.66.0", features = ["mainnet-beta"]} thiserror = "1.0.38" log = "0.4.20" async-trait = "0.1.75" From c7d097c13657f5473d01dd05cf0d56dd9ff2db6d Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 18:16:08 +0000 Subject: [PATCH 2/2] sdk: release v0.10.297 --- ts/sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/sdk/package.json b/ts/sdk/package.json index bfe5c19d..a0ef37e0 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.296", + "version": "0.10.297", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc"