@fogo/sessions-sdk 0.1.9 → 0.1.10

package/cjs/index.d.ts

@@ -1,5 +1,5 @@
-import type { Connection, TransactionError, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
-import { PublicKey } from "@solana/web3.js";
+import type { Connection, TransactionError, VersionedTransaction } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
 import { z } from "zod";

package/cjs/index.js

@@ -464,12 +464,80 @@ const buildStartSessionIntentInstruction = async (options, sessionKey, tokens) =
 const buildIntentInstruction = async (options, header, body, extra) => {
     const message = new TextEncoder().encode([header, serializeKV(body), extra && serializeExtra(extra)].join("\n"));
     const { signature, signedMessage } = await options.signMessage(message);
-    return web3_js_1.Ed25519Program.createInstructionWithPublicKey({
-        message: signedMessage,
-        publicKey: options.walletPublicKey.toBytes(),
-        signature,
+    const publicKey = options.walletPublicKey.toBytes();
+    const publicKeyOffsetInMessage = getOffchainMessagePublicKeyOffset(signedMessage, options.walletPublicKey);
+    if (publicKeyOffsetInMessage !== undefined) {
+        return buildEd25519InstructionWithOffsets({
+            message: signedMessage,
+            publicKeyOffsetInMessage,
+            signature,
+        });
+    }
+    else {
+        return web3_js_1.Ed25519Program.createInstructionWithPublicKey({
+            message: signedMessage,
+            publicKey,
+            signature,
+        });
+    }
+};
+const ED25519_HEADER_LEN = 16;
+const ED25519_PUBLIC_KEY_LEN = 32;
+const ED25519_SIGNATURE_LEN = 64;
+const ED25519_CURRENT_INSTRUCTION_INDEX = 0xff_ff;
+const buildEd25519InstructionWithOffsets = (params) => {
+    const { signature, message, publicKeyOffsetInMessage } = params;
+    if (signature.length !== ED25519_SIGNATURE_LEN) {
+        throw new Error(`Signature must be ${ED25519_SIGNATURE_LEN} bytes but received ${signature.length} bytes`);
+    }
+    if (publicKeyOffsetInMessage < 0 ||
+        publicKeyOffsetInMessage + ED25519_PUBLIC_KEY_LEN > message.length) {
+        throw new Error("Public key offset is out of bounds of signed message");
+    }
+    const signatureOffset = ED25519_HEADER_LEN;
+    const messageDataOffset = signatureOffset + signature.length;
+    const publicKeyOffsetInInstruction = messageDataOffset + publicKeyOffsetInMessage;
+    const instructionData = new Uint8Array(ED25519_HEADER_LEN + ED25519_SIGNATURE_LEN + message.length);
+    const view = new DataView(instructionData.buffer);
+    view.setUint8(0, 1); // num_signatures
+    view.setUint8(1, 0); // padding
+    view.setUint16(2, signatureOffset, true);
+    view.setUint16(4, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    view.setUint16(6, publicKeyOffsetInInstruction, true);
+    view.setUint16(8, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    view.setUint16(10, messageDataOffset, true);
+    view.setUint16(12, message.length, true);
+    view.setUint16(14, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    instructionData.set(signature, signatureOffset);
+    instructionData.set(message, messageDataOffset);
+    return new web3_js_1.TransactionInstruction({
+        data: Buffer.from(instructionData),
+        keys: [],
+        programId: web3_js_1.Ed25519Program.programId,
     });
 };
+const OFFCHAIN_SIGNING_DOMAIN_LEN = 16;
+const OFFCHAIN_V0_SIGNER_LIST_OFFSET = OFFCHAIN_SIGNING_DOMAIN_LEN + 1 + 32 + 1 + 1;
+const OFFCHAIN_V1_SIGNER_LIST_OFFSET = OFFCHAIN_SIGNING_DOMAIN_LEN + 1 + 1;
+const getOffchainMessagePublicKeyOffset = (signedMessage, publicKey) => {
+    const address = publicKey.toBase58();
+    try {
+        const message = (0, kit_1.getOffchainMessageDecoder)().decode(signedMessage);
+        const index = message.requiredSignatories.findIndex((signer) => signer.address === address);
+        if (index !== -1) {
+            const baseOffset = message.version === 1
+                ? OFFCHAIN_V1_SIGNER_LIST_OFFSET
+                : OFFCHAIN_V0_SIGNER_LIST_OFFSET;
+            return baseOffset + index * ED25519_PUBLIC_KEY_LEN;
+        }
+        else {
+            return undefined;
+        }
+    }
+    catch {
+        return undefined;
+    }
+};
 const serializeExtra = (extra) => {
     for (const [key, value] of Object.entries(extra)) {
         if (!/^[a-z]+(_[a-z0-9]+)*$/.test(key)) {

package/esm/index.d.ts

@@ -1,5 +1,5 @@
-import type { Connection, TransactionError, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
-import { PublicKey } from "@solana/web3.js";
+import type { Connection, TransactionError, VersionedTransaction } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
 import { z } from "zod";

package/esm/index.js

@@ -5,9 +5,9 @@ import { publicKey as metaplexPublicKey } from "@metaplex-foundation/umi";
 import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import { sha256 } from "@noble/hashes/sha2.js";
 import { fromLegacyPublicKey } from "@solana/compat";
-import { generateKeyPair, getAddressFromPublicKey, getProgramDerivedAddress, } from "@solana/kit";
+import { generateKeyPair, getAddressFromPublicKey, getOffchainMessageDecoder, getProgramDerivedAddress, } from "@solana/kit";
 import { getAssociatedTokenAddressSync, getMint } from "@solana/spl-token";
-import { ComputeBudgetProgram, Ed25519Program, Keypair, PublicKey, } from "@solana/web3.js";
+import { ComputeBudgetProgram, Ed25519Program, Keypair, PublicKey, TransactionInstruction, } from "@solana/web3.js";
 import { Wormhole, wormhole } from "@wormhole-foundation/sdk";
 import solanaSdk from "@wormhole-foundation/sdk/solana";
 import { contracts } from "@wormhole-foundation/sdk-base";
@@ -411,12 +411,80 @@ const buildStartSessionIntentInstruction = async (options, sessionKey, tokens) =
 const buildIntentInstruction = async (options, header, body, extra) => {
     const message = new TextEncoder().encode([header, serializeKV(body), extra && serializeExtra(extra)].join("\n"));
     const { signature, signedMessage } = await options.signMessage(message);
-    return Ed25519Program.createInstructionWithPublicKey({
-        message: signedMessage,
-        publicKey: options.walletPublicKey.toBytes(),
-        signature,
+    const publicKey = options.walletPublicKey.toBytes();
+    const publicKeyOffsetInMessage = getOffchainMessagePublicKeyOffset(signedMessage, options.walletPublicKey);
+    if (publicKeyOffsetInMessage !== undefined) {
+        return buildEd25519InstructionWithOffsets({
+            message: signedMessage,
+            publicKeyOffsetInMessage,
+            signature,
+        });
+    }
+    else {
+        return Ed25519Program.createInstructionWithPublicKey({
+            message: signedMessage,
+            publicKey,
+            signature,
+        });
+    }
+};
+const ED25519_HEADER_LEN = 16;
+const ED25519_PUBLIC_KEY_LEN = 32;
+const ED25519_SIGNATURE_LEN = 64;
+const ED25519_CURRENT_INSTRUCTION_INDEX = 0xff_ff;
+const buildEd25519InstructionWithOffsets = (params) => {
+    const { signature, message, publicKeyOffsetInMessage } = params;
+    if (signature.length !== ED25519_SIGNATURE_LEN) {
+        throw new Error(`Signature must be ${ED25519_SIGNATURE_LEN} bytes but received ${signature.length} bytes`);
+    }
+    if (publicKeyOffsetInMessage < 0 ||
+        publicKeyOffsetInMessage + ED25519_PUBLIC_KEY_LEN > message.length) {
+        throw new Error("Public key offset is out of bounds of signed message");
+    }
+    const signatureOffset = ED25519_HEADER_LEN;
+    const messageDataOffset = signatureOffset + signature.length;
+    const publicKeyOffsetInInstruction = messageDataOffset + publicKeyOffsetInMessage;
+    const instructionData = new Uint8Array(ED25519_HEADER_LEN + ED25519_SIGNATURE_LEN + message.length);
+    const view = new DataView(instructionData.buffer);
+    view.setUint8(0, 1); // num_signatures
+    view.setUint8(1, 0); // padding
+    view.setUint16(2, signatureOffset, true);
+    view.setUint16(4, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    view.setUint16(6, publicKeyOffsetInInstruction, true);
+    view.setUint16(8, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    view.setUint16(10, messageDataOffset, true);
+    view.setUint16(12, message.length, true);
+    view.setUint16(14, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    instructionData.set(signature, signatureOffset);
+    instructionData.set(message, messageDataOffset);
+    return new TransactionInstruction({
+        data: Buffer.from(instructionData),
+        keys: [],
+        programId: Ed25519Program.programId,
     });
 };
+const OFFCHAIN_SIGNING_DOMAIN_LEN = 16;
+const OFFCHAIN_V0_SIGNER_LIST_OFFSET = OFFCHAIN_SIGNING_DOMAIN_LEN + 1 + 32 + 1 + 1;
+const OFFCHAIN_V1_SIGNER_LIST_OFFSET = OFFCHAIN_SIGNING_DOMAIN_LEN + 1 + 1;
+const getOffchainMessagePublicKeyOffset = (signedMessage, publicKey) => {
+    const address = publicKey.toBase58();
+    try {
+        const message = getOffchainMessageDecoder().decode(signedMessage);
+        const index = message.requiredSignatories.findIndex((signer) => signer.address === address);
+        if (index !== -1) {
+            const baseOffset = message.version === 1
+                ? OFFCHAIN_V1_SIGNER_LIST_OFFSET
+                : OFFCHAIN_V0_SIGNER_LIST_OFFSET;
+            return baseOffset + index * ED25519_PUBLIC_KEY_LEN;
+        }
+        else {
+            return undefined;
+        }
+    }
+    catch {
+        return undefined;
+    }
+};
 const serializeExtra = (extra) => {
     for (const [key, value] of Object.entries(extra)) {
         if (!/^[a-z]+(_[a-z0-9]+)*$/.test(key)) {

package/package.json

@@ -51,5 +51,5 @@
   },
   "type": "module",
   "types": "./cjs/index.d.ts",
-  "version": "0.1.9"
+  "version": "0.1.10"
 }