Skip to content

Commit 5b01aee

Browse files
authored
Merge pull request #547 from drift-labs/master
master -> mainnet
2 parents 7a3e45b + 82fe774 commit 5b01aee

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"main": "lib/index.js",
66
"license": "Apache-2.0",
77
"dependencies": {
8-
"@drift-labs/jit-proxy": "0.21.73",
9-
"@drift-labs/sdk": "2.143.0-beta.7",
8+
"@drift-labs/jit-proxy": "0.21.77",
9+
"@drift-labs/sdk": "2.144.0-beta.1",
1010
"@drift/common": "file:./drift-common/common-ts",
1111
"@opentelemetry/api": "1.7.0",
1212
"@opentelemetry/auto-instrumentations-node": "^0.62.1",

src/bots/filler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ export class FillerBot extends TxThreaded implements Bot {
944944
mmOraclePriceData,
945945
this.getMaxSlot(),
946946
Date.now() / 1000,
947-
this.driftClient.getStateAccount().minPerpAuctionDuration
947+
this.driftClient.getStateAccount()
948948
);
949949

950950
if (

src/experimental-bots/filler/fillerMultithreaded.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,7 @@ export class FillerMultithreaded {
14111411
mmOraclePriceData,
14121412
this.slotSubscriber.getSlot(),
14131413
Date.now() / 1000,
1414-
this.driftClient.getStateAccount().minPerpAuctionDuration
1414+
this.driftClient.getStateAccount()
14151415
)
14161416
) {
14171417
return false;

src/utils.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import {
4949
calculateBaseAssetAmountForAmmToFulfill,
5050
isOrderExpired,
5151
MMOraclePriceData,
52+
StateAccount,
5253
} from '@drift-labs/sdk';
5354
import {
5455
NATIVE_MINT,
@@ -1599,7 +1600,7 @@ export function isFillableByVAMMDetails(
15991600
mmOraclePriceData: MMOraclePriceData,
16001601
slot: number,
16011602
ts: number,
1602-
minAuctionDuration: number
1603+
state: StateAccount
16031604
): {
16041605
fillable: boolean;
16051606
fallbackAvailableLiquiditySource: boolean;
@@ -1609,8 +1610,10 @@ export function isFillableByVAMMDetails(
16091610
} {
16101611
const fallbackAvailableLiquiditySource = isFallbackAvailableLiquiditySource(
16111612
order,
1612-
minAuctionDuration,
1613-
slot
1613+
mmOraclePriceData,
1614+
slot,
1615+
state,
1616+
market
16141617
);
16151618
const baseAssetAmountForAmmToFulfill =
16161619
calculateBaseAssetAmountForAmmToFulfill(

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,21 @@
112112
enabled "2.0.x"
113113
kuler "^2.0.0"
114114

115-
"@drift-labs/[email protected].73":
116-
version "0.21.73"
117-
resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.21.73.tgz#35a35095bc55955c73833332ba824ff9857c69a2"
118-
integrity sha512-HxEN8ckM6zlJvjgxXNkYdhUuk755wyisnTu1Kd4wGHpmVptqmhjFIBGXPEXMs/9l55F6YgqNRhoiHyv3bu0r9Q==
115+
"@drift-labs/[email protected].77":
116+
version "0.21.77"
117+
resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.21.77.tgz#fa4f0997b49713f5a073edab750afacb2fa17c9c"
118+
integrity sha512-cojQYfGoHrV5k7a7g9pAJNSx2cVNEWnsWLe2Ub+KH1Qp1cbXbL64nKgPfcH4kqu+NCVEhaqQmqiK7Dpq4MtfcQ==
119119
dependencies:
120120
"@coral-xyz/anchor" "0.29.0"
121-
"@drift-labs/sdk" "2.143.0-beta.7"
121+
"@drift-labs/sdk" "2.144.0-beta.1"
122122
"@solana/web3.js" "1.98.0"
123123
tweetnacl-util "^0.15.1"
124124
typescript "5.4.5"
125125

126-
"@drift-labs/sdk@2.143.0-beta.7":
127-
version "2.143.0-beta.7"
128-
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.143.0-beta.7.tgz#9cc96438aa7c999666a29e7b4585456ff7175095"
129-
integrity sha512-JNZW3yJjCY3pvoH418hFHBq+zMdkBUsoPoTkT8G45yqrzhJPrAQmI6T/AzWvsL2HCzzaf0nHTOv8/4vpA26GUQ==
126+
"@drift-labs/sdk@2.144.0-beta.1":
127+
version "2.144.0-beta.1"
128+
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.144.0-beta.1.tgz#74c618379aee6c4f3f71369bb06ce113d0f7cf82"
129+
integrity sha512-LH7kgkx06MIbJKoL6GjQIrKpv/eQzq7JUg//j7XBq3Mi4uDOjrIXnbLTfqTnGBknANCZx8j1RYQ5Kyt1YLIS3Q==
130130
dependencies:
131131
"@coral-xyz/anchor" "0.29.0"
132132
"@coral-xyz/anchor-30" "npm:@coral-xyz/[email protected]"

0 commit comments

Comments
 (0)