@drift-labs/sdk 2.110.0-beta.15 → 2.110.0-beta.16

package/VERSION

@@ -1 +1 @@
-2.110.0-beta.15
+2.110.0-beta.16

package/lib/browser/driftClient.js

@@ -64,6 +64,7 @@ const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
 const price_service_sdk_1 = require("@pythnetwork/price-service-sdk");
 const address_1 = require("@pythnetwork/pyth-solana-receiver/lib/address");
 const pythOracleUtils_1 = require("./util/pythOracleUtils");
+const ed25519Utils_1 = require("./signedMsg/ed25519Utils");
 const utils_2 = require("./tx/utils");
 const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
 const on_demand_1 = require("@switchboard-xyz/on-demand");
@@ -3265,7 +3266,7 @@ class DriftClient {
             messageLengthBuffer,
             signedSignedMsgOrderParams.orderParams,
         ]);
-        const signedMsgOrderParamsSignatureIx = (0, pythOracleUtils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, signedMsgIxData, 0);
+        const signedMsgOrderParamsSignatureIx = (0, ed25519Utils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, signedMsgIxData, 0);
         const isDelegateSigner = takerInfo.signingAuthority.equals(takerInfo.takerUserAccount.delegate);
         const placeTakerSignedMsgPerpOrderIx = this.program.instruction.placeSignedMsgTakerOrder(signedMsgIxData, isDelegateSigner, {
             accounts: {
@@ -4670,7 +4671,7 @@ class DriftClient {
     }
     async getPostPythLazerOracleUpdateIxs(feedIds, pythMessageHex, precedingIxs = [], overrideIxCount) {
         const pythMessageBytes = Buffer.from(pythMessageHex, 'hex');
-        const verifyIx = (0, pythOracleUtils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, pythMessageBytes);
+        const verifyIx = (0, ed25519Utils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, pythMessageBytes);
         const remainingAccountsMeta = feedIds.map((feedId) => {
             return {
                 pubkey: (0, pda_1.getPythLazerOraclePublicKey)(this.program.programId, feedId),

package/lib/browser/index.d.ts

@@ -87,7 +87,7 @@ export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
 export * from './oracles/oracleId';
-export * from './swift/swiftOrderSubscriber';
+export * from './signedMsg/signedMsgOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';

package/lib/browser/index.js

@@ -110,7 +110,7 @@ __exportStar(require("./oracles/pythPullClient"), exports);
 __exportStar(require("./oracles/pythLazerClient"), exports);
 __exportStar(require("./oracles/switchboardOnDemandClient"), exports);
 __exportStar(require("./oracles/oracleId"), exports);
-__exportStar(require("./swift/swiftOrderSubscriber"), exports);
+__exportStar(require("./signedMsg/signedMsgOrderSubscriber"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./tx/whileValidTxSender"), exports);

package/lib/browser/signedMsg/ed25519Utils.d.ts

@@ -0,0 +1,10 @@
+import { TransactionInstruction } from '@solana/web3.js';
+/**
+ * Constructs a minimal Ed25519 verification instruction that references the data
+ * inside the drift custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
+ *
+ * @param customInstructionIndex The index of the custom instruction in the transaction (e.g. if tx contains compute budget limit, compute budget price, ed25519 verify, custom ix, this would be 3).
+ * @param messageOffset The offset within the custom instruction data where the signed message begins.
+ * @param customInstructionData The entire instruction data array for the custom instruction.
+ */
+export declare function createMinimalEd25519VerifyIx(customInstructionIndex: number, messageOffset: number, customInstructionData: Uint8Array, magicLen?: number): TransactionInstruction;

package/lib/browser/signedMsg/ed25519Utils.js

@@ -0,0 +1,80 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMinimalEd25519VerifyIx = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const BufferLayout = __importStar(require("@solana/buffer-layout"));
+const ED25519_INSTRUCTION_LEN = 16;
+const SIGNATURE_LEN = 64;
+const PUBKEY_LEN = 32;
+const MAGIC_LEN = 4;
+const MESSAGE_SIZE_LEN = 2;
+const readUint16LE = (data, offset) => {
+    return data[offset] | (data[offset + 1] << 8);
+};
+const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct([
+    BufferLayout.u8('numSignatures'),
+    BufferLayout.u8('padding'),
+    BufferLayout.u16('signatureOffset'),
+    BufferLayout.u16('signatureInstructionIndex'),
+    BufferLayout.u16('publicKeyOffset'),
+    BufferLayout.u16('publicKeyInstructionIndex'),
+    BufferLayout.u16('messageDataOffset'),
+    BufferLayout.u16('messageDataSize'),
+    BufferLayout.u16('messageInstructionIndex'),
+]);
+/**
+ * Constructs a minimal Ed25519 verification instruction that references the data
+ * inside the drift custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
+ *
+ * @param customInstructionIndex The index of the custom instruction in the transaction (e.g. if tx contains compute budget limit, compute budget price, ed25519 verify, custom ix, this would be 3).
+ * @param messageOffset The offset within the custom instruction data where the signed message begins.
+ * @param customInstructionData The entire instruction data array for the custom instruction.
+ */
+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;
+    const messageDataSize = readUint16LE(customInstructionData, messageDataSizeOffset - messageOffset);
+    const instructionData = Buffer.alloc(ED25519_INSTRUCTION_LEN);
+    ED25519_INSTRUCTION_LAYOUT.encode({
+        numSignatures: 1,
+        padding: 0,
+        signatureOffset,
+        signatureInstructionIndex: customInstructionIndex,
+        publicKeyOffset,
+        publicKeyInstructionIndex: customInstructionIndex,
+        messageDataOffset,
+        messageDataSize: messageDataSize,
+        messageInstructionIndex: customInstructionIndex,
+    }, instructionData);
+    return new web3_js_1.TransactionInstruction({
+        keys: [],
+        programId: web3_js_1.Ed25519Program.programId,
+        data: instructionData,
+    });
+}
+exports.createMinimalEd25519VerifyIx = createMinimalEd25519VerifyIx;

package/lib/browser/{swift/swiftOrderSubscriber.js → signedMsg/signedMsgOrderSubscriber.js}

@@ -70,7 +70,7 @@ class SignedMsgOrderSubscriber {
                     this.handleAuthMessage(message);
                 }
                 if (message['order']) {
-                    const order = JSON.parse(message['order']);
+                    const order = message['order'];
                     const signedMsgOrderParamsBuf = Buffer.from(order['order_message'], 'hex');
                     const signedMsgOrderParamsMessage = this.driftClient.decodeSignedMsgOrderParamsMessage(signedMsgOrderParamsBuf);
                     if (!signedMsgOrderParamsMessage.signedMsgOrderParams.price) {

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

@@ -1,18 +1,2 @@
-import { TransactionInstruction } from '@solana/web3.js';
 export declare function trimFeedId(feedId: string): string;
 export declare function getFeedIdUint8Array(feedId: string): Uint8Array;
-export declare function getEd25519ArgsFromHex(hex: string, customInstructionIndex?: number): {
-    publicKey: Uint8Array;
-    signature: Uint8Array;
-    message: Uint8Array;
-    instructionIndex?: number;
-};
-/**
- * Constructs a minimal Ed25519 verification instruction that references the data
- * inside the main instruction (postPythLazerOracleUpdate).
- *
- * @param customInstructionIndex The index of the custom instruction in the transaction (typically 1 if this is second).
- * @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, magicLen?: number): TransactionInstruction;

package/lib/browser/util/pythOracleUtils.js

@@ -1,31 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMinimalEd25519VerifyIx = exports.getEd25519ArgsFromHex = exports.getFeedIdUint8Array = exports.trimFeedId = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const BufferLayout = __importStar(require("@solana/buffer-layout"));
+exports.getFeedIdUint8Array = exports.trimFeedId = void 0;
 function trimFeedId(feedId) {
     if (feedId.startsWith('0x')) {
         return feedId.slice(2);
@@ -38,80 +13,3 @@ function getFeedIdUint8Array(feedId) {
     return Uint8Array.from(Buffer.from(trimmedFeedId, 'hex'));
 }
 exports.getFeedIdUint8Array = getFeedIdUint8Array;
-const ED25519_INSTRUCTION_LEN = 16;
-const SIGNATURE_LEN = 64;
-const PUBKEY_LEN = 32;
-const MAGIC_LEN = 4;
-const MESSAGE_SIZE_LEN = 2;
-function getEd25519ArgsFromHex(hex, customInstructionIndex) {
-    const cleanedHex = hex.startsWith('0x') ? hex.slice(2) : hex;
-    const buffer = new Uint8Array(Buffer.from(cleanedHex, 'hex'));
-    const signatureOffset = MAGIC_LEN;
-    const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
-    const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
-    const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;
-    const signature = buffer.slice(signatureOffset, signatureOffset + SIGNATURE_LEN);
-    const publicKey = buffer.slice(publicKeyOffset, publicKeyOffset + PUBKEY_LEN);
-    const messageSize = buffer[messageDataSizeOffset] | (buffer[messageDataSizeOffset + 1] << 8);
-    const message = buffer.slice(messageDataOffset, messageDataOffset + messageSize);
-    if (publicKey.length !== PUBKEY_LEN) {
-        throw new Error('Invalid public key length');
-    }
-    if (signature.length !== SIGNATURE_LEN) {
-        throw new Error('Invalid signature length');
-    }
-    return {
-        publicKey,
-        signature,
-        message,
-        instructionIndex: customInstructionIndex,
-    };
-}
-exports.getEd25519ArgsFromHex = getEd25519ArgsFromHex;
-const readUint16LE = (data, offset) => {
-    return data[offset] | (data[offset + 1] << 8);
-};
-const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct([
-    BufferLayout.u8('numSignatures'),
-    BufferLayout.u8('padding'),
-    BufferLayout.u16('signatureOffset'),
-    BufferLayout.u16('signatureInstructionIndex'),
-    BufferLayout.u16('publicKeyOffset'),
-    BufferLayout.u16('publicKeyInstructionIndex'),
-    BufferLayout.u16('messageDataOffset'),
-    BufferLayout.u16('messageDataSize'),
-    BufferLayout.u16('messageInstructionIndex'),
-]);
-/**
- * Constructs a minimal Ed25519 verification instruction that references the data
- * inside the main instruction (postPythLazerOracleUpdate).
- *
- * @param customInstructionIndex The index of the custom instruction in the transaction (typically 1 if this is second).
- * @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, 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;
-    const messageDataSize = readUint16LE(customInstructionData, messageDataSizeOffset - messageOffset);
-    const instructionData = Buffer.alloc(ED25519_INSTRUCTION_LEN);
-    ED25519_INSTRUCTION_LAYOUT.encode({
-        numSignatures: 1,
-        padding: 0,
-        signatureOffset,
-        signatureInstructionIndex: customInstructionIndex,
-        publicKeyOffset,
-        publicKeyInstructionIndex: customInstructionIndex,
-        messageDataOffset,
-        messageDataSize: messageDataSize,
-        messageInstructionIndex: customInstructionIndex,
-    }, instructionData);
-    return new web3_js_1.TransactionInstruction({
-        keys: [],
-        programId: web3_js_1.Ed25519Program.programId,
-        data: instructionData,
-    });
-}
-exports.createMinimalEd25519VerifyIx = createMinimalEd25519VerifyIx;

package/lib/node/driftClient.js

@@ -64,6 +64,7 @@ const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
 const price_service_sdk_1 = require("@pythnetwork/price-service-sdk");
 const address_1 = require("@pythnetwork/pyth-solana-receiver/lib/address");
 const pythOracleUtils_1 = require("./util/pythOracleUtils");
+const ed25519Utils_1 = require("./signedMsg/ed25519Utils");
 const utils_2 = require("./tx/utils");
 const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
 const on_demand_1 = require("@switchboard-xyz/on-demand");
@@ -3265,7 +3266,7 @@ class DriftClient {
             messageLengthBuffer,
             signedSignedMsgOrderParams.orderParams,
         ]);
-        const signedMsgOrderParamsSignatureIx = (0, pythOracleUtils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, signedMsgIxData, 0);
+        const signedMsgOrderParamsSignatureIx = (0, ed25519Utils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, signedMsgIxData, 0);
         const isDelegateSigner = takerInfo.signingAuthority.equals(takerInfo.takerUserAccount.delegate);
         const placeTakerSignedMsgPerpOrderIx = this.program.instruction.placeSignedMsgTakerOrder(signedMsgIxData, isDelegateSigner, {
             accounts: {
@@ -4670,7 +4671,7 @@ class DriftClient {
     }
     async getPostPythLazerOracleUpdateIxs(feedIds, pythMessageHex, precedingIxs = [], overrideIxCount) {
         const pythMessageBytes = Buffer.from(pythMessageHex, 'hex');
-        const verifyIx = (0, pythOracleUtils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, pythMessageBytes);
+        const verifyIx = (0, ed25519Utils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, pythMessageBytes);
         const remainingAccountsMeta = feedIds.map((feedId) => {
             return {
                 pubkey: (0, pda_1.getPythLazerOraclePublicKey)(this.program.programId, feedId),

package/lib/node/index.d.ts

@@ -87,7 +87,7 @@ export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
 export * from './oracles/oracleId';
-export * from './swift/swiftOrderSubscriber';
+export * from './signedMsg/signedMsgOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';

package/lib/node/index.js

@@ -110,7 +110,7 @@ __exportStar(require("./oracles/pythPullClient"), exports);
 __exportStar(require("./oracles/pythLazerClient"), exports);
 __exportStar(require("./oracles/switchboardOnDemandClient"), exports);
 __exportStar(require("./oracles/oracleId"), exports);
-__exportStar(require("./swift/swiftOrderSubscriber"), exports);
+__exportStar(require("./signedMsg/signedMsgOrderSubscriber"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./tx/whileValidTxSender"), exports);

package/lib/node/signedMsg/ed25519Utils.d.ts

@@ -0,0 +1,10 @@
+import { TransactionInstruction } from '@solana/web3.js';
+/**
+ * Constructs a minimal Ed25519 verification instruction that references the data
+ * inside the drift custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
+ *
+ * @param customInstructionIndex The index of the custom instruction in the transaction (e.g. if tx contains compute budget limit, compute budget price, ed25519 verify, custom ix, this would be 3).
+ * @param messageOffset The offset within the custom instruction data where the signed message begins.
+ * @param customInstructionData The entire instruction data array for the custom instruction.
+ */
+export declare function createMinimalEd25519VerifyIx(customInstructionIndex: number, messageOffset: number, customInstructionData: Uint8Array, magicLen?: number): TransactionInstruction;

package/lib/node/signedMsg/ed25519Utils.js

@@ -0,0 +1,80 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMinimalEd25519VerifyIx = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const BufferLayout = __importStar(require("@solana/buffer-layout"));
+const ED25519_INSTRUCTION_LEN = 16;
+const SIGNATURE_LEN = 64;
+const PUBKEY_LEN = 32;
+const MAGIC_LEN = 4;
+const MESSAGE_SIZE_LEN = 2;
+const readUint16LE = (data, offset) => {
+    return data[offset] | (data[offset + 1] << 8);
+};
+const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct([
+    BufferLayout.u8('numSignatures'),
+    BufferLayout.u8('padding'),
+    BufferLayout.u16('signatureOffset'),
+    BufferLayout.u16('signatureInstructionIndex'),
+    BufferLayout.u16('publicKeyOffset'),
+    BufferLayout.u16('publicKeyInstructionIndex'),
+    BufferLayout.u16('messageDataOffset'),
+    BufferLayout.u16('messageDataSize'),
+    BufferLayout.u16('messageInstructionIndex'),
+]);
+/**
+ * Constructs a minimal Ed25519 verification instruction that references the data
+ * inside the drift custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
+ *
+ * @param customInstructionIndex The index of the custom instruction in the transaction (e.g. if tx contains compute budget limit, compute budget price, ed25519 verify, custom ix, this would be 3).
+ * @param messageOffset The offset within the custom instruction data where the signed message begins.
+ * @param customInstructionData The entire instruction data array for the custom instruction.
+ */
+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;
+    const messageDataSize = readUint16LE(customInstructionData, messageDataSizeOffset - messageOffset);
+    const instructionData = Buffer.alloc(ED25519_INSTRUCTION_LEN);
+    ED25519_INSTRUCTION_LAYOUT.encode({
+        numSignatures: 1,
+        padding: 0,
+        signatureOffset,
+        signatureInstructionIndex: customInstructionIndex,
+        publicKeyOffset,
+        publicKeyInstructionIndex: customInstructionIndex,
+        messageDataOffset,
+        messageDataSize: messageDataSize,
+        messageInstructionIndex: customInstructionIndex,
+    }, instructionData);
+    return new web3_js_1.TransactionInstruction({
+        keys: [],
+        programId: web3_js_1.Ed25519Program.programId,
+        data: instructionData,
+    });
+}
+exports.createMinimalEd25519VerifyIx = createMinimalEd25519VerifyIx;

package/lib/node/{swift/swiftOrderSubscriber.js → signedMsg/signedMsgOrderSubscriber.js}

@@ -70,7 +70,7 @@ class SignedMsgOrderSubscriber {
                     this.handleAuthMessage(message);
                 }
                 if (message['order']) {
-                    const order = JSON.parse(message['order']);
+                    const order = message['order'];
                     const signedMsgOrderParamsBuf = Buffer.from(order['order_message'], 'hex');
                     const signedMsgOrderParamsMessage = this.driftClient.decodeSignedMsgOrderParamsMessage(signedMsgOrderParamsBuf);
                     if (!signedMsgOrderParamsMessage.signedMsgOrderParams.price) {

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

@@ -1,18 +1,2 @@
-import { TransactionInstruction } from '@solana/web3.js';
 export declare function trimFeedId(feedId: string): string;
 export declare function getFeedIdUint8Array(feedId: string): Uint8Array;
-export declare function getEd25519ArgsFromHex(hex: string, customInstructionIndex?: number): {
-    publicKey: Uint8Array;
-    signature: Uint8Array;
-    message: Uint8Array;
-    instructionIndex?: number;
-};
-/**
- * Constructs a minimal Ed25519 verification instruction that references the data
- * inside the main instruction (postPythLazerOracleUpdate).
- *
- * @param customInstructionIndex The index of the custom instruction in the transaction (typically 1 if this is second).
- * @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, magicLen?: number): TransactionInstruction;

package/lib/node/util/pythOracleUtils.js

@@ -1,31 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMinimalEd25519VerifyIx = exports.getEd25519ArgsFromHex = exports.getFeedIdUint8Array = exports.trimFeedId = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const BufferLayout = __importStar(require("@solana/buffer-layout"));
+exports.getFeedIdUint8Array = exports.trimFeedId = void 0;
 function trimFeedId(feedId) {
     if (feedId.startsWith('0x')) {
         return feedId.slice(2);
@@ -38,80 +13,3 @@ function getFeedIdUint8Array(feedId) {
     return Uint8Array.from(Buffer.from(trimmedFeedId, 'hex'));
 }
 exports.getFeedIdUint8Array = getFeedIdUint8Array;
-const ED25519_INSTRUCTION_LEN = 16;
-const SIGNATURE_LEN = 64;
-const PUBKEY_LEN = 32;
-const MAGIC_LEN = 4;
-const MESSAGE_SIZE_LEN = 2;
-function getEd25519ArgsFromHex(hex, customInstructionIndex) {
-    const cleanedHex = hex.startsWith('0x') ? hex.slice(2) : hex;
-    const buffer = new Uint8Array(Buffer.from(cleanedHex, 'hex'));
-    const signatureOffset = MAGIC_LEN;
-    const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
-    const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
-    const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;
-    const signature = buffer.slice(signatureOffset, signatureOffset + SIGNATURE_LEN);
-    const publicKey = buffer.slice(publicKeyOffset, publicKeyOffset + PUBKEY_LEN);
-    const messageSize = buffer[messageDataSizeOffset] | (buffer[messageDataSizeOffset + 1] << 8);
-    const message = buffer.slice(messageDataOffset, messageDataOffset + messageSize);
-    if (publicKey.length !== PUBKEY_LEN) {
-        throw new Error('Invalid public key length');
-    }
-    if (signature.length !== SIGNATURE_LEN) {
-        throw new Error('Invalid signature length');
-    }
-    return {
-        publicKey,
-        signature,
-        message,
-        instructionIndex: customInstructionIndex,
-    };
-}
-exports.getEd25519ArgsFromHex = getEd25519ArgsFromHex;
-const readUint16LE = (data, offset) => {
-    return data[offset] | (data[offset + 1] << 8);
-};
-const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct([
-    BufferLayout.u8('numSignatures'),
-    BufferLayout.u8('padding'),
-    BufferLayout.u16('signatureOffset'),
-    BufferLayout.u16('signatureInstructionIndex'),
-    BufferLayout.u16('publicKeyOffset'),
-    BufferLayout.u16('publicKeyInstructionIndex'),
-    BufferLayout.u16('messageDataOffset'),
-    BufferLayout.u16('messageDataSize'),
-    BufferLayout.u16('messageInstructionIndex'),
-]);
-/**
- * Constructs a minimal Ed25519 verification instruction that references the data
- * inside the main instruction (postPythLazerOracleUpdate).
- *
- * @param customInstructionIndex The index of the custom instruction in the transaction (typically 1 if this is second).
- * @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, 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;
-    const messageDataSize = readUint16LE(customInstructionData, messageDataSizeOffset - messageOffset);
-    const instructionData = Buffer.alloc(ED25519_INSTRUCTION_LEN);
-    ED25519_INSTRUCTION_LAYOUT.encode({
-        numSignatures: 1,
-        padding: 0,
-        signatureOffset,
-        signatureInstructionIndex: customInstructionIndex,
-        publicKeyOffset,
-        publicKeyInstructionIndex: customInstructionIndex,
-        messageDataOffset,
-        messageDataSize: messageDataSize,
-        messageInstructionIndex: customInstructionIndex,
-    }, instructionData);
-    return new web3_js_1.TransactionInstruction({
-        keys: [],
-        programId: web3_js_1.Ed25519Program.programId,
-        data: instructionData,
-    });
-}
-exports.createMinimalEd25519VerifyIx = createMinimalEd25519VerifyIx;

package/package.json

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

package/src/driftClient.ts

@@ -166,11 +166,8 @@ import {
 } from '@pythnetwork/pyth-solana-receiver/lib/address';
 import { WormholeCoreBridgeSolana } from '@pythnetwork/pyth-solana-receiver/lib/idl/wormhole_core_bridge_solana';
 import { PythSolanaReceiver } from '@pythnetwork/pyth-solana-receiver/lib/idl/pyth_solana_receiver';
-import {
-	getFeedIdUint8Array,
-	trimFeedId,
-	createMinimalEd25519VerifyIx,
-} from './util/pythOracleUtils';
+import { getFeedIdUint8Array, trimFeedId } from './util/pythOracleUtils';
+import { createMinimalEd25519VerifyIx } from './signedMsg/ed25519Utils';
 import { isVersionedTransaction } from './tx/utils';
 import pythSolanaReceiverIdl from './idl/pyth_solana_receiver.json';
 import { asV0Tx, PullFeed } from '@switchboard-xyz/on-demand';

package/src/index.ts

@@ -88,7 +88,7 @@ export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
 export * from './oracles/oracleId';
-export * from './swift/swiftOrderSubscriber';
+export * from './signedMsg/signedMsgOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';

package/src/signedMsg/ed25519Utils.ts

@@ -0,0 +1,85 @@
+import { Ed25519Program, TransactionInstruction } from '@solana/web3.js';
+import * as BufferLayout from '@solana/buffer-layout';
+
+const ED25519_INSTRUCTION_LEN = 16;
+const SIGNATURE_LEN = 64;
+const PUBKEY_LEN = 32;
+const MAGIC_LEN = 4;
+const MESSAGE_SIZE_LEN = 2;
+
+const readUint16LE = (data: Uint8Array, offset: number) => {
+	return data[offset] | (data[offset + 1] << 8);
+};
+
+const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct<
+	Readonly<{
+		messageDataOffset: number;
+		messageDataSize: number;
+		messageInstructionIndex: number;
+		numSignatures: number;
+		padding: number;
+		publicKeyInstructionIndex: number;
+		publicKeyOffset: number;
+		signatureInstructionIndex: number;
+		signatureOffset: number;
+	}>
+>([
+	BufferLayout.u8('numSignatures'),
+	BufferLayout.u8('padding'),
+	BufferLayout.u16('signatureOffset'),
+	BufferLayout.u16('signatureInstructionIndex'),
+	BufferLayout.u16('publicKeyOffset'),
+	BufferLayout.u16('publicKeyInstructionIndex'),
+	BufferLayout.u16('messageDataOffset'),
+	BufferLayout.u16('messageDataSize'),
+	BufferLayout.u16('messageInstructionIndex'),
+]);
+
+/**
+ * Constructs a minimal Ed25519 verification instruction that references the data
+ * inside the drift custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
+ *
+ * @param customInstructionIndex The index of the custom instruction in the transaction (e.g. if tx contains compute budget limit, compute budget price, ed25519 verify, custom ix, this would be 3).
+ * @param messageOffset The offset within the custom instruction data where the signed message begins.
+ * @param customInstructionData The entire instruction data array for the custom instruction.
+ */
+export function createMinimalEd25519VerifyIx(
+	customInstructionIndex: number,
+	messageOffset: number,
+	customInstructionData: Uint8Array,
+	magicLen?: number
+): TransactionInstruction {
+	const signatureOffset =
+		messageOffset + (magicLen === undefined ? MAGIC_LEN : magicLen);
+	const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
+	const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
+	const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;
+
+	const messageDataSize = readUint16LE(
+		customInstructionData,
+		messageDataSizeOffset - messageOffset
+	);
+
+	const instructionData = Buffer.alloc(ED25519_INSTRUCTION_LEN);
+
+	ED25519_INSTRUCTION_LAYOUT.encode(
+		{
+			numSignatures: 1,
+			padding: 0,
+			signatureOffset,
+			signatureInstructionIndex: customInstructionIndex,
+			publicKeyOffset,
+			publicKeyInstructionIndex: customInstructionIndex,
+			messageDataOffset,
+			messageDataSize: messageDataSize,
+			messageInstructionIndex: customInstructionIndex,
+		},
+		instructionData
+	);
+
+	return new TransactionInstruction({
+		keys: [],
+		programId: Ed25519Program.programId,
+		data: instructionData,
+	});
+}

package/src/{swift/swiftOrderSubscriber.ts → signedMsg/signedMsgOrderSubscriber.ts}

@@ -118,7 +118,7 @@ export class SignedMsgOrderSubscriber {
 				}
 
 				if (message['order']) {
-					const order = JSON.parse(message['order']);
+					const order = message['order'];
 					const signedMsgOrderParamsBuf = Buffer.from(
 						order['order_message'],
 						'hex'

package/src/util/pythOracleUtils.ts

@@ -1,6 +1,3 @@
-import { TransactionInstruction, Ed25519Program } from '@solana/web3.js';
-import * as BufferLayout from '@solana/buffer-layout';
-
 export function trimFeedId(feedId: string): string {
 	if (feedId.startsWith('0x')) {
 		return feedId.slice(2);
@@ -12,131 +9,3 @@ export function getFeedIdUint8Array(feedId: string): Uint8Array {
 	const trimmedFeedId = trimFeedId(feedId);
 	return Uint8Array.from(Buffer.from(trimmedFeedId, 'hex'));
 }
-
-const ED25519_INSTRUCTION_LEN = 16;
-const SIGNATURE_LEN = 64;
-const PUBKEY_LEN = 32;
-const MAGIC_LEN = 4;
-const MESSAGE_SIZE_LEN = 2;
-
-export function getEd25519ArgsFromHex(
-	hex: string,
-	customInstructionIndex?: number
-): {
-	publicKey: Uint8Array;
-	signature: Uint8Array;
-	message: Uint8Array;
-	instructionIndex?: number;
-} {
-	const cleanedHex = hex.startsWith('0x') ? hex.slice(2) : hex;
-	const buffer = new Uint8Array(Buffer.from(cleanedHex, 'hex'));
-
-	const signatureOffset = MAGIC_LEN;
-	const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
-	const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
-	const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;
-
-	const signature = buffer.slice(
-		signatureOffset,
-		signatureOffset + SIGNATURE_LEN
-	);
-	const publicKey = buffer.slice(publicKeyOffset, publicKeyOffset + PUBKEY_LEN);
-	const messageSize =
-		buffer[messageDataSizeOffset] | (buffer[messageDataSizeOffset + 1] << 8);
-	const message = buffer.slice(
-		messageDataOffset,
-		messageDataOffset + messageSize
-	);
-
-	if (publicKey.length !== PUBKEY_LEN) {
-		throw new Error('Invalid public key length');
-	}
-
-	if (signature.length !== SIGNATURE_LEN) {
-		throw new Error('Invalid signature length');
-	}
-
-	return {
-		publicKey,
-		signature,
-		message,
-		instructionIndex: customInstructionIndex,
-	};
-}
-
-const readUint16LE = (data: Uint8Array, offset: number) => {
-	return data[offset] | (data[offset + 1] << 8);
-};
-
-const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct<
-	Readonly<{
-		messageDataOffset: number;
-		messageDataSize: number;
-		messageInstructionIndex: number;
-		numSignatures: number;
-		padding: number;
-		publicKeyInstructionIndex: number;
-		publicKeyOffset: number;
-		signatureInstructionIndex: number;
-		signatureOffset: number;
-	}>
->([
-	BufferLayout.u8('numSignatures'),
-	BufferLayout.u8('padding'),
-	BufferLayout.u16('signatureOffset'),
-	BufferLayout.u16('signatureInstructionIndex'),
-	BufferLayout.u16('publicKeyOffset'),
-	BufferLayout.u16('publicKeyInstructionIndex'),
-	BufferLayout.u16('messageDataOffset'),
-	BufferLayout.u16('messageDataSize'),
-	BufferLayout.u16('messageInstructionIndex'),
-]);
-
-/**
- * Constructs a minimal Ed25519 verification instruction that references the data
- * inside the main instruction (postPythLazerOracleUpdate).
- *
- * @param customInstructionIndex The index of the custom instruction in the transaction (typically 1 if this is second).
- * @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 function createMinimalEd25519VerifyIx(
-	customInstructionIndex: number,
-	messageOffset: number,
-	customInstructionData: Uint8Array,
-	magicLen?: number
-): TransactionInstruction {
-	const signatureOffset =
-		messageOffset + (magicLen === undefined ? MAGIC_LEN : magicLen);
-	const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
-	const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
-	const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;
-
-	const messageDataSize = readUint16LE(
-		customInstructionData,
-		messageDataSizeOffset - messageOffset
-	);
-
-	const instructionData = Buffer.alloc(ED25519_INSTRUCTION_LEN);
-
-	ED25519_INSTRUCTION_LAYOUT.encode(
-		{
-			numSignatures: 1,
-			padding: 0,
-			signatureOffset,
-			signatureInstructionIndex: customInstructionIndex,
-			publicKeyOffset,
-			publicKeyInstructionIndex: customInstructionIndex,
-			messageDataOffset,
-			messageDataSize: messageDataSize,
-			messageInstructionIndex: customInstructionIndex,
-		},
-		instructionData
-	);
-
-	return new TransactionInstruction({
-		keys: [],
-		programId: Ed25519Program.programId,
-		data: instructionData,
-	});
-}