@fogo/sessions-sdk 0.0.25 → 0.0.29

package/esm/index.js

@@ -5,7 +5,7 @@ import { publicKey as metaplexPublicKey } from "@metaplex-foundation/umi";
 import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import { sha256 } from "@noble/hashes/sha2";
 import { fromLegacyPublicKey } from "@solana/compat";
-import { generateKeyPair, getAddressFromPublicKey, getProgramDerivedAddress, signatureBytes, verifySignature, } from "@solana/kit";
+import { generateKeyPair, getAddressFromPublicKey, getProgramDerivedAddress, } from "@solana/kit";
 import { getAssociatedTokenAddressSync, getMint } from "@solana/spl-token";
 import { ComputeBudgetProgram, Connection, Ed25519Program, Keypair, PublicKey, } from "@solana/web3.js";
 import { Wormhole, wormhole, routes } from "@wormhole-foundation/sdk";
@@ -43,7 +43,7 @@ export const establishSession = async (options) => {
         : await generateKeyPair();
     if (options.unlimited) {
         return sendSessionEstablishTransaction(options, sessionKey, await Promise.all([
-            buildIntentInstruction(options, sessionKey),
+            buildStartSessionIntentInstruction(options, sessionKey),
             buildStartSessionInstruction(options, sessionKey),
         ]), options.sessionEstablishmentLookupTable);
     }
@@ -53,7 +53,7 @@ export const establishSession = async (options) => {
             ? await getTokenInfo(options.context, filteredLimits)
             : [];
         const [intentInstruction, startSessionInstruction] = await Promise.all([
-            buildIntentInstruction(options, sessionKey, tokenInfo),
+            buildStartSessionIntentInstruction(options, sessionKey, tokenInfo),
             buildStartSessionInstruction(options, sessionKey, tokenInfo),
         ]);
         return sendSessionEstablishTransaction(options, sessionKey, [intentInstruction, startSessionInstruction], options.sessionEstablishmentLookupTable);
@@ -119,6 +119,47 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
             sessionInfo,
         };
 };
+const authorizedTokensSchema = z.union([
+    z.object({
+        Specific: z.object({
+            "0": z.array(z.instanceof(PublicKey)),
+        }),
+    }),
+    z.object({ All: z.object({}) }),
+]);
+const revokedSessionInfoSchema = z.object({
+    user: z.instanceof(PublicKey),
+    expiration: z.instanceof(BN),
+    authorized_tokens_with_mints: authorizedTokensSchema,
+});
+const activeSessionInfoSchema = z.object({
+    authorized_programs: z.union([
+        z.object({
+            Specific: z.object({
+                0: z.array(z.object({
+                    program_id: z.instanceof(PublicKey),
+                    signer_pda: z.instanceof(PublicKey),
+                })),
+            }),
+        }),
+        z.object({
+            All: z.object({}),
+        }),
+    ]),
+    authorized_tokens: z.union([
+        z.object({
+            Specific: z.object({
+                "0": z.array(z.instanceof(PublicKey)),
+            }),
+        }),
+        z.object({ All: z.object({}) }),
+    ]),
+    expiration: z.instanceof(BN),
+    extra: z.object({
+        0: z.unknown(),
+    }),
+    user: z.instanceof(PublicKey),
+});
 const sessionInfoSchema = z
     .object({
     session_info: z.union([
@@ -191,37 +232,31 @@ const sessionInfoSchema = z
             V3: z.object({
                 "0": z.union([
                     z.object({
-                        Revoked: z.instanceof(BN),
+                        Revoked: z.object({
+                            "0": revokedSessionInfoSchema,
+                        }),
+                    }),
+                    z.object({
+                        Active: z.object({
+                            "0": activeSessionInfoSchema,
+                        }),
+                    }),
+                ]),
+            }),
+        }),
+        z.object({
+            V4: z.object({
+                "0": z.union([
+                    z.object({
+                        Revoked: z.object({
+                            "0": revokedSessionInfoSchema,
+                        }),
                     }),
                     z.object({
                         Active: z.object({
                             "0": z.object({
-                                authorized_programs: z.union([
-                                    z.object({
-                                        Specific: z.object({
-                                            0: z.array(z.object({
-                                                program_id: z.instanceof(PublicKey),
-                                                signer_pda: z.instanceof(PublicKey),
-                                            })),
-                                        }),
-                                    }),
-                                    z.object({
-                                        All: z.object({}),
-                                    }),
-                                ]),
-                                authorized_tokens: z.union([
-                                    z.object({
-                                        Specific: z.object({
-                                            "0": z.array(z.instanceof(PublicKey)),
-                                        }),
-                                    }),
-                                    z.object({ All: z.object({}) }),
-                                ]),
-                                expiration: z.instanceof(BN),
-                                extra: z.object({
-                                    0: z.unknown(),
-                                }),
-                                user: z.instanceof(PublicKey),
+                                domain_hash: z.array(z.number()).length(32),
+                                active_session_info: activeSessionInfoSchema,
                             }),
                         }),
                     }),
@@ -247,6 +282,10 @@ const sessionInfoSchema = z
         activeSessionInfo = session_info.V3["0"].Active["0"];
         minor = 3;
     }
+    else if ("V4" in session_info && "Active" in session_info.V4["0"]) {
+        activeSessionInfo = session_info.V4["0"].Active["0"].active_session_info;
+        minor = 4;
+    }
     else {
         return;
     }
@@ -320,64 +359,23 @@ const getTokenInfo = async (context, limits) => {
         };
     }));
 };
-const serializeU16LE = (value) => {
-    const result = new ArrayBuffer(2);
-    new DataView(result).setUint16(0, value, true); // littleEndian = true
-    return new Uint8Array(result);
-};
-// Some wallets add a prefix to the messag before signing, for example Ledger through Phantom
-const addOffchainMessagePrefixToMessageIfNeeded = async (walletPublicKey, signature, message) => {
-    const publicKey = await crypto.subtle.importKey("raw", walletPublicKey.toBytes(), { name: "Ed25519" }, true, ["verify"]);
-    if (await verifySignature(publicKey, signature, message)) {
-        return message;
-    }
-    else {
-        // Source: https://github.com/anza-xyz/solana-sdk/blob/master/offchain-message/src/lib.rs#L162
-        const messageWithOffchainMessagePrefix = Uint8Array.from([
-            // eslint-disable-next-line unicorn/number-literal-case
-            0xff,
-            ...new TextEncoder().encode("solana offchain"),
-            0,
-            1,
-            ...serializeU16LE(message.length),
-            ...message,
-        ]);
-        if (await verifySignature(publicKey, signature, messageWithOffchainMessagePrefix)) {
-            return messageWithOffchainMessagePrefix;
-        }
-        else {
-            throw new Error("The signature provided by the browser wallet is not valid");
-        }
-    }
-};
-const buildIntentInstruction = async (options, sessionKey, tokens) => {
-    const message = await buildMessage({
-        chainId: options.context.chainId,
-        domain: options.context.domain,
-        sessionKey,
-        expires: options.expires,
-        tokens,
-        extra: options.extra,
-    });
-    const intentSignature = signatureBytes(await options.signMessage(message));
+const buildStartSessionIntentInstruction = async (options, sessionKey, tokens) => buildIntentInstruction(options, MESSAGE_HEADER, {
+    version: `${CURRENT_MAJOR}.${CURRENT_MINOR}`,
+    chain_id: options.context.chainId,
+    domain: options.context.domain,
+    expires: options.expires.toISOString(),
+    session_key: await getAddressFromPublicKey(sessionKey.publicKey),
+    tokens: serializeTokenList(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({
         publicKey: options.walletPublicKey.toBytes(),
-        signature: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+        signature,
+        message: signedMessage,
     });
 };
-const buildMessage = async (body) => new TextEncoder().encode([
-    MESSAGE_HEADER,
-    serializeKV({
-        version: `${CURRENT_MAJOR}.${CURRENT_MINOR}`,
-        chain_id: body.chainId,
-        domain: body.domain,
-        expires: body.expires.toISOString(),
-        session_key: await getAddressFromPublicKey(body.sessionKey.publicKey),
-        tokens: serializeTokenList(body.tokens),
-    }),
-    body.extra && serializeExtra(body.extra),
-].join("\n"));
 const serializeExtra = (extra) => {
     for (const [key, value] of Object.entries(extra)) {
         if (!/^[a-z]+(_[a-z0-9]+)*$/.test(key)) {
@@ -560,24 +558,15 @@ const buildTransferIntentInstruction = async (program, options, symbol, feeToken
         getNonce(program, options.walletPublicKey, NonceType.Transfer),
         getMint(options.context.connection, options.mint),
     ]);
-    const message = new TextEncoder().encode([
-        TRANSFER_MESSAGE_HEADER,
-        serializeKV({
-            version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
-            chain_id: options.context.chainId,
-            token: symbol ?? options.mint.toBase58(),
-            amount: amountToString(options.amount, decimals),
-            recipient: options.recipient.toBase58(),
-            fee_token: feeToken,
-            fee_amount: feeAmount,
-            nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
-        }),
-    ].join("\n"));
-    const intentSignature = signatureBytes(await options.signMessage(message));
-    return Ed25519Program.createInstructionWithPublicKey({
-        publicKey: options.walletPublicKey.toBytes(),
-        signature: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+    return buildIntentInstruction(options, TRANSFER_MESSAGE_HEADER, {
+        version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
+        chain_id: options.context.chainId,
+        token: symbol ?? options.mint.toBase58(),
+        amount: amountToString(options.amount, decimals),
+        recipient: options.recipient.toBase58(),
+        fee_token: feeToken,
+        fee_amount: feeAmount,
+        nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
     });
 };
 const BRIDGE_OUT_MESSAGE_HEADER = `Fogo Bridge Transfer:
@@ -679,25 +668,16 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
 };
 const buildBridgeOutIntent = async (program, options, decimals, symbol, feeToken, feeAmount) => {
     const nonce = await getNonce(program, options.walletPublicKey, NonceType.Bridge);
-    const message = new TextEncoder().encode([
-        BRIDGE_OUT_MESSAGE_HEADER,
-        serializeKV({
-            version: `${CURRENT_BRIDGE_OUT_MAJOR}.${CURRENT_BRIDGE_OUT_MINOR}`,
-            from_chain_id: options.context.chainId,
-            to_chain_id: "solana",
-            token: symbol ?? options.fromToken.mint.toBase58(),
-            amount: amountToString(options.amount, decimals),
-            recipient_address: options.walletPublicKey.toBase58(),
-            fee_token: feeToken,
-            fee_amount: feeAmount,
-            nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
-        }),
-    ].join("\n"));
-    const intentSignature = signatureBytes(await options.solanaWallet.signMessage(message));
-    return Ed25519Program.createInstructionWithPublicKey({
-        publicKey: options.walletPublicKey.toBytes(),
-        signature: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+    return buildIntentInstruction(options, BRIDGE_OUT_MESSAGE_HEADER, {
+        version: `${CURRENT_BRIDGE_OUT_MAJOR}.${CURRENT_BRIDGE_OUT_MINOR}`,
+        from_chain_id: options.context.chainId,
+        to_chain_id: "solana",
+        token: symbol ?? options.fromToken.mint.toBase58(),
+        amount: amountToString(options.amount, decimals),
+        recipient_address: options.walletPublicKey.toBase58(),
+        fee_token: feeToken,
+        fee_amount: feeAmount,
+        nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
     });
 };
 export const bridgeIn = async (options) => {
@@ -711,10 +691,9 @@ export const bridgeIn = async (options) => {
             address: () => options.walletPublicKey.toBase58(),
             chain: () => "Solana",
             sign: (transactions) => Promise.all(transactions.map(async ({ transaction }) => {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                const signedTx = await options.solanaWallet.signTransaction(
+                const signedTx = await options.signTransaction(
                 // Hooray for Wormhole's incomplete typing eh?
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
                 transaction.transaction);
                 // Hooray for Wormhole's incomplete typing eh?
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access

package/package.json

@@ -1,7 +1,12 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.25",
+  "version": "0.0.29",
   "description": "A set of utilities for integrating with Fogo sessions",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/fogo-foundation/fogo-sessions",
+    "directory": "packages/sessions-sdk-ts"
+  },
   "keywords": [
     "fogo",
     "sessions",
@@ -43,7 +48,7 @@
     "@wormhole-foundation/sdk-solana-ntt": "^4.0.1",
     "bn.js": "^5.1.2",
     "bs58": "^6.0.0",
-    "zod": "^3.25.62",
-    "@fogo/sessions-idls": "^0.0.11"
+    "zod": "3.25.67",
+    "@fogo/sessions-idls": "^0.0.12"
   }
 }