Skip to content

Commit 870fb9c

Browse files
authored
Merge pull request #342 from drift-labs/master
master -> mainnet
2 parents 93fe143 + c72859f commit 870fb9c

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
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.12.38",
9-
"@drift-labs/sdk": "2.106.0-beta.3",
8+
"@drift-labs/jit-proxy": "0.12.46",
9+
"@drift-labs/sdk": "2.107.0-beta.2",
1010
"@opentelemetry/api": "1.7.0",
1111
"@opentelemetry/auto-instrumentations-node": "0.31.2",
1212
"@opentelemetry/exporter-prometheus": "0.31.0",

src/experimental-bots/swift/makerExample.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export class SwiftMaker {
117117

118118
const swiftOrderParamsBuf = Buffer.from(
119119
order['order_message'],
120-
'base64'
120+
'hex'
121121
);
122122
const {
123123
swiftOrderParams,
@@ -147,8 +147,10 @@ export class SwiftMaker {
147147
}
148148

149149
const ixs = await this.driftClient.getPlaceAndMakeSwiftPerpOrderIxs(
150-
swiftOrderParamsBuf,
151-
Buffer.from(order['order_signature'], 'base64'),
150+
{
151+
orderParams: swiftOrderParamsBuf,
152+
signature: Buffer.from(order['order_signature'], 'base64'),
153+
},
152154
decodeUTF8(order['uuid']),
153155
{
154156
taker: takerUserPubkey,

src/experimental-bots/swift/takerExample.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class SwiftTaker {
7171
stopLossOrderParams: null,
7272
takeProfitOrderParams: null,
7373
};
74-
const signature =
74+
const { orderParams: message, signature } =
7575
this.driftClient.signSwiftOrderParamsMessage(orderMessage);
7676

7777
const hash = digestSignature(Uint8Array.from(signature));
@@ -84,9 +84,7 @@ export class SwiftTaker {
8484
{
8585
market_index: marketIndex,
8686
market_type: 'perp',
87-
message: this.driftClient
88-
.encodeSwiftOrderParamsMessage(orderMessage)
89-
.toString('base64'),
87+
message: message.toString(),
9088
signature: signature.toString('base64'),
9189
taker_pubkey: this.driftClient.wallet.publicKey.toBase58(),
9290
},

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,19 +175,19 @@
175175
enabled "2.0.x"
176176
kuler "^2.0.0"
177177

178-
"@drift-labs/[email protected].38":
179-
version "0.12.38"
180-
resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.12.38.tgz#55c94a388ae998adfefb0d81c3b18b434c7eba83"
181-
integrity sha512-nGMKQCzOS5lVhY6csxSIGkoAPcosHU0M1oPyG0V1wJ714qBSzl4//Y230jdPFZoQfrzUFEDZxEbylcU1I1rctA==
178+
"@drift-labs/[email protected].46":
179+
version "0.12.46"
180+
resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.12.46.tgz#e7463d7c1fa59fa330f0fc12abf80eb0c09668dd"
181+
integrity sha512-hcrDFSIqCI1Kvb8po+iajPN9qPqGGuz+A2yVI+PHvwtwOpTGr2Q7ZC/JmE6NL4WOpaMJKOZmPt8E3dEgKUCfTA==
182182
dependencies:
183183
"@coral-xyz/anchor" "0.26.0"
184-
"@drift-labs/sdk" "2.106.0-beta.3"
184+
"@drift-labs/sdk" "2.107.0-beta.2"
185185
"@solana/web3.js" "1.91.7"
186186

187-
"@drift-labs/sdk@2.106.0-beta.3":
188-
version "2.106.0-beta.3"
189-
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.106.0-beta.3.tgz#dc4cbd779d274c5479df1582c1b82651a7bf02e6"
190-
integrity sha512-SahpOcXubH65FxVeawoT+/nOemDibRKyNq/ihJCos9c7Wa4rRoL+ILuO0NtOS3Rrf94MSMv2g/68VPBRJI08HQ==
187+
"@drift-labs/sdk@2.107.0-beta.2":
188+
version "2.107.0-beta.2"
189+
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.107.0-beta.2.tgz#519a2f19ec85df7dd54703b6e3a7e59f86ff35e8"
190+
integrity sha512-q36E4Qo9jhS11n/8fEK6OLTY7aPjjNrLTvbU6KVCdlhaWfAWmXbNr+r8wFFNAL2CcbjJg85yjTbsNCVuVPiA6g==
191191
dependencies:
192192
"@coral-xyz/anchor" "0.29.0"
193193
"@coral-xyz/anchor-30" "npm:@coral-xyz/[email protected]"

0 commit comments

Comments
 (0)