From df1faea73921ba69cfeb9fd119ba6f9b923be15d Mon Sep 17 00:00:00 2001 From: frank <98238480+soundsonacid@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:34:30 -0800 Subject: [PATCH 01/12] chore: bump driftpy 0.7.9 -> 0.7.10 (#17) --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index c76108e8..762238f2 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -13,7 +13,7 @@ python = "^3.10" python-dotenv = "^1.0.0" solana = "^0.30.1" anchorpy = "^0.17.1" -driftpy = "0.7.9" +driftpy = "0.7.10" [build-system] requires = ["poetry-core"] From 8ce54fdcf59e41217fc04d9124e71646c66be60d Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 18:34:53 +0000 Subject: [PATCH 02/12] sdk: release v0.10.177 --- 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 26e3bd3b..78b881a4 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.176", + "version": "0.10.177", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc" From 05c34bff2e2b9c5c02aff5c9c6bc4fc0bec166b8 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 22:40:42 +0000 Subject: [PATCH 03/12] sdk: release v0.10.178 --- ts/sdk/package.json | 4 ++-- ts/sdk/yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ts/sdk/package.json b/ts/sdk/package.json index 78b881a4..e733fbd8 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,13 +1,13 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.177", + "version": "0.10.178", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc" }, "dependencies": { "@coral-xyz/anchor": "^0.26.0", - "@drift-labs/sdk": "2.54.0-beta.9", + "@drift-labs/sdk": "2.54.0-beta.10", "@solana/web3.js": "1.73.2" }, "engines": { diff --git a/ts/sdk/yarn.lock b/ts/sdk/yarn.lock index 8fad8b6b..aa500911 100644 --- a/ts/sdk/yarn.lock +++ b/ts/sdk/yarn.lock @@ -67,10 +67,10 @@ bn.js "^5.1.2" buffer-layout "^1.2.0" -"@drift-labs/sdk@2.54.0-beta.9": - version "2.54.0-beta.9" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.9.tgz#99a49f44df57b22cf39c1dfbab19e5d1c08c02cc" - integrity sha512-pf6gnt8IntOmN58gfPPIhkKEC4SIoKbXIiZ6YuYBCWiGlEiNSOPm9Jo0iqFlyl4ZYsFRVkjMHTXlWzRSAj56sw== +"@drift-labs/sdk@2.54.0-beta.10": + version "2.54.0-beta.10" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.10.tgz#91e6b604f9ff84cffa73fc29d1069df77b9acc79" + integrity sha512-vXUE0F4Y4RcWyhCZ4nZ7h8eCxDN47r7VeIXqBIUY0YmOnOjPNAN/MH24jwLLzD445IfN29kteN9Nr0ENr33arQ== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 5ab40d4cd145a79b2f3e3ef519330e9a6529c3e3 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:00:56 +0000 Subject: [PATCH 04/12] sdk: release v0.10.179 --- ts/sdk/package.json | 4 ++-- ts/sdk/yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ts/sdk/package.json b/ts/sdk/package.json index e733fbd8..726a5b24 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,13 +1,13 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.178", + "version": "0.10.179", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc" }, "dependencies": { "@coral-xyz/anchor": "^0.26.0", - "@drift-labs/sdk": "2.54.0-beta.10", + "@drift-labs/sdk": "2.55.0-beta.0", "@solana/web3.js": "1.73.2" }, "engines": { diff --git a/ts/sdk/yarn.lock b/ts/sdk/yarn.lock index aa500911..2360eb17 100644 --- a/ts/sdk/yarn.lock +++ b/ts/sdk/yarn.lock @@ -67,10 +67,10 @@ bn.js "^5.1.2" buffer-layout "^1.2.0" -"@drift-labs/sdk@2.54.0-beta.10": - version "2.54.0-beta.10" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.10.tgz#91e6b604f9ff84cffa73fc29d1069df77b9acc79" - integrity sha512-vXUE0F4Y4RcWyhCZ4nZ7h8eCxDN47r7VeIXqBIUY0YmOnOjPNAN/MH24jwLLzD445IfN29kteN9Nr0ENr33arQ== +"@drift-labs/sdk@2.55.0-beta.0": + version "2.55.0-beta.0" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.55.0-beta.0.tgz#004643329816175a1ef84c7a68cd9e22d7600181" + integrity sha512-sQ41P/PT/8A0rQ2X6i9/rUpL0Hn4UZzbPItQWz1l7ZBpVCZ6NFYUVR1eyqX20Ww3adaOspL40SfrTErFltEOpA== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From bc78cdde2793a9adeac5fbe917539364b9fe8d2e Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 13 Jan 2024 00:53:24 +0000 Subject: [PATCH 05/12] sdk: release v0.10.180 --- ts/sdk/package.json | 4 ++-- ts/sdk/yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ts/sdk/package.json b/ts/sdk/package.json index 726a5b24..1124595a 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,13 +1,13 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.179", + "version": "0.10.180", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc" }, "dependencies": { "@coral-xyz/anchor": "^0.26.0", - "@drift-labs/sdk": "2.55.0-beta.0", + "@drift-labs/sdk": "2.54.0-beta.11", "@solana/web3.js": "1.73.2" }, "engines": { diff --git a/ts/sdk/yarn.lock b/ts/sdk/yarn.lock index 2360eb17..1a0aa539 100644 --- a/ts/sdk/yarn.lock +++ b/ts/sdk/yarn.lock @@ -67,10 +67,10 @@ bn.js "^5.1.2" buffer-layout "^1.2.0" -"@drift-labs/sdk@2.55.0-beta.0": - version "2.55.0-beta.0" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.55.0-beta.0.tgz#004643329816175a1ef84c7a68cd9e22d7600181" - integrity sha512-sQ41P/PT/8A0rQ2X6i9/rUpL0Hn4UZzbPItQWz1l7ZBpVCZ6NFYUVR1eyqX20Ww3adaOspL40SfrTErFltEOpA== +"@drift-labs/sdk@2.54.0-beta.11": + version "2.54.0-beta.11" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.11.tgz#7352455eb568f66a78fc058cdcc729d8edfc41c4" + integrity sha512-Fve01yPQY5IEw0ucAt0LURpQobZsAF5RrhotFDaEwHjW2Xse5uVBX+stwHqxdlM8FtTwhmeN3qBW3OoheOF9RQ== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 4e1e580f3c64f1e17667b04a7caa78264d31b0f0 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 06:37:08 +0000 Subject: [PATCH 06/12] sdk: release v0.10.181 --- ts/sdk/package.json | 4 ++-- ts/sdk/yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ts/sdk/package.json b/ts/sdk/package.json index 1124595a..bea11293 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,13 +1,13 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.180", + "version": "0.10.181", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc" }, "dependencies": { "@coral-xyz/anchor": "^0.26.0", - "@drift-labs/sdk": "2.54.0-beta.11", + "@drift-labs/sdk": "2.54.0-beta.12", "@solana/web3.js": "1.73.2" }, "engines": { diff --git a/ts/sdk/yarn.lock b/ts/sdk/yarn.lock index 1a0aa539..28c6aac2 100644 --- a/ts/sdk/yarn.lock +++ b/ts/sdk/yarn.lock @@ -67,10 +67,10 @@ bn.js "^5.1.2" buffer-layout "^1.2.0" -"@drift-labs/sdk@2.54.0-beta.11": - version "2.54.0-beta.11" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.11.tgz#7352455eb568f66a78fc058cdcc729d8edfc41c4" - integrity sha512-Fve01yPQY5IEw0ucAt0LURpQobZsAF5RrhotFDaEwHjW2Xse5uVBX+stwHqxdlM8FtTwhmeN3qBW3OoheOF9RQ== +"@drift-labs/sdk@2.54.0-beta.12": + version "2.54.0-beta.12" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.12.tgz#25e853b1fed27d33fffcda950e943fdc7b358ff9" + integrity sha512-oJDFFuTXESfESvoB0PtkaK0r9sax0QUI7/YdFJLcMf1i/l1m5soPh7Bcsug/MuJrRVqhCdc7ce90bpDaWzJ+gQ== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 6ca2a7bf06341523bf3a1aace1de6321bc56772e Mon Sep 17 00:00:00 2001 From: Chris Heaney Date: Mon, 15 Jan 2024 07:45:50 -0500 Subject: [PATCH 07/12] jit: add post only slide --- programs/jit-proxy/src/instructions/arb_perp.rs | 2 +- programs/jit-proxy/src/instructions/jit.rs | 2 +- programs/jit-proxy/src/state.rs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/jit-proxy/src/instructions/arb_perp.rs b/programs/jit-proxy/src/instructions/arb_perp.rs index 5bf1b130..c83ac17e 100644 --- a/programs/jit-proxy/src/instructions/arb_perp.rs +++ b/programs/jit-proxy/src/instructions/arb_perp.rs @@ -7,8 +7,8 @@ use drift::math::casting::Cast; use drift::math::constants::{BASE_PRECISION, MARGIN_PRECISION_U128, QUOTE_PRECISION}; use drift::math::margin::MarginRequirementType; use drift::program::Drift; -use drift::state::perp_market_map::MarketSet; use drift::state::order_params::{OrderParams, PostOnlyParam}; +use drift::state::perp_market_map::MarketSet; use std::ops::Deref; use drift::math::orders::find_bids_and_asks_from_users; diff --git a/programs/jit-proxy/src/instructions/jit.rs b/programs/jit-proxy/src/instructions/jit.rs index a142f629..74c8cf22 100644 --- a/programs/jit-proxy/src/instructions/jit.rs +++ b/programs/jit-proxy/src/instructions/jit.rs @@ -126,7 +126,7 @@ pub fn jit<'info>(ctx: Context<'_, '_, '_, 'info, Jit<'info>>, params: JitParams reduce_only: false, post_only: params .post_only - .unwrap_or(PostOnlyParam::MustPostOnly) + .unwrap_or(PostOnlyParam::Slide) .to_drift_param(), immediate_or_cancel: true, max_ts: None, diff --git a/programs/jit-proxy/src/state.rs b/programs/jit-proxy/src/state.rs index 677fc077..ed1616f0 100644 --- a/programs/jit-proxy/src/state.rs +++ b/programs/jit-proxy/src/state.rs @@ -8,6 +8,7 @@ pub enum PostOnlyParam { None, MustPostOnly, // Tx fails if order can't be post only TryPostOnly, // Tx succeeds and order not placed if can't be post only + Slide, // Modify price to be post only if can't be post only } impl PostOnlyParam { @@ -16,6 +17,7 @@ impl PostOnlyParam { PostOnlyParam::None => DriftPostOnlyParam::None, PostOnlyParam::MustPostOnly => DriftPostOnlyParam::MustPostOnly, PostOnlyParam::TryPostOnly => DriftPostOnlyParam::TryPostOnly, + PostOnlyParam::Slide => DriftPostOnlyParam::Slide, } } } From a8a4bd4a91a557bfdf86e77c9d6bdf3536c07f47 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 12:47:24 +0000 Subject: [PATCH 08/12] sdk: release v0.10.182 --- 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 bea11293..2f45f575 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.181", + "version": "0.10.182", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc" From 45d1e89bf69818e2d9f0108d653b429f7b29fca7 Mon Sep 17 00:00:00 2001 From: frank <98238480+soundsonacid@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:56:00 -0800 Subject: [PATCH 09/12] version (#18) * chore: bump driftpy 0.7.9 -> 0.7.10 * chore: bump driftpy 0.7.10 -> 0.7.13 --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 762238f2..056530c7 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -13,7 +13,7 @@ python = "^3.10" python-dotenv = "^1.0.0" solana = "^0.30.1" anchorpy = "^0.17.1" -driftpy = "0.7.10" +driftpy = "0.7.13" [build-system] requires = ["poetry-core"] From d13e5439053b18014be9d597350e57120eeee7fc Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 18:56:22 +0000 Subject: [PATCH 10/12] sdk: release v0.10.183 --- 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 2f45f575..415fb236 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.182", + "version": "0.10.183", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc" From c8a4e42d71f2e988dbcb792d0a10bcc71a0af149 Mon Sep 17 00:00:00 2001 From: frank <98238480+soundsonacid@users.noreply.github.com> Date: Mon, 15 Jan 2024 12:07:30 -0800 Subject: [PATCH 11/12] fix: don't send tx if max position is 0 (#19) --- python/sdk/jit_proxy/jitter/jitter_shotgun.py | 3 +++ python/sdk/jit_proxy/jitter/jitter_sniper.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/python/sdk/jit_proxy/jitter/jitter_shotgun.py b/python/sdk/jit_proxy/jitter/jitter_shotgun.py index 21b0df03..909117c7 100644 --- a/python/sdk/jit_proxy/jitter/jitter_shotgun.py +++ b/python/sdk/jit_proxy/jitter/jitter_shotgun.py @@ -57,6 +57,9 @@ async def try_fill(): self.logger.info(f"Trying to fill {order_sig} -> Attempt: {i + 1}") try: + if params.max_position == 0: + break + sig = await self.jit_proxy_client.jit( JitIxParams( taker_key, diff --git a/python/sdk/jit_proxy/jitter/jitter_sniper.py b/python/sdk/jit_proxy/jitter/jitter_sniper.py index 0f469a47..298fed1f 100644 --- a/python/sdk/jit_proxy/jitter/jitter_sniper.py +++ b/python/sdk/jit_proxy/jitter/jitter_sniper.py @@ -176,6 +176,9 @@ async def try_fill(): for _ in range(3): try: + if params.max_position == 0: + break + tx_sig_and_slot = await self.jit_proxy_client.jit( { taker_key, From 551574870c340619fbc3b6d818813c0e01aedf43 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 20:07:52 +0000 Subject: [PATCH 12/12] sdk: release v0.10.184 --- 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 415fb236..796a9ef9 100644 --- a/ts/sdk/package.json +++ b/ts/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@drift-labs/jit-proxy", - "version": "0.10.183", + "version": "0.10.184", "scripts": { "clean": "rm -rf lib", "build": "yarn clean && tsc"