@opendatalabs/vana-sdk 4.2.0 → 4.3.0

package/dist/index.node.d.ts

@@ -60,6 +60,7 @@ export { DERIVATIVE_STATUS_PATH, DEFAULT_DERIVATIVE_STATUS_TIMEOUT_MS, DEFAULT_D
 export { deriveDataPointId, isDataPointId, scopeNamespace, derivedScopeViolatesNaming, assertDerivedScopeNaming, isRedactedLineageNode, personalServerLineagePath, gatewayLineagePath, getLineage, getPersonalServerLineage, getGatewayLineage, LineageNodeSchema, RedactedLineageNodeSchema, LineageEntrySchema, LineageGraphSchema, type LineageNode, type RedactedLineageNode, type LineageEntry, type LineageGraph, type LineageReadResult, type PersonalServerLineageParams, type GatewayLineageParams, type GetLineageParams, } from "./protocol/lineage.js";
 export { DataFileEnvelopeSchema, createDataFileEnvelope, IngestResponseSchema, type DataFileEnvelope, type IngestResponse, } from "./protocol/data-file.js";
 export { createGatewayClient, type GatewayEnvelope, type GatewayProof, type Builder, type Schema, type ServerInfo, type OwnerServerRecord, type OwnerServersResult, type GatewayGrantFee, type GatewayGrantStatus, type GatewayGrantResponse, type GrantListItem, type DataPointRecord, type DataPointListResult, type ListDataPointsOptions, type RegisterServerParams, type RegisterServerResult, type RegisterBuilderParams, type RegisterBuilderResult, type RegisterDataPointParams, type RegisterDataPointResult, type GetDataPointOptions, type DeleteDataPointParams, type DeleteDataPointResult, type CreateGrantParams, type RevokeGrantParams, type AccessRecord, type PayForOperationParams, type PayForOperationResult, type SettleOpType, type SettleItem, type SettlePromoteResult, type SettleReconcileItem, type SettleParams, type SettleResult, type GatewayClient, } from "./protocol/gateway.js";
+export { mergeWithLiveGrant, liveGrantScopes, findLiveGrant, unionGrantScopes, type GrantUnion, type GrantUnionGateway, type GrantUnionStatus, type MergeWithLiveGrantInput, type MergeWithLiveGrantResult, } from "./direct/grant-union.js";
 export { createEscrowGatewayClient, genericPaymentDomain, GENERIC_PAYMENT_TYPES, ESCROW_DEPOSIT_ABI, NATIVE_ASSET_ADDRESS, type GenericPaymentMessage, type EscrowBalanceEntry, type EscrowBalanceResult, type EscrowBalanceSyncResult, type DepositSubmissionResult, type PaymentBreakdown, type EscrowPayResult, EscrowWithdrawalLifecycleError, EscrowWithdrawalRejectionError, type EscrowPaymentClient, type EscrowWithdrawalFailureResult, type EscrowWithdrawalRejectedResult, type EscrowWithdrawalRejectionCode, type EscrowWithdrawalSubmittedResult, type EscrowWithdrawalSubmittedWithoutTransaction, type EscrowWithdrawalSubmittedWithTransaction, type EscrowWithdrawalSettledResult, type EscrowWithdrawalResult, type SubmitDepositParams, type PayForOpParams, type WithdrawFromEscrowParams, type WithdrawNonceResponse, type EscrowGatewayClient, type SubmittedDepositEntry, type FinalizedDepositEntry, type FailedDepositEntry, } from "./protocol/escrow.js";
 export { authorizeEscrowPayment, authorizeGrantPayment, buildEscrowPaymentHeader, buildGrantPaymentHeader, createDefaultNonceSource, DATA_ACCESS_OP_TYPE, GRANT_OP_TYPE, paymentReceiptFromHeader, paymentResponseMetadataFromHeader, toDirectFeeBreakdown, toDirectPaymentReceipt, type EscrowPaymentConfig, type EscrowPaymentHeaderConfig, type PaymentNonceSource, type SignTypedDataFn, } from "./direct/escrow-payment.js";
 export { parsePersonalServerPaymentRequired, type FetchResponseLike, } from "./direct/personal-server-read.js";

package/dist/index.node.js

@@ -37387,6 +37387,101 @@ function createGatewayClient(baseUrl) {
   };
 }
 
+// src/direct/grant-union.ts
+import { DirectConfigError } from "./direct/errors.js";
+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 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 DirectConfigError(
+      "mergeWithLiveGrant needs granteeId or appAddress to find the app's grant."
+    );
+  }
+  if (!input.gateway.getBuilder) {
+    throw new 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";
@@ -38086,6 +38181,7 @@ export {
   encryptWithPassword,
   escrowContractAddress,
   escrowPaymentDomain,
+  findLiveGrant,
   formatScopeEntry,
   gatewayLineagePath,
   generatePkceVerifier,
@@ -38119,7 +38215,9 @@ export {
   isTombstoneHashes,
   kmsIssuedPreimage,
   listQuestions,
+  liveGrantScopes,
   mainnetServices,
+  mergeWithLiveGrant,
   moksha,
   mokshaServices,
   mokshaTestnet2 as mokshaTestnet,
@@ -38163,6 +38261,7 @@ export {
   toDirectPaymentReceipt,
   tombstoneDeletedAt,
   tryGrantPermissions,
+  unionGrantScopes,
   userPsId,
   vanaMainnet2 as vanaMainnet,
   verifyEnclaveIdentityEvidence,