@fogo/sessions-sdk 0.1.5 → 0.1.7

package/cjs/connection.js

@@ -157,9 +157,16 @@ const buildTollboothInstructionIfNeeded = ({ sessionKeyAddress, walletPublicKey,
         return undefined;
     }
 };
-const addSignaturesToExistingTransaction = (transaction, signerKeys) => (0, kit_1.partiallySignTransaction)(signerKeys, transaction instanceof web3_js_1.VersionedTransaction
-    ? (0, compat_1.fromVersionedTransaction)(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
-    : transaction);
+const addSignaturesToExistingTransaction = async (transaction, signerKeys) => {
+    const kitTransaction = transaction instanceof web3_js_1.VersionedTransaction
+        ? (0, compat_1.fromVersionedTransaction)(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
+        : transaction;
+    const signerAddresses = await Promise.all(signerKeys.map(async (signer) => [signer, await (0, kit_1.getAddressFromPublicKey)(signer.publicKey)]));
+    const filteredSignerKeys = signerAddresses
+        .filter(([, address]) => kitTransaction.signatures[address] !== undefined)
+        .map(([signer]) => signer);
+    return (0, kit_1.partiallySignTransaction)(filteredSignerKeys, kitTransaction);
+};
 const getSignerKeys = async (sessionKey, extraSigners) => {
     const extraSignerKeys = extraSigners === undefined
         ? []

package/cjs/index.js

@@ -131,10 +131,36 @@ const getSessionAccount = async (connection, sessionPublicKey) => {
         : sessionInfoSchema.parse(new anchor_1.BorshAccountsCoder(sessions_idls_1.SessionManagerIdl).decode("Session", result.data));
 };
 exports.getSessionAccount = getSessionAccount;
+const getDomainRegistryAuthorizedPrograms = async (connection, domain) => {
+    const result = await connection.getAccountInfo((0, exports.getDomainRecordAddress)(domain), "confirmed");
+    if (result === null) {
+        return [];
+    }
+    else {
+        const programs = [];
+        for (let i = 0; i < result.data.length; i += 64) {
+            programs.push({
+                programId: new web3_js_1.PublicKey(result.data.subarray(i, i + 32)),
+                signerPda: new web3_js_1.PublicKey(result.data.subarray(i + 32, i + 64)),
+            });
+        }
+        return programs;
+    }
+};
+const authorizedProgramsMatchDomainRegistry = (sessionAuthorizedPrograms, domainAuthorizedPrograms) => {
+    if (sessionAuthorizedPrograms.type === AuthorizedProgramsType.All) {
+        return true;
+    }
+    return domainAuthorizedPrograms.every(({ programId: programIdFromRegistry }) => sessionAuthorizedPrograms.programs.some(({ programId }) => programId.equals(programIdFromRegistry)));
+};
 const createSession = async (context, walletPublicKey, sessionKey) => {
     const sessionPublicKey = new web3_js_1.PublicKey(await (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey));
-    const sessionInfo = await (0, exports.getSessionAccount)(context.connection, sessionPublicKey);
-    return sessionInfo === undefined
+    const [sessionInfo, domainRegistryAuthorizedPrograms] = await Promise.all([
+        (0, exports.getSessionAccount)(context.connection, sessionPublicKey),
+        getDomainRegistryAuthorizedPrograms(context.connection, context.domain),
+    ]);
+    return sessionInfo === undefined ||
+        !authorizedProgramsMatchDomainRegistry(sessionInfo.authorizedPrograms, domainRegistryAuthorizedPrograms)
         ? undefined
         : {
             sessionPublicKey,

package/esm/connection.js

@@ -150,9 +150,16 @@ const buildTollboothInstructionIfNeeded = ({ sessionKeyAddress, walletPublicKey,
         return undefined;
     }
 };
-const addSignaturesToExistingTransaction = (transaction, signerKeys) => partiallySignTransaction(signerKeys, transaction instanceof VersionedTransaction
-    ? fromVersionedTransaction(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
-    : transaction);
+const addSignaturesToExistingTransaction = async (transaction, signerKeys) => {
+    const kitTransaction = transaction instanceof VersionedTransaction
+        ? fromVersionedTransaction(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
+        : transaction;
+    const signerAddresses = await Promise.all(signerKeys.map(async (signer) => [signer, await getAddressFromPublicKey(signer.publicKey)]));
+    const filteredSignerKeys = signerAddresses
+        .filter(([, address]) => kitTransaction.signatures[address] !== undefined)
+        .map(([signer]) => signer);
+    return partiallySignTransaction(filteredSignerKeys, kitTransaction);
+};
 const getSignerKeys = async (sessionKey, extraSigners) => {
     const extraSignerKeys = extraSigners === undefined
         ? []

package/esm/index.js

@@ -111,10 +111,36 @@ export const getSessionAccount = async (connection, sessionPublicKey) => {
         ? undefined
         : sessionInfoSchema.parse(new BorshAccountsCoder(SessionManagerIdl).decode("Session", result.data));
 };
+const getDomainRegistryAuthorizedPrograms = async (connection, domain) => {
+    const result = await connection.getAccountInfo(getDomainRecordAddress(domain), "confirmed");
+    if (result === null) {
+        return [];
+    }
+    else {
+        const programs = [];
+        for (let i = 0; i < result.data.length; i += 64) {
+            programs.push({
+                programId: new PublicKey(result.data.subarray(i, i + 32)),
+                signerPda: new PublicKey(result.data.subarray(i + 32, i + 64)),
+            });
+        }
+        return programs;
+    }
+};
+const authorizedProgramsMatchDomainRegistry = (sessionAuthorizedPrograms, domainAuthorizedPrograms) => {
+    if (sessionAuthorizedPrograms.type === AuthorizedProgramsType.All) {
+        return true;
+    }
+    return domainAuthorizedPrograms.every(({ programId: programIdFromRegistry }) => sessionAuthorizedPrograms.programs.some(({ programId }) => programId.equals(programIdFromRegistry)));
+};
 const createSession = async (context, walletPublicKey, sessionKey) => {
     const sessionPublicKey = new PublicKey(await getAddressFromPublicKey(sessionKey.publicKey));
-    const sessionInfo = await getSessionAccount(context.connection, sessionPublicKey);
-    return sessionInfo === undefined
+    const [sessionInfo, domainRegistryAuthorizedPrograms] = await Promise.all([
+        getSessionAccount(context.connection, sessionPublicKey),
+        getDomainRegistryAuthorizedPrograms(context.connection, context.domain),
+    ]);
+    return sessionInfo === undefined ||
+        !authorizedProgramsMatchDomainRegistry(sessionInfo.authorizedPrograms, domainRegistryAuthorizedPrograms)
         ? undefined
         : {
             sessionPublicKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "A set of utilities for integrating with Fogo sessions",
   "repository": {
     "type": "git",