@drift-labs/sdk 2.105.0-beta.2 → 2.105.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.105.0-beta.2
+2.105.0-beta.3

package/lib/browser/driftClient.d.ts

@@ -540,22 +540,22 @@ export declare class DriftClient {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
-    }, txParams?: TxParams): Promise<TransactionSignature>;
+    }, precedingIxs?: TransactionInstruction[], overrideIxCount?: number, txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, marketIndex: number, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
-    }, authority?: PublicKey): Promise<TransactionInstruction[]>;
+    }, authority?: PublicKey, precedingIxs?: TransactionInstruction[], overrideIxCount?: number): Promise<TransactionInstruction[]>;
     placeAndMakeSwiftPerpOrder(encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, swiftOrderUuid: Uint8Array, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
-    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
+    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number, precedingIxs?: TransactionInstruction[], overrideIxCount?: number): Promise<TransactionSignature>;
     getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, swiftOrderUuid: Uint8Array, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
-    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction[]>;
+    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, subAccountId?: number, precedingIxs?: TransactionInstruction[], overrideIxCount?: number): Promise<TransactionInstruction[]>;
     encodeRFQMakerOrderParams(message: RFQMakerOrderParams): Buffer;
     placeAndMatchRFQOrders(rfqMatches: RFQMatch[], txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceAndMatchRFQOrdersIxs(rfqMatches: RFQMatch[]): Promise<TransactionInstruction[]>;

package/lib/browser/driftClient.js

@@ -69,7 +69,6 @@ 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");
 const oracleId_1 = require("./oracles/oracleId");
 /**
  * # DriftClient
@@ -3183,7 +3182,7 @@ class DriftClient {
     }
     signSwiftOrderParamsMessage(orderParamsMessage) {
         const takerOrderParamsMessage = this.encodeSwiftOrderParamsMessage(orderParamsMessage);
-        return this.signMessage(new TextEncoder().encode((0, digest_1.digest)(takerOrderParamsMessage).toString('hex')));
+        return this.signMessage(takerOrderParamsMessage);
     }
     encodeSwiftOrderParamsMessage(orderParamsMessage) {
         return this.program.coder.types.encode('SwiftOrderParamsMessage', orderParamsMessage);
@@ -3194,12 +3193,12 @@ class DriftClient {
     signMessage(message, keypair = this.wallet.payer) {
         return Buffer.from(tweetnacl_1.default.sign.detached(message, keypair.secretKey));
     }
-    async placeSwiftTakerOrder(swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, txParams) {
-        const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo);
+    async placeSwiftTakerOrder(swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, precedingIxs = [], overrideIxCount, txParams) {
+        const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, undefined, precedingIxs, overrideIxCount);
         const { txSig } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
         return txSig;
     }
-    async getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, authority) {
+    async getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, authority, precedingIxs = [], overrideIxCount) {
         if (!authority && !takerInfo.takerUserAccount) {
             throw new Error('authority or takerUserAccount must be provided');
         }
@@ -3209,12 +3208,16 @@ class DriftClient {
             readablePerpMarketIndex: marketIndex,
         });
         const authorityToUse = authority || takerInfo.takerUserAccount.authority;
-        const swiftOrderParamsSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
-            publicKey: authorityToUse.toBytes(),
-            signature: Uint8Array.from(swiftOrderParamsSignature),
-            message: new TextEncoder().encode((0, digest_1.digest)(encodedSwiftOrderParamsMessage).toString('hex')),
-        });
-        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftOrderParamsMessage, {
+        const messageLengthBuffer = Buffer.alloc(2);
+        messageLengthBuffer.writeUInt16LE(encodedSwiftOrderParamsMessage.length);
+        const swiftIxData = Buffer.concat([
+            swiftOrderParamsSignature,
+            authorityToUse.toBytes(),
+            messageLengthBuffer,
+            encodedSwiftOrderParamsMessage,
+        ]);
+        const swiftOrderParamsSignatureIx = (0, pythOracleUtils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, swiftIxData, 0);
+        const placeTakerSwiftPerpOrderIx = this.program.instruction.placeSwiftTakerOrder(swiftIxData, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: takerInfo.taker,
@@ -3227,14 +3230,14 @@ class DriftClient {
         });
         return [swiftOrderParamsSignatureIx, placeTakerSwiftPerpOrderIx];
     }
-    async placeAndMakeSwiftPerpOrder(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, txParams, subAccountId) {
-        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId);
+    async placeAndMakeSwiftPerpOrder(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, txParams, subAccountId, precedingIxs = [], overrideIxCount) {
+        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId, precedingIxs, overrideIxCount);
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId) {
-        const [swiftOrderSignatureIx, placeTakerSwiftPerpOrderIx] = await this.getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, orderParams.marketIndex, takerInfo);
+    async getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId, precedingIxs = [], overrideIxCount) {
+        const [swiftOrderSignatureIx, placeTakerSwiftPerpOrderIx] = await this.getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, orderParams.marketIndex, takerInfo, undefined, precedingIxs, overrideIxCount);
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = this.getUserStatsAccountPublicKey();
         const user = await this.getUserAccountPublicKey(subAccountId);

package/lib/browser/idl/drift.json

@@ -11749,6 +11749,41 @@
                     }
                 ]
             }
+        },
+        {
+            "name": "SignatureVerificationError",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "InvalidEd25519InstructionProgramId"
+                    },
+                    {
+                        "name": "InvalidEd25519InstructionDataLength"
+                    },
+                    {
+                        "name": "InvalidSignatureIndex"
+                    },
+                    {
+                        "name": "InvalidSignatureOffset"
+                    },
+                    {
+                        "name": "InvalidPublicKeyOffset"
+                    },
+                    {
+                        "name": "InvalidMessageOffset"
+                    },
+                    {
+                        "name": "InvalidMessageDataSize"
+                    },
+                    {
+                        "name": "InvalidInstructionIndex"
+                    },
+                    {
+                        "name": "MessageOffsetOverflow"
+                    }
+                ]
+            }
         }
     ],
     "events": [

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

@@ -15,4 +15,4 @@ export declare function getEd25519ArgsFromHex(hex: string, customInstructionInde
  * @param messageOffset The offset within the custom instruction data where the pythMessage begins.
  * @param customInstructionData The entire instruction data array for the custom instruction.
  */
-export declare function createMinimalEd25519VerifyIx(customInstructionIndex: number, messageOffset: number, customInstructionData: Uint8Array): TransactionInstruction;
+export declare function createMinimalEd25519VerifyIx(customInstructionIndex: number, messageOffset: number, customInstructionData: Uint8Array, magicLen?: number): TransactionInstruction;

package/lib/browser/util/pythOracleUtils.js

@@ -89,8 +89,8 @@ const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct([
  * @param messageOffset The offset within the custom instruction data where the pythMessage begins.
  * @param customInstructionData The entire instruction data array for the custom instruction.
  */
-function createMinimalEd25519VerifyIx(customInstructionIndex, messageOffset, customInstructionData) {
-    const signatureOffset = messageOffset + MAGIC_LEN;
+function createMinimalEd25519VerifyIx(customInstructionIndex, messageOffset, customInstructionData, magicLen) {
+    const signatureOffset = messageOffset + (magicLen === undefined ? MAGIC_LEN : magicLen);
     const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
     const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
     const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;

package/lib/node/driftClient.d.ts

@@ -540,22 +540,22 @@ export declare class DriftClient {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
-    }, txParams?: TxParams): Promise<TransactionSignature>;
+    }, precedingIxs?: TransactionInstruction[], overrideIxCount?: number, txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, marketIndex: number, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
-    }, authority?: PublicKey): Promise<TransactionInstruction[]>;
+    }, authority?: PublicKey, precedingIxs?: TransactionInstruction[], overrideIxCount?: number): Promise<TransactionInstruction[]>;
     placeAndMakeSwiftPerpOrder(encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, swiftOrderUuid: Uint8Array, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
-    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
+    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number, precedingIxs?: TransactionInstruction[], overrideIxCount?: number): Promise<TransactionSignature>;
     getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, swiftOrderUuid: Uint8Array, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
-    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction[]>;
+    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, subAccountId?: number, precedingIxs?: TransactionInstruction[], overrideIxCount?: number): Promise<TransactionInstruction[]>;
     encodeRFQMakerOrderParams(message: RFQMakerOrderParams): Buffer;
     placeAndMatchRFQOrders(rfqMatches: RFQMatch[], txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceAndMatchRFQOrdersIxs(rfqMatches: RFQMatch[]): Promise<TransactionInstruction[]>;

package/lib/node/driftClient.js

@@ -69,7 +69,6 @@ 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");
 const oracleId_1 = require("./oracles/oracleId");
 /**
  * # DriftClient
@@ -3183,7 +3182,7 @@ class DriftClient {
     }
     signSwiftOrderParamsMessage(orderParamsMessage) {
         const takerOrderParamsMessage = this.encodeSwiftOrderParamsMessage(orderParamsMessage);
-        return this.signMessage(new TextEncoder().encode((0, digest_1.digest)(takerOrderParamsMessage).toString('hex')));
+        return this.signMessage(takerOrderParamsMessage);
     }
     encodeSwiftOrderParamsMessage(orderParamsMessage) {
         return this.program.coder.types.encode('SwiftOrderParamsMessage', orderParamsMessage);
@@ -3194,12 +3193,12 @@ class DriftClient {
     signMessage(message, keypair = this.wallet.payer) {
         return Buffer.from(tweetnacl_1.default.sign.detached(message, keypair.secretKey));
     }
-    async placeSwiftTakerOrder(swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, txParams) {
-        const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo);
+    async placeSwiftTakerOrder(swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, precedingIxs = [], overrideIxCount, txParams) {
+        const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, undefined, precedingIxs, overrideIxCount);
         const { txSig } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
         return txSig;
     }
-    async getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, authority) {
+    async getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, authority, precedingIxs = [], overrideIxCount) {
         if (!authority && !takerInfo.takerUserAccount) {
             throw new Error('authority or takerUserAccount must be provided');
         }
@@ -3209,12 +3208,16 @@ class DriftClient {
             readablePerpMarketIndex: marketIndex,
         });
         const authorityToUse = authority || takerInfo.takerUserAccount.authority;
-        const swiftOrderParamsSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
-            publicKey: authorityToUse.toBytes(),
-            signature: Uint8Array.from(swiftOrderParamsSignature),
-            message: new TextEncoder().encode((0, digest_1.digest)(encodedSwiftOrderParamsMessage).toString('hex')),
-        });
-        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftOrderParamsMessage, {
+        const messageLengthBuffer = Buffer.alloc(2);
+        messageLengthBuffer.writeUInt16LE(encodedSwiftOrderParamsMessage.length);
+        const swiftIxData = Buffer.concat([
+            swiftOrderParamsSignature,
+            authorityToUse.toBytes(),
+            messageLengthBuffer,
+            encodedSwiftOrderParamsMessage,
+        ]);
+        const swiftOrderParamsSignatureIx = (0, pythOracleUtils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, swiftIxData, 0);
+        const placeTakerSwiftPerpOrderIx = this.program.instruction.placeSwiftTakerOrder(swiftIxData, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: takerInfo.taker,
@@ -3227,14 +3230,14 @@ class DriftClient {
         });
         return [swiftOrderParamsSignatureIx, placeTakerSwiftPerpOrderIx];
     }
-    async placeAndMakeSwiftPerpOrder(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, txParams, subAccountId) {
-        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId);
+    async placeAndMakeSwiftPerpOrder(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, txParams, subAccountId, precedingIxs = [], overrideIxCount) {
+        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId, precedingIxs, overrideIxCount);
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId) {
-        const [swiftOrderSignatureIx, placeTakerSwiftPerpOrderIx] = await this.getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, orderParams.marketIndex, takerInfo);
+    async getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId, precedingIxs = [], overrideIxCount) {
+        const [swiftOrderSignatureIx, placeTakerSwiftPerpOrderIx] = await this.getPlaceSwiftTakerPerpOrderIxs(encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, orderParams.marketIndex, takerInfo, undefined, precedingIxs, overrideIxCount);
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = this.getUserStatsAccountPublicKey();
         const user = await this.getUserAccountPublicKey(subAccountId);

package/lib/node/idl/drift.json

@@ -11749,6 +11749,41 @@
                     }
                 ]
             }
+        },
+        {
+            "name": "SignatureVerificationError",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "InvalidEd25519InstructionProgramId"
+                    },
+                    {
+                        "name": "InvalidEd25519InstructionDataLength"
+                    },
+                    {
+                        "name": "InvalidSignatureIndex"
+                    },
+                    {
+                        "name": "InvalidSignatureOffset"
+                    },
+                    {
+                        "name": "InvalidPublicKeyOffset"
+                    },
+                    {
+                        "name": "InvalidMessageOffset"
+                    },
+                    {
+                        "name": "InvalidMessageDataSize"
+                    },
+                    {
+                        "name": "InvalidInstructionIndex"
+                    },
+                    {
+                        "name": "MessageOffsetOverflow"
+                    }
+                ]
+            }
         }
     ],
     "events": [

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

@@ -15,4 +15,4 @@ export declare function getEd25519ArgsFromHex(hex: string, customInstructionInde
  * @param messageOffset The offset within the custom instruction data where the pythMessage begins.
  * @param customInstructionData The entire instruction data array for the custom instruction.
  */
-export declare function createMinimalEd25519VerifyIx(customInstructionIndex: number, messageOffset: number, customInstructionData: Uint8Array): TransactionInstruction;
+export declare function createMinimalEd25519VerifyIx(customInstructionIndex: number, messageOffset: number, customInstructionData: Uint8Array, magicLen?: number): TransactionInstruction;

package/lib/node/util/pythOracleUtils.js

@@ -89,8 +89,8 @@ const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct([
  * @param messageOffset The offset within the custom instruction data where the pythMessage begins.
  * @param customInstructionData The entire instruction data array for the custom instruction.
  */
-function createMinimalEd25519VerifyIx(customInstructionIndex, messageOffset, customInstructionData) {
-    const signatureOffset = messageOffset + MAGIC_LEN;
+function createMinimalEd25519VerifyIx(customInstructionIndex, messageOffset, customInstructionData, magicLen) {
+    const signatureOffset = messageOffset + (magicLen === undefined ? MAGIC_LEN : magicLen);
     const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
     const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
     const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;

package/package.json

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

package/src/driftClient.ts

@@ -179,7 +179,6 @@ 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';
 import { Slothash } from './slot/SlothashSubscriber';
 import { getOracleId } from './oracles/oracleId';
 
@@ -5886,9 +5885,7 @@ export class DriftClient {
 	): Buffer {
 		const takerOrderParamsMessage =
 			this.encodeSwiftOrderParamsMessage(orderParamsMessage);
-		return this.signMessage(
-			new TextEncoder().encode(digest(takerOrderParamsMessage).toString('hex'))
-		);
+		return this.signMessage(takerOrderParamsMessage);
 	}
 
 	public encodeSwiftOrderParamsMessage(
@@ -5925,13 +5922,18 @@ export class DriftClient {
 			takerStats: PublicKey;
 			takerUserAccount: UserAccount;
 		},
+		precedingIxs: TransactionInstruction[] = [],
+		overrideIxCount?: number,
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(
 			swiftOrderParamsMessage,
 			swiftOrderParamsSignature,
 			marketIndex,
-			takerInfo
+			takerInfo,
+			undefined,
+			precedingIxs,
+			overrideIxCount
 		);
 		const { txSig } = await this.sendTransaction(
 			await this.buildTransaction(ixs, txParams),
@@ -5950,7 +5952,9 @@ export class DriftClient {
 			takerStats: PublicKey;
 			takerUserAccount: UserAccount;
 		},
-		authority?: PublicKey
+		authority?: PublicKey,
+		precedingIxs: TransactionInstruction[] = [],
+		overrideIxCount?: number
 	): Promise<TransactionInstruction[]> {
 		if (!authority && !takerInfo.takerUserAccount) {
 			throw new Error('authority or takerUserAccount must be provided');
@@ -5963,33 +5967,39 @@ export class DriftClient {
 		});
 
 		const authorityToUse = authority || takerInfo.takerUserAccount.authority;
-		const swiftOrderParamsSignatureIx =
-			Ed25519Program.createInstructionWithPublicKey({
-				publicKey: authorityToUse.toBytes(),
-				signature: Uint8Array.from(swiftOrderParamsSignature),
-				message: new TextEncoder().encode(
-					digest(encodedSwiftOrderParamsMessage).toString('hex')
-				),
-			});
+
+		const messageLengthBuffer = Buffer.alloc(2);
+		messageLengthBuffer.writeUInt16LE(encodedSwiftOrderParamsMessage.length);
+
+		const swiftIxData = Buffer.concat([
+			swiftOrderParamsSignature,
+			authorityToUse.toBytes(),
+			messageLengthBuffer,
+			encodedSwiftOrderParamsMessage,
+		]);
+
+		const swiftOrderParamsSignatureIx = createMinimalEd25519VerifyIx(
+			overrideIxCount || precedingIxs.length + 1,
+			12,
+			swiftIxData,
+			0
+		);
 
 		const placeTakerSwiftPerpOrderIx =
-			await this.program.instruction.placeSwiftTakerOrder(
-				encodedSwiftOrderParamsMessage,
-				{
-					accounts: {
-						state: await this.getStatePublicKey(),
-						user: takerInfo.taker,
-						userStats: takerInfo.takerStats,
-						swiftUserOrders: getSwiftUserAccountPublicKey(
-							this.program.programId,
-							takerInfo.taker
-						),
-						authority: this.wallet.publicKey,
-						ixSysvar: SYSVAR_INSTRUCTIONS_PUBKEY,
-					},
-					remainingAccounts,
-				}
-			);
+			this.program.instruction.placeSwiftTakerOrder(swiftIxData, {
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user: takerInfo.taker,
+					userStats: takerInfo.takerStats,
+					swiftUserOrders: getSwiftUserAccountPublicKey(
+						this.program.programId,
+						takerInfo.taker
+					),
+					authority: this.wallet.publicKey,
+					ixSysvar: SYSVAR_INSTRUCTIONS_PUBKEY,
+				},
+				remainingAccounts,
+			});
 
 		return [swiftOrderParamsSignatureIx, placeTakerSwiftPerpOrderIx];
 	}
@@ -6006,7 +6016,9 @@ export class DriftClient {
 		orderParams: OptionalOrderParams,
 		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams,
-		subAccountId?: number
+		subAccountId?: number,
+		precedingIxs: TransactionInstruction[] = [],
+		overrideIxCount?: number
 	): Promise<TransactionSignature> {
 		const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(
 			encodedSwiftOrderParamsMessage,
@@ -6015,7 +6027,9 @@ export class DriftClient {
 			takerInfo,
 			orderParams,
 			referrerInfo,
-			subAccountId
+			subAccountId,
+			precedingIxs,
+			overrideIxCount
 		);
 		const { txSig, slot } = await this.sendTransaction(
 			await this.buildTransaction(ixs, txParams),
@@ -6038,14 +6052,19 @@ export class DriftClient {
 		},
 		orderParams: OptionalOrderParams,
 		referrerInfo?: ReferrerInfo,
-		subAccountId?: number
+		subAccountId?: number,
+		precedingIxs: TransactionInstruction[] = [],
+		overrideIxCount?: number
 	): Promise<TransactionInstruction[]> {
 		const [swiftOrderSignatureIx, placeTakerSwiftPerpOrderIx] =
 			await this.getPlaceSwiftTakerPerpOrderIxs(
 				encodedSwiftOrderParamsMessage,
 				swiftOrderParamsSignature,
 				orderParams.marketIndex,
-				takerInfo
+				takerInfo,
+				undefined,
+				precedingIxs,
+				overrideIxCount
 			);
 
 		orderParams = getOrderParams(orderParams, { marketType: MarketType.PERP });
@@ -8952,7 +8971,6 @@ export class DriftClient {
 		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
 		const isVersionedTx = this.isVersionedTransaction(tx);
-
 		if (isVersionedTx) {
 			return this.txSender.sendVersionedTransaction(
 				tx as VersionedTransaction,

package/src/idl/drift.json

@@ -11749,6 +11749,41 @@
           }
         ]
       }
+    },
+    {
+      "name": "SignatureVerificationError",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "InvalidEd25519InstructionProgramId"
+          },
+          {
+            "name": "InvalidEd25519InstructionDataLength"
+          },
+          {
+            "name": "InvalidSignatureIndex"
+          },
+          {
+            "name": "InvalidSignatureOffset"
+          },
+          {
+            "name": "InvalidPublicKeyOffset"
+          },
+          {
+            "name": "InvalidMessageOffset"
+          },
+          {
+            "name": "InvalidMessageDataSize"
+          },
+          {
+            "name": "InvalidInstructionIndex"
+          },
+          {
+            "name": "MessageOffsetOverflow"
+          }
+        ]
+      }
     }
   ],
   "events": [

package/src/util/pythOracleUtils.ts

@@ -102,9 +102,11 @@ const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct<
 export function createMinimalEd25519VerifyIx(
 	customInstructionIndex: number,
 	messageOffset: number,
-	customInstructionData: Uint8Array
+	customInstructionData: Uint8Array,
+	magicLen?: number
 ): TransactionInstruction {
-	const signatureOffset = messageOffset + MAGIC_LEN;
+	const signatureOffset =
+		messageOffset + (magicLen === undefined ? MAGIC_LEN : magicLen);
 	const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
 	const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
 	const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;