@opendatalabs/vana-sdk 4.2.0 → 4.3.1

package/dist/index.node.cjs

@@ -1208,7 +1208,7 @@ __export(index_node_exports, {
   ESCROW_DEPOSIT_ABI: () => ESCROW_DEPOSIT_ABI,
   EscrowWithdrawalLifecycleError: () => EscrowWithdrawalLifecycleError,
   EscrowWithdrawalRejectionError: () => EscrowWithdrawalRejectionError,
-  ExpiredTokenError: () => import_errors15.ExpiredTokenError,
+  ExpiredTokenError: () => import_errors16.ExpiredTokenError,
   FEE_REGISTRY_ABI: () => FEE_REGISTRY_ABI,
   GENERIC_PAYMENT_TYPES: () => GENERIC_PAYMENT_TYPES,
   GRANT_OP_TYPE: () => GRANT_OP_TYPE,
@@ -1218,7 +1218,7 @@ __export(index_node_exports, {
   InMemoryTokenStore: () => InMemoryTokenStore,
   IngestResponseSchema: () => IngestResponseSchema,
   InvalidScopeEntryError: () => InvalidScopeEntryError,
-  InvalidSignatureError: () => import_errors15.InvalidSignatureError,
+  InvalidSignatureError: () => import_errors16.InvalidSignatureError,
   IpfsStorage: () => IpfsStorage,
   JOB_OPERATIONS: () => JOB_OPERATIONS,
   JOB_PROTOCOL_VERSION: () => JOB_PROTOCOL_VERSION,
@@ -1242,7 +1242,7 @@ __export(index_node_exports, {
   MAX_QUESTION_MODEL_CHARS: () => MAX_QUESTION_MODEL_CHARS,
   MAX_QUESTION_SOURCE_SCOPES: () => MAX_QUESTION_SOURCE_SCOPES,
   MAX_WAIT_SECONDS: () => MAX_WAIT_SECONDS,
-  MissingAuthError: () => import_errors15.MissingAuthError,
+  MissingAuthError: () => import_errors16.MissingAuthError,
   NATIVE_ASSET_ADDRESS: () => NATIVE_ASSET_ADDRESS,
   NATIVE_VANA_ASSET: () => NATIVE_VANA_ASSET,
   NodeECIESProvider: () => NodeECIESUint8Provider,
@@ -1351,6 +1351,7 @@ __export(index_node_exports, {
   encryptWithPassword: () => encryptWithPassword,
   escrowContractAddress: () => escrowContractAddress,
   escrowPaymentDomain: () => escrowPaymentDomain,
+  findLiveGrant: () => findLiveGrant,
   formatScopeEntry: () => formatScopeEntry,
   gatewayLineagePath: () => gatewayLineagePath,
   generatePkceVerifier: () => generatePkceVerifier,
@@ -1384,7 +1385,9 @@ __export(index_node_exports, {
   isTombstoneHashes: () => isTombstoneHashes,
   kmsIssuedPreimage: () => kmsIssuedPreimage,
   listQuestions: () => listQuestions,
+  liveGrantScopes: () => liveGrantScopes,
   mainnetServices: () => mainnetServices,
+  mergeWithLiveGrant: () => mergeWithLiveGrant,
   moksha: () => moksha,
   mokshaServices: () => mokshaServices,
   mokshaTestnet: () => mokshaTestnet2,
@@ -1428,6 +1431,7 @@ __export(index_node_exports, {
   toDirectPaymentReceipt: () => toDirectPaymentReceipt,
   tombstoneDeletedAt: () => tombstoneDeletedAt,
   tryGrantPermissions: () => tryGrantPermissions,
+  unionGrantScopes: () => unionGrantScopes,
   userPsId: () => userPsId,
   vanaMainnet: () => vanaMainnet2,
   verifyEnclaveIdentityEvidence: () => verifyEnclaveIdentityEvidence,
@@ -31922,7 +31926,7 @@ async function verifyWeb3Signed(params) {
 }
 
 // src/index.node.ts
-var import_errors15 = require("./auth/errors.cjs");
+var import_errors16 = require("./auth/errors.cjs");
 
 // src/auth/pkce.ts
 var PKCE_VERIFIER_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
@@ -37587,6 +37591,101 @@ function createGatewayClient(baseUrl) {
   };
 }
 
+// src/direct/grant-union.ts
+var import_errors13 = require("./direct/errors.cjs");
+function dedupe(entries) {
+  return [...new Set(entries)];
+}
+function isCarryable(entry) {
+  try {
+    parseScope(parseScopeEntry(entry).scope);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function unionGrantScopes(liveScopes, scopes, removeScopes = []) {
+  const remove = new Set(removeScopes);
+  const conflicting = scopes.filter((entry) => remove.has(entry));
+  if (conflicting.length > 0) {
+    throw new import_errors13.DirectConfigError(
+      `${conflicting.join(", ")} cannot be both requested and removed. Drop it from scopes or from removeScopes.`,
+      { conflicting }
+    );
+  }
+  const live = dedupe(liveScopes);
+  const requested = dedupe(scopes);
+  const liveSet = new Set(live);
+  const removed = live.filter((entry) => remove.has(entry));
+  const remaining = live.filter((entry) => !remove.has(entry));
+  const notCarried = remaining.filter((entry) => !isCarryable(entry));
+  const keptAll = remaining.filter(isCarryable);
+  const added = requested.filter((entry) => !liveSet.has(entry));
+  return {
+    scopes: dedupe([...keptAll, ...added]),
+    kept: keptAll,
+    added,
+    removed,
+    notCarried,
+    liveScopes: live
+  };
+}
+function isActiveGrant(grant) {
+  return !grant.revokedAt && !grant.expired;
+}
+function sameHex(a, b) {
+  return a.toLowerCase() === b.toLowerCase();
+}
+async function findLiveGrant(gateway, owner, granteeId) {
+  const grants = await gateway.listGrantsByUser(owner);
+  const matching = grants.filter(
+    (grant) => sameHex(grant.granteeId, granteeId) && isActiveGrant(grant)
+  ).sort((a, b) => {
+    const av = BigInt(a.grantVersion || "0");
+    const bv = BigInt(b.grantVersion || "0");
+    return av === bv ? 0 : av > bv ? -1 : 1;
+  });
+  return matching[0] ?? null;
+}
+async function liveGrantScopes(gateway, owner, granteeId) {
+  const grant = await findLiveGrant(gateway, owner, granteeId);
+  return grant ? [...grant.scopes] : [];
+}
+async function resolveGranteeId(input) {
+  if (input.granteeId) {
+    return input.granteeId;
+  }
+  if (!input.appAddress) {
+    throw new import_errors13.DirectConfigError(
+      "mergeWithLiveGrant needs granteeId or appAddress to find the app's grant."
+    );
+  }
+  if (!input.gateway.getBuilder) {
+    throw new import_errors13.DirectConfigError(
+      "mergeWithLiveGrant needs gateway.getBuilder to resolve appAddress to a granteeId. Pass granteeId instead."
+    );
+  }
+  const builder = await input.gateway.getBuilder(input.appAddress);
+  return builder?.id ?? null;
+}
+async function mergeWithLiveGrant(input) {
+  const removeScopes = input.removeScopes ?? [];
+  unionGrantScopes([], input.scopes, removeScopes);
+  const granteeId = await resolveGranteeId(input);
+  const grant = granteeId ? await findLiveGrant(input.gateway, input.owner, granteeId) : null;
+  if (!grant) {
+    return {
+      status: "no_live_grant",
+      ...unionGrantScopes([], input.scopes, removeScopes)
+    };
+  }
+  return {
+    status: "merged",
+    grantId: grant.id,
+    ...unionGrantScopes(grant.scopes, input.scopes, removeScopes)
+  };
+}
+
 // src/direct/escrow-payment.ts
 var GRANT_OP_TYPE = "grant";
 var DATA_ACCESS_OP_TYPE = "data_access";
@@ -37823,8 +37922,8 @@ async function authorizeEscrowPayment(params) {
 }
 
 // src/direct/personal-server-read.ts
-var import_errors13 = require("./direct/errors.cjs");
-var import_errors14 = require("./errors.cjs");
+var import_errors14 = require("./direct/errors.cjs");
+var import_errors15 = require("./errors.cjs");
 function asRecord2(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
@@ -37868,7 +37967,7 @@ function parseLegacyGrantOperation(params) {
   const { challengeGrantId, challengeOpId, challengeOpType, grantId } = params;
   const opType = challengeOpType ?? GRANT_OP_TYPE;
   if (opType !== GRANT_OP_TYPE) {
-    throw new import_errors13.PersonalServerReadError(
+    throw new import_errors14.PersonalServerReadError(
       "Personal Server payment challenge used an unsupported escrow op type",
       402,
       { opType: challengeOpType }
@@ -37876,14 +37975,14 @@ function parseLegacyGrantOperation(params) {
   }
   const opId = challengeOpId ?? challengeGrantId ?? grantId;
   if (!opId || !isBytes32Hex(opId)) {
-    throw new import_errors13.PersonalServerReadError(
+    throw new import_errors14.PersonalServerReadError(
       "Personal Server payment challenge used an invalid escrow op id",
       402,
       { opId }
     );
   }
   if (opId.toLowerCase() !== grantId.toLowerCase()) {
-    throw new import_errors13.PersonalServerReadError(
+    throw new import_errors14.PersonalServerReadError(
       "Personal Server payment challenge did not match the requested grant",
       402,
       { opId, grantId }
@@ -37929,7 +38028,7 @@ function parseCanonicalDataAccessAccept(value) {
 function parseCanonicalDataAccessPayment(params) {
   const { body, grantId, raw } = params;
   if (body.x402Version !== 1 || body.error !== "PAYMENT_REQUIRED") {
-    throw new import_errors13.PersonalServerReadError(
+    throw new import_errors14.PersonalServerReadError(
       "Personal Server data-access payment response was not a canonical x402 challenge",
       402
     );
@@ -37968,20 +38067,20 @@ async function parsePersonalServerPaymentRequired(res, grantId) {
     "accepts"
   );
   if (hasAcceptsEnvelope && (body.x402Version !== 1 || body.error !== "PAYMENT_REQUIRED")) {
-    throw new import_errors13.PersonalServerReadError(
+    throw new import_errors14.PersonalServerReadError(
       "Personal Server grant payment response was not a canonical x402 challenge",
       402
     );
   }
   const accept = preferredLegacyAccept(body);
   if (hasDataAccessMarker(body) && !accept) {
-    throw new import_errors13.PersonalServerReadError(
+    throw new import_errors14.PersonalServerReadError(
       "Personal Server data-access payment challenge was untrusted or incomplete",
       402
     );
   }
   if (hasAcceptsEnvelope && !accept) {
-    throw new import_errors13.PersonalServerReadError(
+    throw new import_errors14.PersonalServerReadError(
       "Personal Server grant payment challenge had no compatible escrow offer",
       402
     );
@@ -37999,7 +38098,7 @@ async function parsePersonalServerPaymentRequired(res, grantId) {
     const accessRecord2 = parseAccessRecord(accept.accessRecord);
     const hasAccessRecord = accept.accessRecord !== void 0;
     if (!network || !payerAddress || !isAddressHex2(payerAddress) || !opId || !isBytes32Hex(opId) || !asset || !isAddressHex2(asset) || !amount || !isUint256Decimal3(amount, true) || !paymentNonce || !isUint256Decimal3(paymentNonce, false) || !acceptAsset || acceptAsset.toLowerCase() !== asset.toLowerCase() || acceptAmount !== amount || hasAccessRecord && (!accessRecord2 || !isValidDataAccessRecord(accessRecord2) || accessRecord2.accessor.toLowerCase() !== payerAddress.toLowerCase()) || amount === "0" && !accessRecord2) {
-      throw new import_errors13.PersonalServerReadError(
+      throw new import_errors14.PersonalServerReadError(
         "Personal Server grant payment challenge was untrusted or incomplete",
         402
       );
@@ -38287,6 +38386,7 @@ async function parsePSError(response) {
   encryptWithPassword,
   escrowContractAddress,
   escrowPaymentDomain,
+  findLiveGrant,
   formatScopeEntry,
   gatewayLineagePath,
   generatePkceVerifier,
@@ -38320,7 +38420,9 @@ async function parsePSError(response) {
   isTombstoneHashes,
   kmsIssuedPreimage,
   listQuestions,
+  liveGrantScopes,
   mainnetServices,
+  mergeWithLiveGrant,
   moksha,
   mokshaServices,
   mokshaTestnet,
@@ -38364,6 +38466,7 @@ async function parsePSError(response) {
   toDirectPaymentReceipt,
   tombstoneDeletedAt,
   tryGrantPermissions,
+  unionGrantScopes,
   userPsId,
   vanaMainnet,
   verifyEnclaveIdentityEvidence,