@drift-labs/sdk 2.98.0-beta.7 → 2.98.0-beta.9

package/VERSION

@@ -1 +1 @@
-2.98.0-beta.7
+2.98.0-beta.9

package/lib/browser/driftClient.js

@@ -69,6 +69,7 @@ const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_r
 const on_demand_1 = require("@switchboard-xyz/on-demand");
 const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
+const digest_1 = require("./util/digest");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -3006,11 +3007,11 @@ class DriftClient {
         };
     }
     signSwiftServerMessage(message) {
-        const swiftServerMessage = Uint8Array.from(this.encodeSwiftServerMessage(message));
+        const swiftServerMessage = Uint8Array.from((0, digest_1.digest)(this.encodeSwiftServerMessage(message)));
         return this.signMessage(swiftServerMessage);
     }
     signSwiftOrderParamsMessage(orderParamsMessage) {
-        const takerOrderParamsMessage = Uint8Array.from(this.encodeSwiftOrderParamsMessage(orderParamsMessage));
+        const takerOrderParamsMessage = Uint8Array.from((0, digest_1.digest)(this.encodeSwiftOrderParamsMessage(orderParamsMessage)));
         return this.signMessage(takerOrderParamsMessage);
     }
     encodeSwiftOrderParamsMessage(orderParamsMessage) {
@@ -3036,14 +3037,14 @@ class DriftClient {
         const swiftServerSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
             publicKey: new web3_js_1.PublicKey(this.swiftID).toBytes(),
             signature: Uint8Array.from(swiftSignature),
-            message: Uint8Array.from(encodedSwiftServerMessage),
+            message: Uint8Array.from((0, digest_1.digest)(encodedSwiftServerMessage)),
         });
         const swiftOrderParamsSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
             publicKey: takerInfo.takerUserAccount.authority.toBytes(),
             signature: Uint8Array.from(swiftOrderParamsSignature),
-            message: Uint8Array.from(encodedSwiftOrderParamsMessage),
+            message: Uint8Array.from((0, digest_1.digest)(encodedSwiftOrderParamsMessage)),
         });
-        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftServerMessage, encodedSwiftOrderParamsMessage, swiftSignature, {
+        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftServerMessage, encodedSwiftOrderParamsMessage, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: takerInfo.taker,

package/lib/browser/events/types.d.ts

@@ -44,7 +44,7 @@ export type EventMap = {
     SwiftOrderRecord: Event<SwiftOrderRecord>;
 };
 export type EventType = keyof EventMap;
-export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord>;
+export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SwiftOrderRecord>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }

package/lib/browser/idl/drift.json

@@ -686,15 +686,6 @@
                 {
                     "name": "swiftOrderParamsMessageBytes",
                     "type": "bytes"
-                },
-                {
-                    "name": "swiftMessageSignature",
-                    "type": {
-                        "array": [
-                            "u8",
-                            64
-                        ]
-                    }
                 }
             ]
         },

package/lib/browser/types.d.ts

@@ -643,6 +643,7 @@ export type SettlePnlRecord = {
     explanation: SettlePnlExplanation;
 };
 export type SwiftOrderRecord = {
+    ts: BN;
     user: PublicKey;
     hash: string;
     matchingOrderParams: OrderParams;

package/lib/browser/util/digest.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+/// <reference types="node" />
+export declare function digest(data: Buffer): Buffer;

package/lib/browser/util/digest.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.digest = void 0;
+const crypto_1 = require("crypto");
+function digest(data) {
+    const hash = (0, crypto_1.createHash)('sha256');
+    hash.update(data);
+    return hash.digest();
+}
+exports.digest = digest;

package/lib/node/driftClient.js

@@ -69,6 +69,7 @@ const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_r
 const on_demand_1 = require("@switchboard-xyz/on-demand");
 const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
+const digest_1 = require("./util/digest");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -3006,11 +3007,11 @@ class DriftClient {
         };
     }
     signSwiftServerMessage(message) {
-        const swiftServerMessage = Uint8Array.from(this.encodeSwiftServerMessage(message));
+        const swiftServerMessage = Uint8Array.from((0, digest_1.digest)(this.encodeSwiftServerMessage(message)));
         return this.signMessage(swiftServerMessage);
     }
     signSwiftOrderParamsMessage(orderParamsMessage) {
-        const takerOrderParamsMessage = Uint8Array.from(this.encodeSwiftOrderParamsMessage(orderParamsMessage));
+        const takerOrderParamsMessage = Uint8Array.from((0, digest_1.digest)(this.encodeSwiftOrderParamsMessage(orderParamsMessage)));
         return this.signMessage(takerOrderParamsMessage);
     }
     encodeSwiftOrderParamsMessage(orderParamsMessage) {
@@ -3036,14 +3037,14 @@ class DriftClient {
         const swiftServerSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
             publicKey: new web3_js_1.PublicKey(this.swiftID).toBytes(),
             signature: Uint8Array.from(swiftSignature),
-            message: Uint8Array.from(encodedSwiftServerMessage),
+            message: Uint8Array.from((0, digest_1.digest)(encodedSwiftServerMessage)),
         });
         const swiftOrderParamsSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
             publicKey: takerInfo.takerUserAccount.authority.toBytes(),
             signature: Uint8Array.from(swiftOrderParamsSignature),
-            message: Uint8Array.from(encodedSwiftOrderParamsMessage),
+            message: Uint8Array.from((0, digest_1.digest)(encodedSwiftOrderParamsMessage)),
         });
-        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftServerMessage, encodedSwiftOrderParamsMessage, swiftSignature, {
+        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftServerMessage, encodedSwiftOrderParamsMessage, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: takerInfo.taker,

package/lib/node/events/types.d.ts

@@ -44,7 +44,7 @@ export type EventMap = {
     SwiftOrderRecord: Event<SwiftOrderRecord>;
 };
 export type EventType = keyof EventMap;
-export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord>;
+export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SwiftOrderRecord>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }

package/lib/node/idl/drift.json

@@ -686,15 +686,6 @@
                 {
                     "name": "swiftOrderParamsMessageBytes",
                     "type": "bytes"
-                },
-                {
-                    "name": "swiftMessageSignature",
-                    "type": {
-                        "array": [
-                            "u8",
-                            64
-                        ]
-                    }
                 }
             ]
         },

package/lib/node/types.d.ts

@@ -643,6 +643,7 @@ export type SettlePnlRecord = {
     explanation: SettlePnlExplanation;
 };
 export type SwiftOrderRecord = {
+    ts: BN;
     user: PublicKey;
     hash: string;
     matchingOrderParams: OrderParams;

package/lib/node/util/digest.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+/// <reference types="node" />
+export declare function digest(data: Buffer): Buffer;

package/lib/node/util/digest.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.digest = void 0;
+const crypto_1 = require("crypto");
+function digest(data) {
+    const hash = (0, crypto_1.createHash)('sha256');
+    hash.update(data);
+    return hash.digest();
+}
+exports.digest = digest;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.98.0-beta.7",
+	"version": "2.98.0-beta.9",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/driftClient.ts

@@ -169,6 +169,7 @@ import pythSolanaReceiverIdl from './idl/pyth_solana_receiver.json';
 import { asV0Tx, PullFeed } from '@switchboard-xyz/on-demand';
 import { gprcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 import nacl from 'tweetnacl';
+import { digest } from './util/digest';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -5545,7 +5546,7 @@ export class DriftClient {
 
 	public signSwiftServerMessage(message: SwiftServerMessage): Buffer {
 		const swiftServerMessage = Uint8Array.from(
-			this.encodeSwiftServerMessage(message)
+			digest(this.encodeSwiftServerMessage(message))
 		);
 		return this.signMessage(swiftServerMessage);
 	}
@@ -5554,7 +5555,7 @@ export class DriftClient {
 		orderParamsMessage: SwiftOrderParamsMessage
 	): Buffer {
 		const takerOrderParamsMessage = Uint8Array.from(
-			this.encodeSwiftOrderParamsMessage(orderParamsMessage)
+			digest(this.encodeSwiftOrderParamsMessage(orderParamsMessage))
 		);
 		return this.signMessage(takerOrderParamsMessage);
 	}
@@ -5635,21 +5636,20 @@ export class DriftClient {
 			Ed25519Program.createInstructionWithPublicKey({
 				publicKey: new PublicKey(this.swiftID).toBytes(),
 				signature: Uint8Array.from(swiftSignature),
-				message: Uint8Array.from(encodedSwiftServerMessage),
+				message: Uint8Array.from(digest(encodedSwiftServerMessage)),
 			});
 
 		const swiftOrderParamsSignatureIx =
 			Ed25519Program.createInstructionWithPublicKey({
 				publicKey: takerInfo.takerUserAccount.authority.toBytes(),
 				signature: Uint8Array.from(swiftOrderParamsSignature),
-				message: Uint8Array.from(encodedSwiftOrderParamsMessage),
+				message: Uint8Array.from(digest(encodedSwiftOrderParamsMessage)),
 			});
 
 		const placeTakerSwiftPerpOrderIx =
 			await this.program.instruction.placeSwiftTakerOrder(
 				encodedSwiftServerMessage,
 				encodedSwiftOrderParamsMessage,
-				swiftSignature,
 				{
 					accounts: {
 						state: await this.getStatePublicKey(),

package/src/events/types.ts

@@ -114,7 +114,8 @@ export type DriftEvent =
 	| Event<InsuranceFundStakeRecord>
 	| Event<CurveRecord>
 	| Event<SwapRecord>
-	| Event<SpotMarketVaultDepositRecord>;
+	| Event<SpotMarketVaultDepositRecord>
+	| Event<SwiftOrderRecord>;
 
 export interface EventSubscriberEvents {
 	newEvent: (event: WrappedEvent<EventType>) => void;

package/src/idl/drift.json

@@ -686,15 +686,6 @@
         {
           "name": "swiftOrderParamsMessageBytes",
           "type": "bytes"
-        },
-        {
-          "name": "swiftMessageSignature",
-          "type": {
-            "array": [
-              "u8",
-              64
-            ]
-          }
         }
       ]
     },

package/src/types.ts

@@ -542,6 +542,7 @@ export type SettlePnlRecord = {
 };
 
 export type SwiftOrderRecord = {
+	ts: BN;
 	user: PublicKey;
 	hash: string;
 	matchingOrderParams: OrderParams;

package/src/util/digest.ts

@@ -0,0 +1,7 @@
+import { createHash } from 'crypto';
+
+export function digest(data: Buffer): Buffer {
+	const hash = createHash('sha256');
+	hash.update(data);
+	return hash.digest();
+}