diff --git a/examples/vana-console/src/app/(dashboard)/dlp-operations/page.tsx b/examples/vana-console/src/app/(dashboard)/dlp-operations/page.tsx
new file mode 100644
index 00000000..20a310ca
--- /dev/null
+++ b/examples/vana-console/src/app/(dashboard)/dlp-operations/page.tsx
@@ -0,0 +1,213 @@
+"use client";
+
+import React, { useState } from "react";
+import { useChainId } from "wagmi";
+import {
+  Card,
+  CardHeader,
+  CardBody,
+  Button,
+  Input,
+  Table,
+  TableHeader,
+  TableColumn,
+  TableBody,
+  TableRow,
+  TableCell,
+  Spinner,
+} from "@heroui/react";
+import { DollarSign, Plus, RefreshCw } from "lucide-react";
+import type { RuntimePermission } from "@opendatalabs/vana-sdk/browser";
+import { useVana } from "@/providers/VanaProvider";
+import { CreateRuntimePermissionModal } from "@/components/ui/CreateRuntimePermissionModal";
+
+/**
+ * DLP Operations page - Monetize dataset access via Vana Runtime
+ *
+ * This page allows DLP operators to create and manage runtime permissions
+ * for their datasets. Data consumers can request access, pay for operations,
+ * and execute tasks on encrypted data through the Vana Runtime TEE environment.
+ */
+export default function DLPOperationsPage() {
+  const chainId = useChainId();
+  const { vana } = useVana();
+
+  // State
+  const [datasetIdInput, setDatasetIdInput] = useState<string>("");
+  const [selectedDatasetId, setSelectedDatasetId] = useState<bigint | null>(
+    null,
+  );
+  const [permissions, setPermissions] = useState<RuntimePermission[]>([]);
+  const [isLoadingPermissions, setIsLoadingPermissions] = useState(false);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  // Load permissions for selected dataset
+  const loadPermissions = async () => {
+    if (!vana || !datasetIdInput) {
+      setError("Please enter a dataset ID");
+      return;
+    }
+
+    setIsLoadingPermissions(true);
+    setError(null);
+
+    try {
+      const datasetId = BigInt(datasetIdInput);
+      setSelectedDatasetId(datasetId);
+
+      // TODO: Re-enable when VanaRuntimePermissions contract is deployed and SDK is updated
+      // const permissionIds =
+      //   await vana.runtimePermissions.getDatasetPermissions(datasetId);
+      // const perms = await Promise.all(
+      //   permissionIds.map((id: bigint) => vana.runtimePermissions.getPermission(id)),
+      // );
+
+      // Stub implementation until contract is deployed
+      const perms: RuntimePermission[] = [];
+
+      setPermissions(perms);
+    } catch (err) {
+      console.error("Failed to load permissions:", err);
+      setError(
+        err instanceof Error ? err.message : "Failed to load permissions",
+      );
+      setPermissions([]);
+    } finally {
+      setIsLoadingPermissions(false);
+    }
+  };
+
+  // Handle permission created
+  const handlePermissionCreated = () => {
+    setIsModalOpen(false);
+    void loadPermissions(); // Refresh the list
+  };
+
+  return (
+    <div className="max-w-6xl mx-auto p-6 space-y-6">
+      {/* Header */}
+      <div className="mb-8">
+        <h1 className="text-3xl font-bold text-foreground mb-2">
+          DLP Operations
+        </h1>
+        <p className="text-lg text-default-600">
+          Monetize dataset access via Vana Runtime
+        </p>
+      </div>
+
+      {/* Dataset Selector */}
+      <Card>
+        <CardHeader>
+          <div className="flex items-center gap-2">
+            <DollarSign className="h-5 w-5" />
+            <h3 className="text-lg font-semibold">Select Dataset</h3>
+          </div>
+        </CardHeader>
+        <CardBody>
+          <div className="flex gap-2">
+            <Input
+              type="number"
+              label="Dataset ID"
+              placeholder="Enter your dataset ID"
+              value={datasetIdInput}
+              onChange={(e) => setDatasetIdInput(e.target.value)}
+              onKeyDown={(e) => {
+                if (e.key === "Enter") {
+                  void loadPermissions();
+                }
+              }}
+              className="flex-1"
+            />
+            <Button
+              color="primary"
+              startContent={<RefreshCw className="h-4 w-4" />}
+              onPress={() => {
+                void loadPermissions();
+              }}
+              isLoading={isLoadingPermissions}
+            >
+              Load Permissions
+            </Button>
+          </div>
+          {error && (
+            <p className="text-danger text-sm mt-2">{error}</p>
+          )}
+        </CardBody>
+      </Card>
+
+      {/* Permissions Table */}
+      {selectedDatasetId !== null && (
+        <Card>
+          <CardHeader className="flex justify-between items-center">
+            <div className="flex items-center gap-2">
+              <h3 className="text-lg font-semibold">
+                Runtime Permissions for Dataset #{selectedDatasetId.toString()}
+              </h3>
+            </div>
+            <Button
+              color="primary"
+              startContent={<Plus className="h-4 w-4" />}
+              onPress={() => setIsModalOpen(true)}
+              isDisabled={!vana}
+            >
+              Create Permission
+            </Button>
+          </CardHeader>
+          <CardBody>
+            {isLoadingPermissions ? (
+              <div className="flex justify-center items-center p-8">
+                <Spinner size="lg" />
+              </div>
+            ) : permissions.length > 0 ? (
+              <Table aria-label="Runtime permissions table" removeWrapper>
+                <TableHeader>
+                  <TableColumn>Grantee ID</TableColumn>
+                  <TableColumn>Dataset ID</TableColumn>
+                  <TableColumn>Grant URL</TableColumn>
+                  <TableColumn>Start Block</TableColumn>
+                  <TableColumn>End Block</TableColumn>
+                </TableHeader>
+                <TableBody>
+                  {permissions.map((permission, index) => (
+                    <TableRow key={index}>
+                      <TableCell className="font-mono text-sm">
+                        {permission.granteeId.toString()}
+                      </TableCell>
+                      <TableCell className="font-mono text-sm">
+                        {permission.datasetId.toString()}
+                      </TableCell>
+                      <TableCell className="font-mono text-xs max-w-xs truncate">
+                        {permission.grant}
+                      </TableCell>
+                      <TableCell>{permission.startBlock.toString()}</TableCell>
+                      <TableCell>{permission.endBlock.toString()}</TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
+            ) : (
+              <div className="text-center p-8">
+                <p className="text-default-600">
+                  No permissions found for this dataset.
+                </p>
+                <p className="text-sm text-default-500 mt-2">
+                  Create a permission to allow data consumers to access your
+                  dataset.
+                </p>
+              </div>
+            )}
+          </CardBody>
+        </Card>
+      )}
+
+      {/* Create Permission Modal */}
+      <CreateRuntimePermissionModal
+        isOpen={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        datasetId={selectedDatasetId}
+        onSuccess={handlePermissionCreated}
+      />
+    </div>
+  );
+}
diff --git a/examples/vana-console/src/app/api/relay/route.ts b/examples/vana-console/src/app/api/relay/route.ts
index a83d6042..bd8d4646 100644
--- a/examples/vana-console/src/app/api/relay/route.ts
+++ b/examples/vana-console/src/app/api/relay/route.ts
@@ -4,6 +4,7 @@ import {
   handleRelayerOperation,
   RedisAtomicStore,
   type UnifiedRelayerRequest,
+  type IRedisClient,
   vanaMainnet,
   mokshaTestnet,
   PinataStorage,
@@ -11,6 +12,7 @@ import {
 import { createWalletClient, http } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { RedisOperationStore } from "@/lib/operationStore";
+import Redis from "ioredis";
 
 export async function POST(request: NextRequest) {
   try {
@@ -43,8 +45,13 @@ export async function POST(request: NextRequest) {
           redis: process.env.REDIS_URL,
         });
 
+        // Create Redis client instance for atomic store
+        // ioredis.Redis is structurally compatible with IRedisClient (duck typing).
+        // Type assertion required because Redis has additional method overloads that IRedisClient doesn't declare.
+        // Runtime validation in RedisAtomicStore constructor ensures compatibility.
+        const redisClient = new Redis(process.env.REDIS_URL);
         atomicStore = new RedisAtomicStore({
-          redis: process.env.REDIS_URL,
+          redis: redisClient as unknown as IRedisClient,
         });
 
         console.info(
diff --git a/examples/vana-console/src/app/api/trusted-server/poll/route.ts b/examples/vana-console/src/app/api/trusted-server/poll/route.ts
index 6025d783..2b5d87df 100644
--- a/examples/vana-console/src/app/api/trusted-server/poll/route.ts
+++ b/examples/vana-console/src/app/api/trusted-server/poll/route.ts
@@ -31,16 +31,11 @@ export async function POST(request: NextRequest) {
     // Use the SDK's chain configuration approach
     const defaultPersonalServerUrl =
       process.env.NEXT_PUBLIC_PERSONAL_SERVER_BASE_URL;
-    if (!defaultPersonalServerUrl) {
-      throw new Error(
-        "NEXT_PUBLIC_PERSONAL_SERVER_BASE_URL environment variable is required",
-      );
-    }
 
     const vana = Vana({
       chainId,
       account: applicationAccount,
-      defaultPersonalServerUrl,
+      ...(defaultPersonalServerUrl && { defaultPersonalServerUrl }),
     });
 
     console.debug("🔍 [Poll] Polling operation:", {
diff --git a/examples/vana-console/src/app/api/trusted-server/route.ts b/examples/vana-console/src/app/api/trusted-server/route.ts
index cd6673de..fca84373 100644
--- a/examples/vana-console/src/app/api/trusted-server/route.ts
+++ b/examples/vana-console/src/app/api/trusted-server/route.ts
@@ -34,16 +34,11 @@ export async function POST(request: NextRequest) {
     // Use the SDK's chain configuration approach
     const defaultPersonalServerUrl =
       process.env.NEXT_PUBLIC_PERSONAL_SERVER_BASE_URL;
-    if (!defaultPersonalServerUrl) {
-      throw new Error(
-        "NEXT_PUBLIC_PERSONAL_SERVER_BASE_URL environment variable is required",
-      );
-    }
 
     const vana = Vana({
       chainId,
       account: applicationAccount,
-      defaultPersonalServerUrl,
+      ...(defaultPersonalServerUrl && { defaultPersonalServerUrl }),
     });
 
     console.debug("🔍 Debug - vana configured with:", {
diff --git a/examples/vana-console/src/app/api/worker/route.ts b/examples/vana-console/src/app/api/worker/route.ts
index 6647948a..3be875d0 100644
--- a/examples/vana-console/src/app/api/worker/route.ts
+++ b/examples/vana-console/src/app/api/worker/route.ts
@@ -10,6 +10,7 @@ import { NextResponse } from "next/server";
 import {
   Vana,
   RedisAtomicStore,
+  type IRedisClient,
   handleRelayerOperation,
   mokshaTestnet,
   vanaMainnet,
@@ -17,6 +18,7 @@ import {
 import { createPublicClient, createWalletClient, http } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { RedisOperationStore } from "@/lib/operationStore";
+import Redis from "ioredis";
 
 // Configuration from environment
 const MAX_RETRIES = parseInt(process.env.WORKER_MAX_RETRIES ?? "3");
@@ -51,8 +53,13 @@ export async function GET(request: NextRequest) {
       redis: process.env.REDIS_URL!,
     });
 
+    // Create Redis client instance for atomic store
+    // ioredis.Redis is structurally compatible with IRedisClient (duck typing).
+    // Type assertion required because Redis has additional method overloads that IRedisClient doesn't declare.
+    // Runtime validation in RedisAtomicStore constructor ensures compatibility.
+    const redisClient = new Redis(process.env.REDIS_URL!);
     const atomicStore = new RedisAtomicStore({
-      redis: process.env.REDIS_URL!,
+      redis: redisClient as unknown as IRedisClient,
     });
 
     // Update worker heartbeat
diff --git a/examples/vana-console/src/components/SidebarNavigation.tsx b/examples/vana-console/src/components/SidebarNavigation.tsx
index a89cadd2..628713de 100644
--- a/examples/vana-console/src/components/SidebarNavigation.tsx
+++ b/examples/vana-console/src/components/SidebarNavigation.tsx
@@ -4,7 +4,7 @@ import React from "react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { Button } from "@heroui/react";
-import { Database, Settings, Zap, FileCode } from "lucide-react";
+import { Database, Settings, Zap, FileCode, DollarSign } from "lucide-react";
 
 /**
  * Represents a navigation view in the sidebar
@@ -55,6 +55,13 @@ const navigationViews: NavigationView[] = [
     icon: FileCode,
     description: "View network contracts",
   },
+  {
+    id: "dlp-operations",
+    href: "/dlp-operations",
+    label: "DLP Operations",
+    icon: DollarSign,
+    description: "Monetize dataset access",
+  },
   {
     id: "developer-tools",
     href: "/developer-tools",
diff --git a/examples/vana-console/src/components/ui/CreateRuntimePermissionModal.tsx b/examples/vana-console/src/components/ui/CreateRuntimePermissionModal.tsx
new file mode 100644
index 00000000..c9120cad
--- /dev/null
+++ b/examples/vana-console/src/components/ui/CreateRuntimePermissionModal.tsx
@@ -0,0 +1,436 @@
+import React, { useState, useEffect } from "react";
+import type { Address } from "viem";
+import {
+  Modal,
+  ModalContent,
+  ModalHeader,
+  ModalBody,
+  ModalFooter,
+  Button,
+  Input,
+  Select,
+  SelectItem,
+  Divider,
+  Card,
+  CardBody,
+} from "@heroui/react";
+import { DollarSign, AlertCircle, Cloud, Database } from "lucide-react";
+import { useVana } from "@/providers/VanaProvider";
+
+export interface CreateRuntimePermissionModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  datasetId: bigint | null;
+  onSuccess?: () => void;
+}
+
+/**
+ * Modal for creating runtime permissions for dataset monetization
+ *
+ * This modal allows DLP operators to create permissions for data consumers
+ * to execute operations on their datasets via Vana Runtime TEE environment.
+ */
+export const CreateRuntimePermissionModal: React.FC<
+  CreateRuntimePermissionModalProps
+> = ({ isOpen, onClose, datasetId, onSuccess }) => {
+  const { vana } = useVana();
+
+  // Form state
+  const [grantee, setGrantee] = useState<string>("");
+  const [task, setTask] = useState("thinker/task:v1");
+  const [operation, setOperation] = useState("aggregate_keywords");
+  const [pricePerFile, setPricePerFile] = useState("0.1");
+  const [minimumPrice, setMinimumPrice] = useState("");
+  const [maximumPrice, setMaximumPrice] = useState("");
+  const [endBlock, setEndBlock] = useState("");
+
+  // Operation state
+  const [isCreating, setIsCreating] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [validationErrors, setValidationErrors] = useState<string[]>([]);
+
+  // Reset form when modal opens
+  useEffect(() => {
+    if (isOpen) {
+      setGrantee("");
+      setTask("thinker/task:v1");
+      setOperation("aggregate_keywords");
+      setPricePerFile("0.1");
+      setMinimumPrice("");
+      setMaximumPrice("");
+      setEndBlock("");
+      setError(null);
+      setValidationErrors([]);
+    }
+  }, [isOpen]);
+
+  // Validate form
+  const validateForm = (): boolean => {
+    const errors: string[] = [];
+
+    if (!datasetId) {
+      errors.push("Dataset ID is required");
+    }
+
+    if (!grantee.trim()) {
+      errors.push("Grantee address is required");
+    } else if (!/^0x[a-fA-F0-9]{40}$/.test(grantee)) {
+      errors.push("Grantee address must be a valid Ethereum address");
+    }
+
+    if (!task.trim()) {
+      errors.push("Task is required");
+    }
+
+    if (!operation.trim()) {
+      errors.push("Operation is required");
+    }
+
+    if (!pricePerFile.trim()) {
+      errors.push("Price per file is required");
+    } else {
+      const price = parseFloat(pricePerFile);
+      if (isNaN(price) || price < 0) {
+        errors.push("Price per file must be a valid non-negative number");
+      }
+    }
+
+    if (minimumPrice && isNaN(parseFloat(minimumPrice))) {
+      errors.push("Minimum price must be a valid number");
+    }
+
+    if (maximumPrice && isNaN(parseFloat(maximumPrice))) {
+      errors.push("Maximum price must be a valid number");
+    }
+
+    if (!endBlock.trim()) {
+      errors.push("End block is required");
+    } else {
+      try {
+        const block = BigInt(endBlock);
+        if (block <= 0) {
+          errors.push("End block must be greater than 0");
+        }
+      } catch {
+        errors.push("End block must be a valid number");
+      }
+    }
+
+    setValidationErrors(errors);
+    return errors.length === 0;
+  };
+
+  // Handle create permission
+  const handleCreate = async () => {
+    if (!vana || !datasetId) {
+      setError("Vana SDK not initialized or dataset not selected");
+      return;
+    }
+
+    if (!validateForm()) {
+      return;
+    }
+
+    setIsCreating(true);
+    setError(null);
+
+    try {
+      const pricing: {
+        price_per_file_vana: number;
+        minimum_price_vana?: number;
+        maximum_price_vana?: number;
+      } = {
+        price_per_file_vana: parseFloat(pricePerFile),
+      };
+
+      if (minimumPrice) {
+        pricing.minimum_price_vana = parseFloat(minimumPrice);
+      }
+
+      if (maximumPrice) {
+        pricing.maximum_price_vana = parseFloat(maximumPrice);
+      }
+
+      // TODO: Re-enable when VanaRuntimePermissions contract is deployed and SDK is updated
+      // const result = await vana.runtimePermissions.createPermission({
+      //   datasetId,
+      //   grantee: grantee as Address,
+      //   task,
+      //   operation,
+      //   pricing,
+      //   endBlock: BigInt(endBlock),
+      // });
+      // console.log("Permission created:", result);
+
+      // Stub implementation until contract is deployed
+      console.log("Permission creation stubbed - contract not deployed yet");
+      setError("Runtime permissions feature is not yet available. The VanaRuntimePermissions contract has not been deployed yet. This UI is ready for when the contract is available.");
+      return; // Don't proceed until contract is deployed
+
+      // Call success callback
+      // if (onSuccess) {
+      //   onSuccess();
+      // }
+      // Close modal
+      // onClose();
+    } catch (err) {
+      console.error("Failed to create permission:", err);
+      setError(err instanceof Error ? err.message : "Failed to create permission");
+    } finally {
+      setIsCreating(false);
+    }
+  };
+
+  const handleClose = () => {
+    if (!isCreating) {
+      onClose();
+    }
+  };
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onClose={handleClose}
+      size="2xl"
+      scrollBehavior="inside"
+      isDismissable={!isCreating}
+    >
+      <ModalContent>
+        <ModalHeader className="flex items-center gap-2">
+          <DollarSign className="h-5 w-5" />
+          Create Runtime Permission
+        </ModalHeader>
+        <ModalBody>
+          <div className="space-y-4">
+            {/* Storage Visibility Info */}
+            <div className="grid grid-cols-2 gap-3">
+              <Card className="bg-default-100">
+                <CardBody className="py-3">
+                  <div className="flex items-center gap-2 mb-1">
+                    <Database className="h-4 w-4 text-primary" />
+                    <span className="text-sm font-medium">On-chain Storage</span>
+                  </div>
+                  <div className="text-xs text-default-600 space-y-1">
+                    <div>• Dataset ID</div>
+                    <div>• Grantee ID</div>
+                    <div>• Block range</div>
+                    <div>• Grant URL</div>
+                  </div>
+                </CardBody>
+              </Card>
+
+              <Card className="bg-primary/10 border border-primary/20">
+                <CardBody className="py-3">
+                  <div className="flex items-center gap-2 mb-1">
+                    <Cloud className="h-4 w-4 text-primary" />
+                    <span className="text-sm font-medium">
+                      Off-chain Storage (IPFS)
+                    </span>
+                  </div>
+                  <div className="text-xs text-primary-700 space-y-1">
+                    <div>• Task name</div>
+                    <div>• Operation type</div>
+                    <div>• Pricing details</div>
+                    <div>• Operation parameters</div>
+                  </div>
+                </CardBody>
+              </Card>
+            </div>
+
+            <Divider />
+
+            {/* Dataset ID Display */}
+            <div className="p-3 bg-default-100 rounded-lg">
+              <p className="text-sm font-medium mb-1">Dataset ID:</p>
+              <p className="text-lg font-mono">
+                {datasetId?.toString() ?? "Not selected"}
+              </p>
+            </div>
+
+            <Divider />
+
+            {/* Grantee Address */}
+            <Input
+              label="Grantee Address"
+              value={grantee}
+              onChange={(e) => setGrantee(e.target.value)}
+              placeholder="0x..."
+              description="Ethereum address of the data consumer"
+              isRequired
+            />
+
+            <Divider />
+
+            {/* Off-chain Configuration (IPFS) */}
+            <div className="bg-primary/5 p-3 rounded-lg">
+              <p className="text-sm font-medium text-primary mb-3">
+                Off-chain Configuration
+              </p>
+
+              {/* Task */}
+              <Input
+                label="Task"
+                value={task}
+                onChange={(e) => setTask(e.target.value)}
+                placeholder="thinker/task:v1"
+                description="The Vana Runtime task that will process the data"
+                isRequired
+              />
+
+              {/* Operation */}
+              <Select
+                label="Operation"
+                selectedKeys={[operation]}
+                onSelectionChange={(keys) => {
+                  setOperation(Array.from(keys)[0] as string);
+                }}
+                description="The specific operation to be performed on the data"
+                isRequired
+                className="mt-3"
+              >
+                <SelectItem key="aggregate_keywords" textValue="Aggregate Keywords">
+                  Aggregate Keywords
+                </SelectItem>
+                <SelectItem key="query_keywords" textValue="Query Keywords">
+                  Query Keywords (10% rate)
+                </SelectItem>
+                <SelectItem key="get_stats" textValue="Get Stats">
+                  Get Stats (flat 0.01 VANA)
+                </SelectItem>
+              </Select>
+
+              {/* Pricing */}
+              <div className="space-y-3 mt-3">
+                <Input
+                  label="Price Per File (VANA)"
+                  type="number"
+                  value={pricePerFile}
+                  onChange={(e) => setPricePerFile(e.target.value)}
+                  placeholder="0.1"
+                  description="Base price per file in VANA tokens"
+                  min="0"
+                  step="0.01"
+                  isRequired
+                />
+
+                <Input
+                  label="Minimum Price (VANA)"
+                  type="number"
+                  value={minimumPrice}
+                  onChange={(e) => setMinimumPrice(e.target.value)}
+                  placeholder="Optional"
+                  description="Optional minimum total price"
+                  min="0"
+                  step="0.01"
+                />
+
+                <Input
+                  label="Maximum Price (VANA)"
+                  type="number"
+                  value={maximumPrice}
+                  onChange={(e) => setMaximumPrice(e.target.value)}
+                  placeholder="Optional"
+                  description="Optional maximum total price"
+                  min="0"
+                  step="0.01"
+                />
+              </div>
+            </div>
+
+            {/* Block Range */}
+            <Input
+              label="End Block"
+              type="number"
+              value={endBlock}
+              onChange={(e) => setEndBlock(e.target.value)}
+              placeholder="2000000"
+              description="The block number when this permission expires"
+              isRequired
+            />
+
+            {/* Validation Errors */}
+            {validationErrors.length > 0 && (
+              <div className="p-3 bg-danger/10 rounded-lg border border-danger/20">
+                <div className="flex items-center gap-2 mb-2">
+                  <AlertCircle className="h-4 w-4 text-danger" />
+                  <p className="text-sm font-medium text-danger">
+                    Validation Errors:
+                  </p>
+                </div>
+                <ul className="text-sm text-danger space-y-1">
+                  {validationErrors.map((err, index) => (
+                    <li key={index} className="flex items-start gap-2">
+                      <span className="text-danger">•</span>
+                      {err}
+                    </li>
+                  ))}
+                </ul>
+              </div>
+            )}
+
+            {/* Error Display */}
+            {error && (
+              <div className="p-3 bg-danger/10 rounded-lg border border-danger/20">
+                <div className="flex items-center gap-2">
+                  <AlertCircle className="h-4 w-4 text-danger" />
+                  <p className="text-sm text-danger">{error}</p>
+                </div>
+              </div>
+            )}
+
+            {/* Preview */}
+            <div className="p-3 bg-primary/10 rounded-lg">
+              <p className="text-sm font-medium text-primary mb-2">Preview:</p>
+              <div className="text-sm text-primary-700 space-y-1">
+                <p>
+                  <strong>Dataset:</strong> {datasetId?.toString() ?? "N/A"}
+                </p>
+                <p>
+                  <strong>Grantee:</strong> {grantee || "Not set"}
+                </p>
+                <p>
+                  <strong>Task:</strong> {task}
+                </p>
+                <p>
+                  <strong>Operation:</strong> {operation}
+                </p>
+                <p>
+                  <strong>Price:</strong> {pricePerFile} VANA per file
+                </p>
+                {minimumPrice && (
+                  <p>
+                    <strong>Minimum:</strong> {minimumPrice} VANA
+                  </p>
+                )}
+                {maximumPrice && (
+                  <p>
+                    <strong>Maximum:</strong> {maximumPrice} VANA
+                  </p>
+                )}
+                <p>
+                  <strong>Valid until block:</strong> {endBlock || "Not set"}
+                </p>
+              </div>
+            </div>
+          </div>
+        </ModalBody>
+        <ModalFooter>
+          <Button variant="flat" onPress={handleClose} isDisabled={isCreating}>
+            Cancel
+          </Button>
+          <Button
+            color="primary"
+            onPress={handleCreate}
+            isLoading={isCreating}
+            isDisabled={!datasetId}
+            startContent={
+              !isCreating ? <DollarSign className="h-4 w-4" /> : undefined
+            }
+          >
+            {isCreating ? "Creating..." : "Create Permission"}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+};
diff --git a/examples/vana-console/src/providers/SDKConfigProvider.tsx b/examples/vana-console/src/providers/SDKConfigProvider.tsx
index 44715cfc..c0d04fae 100644
--- a/examples/vana-console/src/providers/SDKConfigProvider.tsx
+++ b/examples/vana-console/src/providers/SDKConfigProvider.tsx
@@ -108,12 +108,7 @@ export function SDKConfigProvider({ children }: SDKConfigProviderProps) {
     dropboxExpiresAt: null,
     readOnlyAddress: "",
     defaultPersonalServerUrl:
-      process.env.NEXT_PUBLIC_PERSONAL_SERVER_BASE_URL ??
-      (() => {
-        throw new Error(
-          "NEXT_PUBLIC_PERSONAL_SERVER_BASE_URL environment variable is required",
-        );
-      })(),
+      process.env.NEXT_PUBLIC_PERSONAL_SERVER_BASE_URL ?? "",
   }));
 
   // App Configuration state
diff --git a/package-lock.json b/package-lock.json
index 9ceeefb2..290443e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -474,6 +474,7 @@
     "node_modules/@babel/core": {
       "version": "7.28.3",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.27.1",
@@ -615,7 +616,6 @@
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -626,7 +626,6 @@
     "node_modules/@babel/plugin-syntax-bigint": {
       "version": "7.8.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -637,7 +636,6 @@
     "node_modules/@babel/plugin-syntax-class-properties": {
       "version": "7.12.13",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -648,7 +646,6 @@
     "node_modules/@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -676,7 +673,6 @@
     "node_modules/@babel/plugin-syntax-import-attributes": {
       "version": "7.27.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
       },
@@ -690,7 +686,6 @@
     "node_modules/@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -701,7 +696,6 @@
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -712,7 +706,6 @@
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -723,7 +716,6 @@
     "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -734,7 +726,6 @@
     "node_modules/@babel/plugin-syntax-numeric-separator": {
       "version": "7.10.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -745,7 +736,6 @@
     "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -756,7 +746,6 @@
     "node_modules/@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -767,7 +756,6 @@
     "node_modules/@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -778,7 +766,6 @@
     "node_modules/@babel/plugin-syntax-private-property-in-object": {
       "version": "7.14.5",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -792,7 +779,6 @@
     "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -870,7 +856,6 @@
       "name": "@babel/traverse",
       "version": "7.28.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.3",
@@ -1163,7 +1148,6 @@
     "node_modules/@coinbase/wallet-sdk": {
       "version": "4.3.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@noble/hashes": "^1.4.0",
         "clsx": "^1.2.1",
@@ -1174,7 +1158,6 @@
     "node_modules/@coinbase/wallet-sdk/node_modules/clsx": {
       "version": "1.2.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -1193,7 +1176,6 @@
     "node_modules/@confio/ics23": {
       "version": "0.6.8",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@noble/hashes": "^1.0.0",
         "protobufjs": "^6.8.8"
@@ -1231,7 +1213,6 @@
     "node_modules/@cosmjs/crypto": {
       "version": "0.31.3",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@cosmjs/encoding": "^0.31.3",
         "@cosmjs/math": "^0.31.3",
@@ -1244,8 +1225,7 @@
     },
     "node_modules/@cosmjs/crypto/node_modules/bn.js": {
       "version": "5.2.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@cosmjs/encoding": {
       "version": "0.31.3",
@@ -1260,7 +1240,6 @@
     "node_modules/@cosmjs/json-rpc": {
       "version": "0.31.3",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@cosmjs/stream": "^0.31.3",
         "xstream": "^11.14.0"
@@ -1269,7 +1248,6 @@
     "node_modules/@cosmjs/launchpad": {
       "version": "0.27.1",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@cosmjs/amino": "0.27.1",
         "@cosmjs/crypto": "0.27.1",
@@ -1283,7 +1261,6 @@
     "node_modules/@cosmjs/launchpad/node_modules/@cosmjs/amino": {
       "version": "0.27.1",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@cosmjs/crypto": "0.27.1",
         "@cosmjs/encoding": "0.27.1",
@@ -1294,7 +1271,6 @@
     "node_modules/@cosmjs/launchpad/node_modules/@cosmjs/crypto": {
       "version": "0.27.1",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@cosmjs/encoding": "0.27.1",
         "@cosmjs/math": "0.27.1",
@@ -1311,7 +1287,6 @@
     "node_modules/@cosmjs/launchpad/node_modules/@cosmjs/encoding": {
       "version": "0.27.1",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.0",
         "bech32": "^1.1.4",
@@ -1321,33 +1296,28 @@
     "node_modules/@cosmjs/launchpad/node_modules/@cosmjs/math": {
       "version": "0.27.1",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "bn.js": "^5.2.0"
       }
     },
     "node_modules/@cosmjs/launchpad/node_modules/@cosmjs/utils": {
       "version": "0.27.1",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@cosmjs/launchpad/node_modules/bn.js": {
       "version": "5.2.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@cosmjs/math": {
       "version": "0.31.3",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "bn.js": "^5.2.0"
       }
     },
     "node_modules/@cosmjs/math/node_modules/bn.js": {
       "version": "5.2.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@cosmjs/proto-signing": {
       "version": "0.31.3",
@@ -1366,7 +1336,6 @@
     "node_modules/@cosmjs/socket": {
       "version": "0.31.3",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@cosmjs/stream": "^0.31.3",
         "isomorphic-ws": "^4.0.1",
@@ -1377,7 +1346,6 @@
     "node_modules/@cosmjs/socket/node_modules/isomorphic-ws": {
       "version": "4.0.1",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "ws": "*"
       }
@@ -1424,7 +1392,6 @@
     "node_modules/@cosmjs/stream": {
       "version": "0.31.3",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "xstream": "^11.14.0"
       }
@@ -1448,13 +1415,11 @@
     },
     "node_modules/@cosmjs/utils": {
       "version": "0.31.3",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@cosmsnap/snapper": {
       "version": "0.1.29",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@keplr-wallet/proto-types": "0.12.12",
         "@keplr-wallet/types": "0.12.12",
@@ -1467,7 +1432,6 @@
     "node_modules/@cosmsnap/snapper/node_modules/@keplr-wallet/types": {
       "version": "0.12.12",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "long": "^4.0.0"
       }
@@ -1475,7 +1439,6 @@
     "node_modules/@dao-dao/cosmiframe": {
       "version": "0.1.0",
       "license": "BSD-3-Clause-Clear",
-      "peer": true,
       "dependencies": {
         "uuid": "^9.0.1"
       },
@@ -1491,7 +1454,6 @@
         "https://github.com/sponsors/ctavan"
       ],
       "license": "MIT",
-      "peer": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -1513,6 +1475,7 @@
       "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
       "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@dnd-kit/accessibility": "^3.1.1",
         "@dnd-kit/utilities": "^3.2.2",
@@ -1570,6 +1533,7 @@
     "node_modules/@emotion/is-prop-valid": {
       "version": "1.2.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@emotion/memoize": "^0.8.1"
       }
@@ -2345,7 +2309,6 @@
     },
     "node_modules/@getpara/core-components": {
       "version": "2.0.0-alpha.50",
-      "peer": true,
       "dependencies": {
         "@stencil/core": "^4.7.0",
         "color-blend": "^4.0.0",
@@ -2357,7 +2320,6 @@
     },
     "node_modules/@getpara/core-sdk": {
       "version": "2.0.0-alpha.50",
-      "peer": true,
       "dependencies": {
         "@celo/utils": "^8.0.2",
         "@cosmjs/encoding": "^0.32.4",
@@ -2373,7 +2335,6 @@
     "node_modules/@getpara/core-sdk/node_modules/@cosmjs/encoding": {
       "version": "0.32.4",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.0",
         "bech32": "^1.1.4",
@@ -2382,7 +2343,6 @@
     },
     "node_modules/@getpara/cosmjs-v0-integration": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "@getpara/core-sdk": "2.0.0-fc.3"
       },
@@ -2395,7 +2355,6 @@
     },
     "node_modules/@getpara/cosmjs-v0-integration/node_modules/@getpara/core-sdk": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "@celo/utils": "^8.0.2",
         "@cosmjs/encoding": "^0.32.4",
@@ -2411,7 +2370,6 @@
     "node_modules/@getpara/cosmjs-v0-integration/node_modules/@getpara/core-sdk/node_modules/@cosmjs/encoding": {
       "version": "0.32.4",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.0",
         "bech32": "^1.1.4",
@@ -2420,7 +2378,6 @@
     },
     "node_modules/@getpara/cosmjs-v0-integration/node_modules/@getpara/user-management-client": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "axios": "^1.8.4",
         "libphonenumber-js": "^1.11.7"
@@ -2429,7 +2386,6 @@
     "node_modules/@getpara/cosmjs-v0-integration/node_modules/axios": {
       "version": "1.11.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -2438,7 +2394,6 @@
     },
     "node_modules/@getpara/cosmos-wallet-connectors": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "@getpara/graz": "2.0.0-alpha.3",
         "@getpara/react-common": "2.0.0-fc.3",
@@ -2457,7 +2412,6 @@
     "node_modules/@getpara/cosmos-wallet-connectors/node_modules/@cosmjs/encoding": {
       "version": "0.32.4",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.0",
         "bech32": "^1.1.4",
@@ -2466,7 +2420,6 @@
     },
     "node_modules/@getpara/cosmos-wallet-connectors/node_modules/@getpara/core-components": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "@stencil/core": "^4.7.0",
         "color-blend": "^4.0.0",
@@ -2478,7 +2431,6 @@
     },
     "node_modules/@getpara/cosmos-wallet-connectors/node_modules/@getpara/core-sdk": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "@celo/utils": "^8.0.2",
         "@cosmjs/encoding": "^0.32.4",
@@ -2493,7 +2445,6 @@
     },
     "node_modules/@getpara/cosmos-wallet-connectors/node_modules/@getpara/react-common": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "@getpara/react-components": "2.0.0-fc.3",
         "@getpara/web-sdk": "2.0.0-fc.3",
@@ -2510,14 +2461,12 @@
     },
     "node_modules/@getpara/cosmos-wallet-connectors/node_modules/@getpara/react-components": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "@getpara/core-components": "2.0.0-fc.3"
       }
     },
     "node_modules/@getpara/cosmos-wallet-connectors/node_modules/@getpara/user-management-client": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "axios": "^1.8.4",
         "libphonenumber-js": "^1.11.7"
@@ -2525,7 +2474,6 @@
     },
     "node_modules/@getpara/cosmos-wallet-connectors/node_modules/@getpara/web-sdk": {
       "version": "2.0.0-fc.3",
-      "peer": true,
       "dependencies": {
         "@getpara/core-sdk": "2.0.0-fc.3",
         "@getpara/user-management-client": "2.0.0-fc.3",
@@ -2548,7 +2496,6 @@
     "node_modules/@getpara/cosmos-wallet-connectors/node_modules/axios": {
       "version": "1.11.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -2572,7 +2519,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -2605,7 +2551,6 @@
     "node_modules/@getpara/graz": {
       "version": "2.0.0-alpha.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@cosmsnap/snapper": "0.1.29",
         "@dao-dao/cosmiframe": "0.1.0",
@@ -2642,7 +2587,6 @@
     "node_modules/@getpara/graz/node_modules/@metamask/json-rpc-engine": {
       "version": "7.3.3",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "@metamask/rpc-errors": "^6.2.1",
         "@metamask/safe-event-emitter": "^3.0.0",
@@ -2655,7 +2599,6 @@
     "node_modules/@getpara/graz/node_modules/@metamask/object-multiplex": {
       "version": "1.3.0",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "end-of-stream": "^1.4.4",
         "once": "^1.4.0",
@@ -2668,7 +2611,6 @@
     "node_modules/@getpara/graz/node_modules/@metamask/providers": {
       "version": "12.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@metamask/json-rpc-engine": "^7.1.1",
         "@metamask/object-multiplex": "^1.1.0",
@@ -2690,7 +2632,6 @@
     "node_modules/@getpara/graz/node_modules/@metamask/rpc-errors": {
       "version": "6.4.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@metamask/utils": "^9.0.0",
         "fast-safe-stringify": "^2.0.6"
@@ -2702,7 +2643,6 @@
     "node_modules/@getpara/graz/node_modules/@metamask/rpc-errors/node_modules/@metamask/utils": {
       "version": "9.3.0",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "@ethereumjs/tx": "^4.2.0",
         "@metamask/superstruct": "^3.1.0",
@@ -2721,7 +2661,6 @@
     "node_modules/@getpara/graz/node_modules/@metamask/utils": {
       "version": "8.5.0",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "@ethereumjs/tx": "^4.2.0",
         "@metamask/superstruct": "^3.0.0",
@@ -2740,7 +2679,6 @@
     "node_modules/@getpara/graz/node_modules/@terra-money/station-connector": {
       "version": "1.1.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "bech32": "^2.0.0"
       },
@@ -2764,13 +2702,11 @@
     },
     "node_modules/@getpara/graz/node_modules/bech32": {
       "version": "2.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@getpara/graz/node_modules/extension-port-stream": {
       "version": "2.1.1",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "webextension-polyfill": ">=0.10.0 <1.0"
       },
@@ -2780,13 +2716,11 @@
     },
     "node_modules/@getpara/graz/node_modules/isarray": {
       "version": "1.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@getpara/graz/node_modules/readable-stream": {
       "version": "2.3.8",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -2799,13 +2733,11 @@
     },
     "node_modules/@getpara/graz/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@getpara/graz/node_modules/semver": {
       "version": "7.7.2",
       "license": "ISC",
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2816,7 +2748,6 @@
     "node_modules/@getpara/graz/node_modules/string_decoder": {
       "version": "1.1.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -2828,7 +2759,6 @@
         "https://github.com/sponsors/ctavan"
       ],
       "license": "MIT",
-      "peer": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -2836,7 +2766,6 @@
     "node_modules/@getpara/graz/node_modules/zustand": {
       "version": "4.5.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "use-sync-external-store": "1.2.0"
       },
@@ -2863,14 +2792,12 @@
     "node_modules/@getpara/graz/node_modules/zustand/node_modules/use-sync-external-store": {
       "version": "1.2.0",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/@getpara/react-common": {
       "version": "2.0.0-alpha.50",
-      "peer": true,
       "dependencies": {
         "@getpara/react-components": "2.0.0-alpha.50",
         "@getpara/web-sdk": "2.0.0-alpha.50",
@@ -2887,7 +2814,6 @@
     },
     "node_modules/@getpara/react-components": {
       "version": "2.0.0-alpha.50",
-      "peer": true,
       "dependencies": {
         "@getpara/core-components": "2.0.0-alpha.50"
       }
@@ -3093,7 +3019,6 @@
     },
     "node_modules/@getpara/user-management-client": {
       "version": "2.0.0-alpha.50",
-      "peer": true,
       "dependencies": {
         "axios": "^1.8.4",
         "libphonenumber-js": "^1.11.7"
@@ -3102,7 +3027,6 @@
     "node_modules/@getpara/user-management-client/node_modules/axios": {
       "version": "1.11.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -3111,7 +3035,6 @@
     },
     "node_modules/@getpara/viem-v2-integration": {
       "version": "2.0.0-alpha.50",
-      "peer": true,
       "dependencies": {
         "@getpara/core-sdk": "2.0.0-alpha.50"
       },
@@ -3121,7 +3044,6 @@
     },
     "node_modules/@getpara/wagmi-v2-connector": {
       "version": "2.0.0-alpha.50",
-      "peer": true,
       "dependencies": {
         "@getpara/viem-v2-integration": "2.0.0-alpha.50",
         "@getpara/web-sdk": "2.0.0-alpha.50"
@@ -3135,7 +3057,6 @@
     },
     "node_modules/@getpara/web-sdk": {
       "version": "2.0.0-alpha.50",
-      "peer": true,
       "dependencies": {
         "@getpara/core-sdk": "2.0.0-alpha.50",
         "@getpara/user-management-client": "2.0.0-alpha.50",
@@ -3171,7 +3092,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -4938,6 +4858,7 @@
     "node_modules/@heroui/system": {
       "version": "2.4.20",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@heroui/react-utils": "2.1.12",
         "@heroui/system-rsc": "2.3.17",
@@ -5022,6 +4943,7 @@
     "node_modules/@heroui/theme": {
       "version": "2.4.20",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@heroui/shared-utils": "2.1.10",
         "clsx": "^1.2.1",
@@ -5458,7 +5380,6 @@
     "node_modules/@improbable-eng/grpc-web": {
       "version": "0.14.1",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "browser-headers": "^0.4.1"
       },
@@ -5636,7 +5557,6 @@
     "node_modules/@isaacs/ttlcache": {
       "version": "1.4.1",
       "license": "ISC",
-      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -5644,7 +5564,6 @@
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -5659,7 +5578,6 @@
     "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
       "version": "1.0.10",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -5667,7 +5585,6 @@
     "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
       "version": "4.1.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -5679,7 +5596,6 @@
     "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
       "version": "3.14.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -5691,7 +5607,6 @@
     "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
       "version": "5.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -5702,7 +5617,6 @@
     "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
       "version": "2.3.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -5716,7 +5630,6 @@
     "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
       "version": "4.1.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -5734,7 +5647,6 @@
     "node_modules/@jest/create-cache-key-function": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3"
       },
@@ -5745,7 +5657,6 @@
     "node_modules/@jest/environment": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -5759,7 +5670,6 @@
     "node_modules/@jest/fake-timers": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
@@ -5775,7 +5685,6 @@
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -5786,7 +5695,6 @@
     "node_modules/@jest/transform": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/types": "^29.6.3",
@@ -5811,7 +5719,6 @@
     "node_modules/@jest/types": {
       "version": "29.6.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -5851,7 +5758,6 @@
     "node_modules/@jridgewell/source-map": {
       "version": "0.3.11",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
@@ -5872,7 +5778,6 @@
     "node_modules/@keplr-wallet/common": {
       "version": "0.12.156",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@keplr-wallet/crypto": "0.12.156",
         "@keplr-wallet/types": "0.12.156",
@@ -5897,7 +5802,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -5906,7 +5810,6 @@
     "node_modules/@keplr-wallet/cosmos": {
       "version": "0.12.156",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@ethersproject/address": "^5.6.0",
         "@keplr-wallet/common": "0.12.156",
@@ -5924,7 +5827,6 @@
     "node_modules/@keplr-wallet/cosmos/node_modules/@keplr-wallet/proto-types": {
       "version": "0.12.156",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "long": "^4.0.0",
         "protobufjs": "^6.11.2"
@@ -5947,7 +5849,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -5956,7 +5857,6 @@
     "node_modules/@keplr-wallet/crypto": {
       "version": "0.12.156",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@noble/curves": "^1.4.2",
         "@noble/hashes": "^1.4.0",
@@ -5986,7 +5886,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -5995,7 +5894,6 @@
     "node_modules/@keplr-wallet/proto-types": {
       "version": "0.12.12",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "long": "^4.0.0",
         "protobufjs": "^6.11.2"
@@ -6003,13 +5901,11 @@
     },
     "node_modules/@keplr-wallet/simple-fetch": {
       "version": "0.12.156",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@keplr-wallet/types": {
       "version": "0.12.156",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "long": "^4.0.0"
       },
@@ -6020,7 +5916,6 @@
     "node_modules/@keplr-wallet/unit": {
       "version": "0.12.156",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@keplr-wallet/types": "0.12.156",
         "big-integer": "^1.6.48",
@@ -6041,13 +5936,11 @@
     },
     "node_modules/@leapwallet/cosmos-social-login-capsule-provider/node_modules/long": {
       "version": "5.2.3",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@leapwallet/cosmos-social-login-core": {
       "version": "0.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@cosmjs/amino": "^0.31.3",
         "@cosmjs/proto-signing": "^0.31.3",
@@ -6559,6 +6452,7 @@
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.1.0.tgz",
       "integrity": "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-fetch": "^2.7.0"
       }
@@ -6726,7 +6620,6 @@
     "node_modules/@motionone/animation": {
       "version": "10.18.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@motionone/easing": "^10.18.0",
         "@motionone/types": "^10.17.1",
@@ -6737,7 +6630,6 @@
     "node_modules/@motionone/dom": {
       "version": "10.18.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@motionone/animation": "^10.18.0",
         "@motionone/generators": "^10.18.0",
@@ -6750,7 +6642,6 @@
     "node_modules/@motionone/easing": {
       "version": "10.18.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@motionone/utils": "^10.18.0",
         "tslib": "^2.3.1"
@@ -6759,7 +6650,6 @@
     "node_modules/@motionone/generators": {
       "version": "10.18.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@motionone/types": "^10.17.1",
         "@motionone/utils": "^10.18.0",
@@ -6769,7 +6659,6 @@
     "node_modules/@motionone/svelte": {
       "version": "10.16.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@motionone/dom": "^10.16.4",
         "tslib": "^2.3.1"
@@ -6777,13 +6666,11 @@
     },
     "node_modules/@motionone/types": {
       "version": "10.17.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@motionone/utils": {
       "version": "10.18.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@motionone/types": "^10.17.1",
         "hey-listen": "^1.0.8",
@@ -6793,7 +6680,6 @@
     "node_modules/@motionone/vue": {
       "version": "10.16.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@motionone/dom": "^10.16.4",
         "tslib": "^2.3.1"
@@ -6859,6 +6745,7 @@
       "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz",
       "integrity": "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^14.21.3 || >=16"
       },
@@ -6952,6 +6839,7 @@
       "integrity": "sha512-t54CUOsFMappY1Jbzb7fetWeO0n6K0k/4+/ZpkS+3Joz8I4VcvY9OiEBFRYISqaI2fq5sCiPtAjRDOzVYG8m+Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^6.0.0",
         "@octokit/graphql": "^9.0.2",
@@ -7178,28 +7066,23 @@
     },
     "node_modules/@protobufjs/aspromise": {
       "version": "1.1.2",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/base64": {
       "version": "1.1.2",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/codegen": {
       "version": "2.0.4",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/eventemitter": {
       "version": "1.1.0",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/fetch": {
       "version": "1.1.0",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@protobufjs/aspromise": "^1.1.1",
         "@protobufjs/inquire": "^1.1.0"
@@ -7207,28 +7090,23 @@
     },
     "node_modules/@protobufjs/float": {
       "version": "1.0.2",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/inquire": {
       "version": "1.1.0",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/path": {
       "version": "1.1.2",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/pool": {
       "version": "1.1.0",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/utf8": {
       "version": "1.1.0",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@radix-ui/react-compose-refs": {
       "version": "1.1.2",
@@ -8010,7 +7888,6 @@
     "node_modules/@react-native/assets-registry": {
       "version": "0.81.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 20.19.4"
       }
@@ -8018,7 +7895,6 @@
     "node_modules/@react-native/codegen": {
       "version": "0.81.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.25.2",
         "@babel/parser": "^7.25.3",
@@ -8038,7 +7914,6 @@
     "node_modules/@react-native/community-cli-plugin": {
       "version": "0.81.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@react-native/dev-middleware": "0.81.1",
         "debug": "^4.4.0",
@@ -8067,7 +7942,6 @@
     "node_modules/@react-native/community-cli-plugin/node_modules/semver": {
       "version": "7.7.2",
       "license": "ISC",
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -8078,7 +7952,6 @@
     "node_modules/@react-native/debugger-frontend": {
       "version": "0.81.1",
       "license": "BSD-3-Clause",
-      "peer": true,
       "engines": {
         "node": ">= 20.19.4"
       }
@@ -8086,7 +7959,6 @@
     "node_modules/@react-native/dev-middleware": {
       "version": "0.81.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@isaacs/ttlcache": "^1.4.1",
         "@react-native/debugger-frontend": "0.81.1",
@@ -8107,7 +7979,6 @@
     "node_modules/@react-native/dev-middleware/node_modules/ws": {
       "version": "6.2.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "async-limiter": "~1.0.0"
       }
@@ -8115,7 +7986,6 @@
     "node_modules/@react-native/gradle-plugin": {
       "version": "0.81.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 20.19.4"
       }
@@ -8123,20 +7993,17 @@
     "node_modules/@react-native/js-polyfills": {
       "version": "0.81.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 20.19.4"
       }
     },
     "node_modules/@react-native/normalize-colors": {
       "version": "0.81.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@react-native/virtualized-lists": {
       "version": "0.81.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "invariant": "^2.2.4",
         "nullthrows": "^1.1.1"
@@ -9060,6 +8927,7 @@
     "node_modules/@reown/appkit-controllers/node_modules/ws": {
       "version": "8.18.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -9543,6 +9411,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -10020,6 +9889,7 @@
     "node_modules/@reown/appkit-utils/node_modules/ws": {
       "version": "8.18.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -10275,6 +10145,7 @@
     "node_modules/@reown/appkit/node_modules/ws": {
       "version": "8.18.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -10424,7 +10295,6 @@
     "node_modules/@scure/starknet": {
       "version": "1.1.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@noble/curves": "~1.7.0",
         "@noble/hashes": "~1.6.0"
@@ -10436,7 +10306,6 @@
     "node_modules/@scure/starknet/node_modules/@noble/curves": {
       "version": "1.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@noble/hashes": "1.6.0"
       },
@@ -10450,7 +10319,6 @@
     "node_modules/@scure/starknet/node_modules/@noble/curves/node_modules/@noble/hashes": {
       "version": "1.6.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.21.3 || >=16"
       },
@@ -10461,7 +10329,6 @@
     "node_modules/@scure/starknet/node_modules/@noble/hashes": {
       "version": "1.6.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.21.3 || >=16"
       },
@@ -11071,8 +10938,7 @@
     },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@sindresorhus/is": {
       "version": "4.6.0",
@@ -11103,7 +10969,6 @@
     "node_modules/@sinonjs/commons": {
       "version": "3.0.1",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "type-detect": "4.0.8"
       }
@@ -11111,7 +10976,6 @@
     "node_modules/@sinonjs/fake-timers": {
       "version": "10.3.0",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
       }
@@ -11161,6 +11025,7 @@
     "node_modules/@solana-mobile/wallet-adapter-mobile": {
       "version": "2.2.3",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@solana-mobile/mobile-wallet-adapter-protocol-web3js": "^2.2.0",
         "@solana-mobile/wallet-standard-mobile": "^0.4.0",
@@ -11203,7 +11068,6 @@
     "node_modules/@solana/buffer-layout": {
       "version": "4.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "buffer": "~6.0.3"
       },
@@ -11228,7 +11092,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -11237,7 +11100,6 @@
     "node_modules/@solana/codecs-core": {
       "version": "2.3.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@solana/errors": "2.3.0"
       },
@@ -11251,7 +11113,6 @@
     "node_modules/@solana/codecs-numbers": {
       "version": "2.3.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@solana/codecs-core": "2.3.0",
         "@solana/errors": "2.3.0"
@@ -11266,7 +11127,6 @@
     "node_modules/@solana/errors": {
       "version": "2.3.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chalk": "^5.4.1",
         "commander": "^14.0.0"
@@ -11284,7 +11144,6 @@
     "node_modules/@solana/errors/node_modules/chalk": {
       "version": "5.6.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
@@ -11295,6 +11154,7 @@
     "node_modules/@solana/wallet-adapter-base": {
       "version": "0.9.27",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@solana/wallet-standard-features": "^1.3.0",
         "@wallet-standard/base": "^1.1.0",
@@ -11311,6 +11171,7 @@
     "node_modules/@solana/wallet-adapter-react": {
       "version": "0.15.39",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@solana-mobile/wallet-adapter-mobile": "^2.2.0",
         "@solana/wallet-adapter-base": "^0.9.27",
@@ -11327,6 +11188,7 @@
     "node_modules/@solana/wallet-adapter-walletconnect": {
       "version": "0.1.21",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@solana/wallet-adapter-base": "^0.9.27",
         "@walletconnect/solana-adapter": "^0.0.8"
@@ -11467,20 +11329,17 @@
     "node_modules/@solana/web3.js/node_modules/base-x": {
       "version": "3.0.11",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
     },
     "node_modules/@solana/web3.js/node_modules/bn.js": {
       "version": "5.2.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@solana/web3.js/node_modules/bs58": {
       "version": "4.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base-x": "^3.0.2"
       }
@@ -11502,7 +11361,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -11511,7 +11369,6 @@
     "node_modules/@solana/web3.js/node_modules/node-fetch": {
       "version": "2.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -11529,26 +11386,22 @@
     },
     "node_modules/@stablelib/aead": {
       "version": "1.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@stablelib/binary": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/int": "^1.0.1"
       }
     },
     "node_modules/@stablelib/bytes": {
       "version": "1.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@stablelib/chacha": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/binary": "^1.0.1",
         "@stablelib/wipe": "^1.0.1"
@@ -11557,7 +11410,6 @@
     "node_modules/@stablelib/chacha20poly1305": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/aead": "^1.0.1",
         "@stablelib/binary": "^1.0.1",
@@ -11569,13 +11421,11 @@
     },
     "node_modules/@stablelib/constant-time": {
       "version": "1.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@stablelib/ed25519": {
       "version": "1.0.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/random": "^1.0.2",
         "@stablelib/sha512": "^1.0.1",
@@ -11584,13 +11434,11 @@
     },
     "node_modules/@stablelib/hash": {
       "version": "1.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@stablelib/hkdf": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/hash": "^1.0.1",
         "@stablelib/hmac": "^1.0.1",
@@ -11600,7 +11448,6 @@
     "node_modules/@stablelib/hmac": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/constant-time": "^1.0.1",
         "@stablelib/hash": "^1.0.1",
@@ -11609,13 +11456,11 @@
     },
     "node_modules/@stablelib/int": {
       "version": "1.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@stablelib/keyagreement": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/bytes": "^1.0.1"
       }
@@ -11623,7 +11468,6 @@
     "node_modules/@stablelib/poly1305": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/constant-time": "^1.0.1",
         "@stablelib/wipe": "^1.0.1"
@@ -11632,7 +11476,6 @@
     "node_modules/@stablelib/random": {
       "version": "1.0.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/binary": "^1.0.1",
         "@stablelib/wipe": "^1.0.1"
@@ -11641,7 +11484,6 @@
     "node_modules/@stablelib/sha256": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/binary": "^1.0.1",
         "@stablelib/hash": "^1.0.1",
@@ -11651,7 +11493,6 @@
     "node_modules/@stablelib/sha512": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/binary": "^1.0.1",
         "@stablelib/hash": "^1.0.1",
@@ -11660,13 +11501,11 @@
     },
     "node_modules/@stablelib/wipe": {
       "version": "1.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@stablelib/x25519": {
       "version": "1.0.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/keyagreement": "^1.0.1",
         "@stablelib/random": "^1.0.2",
@@ -11844,7 +11683,6 @@
     "node_modules/@terra-money/feather.js": {
       "version": "3.0.0-beta.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7",
         "@terra-money/terra.proto": "5.3.0-beta.0",
@@ -11872,7 +11710,6 @@
     "node_modules/@terra-money/feather.js/node_modules/axios": {
       "version": "0.27.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.14.9",
         "form-data": "^4.0.0"
@@ -11880,24 +11717,20 @@
     },
     "node_modules/@terra-money/feather.js/node_modules/bech32": {
       "version": "2.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@terra-money/feather.js/node_modules/long": {
       "version": "5.3.2",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@terra-money/feather.js/node_modules/node-addon-api": {
       "version": "5.1.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@terra-money/feather.js/node_modules/secp256k1": {
       "version": "4.0.4",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "elliptic": "^6.5.7",
         "node-addon-api": "^5.0.0",
@@ -11910,7 +11743,6 @@
     "node_modules/@terra-money/feather.js/node_modules/ws": {
       "version": "7.5.10",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -11931,7 +11763,6 @@
       "name": "@terra-money/terra.proto",
       "version": "0.1.7",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "google-protobuf": "^3.17.3",
         "long": "^4.0.0",
@@ -11941,7 +11772,6 @@
     "node_modules/@terra-money/terra.proto": {
       "version": "5.3.0-beta.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@improbable-eng/grpc-web": "^0.14.1",
         "browser-headers": "^0.4.1",
@@ -11954,6 +11784,7 @@
       "version": "10.4.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -12102,7 +11933,6 @@
     "node_modules/@types/connect": {
       "version": "3.4.38",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -12122,7 +11952,6 @@
     "node_modules/@types/elliptic": {
       "version": "6.4.18",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/bn.js": "*"
       }
@@ -12134,7 +11963,6 @@
     "node_modules/@types/ethereumjs-util": {
       "version": "5.2.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/bn.js": "*",
         "@types/node": "*"
@@ -12143,7 +11971,6 @@
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -12158,13 +11985,11 @@
     },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -12172,7 +11997,6 @@
     "node_modules/@types/istanbul-reports": {
       "version": "3.0.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
@@ -12198,8 +12022,7 @@
     },
     "node_modules/@types/long": {
       "version": "4.0.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/ms": {
       "version": "2.1.0",
@@ -12230,7 +12053,6 @@
     "node_modules/@types/pbkdf2": {
       "version": "3.1.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -12239,6 +12061,7 @@
       "version": "19.1.11",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -12247,6 +12070,7 @@
       "version": "19.1.7",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "@types/react": "^19.0.0"
       }
@@ -12260,8 +12084,7 @@
     },
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/stylis": {
       "version": "4.2.5",
@@ -12278,8 +12101,7 @@
     },
     "node_modules/@types/uuid": {
       "version": "8.3.4",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/whatwg-mimetype": {
       "version": "3.0.2",
@@ -12296,15 +12118,13 @@
     "node_modules/@types/yargs": {
       "version": "17.0.33",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
       "version": "21.0.3",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.46.1",
@@ -12544,7 +12364,6 @@
     },
     "node_modules/@usecapsule/core-sdk": {
       "version": "1.24.1",
-      "peer": true,
       "dependencies": {
         "@celo/utils": "^6.0.1",
         "@cosmjs/encoding": "^0.32.4",
@@ -12559,13 +12378,11 @@
     },
     "node_modules/@usecapsule/core-sdk/node_modules/@celo/base": {
       "version": "6.1.0",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@usecapsule/core-sdk/node_modules/@celo/utils": {
       "version": "6.0.1",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@celo/base": "^6.0.1",
         "@ethereumjs/util": "8.0.5",
@@ -12584,7 +12401,6 @@
     "node_modules/@usecapsule/core-sdk/node_modules/@cosmjs/encoding": {
       "version": "0.32.4",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.0",
         "bech32": "^1.1.4",
@@ -12594,7 +12410,6 @@
     "node_modules/@usecapsule/core-sdk/node_modules/@ethereumjs/rlp": {
       "version": "4.0.1",
       "license": "MPL-2.0",
-      "peer": true,
       "bin": {
         "rlp": "bin/rlp"
       },
@@ -12605,7 +12420,6 @@
     "node_modules/@usecapsule/core-sdk/node_modules/@ethereumjs/util": {
       "version": "8.0.5",
       "license": "MPL-2.0",
-      "peer": true,
       "dependencies": {
         "@chainsafe/ssz": "0.9.4",
         "@ethereumjs/rlp": "^4.0.1",
@@ -12624,7 +12438,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@noble/hashes": "~1.2.0",
         "@noble/secp256k1": "~1.7.0",
@@ -12639,8 +12452,7 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/core-sdk/node_modules/@scure/bip39": {
       "version": "1.1.1",
@@ -12651,7 +12463,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@noble/hashes": "~1.2.0",
         "@scure/base": "~1.1.0"
@@ -12665,13 +12476,11 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/core-sdk/node_modules/@types/node": {
       "version": "18.19.123",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -12693,7 +12502,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -12702,7 +12510,6 @@
     "node_modules/@usecapsule/core-sdk/node_modules/ethereum-cryptography": {
       "version": "1.2.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@noble/hashes": "1.2.0",
         "@noble/secp256k1": "1.7.1",
@@ -12718,27 +12525,22 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/core-sdk/node_modules/fp-ts": {
       "version": "2.1.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/core-sdk/node_modules/libphonenumber-js": {
       "version": "1.11.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/core-sdk/node_modules/undici-types": {
       "version": "5.26.5",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/cosmjs-v0-integration": {
       "version": "1.24.1",
-      "peer": true,
       "dependencies": {
         "@usecapsule/core-sdk": "1.24.1"
       },
@@ -12750,7 +12552,6 @@
     },
     "node_modules/@usecapsule/user-management-client": {
       "version": "1.21.1",
-      "peer": true,
       "dependencies": {
         "axios": "^1.6.3",
         "qs": "^6.12.0"
@@ -12759,7 +12560,6 @@
     "node_modules/@usecapsule/user-management-client/node_modules/axios": {
       "version": "1.11.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -12768,7 +12568,6 @@
     },
     "node_modules/@usecapsule/web-sdk": {
       "version": "1.23.0",
-      "peer": true,
       "dependencies": {
         "@usecapsule/core-sdk": "1.21.0",
         "@usecapsule/user-management-client": "1.18.0",
@@ -12781,13 +12580,11 @@
     },
     "node_modules/@usecapsule/web-sdk/node_modules/@celo/base": {
       "version": "3.2.0",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@usecapsule/web-sdk/node_modules/@celo/utils": {
       "version": "3.2.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@celo/base": "3.2.0",
         "@types/bn.js": "^5.1.0",
@@ -12805,7 +12602,6 @@
     "node_modules/@usecapsule/web-sdk/node_modules/@celo/utils/node_modules/ethereumjs-util": {
       "version": "5.2.1",
       "license": "MPL-2.0",
-      "peer": true,
       "dependencies": {
         "bn.js": "^4.11.0",
         "create-hash": "^1.1.2",
@@ -12819,7 +12615,6 @@
     "node_modules/@usecapsule/web-sdk/node_modules/@ethersproject/abi": {
       "version": "5.0.7",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ethersproject/address": "^5.0.4",
         "@ethersproject/bignumber": "^5.0.7",
@@ -12834,12 +12629,10 @@
     },
     "node_modules/@usecapsule/web-sdk/node_modules/@types/node": {
       "version": "10.17.60",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/web-sdk/node_modules/@usecapsule/core-sdk": {
       "version": "1.21.0",
-      "peer": true,
       "dependencies": {
         "@celo/utils": "^3.2.0",
         "@usecapsule/user-management-client": "1.18.0",
@@ -12852,7 +12645,6 @@
     },
     "node_modules/@usecapsule/web-sdk/node_modules/@usecapsule/user-management-client": {
       "version": "1.18.0",
-      "peer": true,
       "dependencies": {
         "axios": "^1.6.3",
         "qs": "^6.12.0"
@@ -12861,7 +12653,6 @@
     "node_modules/@usecapsule/web-sdk/node_modules/axios": {
       "version": "1.11.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -12885,7 +12676,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -12894,7 +12684,6 @@
     "node_modules/@usecapsule/web-sdk/node_modules/cbor-web": {
       "version": "8.1.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12.19"
       }
@@ -12902,7 +12691,6 @@
     "node_modules/@usecapsule/web-sdk/node_modules/ethereum-cryptography": {
       "version": "0.1.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/pbkdf2": "^3.0.0",
         "@types/secp256k1": "^4.0.1",
@@ -12923,19 +12711,16 @@
     },
     "node_modules/@usecapsule/web-sdk/node_modules/libphonenumber-js": {
       "version": "1.11.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/web-sdk/node_modules/node-addon-api": {
       "version": "5.1.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@usecapsule/web-sdk/node_modules/secp256k1": {
       "version": "4.0.4",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "elliptic": "^6.5.7",
         "node-addon-api": "^5.0.0",
@@ -12948,7 +12733,6 @@
     "node_modules/@usecapsule/web-sdk/node_modules/web3-eth-abi": {
       "version": "1.3.6",
       "license": "LGPL-3.0",
-      "peer": true,
       "dependencies": {
         "@ethersproject/abi": "5.0.7",
         "underscore": "1.12.1",
@@ -12961,7 +12745,6 @@
     "node_modules/@usecapsule/web-sdk/node_modules/web3-utils": {
       "version": "1.3.6",
       "license": "LGPL-3.0",
-      "peer": true,
       "dependencies": {
         "bn.js": "^4.11.9",
         "eth-lib": "0.2.8",
@@ -13030,8 +12813,7 @@
     },
     "node_modules/@vectis/extension-client": {
       "version": "0.7.2",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@vitejs/plugin-react": {
       "version": "4.7.0",
@@ -13322,6 +13104,7 @@
       "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-2.22.1.tgz",
       "integrity": "sha512-cG/xwQWsBEcKgRTkQVhH29cbpbs/TdcUJVFXCyri3ZknxhMyGv0YEjTcrNpRgt2SaswL1KrvslSNYKKo+5YEAg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "eventemitter3": "5.0.1",
         "mipd": "0.0.7",
@@ -13458,7 +13241,6 @@
     "node_modules/@walletconnect/core": {
       "version": "2.17.2",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@walletconnect/heartbeat": "1.2.2",
         "@walletconnect/jsonrpc-provider": "1.0.14",
@@ -13485,7 +13267,6 @@
     "node_modules/@walletconnect/core/node_modules/@walletconnect/jsonrpc-ws-connection": {
       "version": "1.0.14",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@walletconnect/jsonrpc-utils": "^1.0.6",
         "@walletconnect/safe-json": "^1.0.2",
@@ -13496,7 +13277,6 @@
     "node_modules/@walletconnect/core/node_modules/@walletconnect/relay-auth": {
       "version": "1.0.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/ed25519": "^1.0.2",
         "@stablelib/random": "^1.0.1",
@@ -13508,13 +13288,11 @@
     },
     "node_modules/@walletconnect/core/node_modules/tslib": {
       "version": "1.14.1",
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/@walletconnect/core/node_modules/ws": {
       "version": "7.5.10",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -14458,6 +14236,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -14633,7 +14412,6 @@
     "node_modules/@walletconnect/modal": {
       "version": "2.7.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@walletconnect/modal-core": "2.7.0",
         "@walletconnect/modal-ui": "2.7.0"
@@ -14642,15 +14420,13 @@
     "node_modules/@walletconnect/modal-core": {
       "version": "2.7.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "valtio": "1.11.2"
       }
     },
     "node_modules/@walletconnect/modal-core/node_modules/proxy-compare": {
       "version": "2.5.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@walletconnect/modal-core/node_modules/react": {
       "version": "18.3.1",
@@ -14666,7 +14442,6 @@
     "node_modules/@walletconnect/modal-core/node_modules/use-sync-external-store": {
       "version": "1.2.0",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
@@ -14674,7 +14449,6 @@
     "node_modules/@walletconnect/modal-core/node_modules/valtio": {
       "version": "1.11.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "proxy-compare": "2.5.1",
         "use-sync-external-store": "1.2.0"
@@ -14698,7 +14472,6 @@
     "node_modules/@walletconnect/modal-ui": {
       "version": "2.7.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@walletconnect/modal-core": "2.7.0",
         "lit": "2.8.0",
@@ -14709,7 +14482,6 @@
     "node_modules/@walletconnect/modal-ui/node_modules/cliui": {
       "version": "6.0.0",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -14719,7 +14491,6 @@
     "node_modules/@walletconnect/modal-ui/node_modules/find-up": {
       "version": "4.1.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -14731,7 +14502,6 @@
     "node_modules/@walletconnect/modal-ui/node_modules/locate-path": {
       "version": "5.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -14742,7 +14512,6 @@
     "node_modules/@walletconnect/modal-ui/node_modules/p-limit": {
       "version": "2.3.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -14756,7 +14525,6 @@
     "node_modules/@walletconnect/modal-ui/node_modules/p-locate": {
       "version": "4.1.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -14767,7 +14535,6 @@
     "node_modules/@walletconnect/modal-ui/node_modules/qrcode": {
       "version": "1.5.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "dijkstrajs": "^1.0.1",
         "encode-utf8": "^1.0.3",
@@ -14783,13 +14550,11 @@
     },
     "node_modules/@walletconnect/modal-ui/node_modules/y18n": {
       "version": "4.0.3",
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/@walletconnect/modal-ui/node_modules/yargs": {
       "version": "15.4.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cliui": "^6.0.0",
         "decamelize": "^1.2.0",
@@ -14810,7 +14575,6 @@
     "node_modules/@walletconnect/modal-ui/node_modules/yargs-parser": {
       "version": "18.1.3",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -14874,7 +14638,6 @@
     "node_modules/@walletconnect/sign-client": {
       "version": "2.17.2",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@walletconnect/core": "2.17.2",
         "@walletconnect/events": "1.0.1",
@@ -15070,6 +14833,7 @@
     "node_modules/@walletconnect/solana-adapter/node_modules/ws": {
       "version": "8.18.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -15100,7 +14864,6 @@
     "node_modules/@walletconnect/types": {
       "version": "2.17.2",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@walletconnect/events": "1.0.1",
         "@walletconnect/heartbeat": "1.2.2",
@@ -15338,6 +15101,7 @@
     "node_modules/@walletconnect/universal-provider/node_modules/ws": {
       "version": "8.18.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -15357,7 +15121,6 @@
     "node_modules/@walletconnect/utils": {
       "version": "2.17.2",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@ethersproject/hash": "5.7.0",
         "@ethersproject/transactions": "5.7.0",
@@ -15394,7 +15157,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ethersproject/abstract-signer": "^5.7.0",
         "@ethersproject/address": "^5.7.0",
@@ -15420,7 +15182,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ethersproject/address": "^5.7.0",
         "@ethersproject/bignumber": "^5.7.0",
@@ -15436,7 +15197,6 @@
     "node_modules/@walletconnect/utils/node_modules/@walletconnect/relay-auth": {
       "version": "1.0.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@stablelib/ed25519": "^1.0.2",
         "@stablelib/random": "^1.0.1",
@@ -15449,7 +15209,6 @@
     "node_modules/@walletconnect/utils/node_modules/elliptic": {
       "version": "6.6.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "bn.js": "^4.11.9",
         "brorand": "^1.1.0",
@@ -15462,8 +15221,7 @@
     },
     "node_modules/@walletconnect/utils/node_modules/tslib": {
       "version": "1.14.1",
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/@walletconnect/window-getters": {
       "version": "1.0.1",
@@ -15540,7 +15298,6 @@
     "node_modules/abi-wan-kanabi": {
       "version": "2.2.4",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "ansicolors": "^0.3.2",
         "cardinal": "^2.1.1",
@@ -15573,7 +15330,6 @@
     "node_modules/abort-controller": {
       "version": "3.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "event-target-shim": "^5.0.0"
       },
@@ -15584,7 +15340,6 @@
     "node_modules/accepts": {
       "version": "1.3.8",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -15596,6 +15351,7 @@
     "node_modules/acorn": {
       "version": "8.15.0",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -15624,7 +15380,6 @@
     "node_modules/agentkeepalive": {
       "version": "4.6.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "humanize-ms": "^1.2.1"
       },
@@ -15675,8 +15430,7 @@
     },
     "node_modules/anser": {
       "version": "1.4.10",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
@@ -15722,8 +15476,7 @@
     },
     "node_modules/ansicolors": {
       "version": "0.3.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/any-promise": {
       "version": "1.3.0",
@@ -15937,7 +15690,6 @@
     "node_modules/assert": {
       "version": "2.1.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "is-nan": "^1.3.2",
@@ -15991,8 +15743,7 @@
     },
     "node_modules/async-limiter": {
       "version": "1.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/async-mutex": {
       "version": "0.2.6",
@@ -16085,7 +15836,6 @@
     "node_modules/axios": {
       "version": "0.21.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.14.0"
       }
@@ -16101,7 +15851,6 @@
     "node_modules/babel-jest": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
@@ -16121,7 +15870,6 @@
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -16136,7 +15884,6 @@
     "node_modules/babel-plugin-istanbul/node_modules/brace-expansion": {
       "version": "1.1.12",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -16145,7 +15892,6 @@
     "node_modules/babel-plugin-istanbul/node_modules/minimatch": {
       "version": "3.1.2",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -16156,7 +15902,6 @@
     "node_modules/babel-plugin-istanbul/node_modules/test-exclude": {
       "version": "6.0.0",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -16169,7 +15914,6 @@
     "node_modules/babel-plugin-jest-hoist": {
       "version": "29.6.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -16183,7 +15927,6 @@
     "node_modules/babel-plugin-syntax-hermes-parser": {
       "version": "0.29.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "hermes-parser": "0.29.1"
       }
@@ -16191,7 +15934,6 @@
     "node_modules/babel-preset-current-node-syntax": {
       "version": "1.2.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
@@ -16216,7 +15958,6 @@
     "node_modules/babel-preset-jest": {
       "version": "29.6.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
@@ -16275,7 +16016,6 @@
     "node_modules/big-integer": {
       "version": "1.6.52",
       "license": "Unlicense",
-      "peer": true,
       "engines": {
         "node": ">=0.6"
       }
@@ -16308,7 +16048,6 @@
     "node_modules/bip32": {
       "version": "2.0.6",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "10.12.18",
         "bs58check": "^2.1.1",
@@ -16324,13 +16063,11 @@
     },
     "node_modules/bip32/node_modules/@types/node": {
       "version": "10.12.18",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/bip39": {
       "version": "3.1.0",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "@noble/hashes": "^1.2.0"
       }
@@ -16354,8 +16091,7 @@
     },
     "node_modules/blakejs": {
       "version": "1.2.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/bn.js": {
       "version": "4.12.2",
@@ -16368,7 +16104,6 @@
     "node_modules/borsh": {
       "version": "0.7.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "bn.js": "^5.2.0",
         "bs58": "^4.0.0",
@@ -16378,20 +16113,17 @@
     "node_modules/borsh/node_modules/base-x": {
       "version": "3.0.11",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
     },
     "node_modules/borsh/node_modules/bn.js": {
       "version": "5.2.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/borsh/node_modules/bs58": {
       "version": "4.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base-x": "^3.0.2"
       }
@@ -16432,8 +16164,7 @@
     },
     "node_modules/browser-headers": {
       "version": "0.4.1",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/browserify-aes": {
       "version": "1.2.0",
@@ -16554,6 +16285,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001733",
         "electron-to-chromium": "^1.5.199",
@@ -16570,6 +16302,7 @@
     "node_modules/bs58": {
       "version": "6.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "base-x": "^5.0.0"
       }
@@ -16577,7 +16310,6 @@
     "node_modules/bs58check": {
       "version": "2.1.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "bs58": "^4.0.0",
         "create-hash": "^1.1.0",
@@ -16587,7 +16319,6 @@
     "node_modules/bs58check/node_modules/base-x": {
       "version": "3.0.11",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -16595,7 +16326,6 @@
     "node_modules/bs58check/node_modules/bs58": {
       "version": "4.0.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base-x": "^3.0.2"
       }
@@ -16632,13 +16362,11 @@
     },
     "node_modules/buffer-from": {
       "version": "1.1.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/buffer-to-arraybuffer": {
       "version": "0.0.5",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/buffer-xor": {
       "version": "1.0.3",
@@ -16648,6 +16376,7 @@
       "version": "4.0.9",
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-gyp-build": "^4.3.0"
       },
@@ -16721,7 +16450,6 @@
     "node_modules/caller-callsite": {
       "version": "2.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "callsites": "^2.0.0"
       },
@@ -16732,7 +16460,6 @@
     "node_modules/caller-callsite/node_modules/callsites": {
       "version": "2.0.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -16740,7 +16467,6 @@
     "node_modules/caller-path": {
       "version": "2.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caller-callsite": "^2.0.0"
       },
@@ -16809,7 +16535,6 @@
     "node_modules/cardinal": {
       "version": "2.1.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansicolors": "~0.3.2",
         "redeyed": "~2.1.0"
@@ -17001,7 +16726,6 @@
     "node_modules/chrome-launcher": {
       "version": "0.15.2",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "escape-string-regexp": "^4.0.0",
@@ -17018,7 +16742,6 @@
     "node_modules/chromium-edge-launcher": {
       "version": "0.2.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "escape-string-regexp": "^4.0.0",
@@ -17031,7 +16754,6 @@
     "node_modules/chromium-edge-launcher/node_modules/rimraf": {
       "version": "3.0.2",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -17051,7 +16773,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -17410,7 +17131,6 @@
     "node_modules/connect": {
       "version": "3.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
@@ -17424,15 +17144,13 @@
     "node_modules/connect/node_modules/debug": {
       "version": "2.6.9",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/connect/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/consola": {
       "version": "3.4.2",
@@ -17589,7 +17307,6 @@
     "node_modules/cosmjs-types": {
       "version": "0.8.0",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "long": "^4.0.0",
         "protobufjs": "~6.11.2"
@@ -17598,7 +17315,6 @@
     "node_modules/cosmos-directory-client": {
       "version": "0.0.6",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cosmos-directory-types": "0.0.6",
         "node-fetch-native": "latest"
@@ -17606,8 +17322,7 @@
     },
     "node_modules/cosmos-directory-types": {
       "version": "0.0.6",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/crc-32": {
       "version": "1.2.2",
@@ -17701,6 +17416,7 @@
     "node_modules/crossws": {
       "version": "0.3.5",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "uncrypto": "^0.1.3"
       }
@@ -17951,7 +17667,6 @@
     "node_modules/decompress-response": {
       "version": "3.3.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "mimic-response": "^1.0.0"
       },
@@ -18052,7 +17767,6 @@
     "node_modules/delay": {
       "version": "4.4.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       },
@@ -18077,7 +17791,6 @@
     "node_modules/depd": {
       "version": "2.0.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -18120,7 +17833,6 @@
     "node_modules/destroy": {
       "version": "1.2.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
@@ -18208,8 +17920,7 @@
       "license": "MIT"
     },
     "node_modules/dom-walk": {
-      "version": "0.1.2",
-      "peer": true
+      "version": "0.1.2"
     },
     "node_modules/dot-case": {
       "version": "3.0.4",
@@ -18377,6 +18088,7 @@
       "resolved": "https://registry.npmjs.org/eciesjs/-/eciesjs-0.4.16.tgz",
       "integrity": "sha512-dS5cbA9rA2VR4Ybuvhg6jvdmp46ubLn3E+px8cG/35aEDNclrqoCjg6mt0HYZ/M+OoESS3jSkCrqk1kWAEhWAw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ecies/ciphers": "^0.2.4",
         "@noble/ciphers": "^1.3.0",
@@ -18406,8 +18118,7 @@
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
       "version": "1.5.201",
@@ -18458,7 +18169,6 @@
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -18742,7 +18452,6 @@
     "node_modules/error-stack-parser": {
       "version": "2.1.4",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "stackframe": "^1.3.4"
       }
@@ -18916,13 +18625,11 @@
     },
     "node_modules/es6-promise": {
       "version": "4.2.8",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/es6-promisify": {
       "version": "5.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "es6-promise": "^4.0.3"
       }
@@ -18932,6 +18639,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -18976,8 +18684,7 @@
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
@@ -18992,6 +18699,7 @@
     "node_modules/eslint": {
       "version": "9.34.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -19077,6 +18785,7 @@
       "version": "10.1.8",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -19548,7 +19257,6 @@
     "node_modules/esprima": {
       "version": "4.0.1",
       "license": "BSD-2-Clause",
-      "peer": true,
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -19602,7 +19310,6 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -19691,7 +19398,6 @@
     "node_modules/eth-lib": {
       "version": "0.2.8",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "bn.js": "^4.11.6",
         "elliptic": "^6.4.0",
@@ -19755,7 +19461,6 @@
     "node_modules/ethereumjs-util": {
       "version": "7.1.5",
       "license": "MPL-2.0",
-      "peer": true,
       "dependencies": {
         "@types/bn.js": "^5.1.0",
         "bn.js": "^5.1.2",
@@ -19769,13 +19474,11 @@
     },
     "node_modules/ethereumjs-util/node_modules/bn.js": {
       "version": "5.2.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/ethereumjs-util/node_modules/ethereum-cryptography": {
       "version": "0.1.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/pbkdf2": "^3.0.0",
         "@types/secp256k1": "^4.0.1",
@@ -19796,14 +19499,12 @@
     },
     "node_modules/ethereumjs-util/node_modules/node-addon-api": {
       "version": "5.1.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/ethereumjs-util/node_modules/secp256k1": {
       "version": "4.0.4",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "elliptic": "^6.5.7",
         "node-addon-api": "^5.0.0",
@@ -19832,7 +19533,6 @@
     "node_modules/ethjs-util": {
       "version": "0.1.6",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-hex-prefixed": "1.0.0",
         "strip-hex-prefix": "1.0.0"
@@ -19845,7 +19545,6 @@
     "node_modules/event-target-shim": {
       "version": "5.0.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -19854,7 +19553,8 @@
       "version": "6.4.9",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.9.tgz",
       "integrity": "sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/eventemitter3": {
       "version": "5.0.1",
@@ -19997,8 +19697,7 @@
     },
     "node_modules/exponential-backoff": {
       "version": "3.1.2",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/extension-port-stream": {
       "version": "3.0.0",
@@ -20015,7 +19714,6 @@
     },
     "node_modules/eyes": {
       "version": "0.1.8",
-      "peer": true,
       "engines": {
         "node": "> 0.1.90"
       }
@@ -20086,8 +19784,7 @@
     },
     "node_modules/fast-stable-stringify": {
       "version": "1.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/fast-uri": {
       "version": "3.0.6",
@@ -20193,7 +19890,6 @@
     "node_modules/fetch-cookie": {
       "version": "3.0.1",
       "license": "Unlicense",
-      "peer": true,
       "dependencies": {
         "set-cookie-parser": "^2.4.8",
         "tough-cookie": "^4.0.0"
@@ -20260,7 +19956,6 @@
     "node_modules/finalhandler": {
       "version": "1.1.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -20277,15 +19972,13 @@
     "node_modules/finalhandler/node_modules/debug": {
       "version": "2.6.9",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/find-up": {
       "version": "5.0.0",
@@ -20365,8 +20058,7 @@
     },
     "node_modules/flow-enums-runtime": {
       "version": "0.0.6",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/follow-redirects": {
       "version": "1.15.11",
@@ -20451,7 +20143,8 @@
     },
     "node_modules/fp-ts": {
       "version": "2.16.9",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/fraction.js": {
       "version": "4.3.7",
@@ -20468,6 +20161,7 @@
     "node_modules/framer-motion": {
       "version": "12.23.12",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "motion-dom": "^12.23.12",
         "motion-utils": "^12.23.6",
@@ -20493,7 +20187,6 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -20552,7 +20245,6 @@
     "node_modules/fs-extra": {
       "version": "10.1.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -20564,8 +20256,7 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
@@ -20669,7 +20360,6 @@
     "node_modules/get-package-type": {
       "version": "0.1.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.0.0"
       }
@@ -20752,7 +20442,6 @@
     "node_modules/glob": {
       "version": "7.2.3",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -20781,7 +20470,6 @@
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "1.1.12",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -20790,7 +20478,6 @@
     "node_modules/glob/node_modules/minimatch": {
       "version": "3.1.2",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -20801,7 +20488,6 @@
     "node_modules/global": {
       "version": "4.4.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "min-document": "^2.19.0",
         "process": "^0.11.10"
@@ -20890,6 +20576,7 @@
     "node_modules/graphql": {
       "version": "16.11.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
       }
@@ -21172,21 +20859,18 @@
     },
     "node_modules/hermes-estree": {
       "version": "0.29.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/hermes-parser": {
       "version": "0.29.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "hermes-estree": "0.29.1"
       }
     },
     "node_modules/hey-listen": {
       "version": "1.0.8",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/highlight.js": {
       "version": "9.18.5",
@@ -21241,7 +20925,6 @@
     "node_modules/http-errors": {
       "version": "2.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -21256,7 +20939,6 @@
     "node_modules/http-errors/node_modules/statuses": {
       "version": "2.0.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -21297,7 +20979,6 @@
     "node_modules/humanize-ms": {
       "version": "1.2.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ms": "^2.0.0"
       }
@@ -21329,7 +21010,8 @@
     },
     "node_modules/idb-keyval": {
       "version": "6.2.2",
-      "license": "Apache-2.0"
+      "license": "Apache-2.0",
+      "peer": true
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
@@ -21359,7 +21041,6 @@
     "node_modules/image-size": {
       "version": "1.2.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "queue": "6.0.2"
       },
@@ -21464,7 +21145,6 @@
     "node_modules/inflight": {
       "version": "1.0.6",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -21763,7 +21443,6 @@
     "node_modules/is-directory": {
       "version": "0.3.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -21771,7 +21450,6 @@
     "node_modules/is-docker": {
       "version": "2.2.1",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "is-docker": "cli.js"
       },
@@ -21811,8 +21489,7 @@
     },
     "node_modules/is-function": {
       "version": "1.0.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/is-generator-function": {
       "version": "1.1.0",
@@ -21877,7 +21554,6 @@
     "node_modules/is-nan": {
       "version": "1.3.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "define-properties": "^1.1.3"
@@ -22140,7 +21816,6 @@
     "node_modules/is-wsl": {
       "version": "2.2.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -22159,7 +21834,6 @@
     "node_modules/isomorphic-fetch": {
       "version": "3.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "node-fetch": "^2.6.1",
         "whatwg-fetch": "^3.4.1"
@@ -22168,7 +21842,6 @@
     "node_modules/isomorphic-fetch/node_modules/node-fetch": {
       "version": "2.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -22232,7 +21905,6 @@
     "node_modules/istanbul-lib-instrument": {
       "version": "5.2.1",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -22325,7 +21997,6 @@
     "node_modules/jayson": {
       "version": "4.2.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/connect": "^3.4.33",
         "@types/node": "^12.12.54",
@@ -22349,26 +22020,22 @@
     },
     "node_modules/jayson/node_modules/@types/node": {
       "version": "12.20.55",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jayson/node_modules/@types/ws": {
       "version": "7.4.7",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/jayson/node_modules/commander": {
       "version": "2.20.3",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jayson/node_modules/delay": {
       "version": "5.0.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -22379,7 +22046,6 @@
     "node_modules/jayson/node_modules/isomorphic-ws": {
       "version": "4.0.1",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "ws": "*"
       }
@@ -22387,7 +22053,6 @@
     "node_modules/jayson/node_modules/uuid": {
       "version": "8.3.2",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -22415,7 +22080,6 @@
     "node_modules/jest-environment-node": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -22431,7 +22095,6 @@
     "node_modules/jest-get-type": {
       "version": "29.6.3",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -22439,7 +22102,6 @@
     "node_modules/jest-haste-map": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
@@ -22463,7 +22125,6 @@
     "node_modules/jest-message-util": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^29.6.3",
@@ -22482,7 +22143,6 @@
     "node_modules/jest-message-util/node_modules/ansi-styles": {
       "version": "5.2.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -22493,7 +22153,6 @@
     "node_modules/jest-message-util/node_modules/pretty-format": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -22505,13 +22164,11 @@
     },
     "node_modules/jest-message-util/node_modules/react-is": {
       "version": "18.3.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-mock": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -22524,7 +22181,6 @@
     "node_modules/jest-regex-util": {
       "version": "29.6.3",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -22532,7 +22188,6 @@
     "node_modules/jest-util": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -22548,7 +22203,6 @@
     "node_modules/jest-validate": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
@@ -22564,7 +22218,6 @@
     "node_modules/jest-validate/node_modules/ansi-styles": {
       "version": "5.2.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -22575,7 +22228,6 @@
     "node_modules/jest-validate/node_modules/camelcase": {
       "version": "6.3.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -22586,7 +22238,6 @@
     "node_modules/jest-validate/node_modules/pretty-format": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -22598,13 +22249,11 @@
     },
     "node_modules/jest-validate/node_modules/react-is": {
       "version": "18.3.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-worker": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "jest-util": "^29.7.0",
@@ -22618,7 +22267,6 @@
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -22689,13 +22337,11 @@
     },
     "node_modules/jsc-safe-url": {
       "version": "0.2.4",
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/jscrypto": {
       "version": "1.0.3",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jscrypto": "bin/cli.js"
       }
@@ -22749,7 +22395,6 @@
     "node_modules/json-rpc-middleware-stream": {
       "version": "4.2.3",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "@metamask/safe-event-emitter": "^3.0.0",
         "json-rpc-engine": "^6.1.0",
@@ -22761,13 +22406,11 @@
     },
     "node_modules/json-rpc-middleware-stream/node_modules/isarray": {
       "version": "1.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/json-rpc-middleware-stream/node_modules/readable-stream": {
       "version": "2.3.8",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -22780,13 +22423,11 @@
     },
     "node_modules/json-rpc-middleware-stream/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/json-rpc-middleware-stream/node_modules/string_decoder": {
       "version": "1.1.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -22807,8 +22448,7 @@
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/json-to-pretty-yaml": {
       "version": "1.2.2",
@@ -22872,7 +22512,6 @@
     "node_modules/keccak256": {
       "version": "1.0.6",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "bn.js": "^5.2.0",
         "buffer": "^6.0.3",
@@ -22881,8 +22520,7 @@
     },
     "node_modules/keccak256/node_modules/bn.js": {
       "version": "5.2.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/keccak256/node_modules/buffer": {
       "version": "6.0.3",
@@ -22901,7 +22539,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -22937,7 +22574,6 @@
     "node_modules/leven": {
       "version": "3.1.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -22959,18 +22595,15 @@
     },
     "node_modules/libsodium": {
       "version": "0.7.15",
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/libsodium-sumo": {
       "version": "0.7.15",
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/libsodium-wrappers": {
       "version": "0.7.15",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "libsodium": "^0.7.15"
       }
@@ -22978,7 +22611,6 @@
     "node_modules/libsodium-wrappers-sumo": {
       "version": "0.7.15",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "libsodium-sumo": "^0.7.15"
       }
@@ -22986,7 +22618,6 @@
     "node_modules/lighthouse-logger": {
       "version": "1.4.2",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "debug": "^2.6.9",
         "marky": "^1.2.2"
@@ -22995,20 +22626,19 @@
     "node_modules/lighthouse-logger/node_modules/debug": {
       "version": "2.6.9",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/lighthouse-logger/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lightningcss": {
       "version": "1.30.1",
       "dev": true,
       "license": "MPL-2.0",
+      "peer": true,
       "dependencies": {
         "detect-libc": "^2.0.3"
       },
@@ -23421,7 +23051,6 @@
     "node_modules/lit": {
       "version": "2.8.0",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@lit/reactive-element": "^1.6.0",
         "lit-element": "^3.3.0",
@@ -23447,7 +23076,6 @@
     "node_modules/lit/node_modules/@lit/reactive-element": {
       "version": "1.6.3",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@lit-labs/ssr-dom-shim": "^1.0.0"
       }
@@ -23455,7 +23083,6 @@
     "node_modules/lit/node_modules/lit-element": {
       "version": "3.3.3",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@lit-labs/ssr-dom-shim": "^1.1.0",
         "@lit/reactive-element": "^1.3.0",
@@ -23465,7 +23092,6 @@
     "node_modules/lit/node_modules/lit-html": {
       "version": "2.8.0",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@types/trusted-types": "^2.0.2"
       }
@@ -23579,8 +23205,7 @@
     },
     "node_modules/lodash.throttle": {
       "version": "4.1.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lodash.uniqby": {
       "version": "4.7.0",
@@ -23639,8 +23264,7 @@
     },
     "node_modules/long": {
       "version": "4.0.0",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
@@ -23654,8 +23278,7 @@
     },
     "node_modules/lossless-json": {
       "version": "4.1.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/loupe": {
       "version": "3.2.0",
@@ -23751,7 +23374,6 @@
     "node_modules/makeerror": {
       "version": "1.0.12",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "tmpl": "1.0.5"
       }
@@ -23793,8 +23415,7 @@
     },
     "node_modules/marky": {
       "version": "1.3.0",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
@@ -23826,8 +23447,7 @@
     },
     "node_modules/memoize-one": {
       "version": "5.2.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/memorystream": {
       "version": "0.3.1",
@@ -23890,7 +23510,6 @@
     "node_modules/metro": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.24.7",
         "@babel/core": "^7.25.2",
@@ -23943,7 +23562,6 @@
     "node_modules/metro-babel-transformer": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.25.2",
         "flow-enums-runtime": "^0.0.6",
@@ -23957,7 +23575,6 @@
     "node_modules/metro-cache": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "exponential-backoff": "^3.1.1",
         "flow-enums-runtime": "^0.0.6",
@@ -23971,7 +23588,6 @@
     "node_modules/metro-cache-key": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "flow-enums-runtime": "^0.0.6"
       },
@@ -23982,7 +23598,6 @@
     "node_modules/metro-config": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "connect": "^3.6.5",
         "cosmiconfig": "^5.0.5",
@@ -24000,7 +23615,6 @@
     "node_modules/metro-config/node_modules/argparse": {
       "version": "1.0.10",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -24008,7 +23622,6 @@
     "node_modules/metro-config/node_modules/cosmiconfig": {
       "version": "5.2.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "import-fresh": "^2.0.0",
         "is-directory": "^0.3.1",
@@ -24022,7 +23635,6 @@
     "node_modules/metro-config/node_modules/import-fresh": {
       "version": "2.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caller-path": "^2.0.0",
         "resolve-from": "^3.0.0"
@@ -24034,7 +23646,6 @@
     "node_modules/metro-config/node_modules/js-yaml": {
       "version": "3.14.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -24046,7 +23657,6 @@
     "node_modules/metro-config/node_modules/parse-json": {
       "version": "4.0.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "error-ex": "^1.3.1",
         "json-parse-better-errors": "^1.0.1"
@@ -24058,7 +23668,6 @@
     "node_modules/metro-config/node_modules/resolve-from": {
       "version": "3.0.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -24066,7 +23675,6 @@
     "node_modules/metro-core": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "flow-enums-runtime": "^0.0.6",
         "lodash.throttle": "^4.1.1",
@@ -24079,7 +23687,6 @@
     "node_modules/metro-file-map": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "fb-watchman": "^2.0.0",
@@ -24098,7 +23705,6 @@
     "node_modules/metro-minify-terser": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "flow-enums-runtime": "^0.0.6",
         "terser": "^5.15.0"
@@ -24110,7 +23716,6 @@
     "node_modules/metro-resolver": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "flow-enums-runtime": "^0.0.6"
       },
@@ -24121,7 +23726,6 @@
     "node_modules/metro-runtime": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.25.0",
         "flow-enums-runtime": "^0.0.6"
@@ -24133,7 +23737,6 @@
     "node_modules/metro-source-map": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/traverse": "^7.25.3",
         "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3",
@@ -24153,7 +23756,6 @@
     "node_modules/metro-symbolicate": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "flow-enums-runtime": "^0.0.6",
         "invariant": "^2.2.4",
@@ -24172,7 +23774,6 @@
     "node_modules/metro-transform-plugins": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.25.2",
         "@babel/generator": "^7.25.0",
@@ -24188,7 +23789,6 @@
     "node_modules/metro-transform-worker": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.25.2",
         "@babel/generator": "^7.25.0",
@@ -24210,13 +23810,11 @@
     },
     "node_modules/metro/node_modules/ci-info": {
       "version": "2.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/metro/node_modules/ws": {
       "version": "7.5.10",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -24262,7 +23860,6 @@
     "node_modules/mime": {
       "version": "1.6.0",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "mime": "cli.js"
       },
@@ -24309,14 +23906,12 @@
     "node_modules/mimic-response": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/min-document": {
       "version": "2.19.0",
-      "peer": true,
       "dependencies": {
         "dom-walk": "^0.1.0"
       }
@@ -24399,7 +23994,6 @@
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -24425,7 +24019,6 @@
     "node_modules/motion": {
       "version": "10.16.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@motionone/animation": "^10.15.1",
         "@motionone/dom": "^10.16.2",
@@ -24529,7 +24122,6 @@
     "node_modules/negotiator": {
       "version": "0.6.3",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -27457,6 +27049,7 @@
       "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -27731,7 +27324,6 @@
     "node_modules/ob1": {
       "version": "0.83.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "flow-enums-runtime": "^0.0.6"
       },
@@ -27806,7 +27398,6 @@
     "node_modules/object-is": {
       "version": "1.1.6",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1"
@@ -27917,7 +27508,6 @@
     "node_modules/on-finished": {
       "version": "2.3.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -27949,7 +27539,6 @@
     "node_modules/open": {
       "version": "7.4.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -28281,8 +27870,7 @@
     },
     "node_modules/pako": {
       "version": "2.1.0",
-      "license": "(MIT AND Zlib)",
-      "peer": true
+      "license": "(MIT AND Zlib)"
     },
     "node_modules/param-case": {
       "version": "3.0.4",
@@ -28333,8 +27921,7 @@
     },
     "node_modules/parse-headers": {
       "version": "2.0.6",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/parse-imports-exports": {
       "version": "0.2.4",
@@ -28406,7 +27993,6 @@
     "node_modules/parseurl": {
       "version": "1.3.3",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -28443,7 +28029,6 @@
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -28975,6 +28560,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz",
       "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -29033,6 +28619,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -29106,6 +28693,7 @@
       "version": "3.6.2",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -29185,7 +28773,6 @@
     "node_modules/promise": {
       "version": "8.3.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "asap": "~2.0.6"
       }
@@ -29216,7 +28803,6 @@
       "version": "6.11.4",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@protobufjs/aspromise": "^1.1.2",
         "@protobufjs/base64": "^1.1.2",
@@ -29248,7 +28834,6 @@
     "node_modules/psl": {
       "version": "1.15.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "punycode": "^2.3.1"
       },
@@ -29259,7 +28844,6 @@
     "node_modules/psl/node_modules/punycode": {
       "version": "2.3.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -29452,13 +29036,11 @@
     },
     "node_modules/querystringify": {
       "version": "2.2.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/queue": {
       "version": "6.0.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "inherits": "~2.0.3"
       }
@@ -29507,7 +29089,6 @@
     "node_modules/range-parser": {
       "version": "1.2.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -29541,6 +29122,7 @@
     "node_modules/react": {
       "version": "19.1.1",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -29548,7 +29130,6 @@
     "node_modules/react-devtools-core": {
       "version": "6.1.5",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "shell-quote": "^1.6.1",
         "ws": "^7"
@@ -29557,7 +29138,6 @@
     "node_modules/react-devtools-core/node_modules/ws": {
       "version": "7.5.10",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -29577,6 +29157,7 @@
     "node_modules/react-dom": {
       "version": "19.1.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.26.0"
       },
@@ -29648,7 +29229,6 @@
     "node_modules/react-native/node_modules/ansi-styles": {
       "version": "5.2.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -29659,7 +29239,6 @@
     "node_modules/react-native/node_modules/commander": {
       "version": "12.1.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -29667,7 +29246,6 @@
     "node_modules/react-native/node_modules/pretty-format": {
       "version": "29.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -29679,13 +29257,11 @@
     },
     "node_modules/react-native/node_modules/react-is": {
       "version": "18.3.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/react-native/node_modules/react-refresh": {
       "version": "0.14.2",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -29693,7 +29269,6 @@
     "node_modules/react-native/node_modules/semver": {
       "version": "7.7.2",
       "license": "ISC",
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -29704,7 +29279,6 @@
     "node_modules/react-native/node_modules/ws": {
       "version": "6.2.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "async-limiter": "~1.0.0"
       }
@@ -29952,6 +29526,7 @@
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -29998,7 +29573,6 @@
     "node_modules/redeyed": {
       "version": "2.1.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esprima": "~4.0.0"
       }
@@ -30042,8 +29616,7 @@
     },
     "node_modules/regenerator-runtime": {
       "version": "0.13.11",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.4",
@@ -30124,8 +29697,7 @@
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/resolve": {
       "version": "1.22.10",
@@ -30250,7 +29822,6 @@
     "node_modules/rlp": {
       "version": "2.2.7",
       "license": "MPL-2.0",
-      "peer": true,
       "dependencies": {
         "bn.js": "^5.2.0"
       },
@@ -30260,8 +29831,7 @@
     },
     "node_modules/rlp/node_modules/bn.js": {
       "version": "5.2.2",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/rollup": {
       "version": "4.46.2",
@@ -30328,7 +29898,6 @@
     "node_modules/rpc-websockets": {
       "version": "9.1.3",
       "license": "LGPL-3.0-only",
-      "peer": true,
       "dependencies": {
         "@swc/helpers": "^0.5.11",
         "@types/uuid": "^8.3.4",
@@ -30364,7 +29933,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -30373,7 +29941,6 @@
     "node_modules/rpc-websockets/node_modules/uuid": {
       "version": "8.3.2",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -30504,8 +30071,7 @@
     },
     "node_modules/scrypt-js": {
       "version": "3.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/scuid": {
       "version": "1.1.0",
@@ -30552,6 +30118,7 @@
       "integrity": "sha512-phCkJ6pjDi9ANdhuF5ElS10GGdAKY6R1Pvt9lT3SFhOwM4T7QZE7MLpBDbNruUx/Q3gFD92/UOFringGipRqZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@semantic-release/commit-analyzer": "^13.0.0-beta.1",
         "@semantic-release/error": "^4.0.0",
@@ -30786,6 +30353,7 @@
       "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -30881,7 +30449,6 @@
     "node_modules/send": {
       "version": "0.19.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -30904,20 +30471,17 @@
     "node_modules/send/node_modules/debug": {
       "version": "2.6.9",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/send/node_modules/on-finished": {
       "version": "2.4.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -30928,7 +30492,6 @@
     "node_modules/send/node_modules/statuses": {
       "version": "2.0.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -30946,7 +30509,6 @@
     "node_modules/serialize-error": {
       "version": "2.1.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -30954,7 +30516,6 @@
     "node_modules/serve-static": {
       "version": "1.16.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
@@ -30968,15 +30529,13 @@
     "node_modules/serve-static/node_modules/encodeurl": {
       "version": "2.0.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/ses": {
       "version": "0.18.4",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/set-blocking": {
       "version": "2.0.0",
@@ -30984,8 +30543,7 @@
     },
     "node_modules/set-cookie-parser": {
       "version": "2.7.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
@@ -31033,8 +30591,7 @@
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/sha.js": {
       "version": "2.4.12",
@@ -31337,13 +30894,11 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/simple-get": {
       "version": "2.8.2",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "decompress-response": "^3.3.0",
         "once": "^1.3.1",
@@ -31421,6 +30976,7 @@
       "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
       "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
@@ -31488,7 +31044,6 @@
     "node_modules/source-map": {
       "version": "0.5.7",
       "license": "BSD-3-Clause",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -31503,7 +31058,6 @@
     "node_modules/source-map-support": {
       "version": "0.5.21",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -31512,7 +31066,6 @@
     "node_modules/source-map-support/node_modules/source-map": {
       "version": "0.6.1",
       "license": "BSD-3-Clause",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -31585,8 +31138,7 @@
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/stable-hash": {
       "version": "0.0.5",
@@ -31596,7 +31148,6 @@
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -31607,7 +31158,6 @@
     "node_modules/stack-utils/node_modules/escape-string-regexp": {
       "version": "2.0.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -31619,13 +31169,11 @@
     },
     "node_modules/stackframe": {
       "version": "1.3.4",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/stacktrace-parser": {
       "version": "0.1.11",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "type-fest": "^0.7.1"
       },
@@ -31636,7 +31184,6 @@
     "node_modules/stacktrace-parser/node_modules/type-fest": {
       "version": "0.7.1",
       "license": "(MIT OR CC0-1.0)",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -31666,13 +31213,11 @@
     "node_modules/starknet-types-07": {
       "name": "@starknet-io/types-js",
       "version": "0.7.10",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/starknet/node_modules/@noble/curves": {
       "version": "1.7.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@noble/hashes": "1.6.0"
       },
@@ -31686,7 +31231,6 @@
     "node_modules/starknet/node_modules/@noble/hashes": {
       "version": "1.6.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.21.3 || >=16"
       },
@@ -31697,7 +31241,6 @@
     "node_modules/starknet/node_modules/@scure/base": {
       "version": "1.2.1",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
@@ -31705,7 +31248,6 @@
     "node_modules/statuses": {
       "version": "1.5.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -31736,8 +31278,7 @@
     },
     "node_modules/stream-chain": {
       "version": "2.2.5",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/stream-combiner2": {
       "version": "1.1.1",
@@ -31793,7 +31334,6 @@
     "node_modules/stream-json": {
       "version": "1.9.1",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "stream-chain": "^2.2.5"
       }
@@ -32252,7 +31792,6 @@
     "node_modules/superstruct": {
       "version": "2.0.2",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=14.0.0"
       }
@@ -32305,7 +31844,6 @@
     "node_modules/symbol-observable": {
       "version": "2.0.3",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10"
       }
@@ -32348,6 +31886,7 @@
     "node_modules/tailwind-merge": {
       "version": "3.3.1",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
@@ -32502,8 +32041,7 @@
     },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/test-exclude": {
       "version": "7.0.1",
@@ -32572,8 +32110,7 @@
       }
     },
     "node_modules/text-encoding-utf-8": {
-      "version": "1.0.2",
-      "peer": true
+      "version": "1.0.2"
     },
     "node_modules/thenify": {
       "version": "3.3.1",
@@ -32603,8 +32140,7 @@
     },
     "node_modules/throat": {
       "version": "5.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/through": {
       "version": "2.3.8",
@@ -32681,7 +32217,6 @@
     "node_modules/timed-out": {
       "version": "4.0.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -32698,7 +32233,6 @@
       "version": "1.1.7",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "bindings": "^1.3.0",
         "bn.js": "^4.11.8",
@@ -32755,6 +32289,7 @@
       "version": "4.0.3",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -32797,15 +32332,13 @@
     "node_modules/tmp": {
       "version": "0.2.5",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=14.14"
       }
     },
     "node_modules/tmpl": {
       "version": "1.0.5",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/to-buffer": {
       "version": "1.2.1",
@@ -32832,7 +32365,6 @@
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.6"
       }
@@ -32848,7 +32380,6 @@
     "node_modules/tough-cookie": {
       "version": "4.1.4",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -32862,7 +32393,6 @@
     "node_modules/tough-cookie/node_modules/punycode": {
       "version": "2.3.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -32870,7 +32400,6 @@
     "node_modules/tough-cookie/node_modules/universalify": {
       "version": "0.2.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -32922,8 +32451,7 @@
     },
     "node_modules/ts-mixer": {
       "version": "6.0.4",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/tsconfck": {
       "version": "3.1.6",
@@ -33128,7 +32656,6 @@
     "node_modules/type-detect": {
       "version": "4.0.8",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -33221,6 +32748,7 @@
       "version": "0.28.10",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@gerrit0/mini-shiki": "^3.9.0",
         "lunr": "^2.3.9",
@@ -33253,12 +32781,12 @@
     },
     "node_modules/typeforce": {
       "version": "1.18.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/typescript": {
       "version": "5.9.2",
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -33416,8 +32944,7 @@
     },
     "node_modules/underscore": {
       "version": "1.12.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/undici-types": {
       "version": "7.12.0",
@@ -33501,7 +33028,6 @@
     "node_modules/unpipe": {
       "version": "1.0.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -33720,7 +33246,6 @@
     "node_modules/url-parse": {
       "version": "1.5.10",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -33728,8 +33253,7 @@
     },
     "node_modules/url-set-query": {
       "version": "1.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/urlpattern-polyfill": {
       "version": "10.1.0",
@@ -33825,6 +33349,7 @@
       "version": "5.0.10",
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-gyp-build": "^4.3.0"
       },
@@ -33854,7 +33379,6 @@
     "node_modules/utility-types": {
       "version": "3.11.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 4"
       }
@@ -33862,7 +33386,6 @@
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -33899,6 +33422,7 @@
     "node_modules/valtio": {
       "version": "1.13.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "derive-valtio": "0.1.0",
         "proxy-compare": "2.6.0",
@@ -33950,6 +33474,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@noble/curves": "1.9.1",
         "@noble/hashes": "1.8.0",
@@ -34069,6 +33594,7 @@
       "version": "7.1.2",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.4.6",
@@ -34197,6 +33723,7 @@
       "version": "4.0.3",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -34288,14 +33815,14 @@
     },
     "node_modules/vlq": {
       "version": "1.0.1",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/wagmi": {
       "version": "2.18.2",
       "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-2.18.2.tgz",
       "integrity": "sha512-9jFip+0ZfjMBxT72m02MZD2+VmQQ/UmqZhHl+98N9HEqXLn765fIu45QPV85DAnQqIHD81gvY3vTvfWt16A5yQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@wagmi/connectors": "6.1.0",
         "@wagmi/core": "2.22.1",
@@ -34326,7 +33853,6 @@
     "node_modules/walker": {
       "version": "1.0.8",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "makeerror": "1.0.12"
       }
@@ -34410,8 +33936,7 @@
     },
     "node_modules/whatwg-fetch": {
       "version": "3.6.20",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/whatwg-mimetype": {
       "version": "3.0.0",
@@ -34541,7 +34066,6 @@
     "node_modules/wif": {
       "version": "2.0.6",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "bs58check": "<3.0.0"
       }
@@ -34596,7 +34120,6 @@
     "node_modules/write-file-atomic": {
       "version": "4.0.2",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
@@ -34608,6 +34131,7 @@
     "node_modules/ws": {
       "version": "8.18.3",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -34627,7 +34151,6 @@
     "node_modules/xhr": {
       "version": "2.6.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "global": "~4.4.0",
         "is-function": "^1.0.1",
@@ -34638,7 +34161,6 @@
     "node_modules/xhr-request": {
       "version": "1.1.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "buffer-to-arraybuffer": "^0.0.5",
         "object-assign": "^4.1.1",
@@ -34652,7 +34174,6 @@
     "node_modules/xhr-request-promise": {
       "version": "0.1.3",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "xhr-request": "^1.1.0"
       }
@@ -34660,7 +34181,6 @@
     "node_modules/xhr-request/node_modules/query-string": {
       "version": "5.1.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "decode-uri-component": "^0.2.0",
         "object-assign": "^4.1.0",
@@ -34673,7 +34193,6 @@
     "node_modules/xhr-request/node_modules/strict-uri-encode": {
       "version": "1.1.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -34689,7 +34208,6 @@
     "node_modules/xstream": {
       "version": "11.14.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "globalthis": "^1.0.1",
         "symbol-observable": "^2.0.3"
@@ -34778,6 +34296,7 @@
     "node_modules/zod": {
       "version": "3.22.4",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -34785,6 +34304,7 @@
     "node_modules/zustand": {
       "version": "4.5.7",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "use-sync-external-store": "^1.2.2"
       },
@@ -34901,6 +34421,7 @@
         "ajv-formats": "^3.0.1",
         "eccrypto-js": "^5.4.0",
         "graphql": "^16.11.0",
+        "multiformats": "^9.9.0",
         "openpgp": "^6.1.1",
         "uuid": "^13.0.0",
         "viem": "^2.35.1"
diff --git a/packages/vana-sdk/package.json b/packages/vana-sdk/package.json
index 5dc8508b..7f004391 100644
--- a/packages/vana-sdk/package.json
+++ b/packages/vana-sdk/package.json
@@ -122,6 +122,7 @@
     "ajv-formats": "^3.0.1",
     "eccrypto-js": "^5.4.0",
     "graphql": "^16.11.0",
+    "multiformats": "^9.9.0",
     "openpgp": "^6.1.1",
     "uuid": "^13.0.0",
     "viem": "^2.35.1"
diff --git a/packages/vana-sdk/src/client/__tests__/enhancedResponse.test.ts b/packages/vana-sdk/src/client/__tests__/enhancedResponse.test.ts
index 3f92f4db..947ec0a3 100644
--- a/packages/vana-sdk/src/client/__tests__/enhancedResponse.test.ts
+++ b/packages/vana-sdk/src/client/__tests__/enhancedResponse.test.ts
@@ -37,7 +37,7 @@ describe("EnhancedTransactionResponse", () => {
           },
         },
       }),
-      relayerCallback: vi.fn(),
+      relayer: vi.fn(),
     } as any;
 
     // Reset mocks
@@ -203,7 +203,7 @@ describe("EnhancedTransactionResponse", () => {
         onStatusUpdate: vi.fn(),
       });
 
-      expect(PollingManager).toHaveBeenCalledWith(mockSdk.relayerCallback);
+      expect(PollingManager).toHaveBeenCalledWith(mockSdk.relayer);
       expect(mockStartPolling).toHaveBeenCalledWith(
         mockOperationId,
         expect.objectContaining({
@@ -223,7 +223,7 @@ describe("EnhancedTransactionResponse", () => {
       // SDK without relayer callback
       const sdkNoRelayer = {
         ...mockSdk,
-        relayerCallback: undefined,
+        relayer: undefined,
       } as any;
 
       const enhanced = new EnhancedTransactionResponse(response, sdkNoRelayer);
diff --git a/packages/vana-sdk/src/client/enhancedResponse.ts b/packages/vana-sdk/src/client/enhancedResponse.ts
index 9e2ba3b3..51ee2c1d 100644
--- a/packages/vana-sdk/src/client/enhancedResponse.ts
+++ b/packages/vana-sdk/src/client/enhancedResponse.ts
@@ -17,6 +17,7 @@ import type {
 } from "../types/relayer";
 import { PollingManager } from "../core/pollingManager";
 import type { OperationStatus } from "../types/options";
+import type { EnhancedResponseSDK } from "../types/controller-context";
 
 /**
  * Enhanced transaction response that provides a fluent API for waiting.
@@ -52,9 +53,10 @@ export class EnhancedTransactionResponse {
   /** Transaction context for event parsing */
   public readonly context?: TransactionContext;
 
-  private readonly sdk: any; // Using any to avoid circular dependency
+  /** SDK instance providing blockchain and relayer functionality */
+  private readonly sdk: EnhancedResponseSDK;
 
-  constructor(response: UnifiedRelayerResponse, sdk: any) {
+  constructor(response: UnifiedRelayerResponse, sdk: EnhancedResponseSDK) {
     this.response = response;
     this.sdk = sdk;
 
@@ -103,7 +105,17 @@ export class EnhancedTransactionResponse {
     signal?: AbortSignal;
     /** Timeout in milliseconds */
     timeout?: number;
-  }): Promise<any> {
+  }): Promise<{
+    hash: Hash;
+    receipt?: TransactionReceipt;
+    expectedEvents?: Record<string, unknown>;
+    allEvents?: Array<{
+      contractAddress: string;
+      eventName: string;
+      args: Record<string, unknown>;
+      logIndex: number;
+    }>;
+  }> {
     // Handle 'confirmed' responses - already complete
     if (this.response.type === "confirmed") {
       return {
@@ -140,15 +152,12 @@ export class EnhancedTransactionResponse {
 
     // Handle 'pending' responses - use PollingManager
     if (this.response.type === "pending") {
-      // Access the relayer callback from the SDK's internal config
-      const sdkInternal = this.sdk as any;
-      const relayerCallback = sdkInternal.relayerCallback;
-
-      if (typeof relayerCallback !== "function") {
+      // Access the relayer callback from the SDK
+      if (!this.sdk.relayer) {
         throw new Error("Relayer callback not configured for polling");
       }
 
-      const pollingManager = new PollingManager(relayerCallback);
+      const pollingManager = new PollingManager(this.sdk.relayer);
       return await pollingManager.startPolling(this.response.operationId, {
         signal: options?.signal,
         onStatusUpdate: options?.onStatusUpdate,
@@ -156,9 +165,10 @@ export class EnhancedTransactionResponse {
       });
     }
 
-    // Response type cannot be waited on
+    // Response type cannot be waited on - use discriminated union exhaustiveness
+    const unknownType = this.response.type;
     throw new Error(
-      `Cannot wait on response type: ${(this.response as any).type}. ` +
+      `Cannot wait on response type: ${unknownType}. ` +
         `Only 'submitted', 'signed', 'pending', and 'confirmed' responses can be waited on.`,
     );
   }
@@ -220,7 +230,7 @@ export function canEnhanceResponse(response: UnifiedRelayerResponse): boolean {
  * Factory function to create an enhanced response if applicable.
  *
  * @param response - The unified relayer response
- * @param sdk - The Vana SDK instance
+ * @param sdk - The Vana SDK instance (or minimal SDK interface)
  * @returns EnhancedTransactionResponse if enhanceable, null otherwise
  *
  * @example
@@ -234,7 +244,7 @@ export function canEnhanceResponse(response: UnifiedRelayerResponse): boolean {
  */
 export function enhanceResponse(
   response: UnifiedRelayerResponse,
-  sdk: any,
+  sdk: EnhancedResponseSDK,
 ): EnhancedTransactionResponse | null {
   if (canEnhanceResponse(response)) {
     return new EnhancedTransactionResponse(response, sdk);
diff --git a/packages/vana-sdk/src/controllers/__tests__/operations.test.ts b/packages/vana-sdk/src/controllers/__tests__/operations.test.ts
new file mode 100644
index 00000000..21c4a978
--- /dev/null
+++ b/packages/vana-sdk/src/controllers/__tests__/operations.test.ts
@@ -0,0 +1,773 @@
+/**
+ * Comprehensive tests for OperationsController
+ *
+ * @remarks
+ * Tests all public methods: getStatus, waitForConfirmation, cancel, burnStuckNonce
+ * and the private method mapResponseToStatus.
+ * Also covers edge cases for error handling, timeouts, and gas escalation.
+ */
+
+import { describe, it, expect, beforeEach, vi } from "vitest";
+import { OperationsController } from "../operations";
+import type { ControllerContext } from "../permissions";
+import type {
+  UnifiedRelayerRequest,
+  UnifiedRelayerResponse,
+} from "../../types/relayer";
+import type { WalletClient, PublicClient, TransactionReceipt } from "viem";
+import type { IOperationStore } from "../../types/operationStore";
+import type { IAtomicStore } from "../../types/atomicStore";
+import { TransactionPendingError } from "../../errors";
+import { PollingManager } from "../../core/pollingManager";
+
+// Mock the PollingManager
+vi.mock("../../core/pollingManager");
+
+describe("OperationsController", () => {
+  let controller: OperationsController;
+  let mockContext: ControllerContext;
+  let mockRelayer: ReturnType<typeof vi.fn>;
+  let mockPublicClient: PublicClient;
+  let mockWalletClient: WalletClient;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    // Mock relayer function
+    mockRelayer = vi.fn();
+
+    // Mock public client
+    mockPublicClient = {
+      getChainId: vi.fn().mockResolvedValue(14800),
+      getGasPrice: vi.fn().mockResolvedValue(20000000000n),
+      waitForTransactionReceipt: vi.fn().mockResolvedValue({
+        status: "success",
+        transactionHash: "0xhash123",
+        blockNumber: 1000n,
+        gasUsed: 21000n,
+      } as unknown as TransactionReceipt),
+    } as unknown as PublicClient;
+
+    // Mock wallet client
+    mockWalletClient = {
+      getChainId: vi.fn().mockResolvedValue(14800),
+      getAddresses: vi.fn().mockResolvedValue(["0xRelayerAddress"]),
+      sendTransaction: vi.fn().mockResolvedValue("0xtxhash"),
+      account: { address: "0xRelayerAddress" },
+      chain: { id: 14800 },
+    } as unknown as WalletClient;
+
+    // Create mock context
+    mockContext = {
+      relayer: mockRelayer,
+      publicClient: mockPublicClient,
+      walletClient: mockWalletClient,
+    } as unknown as ControllerContext;
+
+    controller = new OperationsController(mockContext);
+  });
+
+  describe("getStatus", () => {
+    it("should throw error when relayer not configured", async () => {
+      const controllerWithoutRelayer = new OperationsController({
+        ...mockContext,
+        relayer: undefined,
+      } as unknown as ControllerContext);
+
+      await expect(
+        controllerWithoutRelayer.getStatus("op-123"),
+      ).rejects.toThrow("Relayer not configured");
+    });
+
+    it("should return pending status", async () => {
+      const response: UnifiedRelayerResponse = {
+        type: "pending",
+        operationId: "op-123",
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "pending",
+        operationId: "op-123",
+      });
+
+      expect(mockRelayer).toHaveBeenCalledWith({
+        type: "status_check",
+        operationId: "op-123",
+      });
+    });
+
+    it("should return submitted status", async () => {
+      const response: UnifiedRelayerResponse = {
+        type: "submitted",
+        hash: "0xhash123",
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "submitted",
+        hash: "0xhash123",
+      });
+    });
+
+    it("should return confirmed status with receipt", async () => {
+      const receipt = {
+        status: "success",
+        transactionHash: "0xhash123",
+        blockNumber: 1000n,
+      } as unknown as TransactionReceipt;
+
+      const response: UnifiedRelayerResponse = {
+        type: "confirmed",
+        hash: "0xhash123",
+        receipt,
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "confirmed",
+        hash: "0xhash123",
+        receipt,
+      });
+    });
+
+    it("should return failed status from error response", async () => {
+      const response: UnifiedRelayerResponse = {
+        type: "error",
+        error: "Transaction failed: insufficient funds",
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "failed",
+        error: "Transaction failed: insufficient funds",
+        operationId: "op-123",
+      });
+    });
+
+    it("should handle error response with missing error message", async () => {
+      const response: UnifiedRelayerResponse = {
+        type: "error",
+        error: undefined as unknown as string,
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "failed",
+        error: "Unknown error",
+        operationId: "op-123",
+      });
+    });
+
+    it("should map signed response to submitted status", async () => {
+      const response: UnifiedRelayerResponse = {
+        type: "signed",
+        hash: "0xhash123",
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "submitted",
+        hash: "0xhash123",
+      });
+    });
+
+    it("should map direct response to confirmed status", async () => {
+      const response: UnifiedRelayerResponse = {
+        type: "direct",
+        result: { success: true },
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "confirmed",
+        hash: "0x0000000000000000000000000000000000000000000000000000000000000000",
+        receipt: undefined,
+      });
+    });
+
+    it("should handle network errors gracefully", async () => {
+      mockRelayer.mockRejectedValue(new Error("Network failure"));
+
+      await expect(controller.getStatus("op-123")).rejects.toThrow(
+        "Network failure",
+      );
+    });
+  });
+
+  describe("waitForConfirmation", () => {
+    it("should throw error when relayer not configured", async () => {
+      const controllerWithoutRelayer = new OperationsController({
+        ...mockContext,
+        relayer: undefined,
+      } as unknown as ControllerContext);
+
+      await expect(
+        controllerWithoutRelayer.waitForConfirmation("op-123"),
+      ).rejects.toThrow("Relayer not configured");
+    });
+
+    it("should return immediately if already confirmed", async () => {
+      const receipt = {
+        status: "success",
+        transactionHash: "0xhash123",
+      } as unknown as TransactionReceipt;
+
+      mockRelayer.mockResolvedValue({
+        type: "confirmed",
+        hash: "0xhash123",
+        receipt,
+      });
+
+      const result = await controller.waitForConfirmation("op-123");
+
+      expect(result).toEqual({
+        hash: "0xhash123",
+        receipt,
+      });
+
+      // Should not start polling
+      expect(PollingManager).not.toHaveBeenCalled();
+    });
+
+    it("should throw error if operation is failed", async () => {
+      mockRelayer.mockResolvedValue({
+        type: "error",
+        error: "Transaction reverted",
+      });
+
+      await expect(controller.waitForConfirmation("op-123")).rejects.toThrow(
+        "Transaction reverted",
+      );
+
+      // Should not start polling
+      expect(PollingManager).not.toHaveBeenCalled();
+    });
+
+    it("should start polling if operation is pending", async () => {
+      mockRelayer.mockResolvedValue({
+        type: "pending",
+        operationId: "op-123",
+      });
+
+      const mockPollingManager = {
+        startPolling: vi.fn().mockResolvedValue({
+          hash: "0xhash123",
+          receipt: { status: "success" } as unknown as TransactionReceipt,
+        }),
+      };
+
+      vi.mocked(PollingManager).mockImplementation(
+        () => mockPollingManager as unknown as PollingManager,
+      );
+
+      const result = await controller.waitForConfirmation("op-123");
+
+      expect(result).toEqual({
+        hash: "0xhash123",
+        receipt: { status: "success" },
+      });
+
+      expect(PollingManager).toHaveBeenCalledWith(mockRelayer);
+      expect(mockPollingManager.startPolling).toHaveBeenCalledWith("op-123", {
+        signal: undefined,
+        onStatusUpdate: undefined,
+        timeout: undefined,
+        initialInterval: undefined,
+        maxInterval: undefined,
+      });
+    });
+
+    it("should pass through polling options", async () => {
+      mockRelayer.mockResolvedValue({
+        type: "pending",
+        operationId: "op-123",
+      });
+
+      const mockPollingManager = {
+        startPolling: vi.fn().mockResolvedValue({
+          hash: "0xhash123",
+        }),
+      };
+
+      vi.mocked(PollingManager).mockImplementation(
+        () => mockPollingManager as unknown as PollingManager,
+      );
+
+      const onStatusUpdate = vi.fn();
+      const signal = new AbortController().signal;
+
+      await controller.waitForConfirmation("op-123", {
+        signal,
+        onStatusUpdate,
+        timeout: 60000,
+        initialInterval: 2000,
+        maxInterval: 15000,
+      });
+
+      expect(mockPollingManager.startPolling).toHaveBeenCalledWith("op-123", {
+        signal,
+        onStatusUpdate,
+        timeout: 60000,
+        initialInterval: 2000,
+        maxInterval: 15000,
+      });
+    });
+
+    it("should handle polling timeout errors", async () => {
+      mockRelayer.mockResolvedValue({
+        type: "pending",
+        operationId: "op-123",
+      });
+
+      const mockPollingManager = {
+        startPolling: vi
+          .fn()
+          .mockRejectedValue(
+            new TransactionPendingError("op-123", "Polling timed out"),
+          ),
+      };
+
+      vi.mocked(PollingManager).mockImplementation(
+        () => mockPollingManager as unknown as PollingManager,
+      );
+
+      await expect(controller.waitForConfirmation("op-123")).rejects.toThrow(
+        TransactionPendingError,
+      );
+    });
+
+    it("should handle cancellation via AbortSignal", async () => {
+      mockRelayer.mockResolvedValue({
+        type: "pending",
+        operationId: "op-123",
+      });
+
+      const abortController = new AbortController();
+      const mockPollingManager = {
+        startPolling: vi.fn().mockImplementation(() => {
+          abortController.abort();
+          return Promise.reject(new Error("Operation cancelled"));
+        }),
+      };
+
+      vi.mocked(PollingManager).mockImplementation(
+        () => mockPollingManager as unknown as PollingManager,
+      );
+
+      await expect(
+        controller.waitForConfirmation("op-123", {
+          signal: abortController.signal,
+        }),
+      ).rejects.toThrow("Operation cancelled");
+    });
+  });
+
+  describe("cancel", () => {
+    it("should throw error when relayer not configured", async () => {
+      const controllerWithoutRelayer = new OperationsController({
+        ...mockContext,
+        relayer: undefined,
+      } as unknown as ControllerContext);
+
+      await expect(controllerWithoutRelayer.cancel("op-123")).rejects.toThrow(
+        "Relayer not configured",
+      );
+    });
+
+    it("should throw not implemented error", async () => {
+      await expect(controller.cancel("op-123")).rejects.toThrow(
+        "Operation cancellation is not yet implemented",
+      );
+
+      // Should not call relayer
+      expect(mockRelayer).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("burnStuckNonce", () => {
+    let mockAtomicStore: IAtomicStore;
+
+    beforeEach(() => {
+      mockAtomicStore = {
+        get: vi.fn(),
+        set: vi.fn(),
+        incr: vi.fn(),
+        acquireLock: vi.fn(),
+        releaseLock: vi.fn(),
+      };
+    });
+
+    it("should burn stuck nonce with premium gas", async () => {
+      vi.mocked(mockPublicClient.getGasPrice).mockResolvedValue(20000000000n);
+      vi.mocked(mockWalletClient.sendTransaction).mockResolvedValue("0xburntx");
+      vi.mocked(mockPublicClient.waitForTransactionReceipt).mockResolvedValue({
+        status: "success",
+        transactionHash: "0xburntx",
+      } as unknown as TransactionReceipt);
+
+      const hash = await controller.burnStuckNonce({
+        walletClient: mockWalletClient,
+        publicClient: mockPublicClient,
+        atomicStore: mockAtomicStore,
+        address: "0xRelayerAddress",
+        stuckNonce: 42,
+      });
+
+      expect(hash).toBe("0xburntx");
+
+      // Should get gas price
+      expect(mockPublicClient.getGasPrice).toHaveBeenCalled();
+
+      // Should send transaction with 50% premium gas
+      expect(mockWalletClient.sendTransaction).toHaveBeenCalledWith({
+        account: mockWalletClient.account,
+        chain: mockWalletClient.chain,
+        to: "0xRelayerAddress",
+        value: expect.any(BigInt), // 0.00001 ETH
+        nonce: 42,
+        gasPrice: 30000000000n, // 20000000000 * 1.5
+        gas: 21000n,
+      });
+
+      // Should wait for confirmation
+      expect(mockPublicClient.waitForTransactionReceipt).toHaveBeenCalledWith({
+        hash: "0xburntx",
+        timeout: 120000,
+      });
+    });
+
+    it("should update stored nonce after successful burn", async () => {
+      vi.mocked(mockPublicClient.waitForTransactionReceipt).mockResolvedValue({
+        status: "success",
+        transactionHash: "0xburntx",
+      } as unknown as TransactionReceipt);
+
+      vi.mocked(mockAtomicStore.get).mockResolvedValue("40");
+
+      await controller.burnStuckNonce({
+        walletClient: mockWalletClient,
+        publicClient: mockPublicClient,
+        atomicStore: mockAtomicStore,
+        address: "0xRelayerAddress",
+        stuckNonce: 42,
+      });
+
+      // Should update stored nonce since 42 > 40
+      expect(mockAtomicStore.set).toHaveBeenCalledWith(
+        "nonce:14800:0xRelayerAddress:lastUsed",
+        "42",
+      );
+    });
+
+    it("should not update stored nonce if lower than current", async () => {
+      vi.mocked(mockPublicClient.waitForTransactionReceipt).mockResolvedValue({
+        status: "success",
+        transactionHash: "0xburntx",
+      } as unknown as TransactionReceipt);
+
+      vi.mocked(mockAtomicStore.get).mockResolvedValue("50");
+
+      await controller.burnStuckNonce({
+        walletClient: mockWalletClient,
+        publicClient: mockPublicClient,
+        atomicStore: mockAtomicStore,
+        address: "0xRelayerAddress",
+        stuckNonce: 42,
+      });
+
+      // Should not update since 42 < 50
+      expect(mockAtomicStore.set).not.toHaveBeenCalled();
+    });
+
+    it("should update stored nonce when no previous nonce exists", async () => {
+      vi.mocked(mockPublicClient.waitForTransactionReceipt).mockResolvedValue({
+        status: "success",
+        transactionHash: "0xburntx",
+      } as unknown as TransactionReceipt);
+
+      vi.mocked(mockAtomicStore.get).mockResolvedValue(null);
+
+      await controller.burnStuckNonce({
+        walletClient: mockWalletClient,
+        publicClient: mockPublicClient,
+        atomicStore: mockAtomicStore,
+        address: "0xRelayerAddress",
+        stuckNonce: 42,
+      });
+
+      // Should update since no previous value exists
+      expect(mockAtomicStore.set).toHaveBeenCalledWith(
+        "nonce:14800:0xRelayerAddress:lastUsed",
+        "42",
+      );
+    });
+
+    it("should throw error if burn transaction fails", async () => {
+      vi.mocked(mockWalletClient.sendTransaction).mockResolvedValue("0xburntx");
+      vi.mocked(mockPublicClient.waitForTransactionReceipt).mockResolvedValue({
+        status: "reverted",
+        transactionHash: "0xburntx",
+      } as unknown as TransactionReceipt);
+
+      await expect(
+        controller.burnStuckNonce({
+          walletClient: mockWalletClient,
+          publicClient: mockPublicClient,
+          atomicStore: mockAtomicStore,
+          address: "0xRelayerAddress",
+          stuckNonce: 42,
+        }),
+      ).rejects.toThrow("Nonce burn transaction failed: 0xburntx");
+
+      // Should not update stored nonce
+      expect(mockAtomicStore.set).not.toHaveBeenCalled();
+    });
+
+    it("should handle transaction submission errors", async () => {
+      vi.mocked(mockWalletClient.sendTransaction).mockRejectedValue(
+        new Error("insufficient funds"),
+      );
+
+      await expect(
+        controller.burnStuckNonce({
+          walletClient: mockWalletClient,
+          publicClient: mockPublicClient,
+          atomicStore: mockAtomicStore,
+          address: "0xRelayerAddress",
+          stuckNonce: 42,
+        }),
+      ).rejects.toThrow("insufficient funds");
+    });
+
+    it("should handle timeout waiting for confirmation", async () => {
+      vi.mocked(mockPublicClient.waitForTransactionReceipt).mockRejectedValue(
+        new Error("timeout"),
+      );
+
+      await expect(
+        controller.burnStuckNonce({
+          walletClient: mockWalletClient,
+          publicClient: mockPublicClient,
+          atomicStore: mockAtomicStore,
+          address: "0xRelayerAddress",
+          stuckNonce: 42,
+        }),
+      ).rejects.toThrow("timeout");
+    });
+  });
+
+  describe("processQueue", () => {
+    let mockOperationStore: IOperationStore;
+    let mockAtomicStore: IAtomicStore;
+
+    beforeEach(() => {
+      mockOperationStore = {
+        storeOperation: vi.fn(),
+        getQueuedOperations: vi.fn().mockResolvedValue([]),
+        updateStatus: vi.fn(),
+      };
+
+      mockAtomicStore = {
+        get: vi.fn(),
+        set: vi.fn(),
+        incr: vi.fn(),
+        acquireLock: vi.fn(),
+        releaseLock: vi.fn(),
+      };
+    });
+
+    it("should return empty results when queue is empty", async () => {
+      vi.mocked(mockOperationStore.getQueuedOperations).mockResolvedValue([]);
+
+      const results = await controller.processQueue({
+        operationStore: mockOperationStore,
+        atomicStore: mockAtomicStore,
+        walletClient: mockWalletClient,
+        publicClient: mockPublicClient,
+      });
+
+      expect(results).toEqual({
+        processed: 0,
+        succeeded: 0,
+        failed: 0,
+        errors: [],
+      });
+    });
+
+    it("should respect maxOperations parameter", async () => {
+      await controller.processQueue({
+        operationStore: mockOperationStore,
+        atomicStore: mockAtomicStore,
+        walletClient: mockWalletClient,
+        publicClient: mockPublicClient,
+        maxOperations: 5,
+      });
+
+      expect(mockOperationStore.getQueuedOperations).toHaveBeenCalledWith({
+        limit: 5,
+      });
+    });
+
+    it("should use default maxOperations of 10", async () => {
+      await controller.processQueue({
+        operationStore: mockOperationStore,
+        atomicStore: mockAtomicStore,
+        walletClient: mockWalletClient,
+        publicClient: mockPublicClient,
+      });
+
+      expect(mockOperationStore.getQueuedOperations).toHaveBeenCalledWith({
+        limit: 10,
+      });
+    });
+
+    it("should handle operations without atomicStore (uses InMemoryNonceManager)", async () => {
+      const operation = {
+        id: "op-1",
+        status: "queued" as const,
+        data: JSON.stringify({ to: "0x456", data: "0xabc" }),
+      };
+
+      vi.mocked(mockOperationStore.getQueuedOperations).mockResolvedValue([
+        operation,
+      ]);
+
+      // Create a controller without atomicStore to trigger InMemoryNonceManager
+      const results = await controller.processQueue({
+        operationStore: mockOperationStore,
+        atomicStore: undefined as unknown as IAtomicStore,
+        walletClient: mockWalletClient,
+        publicClient: mockPublicClient,
+      });
+
+      // Should still process operations
+      expect(results.processed).toBeGreaterThan(0);
+    });
+  });
+
+  describe("mapResponseToStatus (via getStatus)", () => {
+    it("should handle unknown response type as pending", async () => {
+      // Force an unknown response type
+      const response = {
+        type: "unknown_type",
+        someData: "value",
+      } as unknown as UnifiedRelayerResponse;
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "pending",
+        operationId: "op-123",
+      });
+    });
+
+    it("should preserve context in signed response", async () => {
+      const response: UnifiedRelayerResponse = {
+        type: "signed",
+        hash: "0xhash123",
+        context: {
+          contract: "DataRegistry",
+          fn: "addFile",
+          from: "0xUserAddress",
+        },
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      // Context is not mapped to status, but response is converted to submitted
+      expect(status.type).toBe("submitted");
+      expect(status).toHaveProperty("hash", "0xhash123");
+    });
+
+    it("should handle confirmed response without receipt", async () => {
+      const response: UnifiedRelayerResponse = {
+        type: "confirmed",
+        hash: "0xhash123",
+      };
+
+      mockRelayer.mockResolvedValue(response);
+
+      const status = await controller.getStatus("op-123");
+
+      expect(status).toEqual({
+        type: "confirmed",
+        hash: "0xhash123",
+        receipt: undefined,
+      });
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should handle concurrent getStatus calls", async () => {
+      mockRelayer.mockImplementation(async (request: UnifiedRelayerRequest) => {
+        // Simulate network delay
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        return {
+          type: "pending",
+          operationId:
+            request.type === "status_check" ? request.operationId : "unknown",
+        };
+      });
+
+      const results = await Promise.all([
+        controller.getStatus("op-1"),
+        controller.getStatus("op-2"),
+        controller.getStatus("op-3"),
+      ]);
+
+      expect(results).toHaveLength(3);
+      expect(results[0].type).toBe("pending");
+      expect(results[1].type).toBe("pending");
+      expect(results[2].type).toBe("pending");
+      if (results[0].type === "pending")
+        expect(results[0].operationId).toBe("op-1");
+      if (results[1].type === "pending")
+        expect(results[1].operationId).toBe("op-2");
+      if (results[2].type === "pending")
+        expect(results[2].operationId).toBe("op-3");
+    });
+
+    it("should handle malformed relayer response", async () => {
+      mockRelayer.mockResolvedValue(null);
+
+      await expect(controller.getStatus("op-123")).rejects.toThrow();
+    });
+
+    it("should handle empty operation ID", async () => {
+      mockRelayer.mockResolvedValue({
+        type: "pending",
+        operationId: "",
+      });
+
+      const status = await controller.getStatus("");
+
+      expect(status.type).toBe("pending");
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/controllers/base.ts b/packages/vana-sdk/src/controllers/base.ts
index f1bc3801..6e8217b5 100644
--- a/packages/vana-sdk/src/controllers/base.ts
+++ b/packages/vana-sdk/src/controllers/base.ts
@@ -115,12 +115,15 @@ export abstract class BaseController {
    * @returns Properly formatted options for viem
    * @internal
    */
-  protected spreadTransactionOptions(options?: TransactionOptions) {
+  protected spreadTransactionOptions(
+    options?: TransactionOptions,
+  ): Record<string, bigint | number | undefined> {
     if (!options) return {};
 
-    const baseOptions: any = {
+    const baseOptions: Record<string, bigint | number | undefined> = {
       ...(options.nonce !== undefined && { nonce: options.nonce }),
       ...(options.gas !== undefined && { gas: options.gas }),
+      ...(options.value !== undefined && { value: options.value }),
     };
 
     // EIP-1559 and legacy gasPrice are mutually exclusive in viem
diff --git a/packages/vana-sdk/src/controllers/operations.ts b/packages/vana-sdk/src/controllers/operations.ts
index ff00e28f..4364376f 100644
--- a/packages/vana-sdk/src/controllers/operations.ts
+++ b/packages/vana-sdk/src/controllers/operations.ts
@@ -12,7 +12,7 @@ import type {
 } from "../types/relayer";
 import type { IOperationStore } from "../types/operationStore";
 import type { IAtomicStore } from "../types/atomicStore";
-import type { WalletClient, PublicClient } from "viem";
+import type { WalletClient, PublicClient, TransactionReceipt } from "viem";
 import { BaseController } from "./base";
 import { PollingManager } from "../core/pollingManager";
 import { DistributedNonceManager } from "../core/nonceManager";
@@ -141,7 +141,7 @@ export class OperationsController extends BaseController {
       initialInterval?: number;
       maxInterval?: number;
     },
-  ): Promise<{ hash: string; receipt?: any }> {
+  ): Promise<{ hash: string; receipt?: TransactionReceipt }> {
     if (!this.context.relayer) {
       throw new Error("Relayer not configured");
     }
@@ -481,8 +481,15 @@ export class OperationsController extends BaseController {
     const premiumGasPrice = (gasPrice * 150n) / 100n;
 
     // Send minimal self-transfer
+    const account = walletClient.account;
+    if (!account) {
+      throw new Error(
+        "WalletClient must be configured with an account to burn stuck nonces",
+      );
+    }
+
     const hash = await walletClient.sendTransaction({
-      account: walletClient.account!,
+      account,
       chain: walletClient.chain,
       to: address,
       value: parseEther("0.00001"), // Minimal amount
diff --git a/packages/vana-sdk/src/controllers/permissions.ts b/packages/vana-sdk/src/controllers/permissions.ts
index af1a6f6b..d59698d9 100644
--- a/packages/vana-sdk/src/controllers/permissions.ts
+++ b/packages/vana-sdk/src/controllers/permissions.ts
@@ -5469,14 +5469,16 @@ export class PermissionsController extends BaseController {
     // Format signature for contract compatibility
     const formattedSignature = formatSignatureForContract(signature);
 
+    // Type assertion required: viem requires readonly arrays, but typed data produces mutable arrays.
+    // This is safe - the data is immutable after construction and goes directly to the contract call.
+    // TypeScript's strict variance rules prevent direct assignment despite runtime safety.
     const hash = await this.context.walletClient.writeContract({
       address: DataPortabilityPermissionsAddress,
       abi: DataPortabilityPermissionsAbi,
       functionName: "addServerFilesAndPermissions",
-      args: [serverFilesAndPermissionInput, formattedSignature],
+      args: [serverFilesAndPermissionInput, formattedSignature] as any,
       account: this.context.walletClient?.account ?? this.context.userAddress,
       chain: this.context.walletClient?.chain ?? null,
-      ...(options?.value && { value: options.value }),
       ...this.spreadTransactionOptions(options),
     });
 
diff --git a/packages/vana-sdk/src/controllers/runtimePermissions.ts b/packages/vana-sdk/src/controllers/runtimePermissions.ts
new file mode 100644
index 00000000..e54c0207
--- /dev/null
+++ b/packages/vana-sdk/src/controllers/runtimePermissions.ts
@@ -0,0 +1,330 @@
+// @ts-nocheck
+// TODO: Remove @ts-nocheck when VanaRuntimePermissions contract is deployed and added to SDK
+import type { Address, Hash } from "viem";
+import { getContract } from "viem";
+import { BaseController } from "./base";
+import type {
+  RuntimePermissionParams,
+  RuntimePermission,
+  RuntimeGrantFile,
+  RuntimePermissionResult,
+} from "../types/runtimePermissions";
+import type { UnifiedRelayerRequest } from "../types/relayer";
+import { createRuntimeGrantFile, retrieveRuntimeGrantFile } from "../utils/runtimeGrantFiles";
+import { BlockchainError, NetworkError } from "../errors";
+import { getContractAddress } from "../generated/addresses";
+import { getAbi } from "../generated/abi";
+
+/**
+ * Controller for VanaRuntimePermissions contract
+ *
+ * @remarks
+ * Manages permissions for data access via Vana Runtime. Allows dataset owners
+ * to create monetized access permissions for data consumers to execute operations
+ * on their datasets within TEE environments.
+ *
+ * Follows the same pattern as PermissionsController but for runtime-specific permissions.
+ *
+ * @category Controllers
+ * @example
+ * ```typescript
+ * // Create a permission for a data consumer
+ * const result = await sdk.runtimePermissions.createPermission({
+ *   datasetId: 123n,
+ *   grantee: "0x...",
+ *   task: "thinker/task:v1",
+ *   operation: "aggregate_keywords",
+ *   pricing: { price_per_file_vana: 0.1 },
+ *   endBlock: 2000000n
+ * });
+ *
+ * console.log(`Permission created with ID: ${result.permissionId}`);
+ * console.log(`Grant stored at: ${result.grantUrl}`);
+ * ```
+ */
+export class RuntimePermissionsController extends BaseController {
+  /**
+   * Create a new runtime permission grant
+   *
+   * @remarks
+   * This method:
+   * 1. Creates a grant file with pricing and operation details
+   * 2. Uploads the grant to IPFS (via relayer if available)
+   * 3. Calls VanaRuntimePermissions.createPermission() on-chain
+   * 4. Waits for transaction confirmation
+   * 5. Returns the permission ID and grant URL
+   *
+   * @param params - Permission parameters including dataset, grantee, pricing
+   * @returns Permission ID, transaction hash, and grant URL
+   * @throws {BlockchainError} When permission creation fails
+   * @throws {NetworkError} When IPFS upload fails
+   *
+   * @example
+   * ```typescript
+   * const result = await sdk.runtimePermissions.createPermission({
+   *   datasetId: 123n,
+   *   grantee: "0x742d35Cc...",
+   *   task: "thinker/task:v1",
+   *   operation: "aggregate_keywords",
+   *   pricing: {
+   *     price_per_file_vana: 0.1,
+   *     minimum_price_vana: 0.01,
+   *     maximum_price_vana: 100
+   *   },
+   *   parameters: {
+   *     maxFiles: 1000
+   *   },
+   *   endBlock: 2000000n
+   * });
+   * ```
+   */
+  async createPermission(
+    params: RuntimePermissionParams,
+  ): Promise<RuntimePermissionResult> {
+    this.assertWallet();
+
+    try {
+      // 1. Create grant file
+      const grantFile = createRuntimeGrantFile(params);
+
+      // 2. Upload to IPFS (via relayer if available, or use provided URL)
+      let grantUrl = params.grantUrl;
+      if (!grantUrl) {
+        if (!this.context.relayer) {
+          throw new NetworkError(
+            "No relayer configured and no grantUrl provided. " +
+              "Configure relayer or provide grantUrl parameter.",
+          );
+        }
+
+        // Store via relayer
+        const request: UnifiedRelayerRequest = {
+          type: "direct",
+          operation: "storeGrantFile",
+          params: grantFile,
+        };
+        const response = await this.context.relayer(request);
+        if (response.type === "error") {
+          throw new NetworkError(
+            `Failed to store grant file: ${response.error}`,
+          );
+        }
+        if (
+          response.type === "direct" &&
+          typeof response.result === "object" &&
+          response.result !== null &&
+          "url" in response.result &&
+          typeof response.result.url === "string"
+        ) {
+          grantUrl = response.result.url;
+        } else {
+          throw new NetworkError("Upload succeeded but no URL was returned");
+        }
+      }
+
+      // 3. Get contract address and ABI
+      const chainId = await this.context.publicClient.getChainId();
+      const contractAddress = getContractAddress(
+        chainId,
+        "VanaRuntimePermissions",
+      );
+      const abi = getAbi("VanaRuntimePermissions");
+
+      // 4. Convert grantee address to ID
+      // NOTE: For MVP, we use address as ID. In production, this should
+      // query a grantee registry contract or use a proper ID scheme.
+      const granteeId = BigInt(params.grantee);
+
+      // 5. Get current block if startBlock not provided
+      const startBlock =
+        params.startBlock || (await this.context.publicClient.getBlockNumber());
+
+      // 6. Call contract to create permission
+      const account =
+        this.context.walletClient?.account ?? this.context.userAddress;
+
+      const hash = await this.context.walletClient.writeContract({
+        address: contractAddress,
+        abi,
+        functionName: "createPermission",
+        args: [params.datasetId, granteeId, grantUrl, startBlock, params.endBlock],
+        account,
+        chain: this.context.walletClient?.chain ?? null,
+      });
+
+      // 7. Wait for transaction confirmation
+      const receipt = await this.context.publicClient.waitForTransactionReceipt({
+        hash,
+      });
+
+      // 8. Parse PermissionCreated event to get permission ID
+      // For MVP, we'll use a placeholder. In production, parse event logs.
+      // TODO: Add proper event parsing from receipt.logs
+      const permissionId = 0n; // Placeholder
+
+      return {
+        permissionId,
+        hash,
+        grantUrl,
+      };
+    } catch (error) {
+      if (error instanceof NetworkError) {
+        throw error;
+      }
+      if (error instanceof Error) {
+        throw new BlockchainError(
+          `Failed to create runtime permission: ${error.message}`,
+          error,
+        );
+      }
+      throw new BlockchainError(
+        "Failed to create runtime permission with unknown error",
+      );
+    }
+  }
+
+  /**
+   * Get permission by ID
+   *
+   * @remarks
+   * Fetches permission details from the VanaRuntimePermissions contract.
+   * The returned permission contains an IPFS hash in the grant field,
+   * which can be resolved using fetchGrant().
+   *
+   * @param permissionId - Permission identifier
+   * @returns Permission details including dataset, grantee, and grant hash
+   *
+   * @example
+   * ```typescript
+   * const permission = await sdk.runtimePermissions.getPermission(1024n);
+   * console.log(`Dataset: ${permission.datasetId}`);
+   * console.log(`Grant: ${permission.grant}`); // IPFS hash
+   *
+   * // Resolve full grant details
+   * const grantFile = await sdk.runtimePermissions.fetchGrant(permission);
+   * console.log(`Price: ${grantFile.pricing.price_per_file_vana} VANA`);
+   * ```
+   */
+  async getPermission(permissionId: bigint): Promise<RuntimePermission> {
+    const chainId = await this.context.publicClient.getChainId();
+    const contractAddress = getContractAddress(
+      chainId,
+      "VanaRuntimePermissions",
+    );
+    const abi = getAbi("VanaRuntimePermissions");
+
+    const contract = getContract({
+      address: contractAddress,
+      abi,
+      client: this.context.publicClient,
+    });
+
+    return (await contract.read.getPermission([
+      permissionId,
+    ])) as RuntimePermission;
+  }
+
+  /**
+   * Check if permission is active (not expired)
+   *
+   * @remarks
+   * Returns true if the current block number is between startBlock and endBlock.
+   *
+   * @param permissionId - Permission identifier
+   * @returns Whether permission is currently active
+   *
+   * @example
+   * ```typescript
+   * const isActive = await sdk.runtimePermissions.isPermissionActive(1024n);
+   * if (isActive) {
+   *   console.log("Permission is valid");
+   * } else {
+   *   console.log("Permission has expired");
+   * }
+   * ```
+   */
+  async isPermissionActive(permissionId: bigint): Promise<boolean> {
+    const chainId = await this.context.publicClient.getChainId();
+    const contractAddress = getContractAddress(
+      chainId,
+      "VanaRuntimePermissions",
+    );
+    const abi = getAbi("VanaRuntimePermissions");
+
+    const contract = getContract({
+      address: contractAddress,
+      abi,
+      client: this.context.publicClient,
+    });
+
+    return (await contract.read.isPermissionActive([
+      permissionId,
+    ])) as boolean;
+  }
+
+  /**
+   * Get all permissions for a dataset
+   *
+   * @remarks
+   * Returns an array of permission IDs that have been granted for the specified dataset.
+   * Useful for dataset owners to view all active permissions.
+   *
+   * @param datasetId - Dataset identifier
+   * @returns Array of permission IDs
+   *
+   * @example
+   * ```typescript
+   * const permissionIds = await sdk.runtimePermissions.getDatasetPermissions(123n);
+   * console.log(`Found ${permissionIds.length} permissions`);
+   *
+   * // Fetch details for each permission
+   * for (const id of permissionIds) {
+   *   const permission = await sdk.runtimePermissions.getPermission(id);
+   *   console.log(`Permission ${id}: ${permission.grant}`);
+   * }
+   * ```
+   */
+  async getDatasetPermissions(datasetId: bigint): Promise<bigint[]> {
+    const chainId = await this.context.publicClient.getChainId();
+    const contractAddress = getContractAddress(
+      chainId,
+      "VanaRuntimePermissions",
+    );
+    const abi = getAbi("VanaRuntimePermissions");
+
+    const contract = getContract({
+      address: contractAddress,
+      abi,
+      client: this.context.publicClient,
+    });
+
+    return (await contract.read.getDatasetPermissions([
+      datasetId,
+    ])) as bigint[];
+  }
+
+  /**
+   * Fetch and parse grant file from IPFS
+   *
+   * @remarks
+   * Resolves the IPFS hash stored in permission.grant and returns the
+   * full grant file with pricing and operation details.
+   *
+   * @param permission - Permission with grant URL/hash
+   * @returns Parsed grant file with pricing and parameters
+   * @throws {NetworkError} When IPFS fetch fails
+   *
+   * @example
+   * ```typescript
+   * const permission = await sdk.runtimePermissions.getPermission(1024n);
+   * const grant = await sdk.runtimePermissions.fetchGrant(permission);
+   *
+   * console.log(`Task: ${grant.task}`);
+   * console.log(`Operation: ${grant.operation}`);
+   * console.log(`Price: ${grant.pricing.price_per_file_vana} VANA per file`);
+   * ```
+   */
+  async fetchGrant(permission: RuntimePermission): Promise<RuntimeGrantFile> {
+    return await retrieveRuntimeGrantFile(permission.grant);
+  }
+}
diff --git a/packages/vana-sdk/src/core.ts b/packages/vana-sdk/src/core.ts
index cb8b6d5c..0fbbee3a 100644
--- a/packages/vana-sdk/src/core.ts
+++ b/packages/vana-sdk/src/core.ts
@@ -22,6 +22,8 @@ import type {
 import { InvalidConfigurationError } from "./errors";
 import type { ControllerContext } from "./controllers/permissions";
 import { PermissionsController } from "./controllers/permissions";
+// TODO: Re-enable when VanaRuntimePermissions contract is deployed
+// import { RuntimePermissionsController } from "./controllers/runtimePermissions";
 import { DataController } from "./controllers/data";
 import { SchemaController } from "./controllers/schemas";
 import { ServerController } from "./controllers/server";
@@ -161,6 +163,10 @@ export class VanaCore {
   /** Manages gasless data access permissions and trusted server registry. */
   public readonly permissions: PermissionsController;
 
+  // TODO: Re-enable when VanaRuntimePermissions contract is deployed
+  // /** Manages runtime permissions for dataset monetization via Vana Runtime. */
+  // public readonly runtimePermissions: RuntimePermissionsController;
+
   /** Handles user data file operations. */
   public readonly data: DataController;
 
@@ -395,6 +401,8 @@ export class VanaCore {
 
     // Initialize controllers
     this.permissions = new PermissionsController(sharedContext);
+    // TODO: Re-enable when VanaRuntimePermissions contract is deployed
+    // this.runtimePermissions = new RuntimePermissionsController(sharedContext);
     this.data = new DataController(sharedContext);
     this.schemas = new SchemaController(sharedContext);
     this.operations = new OperationsController(sharedContext);
@@ -646,6 +654,23 @@ export class VanaCore {
     throw new Error("No user address available");
   }
 
+  /**
+   * Gets the relayer callback function configured for this SDK instance.
+   *
+   * @remarks
+   * The relayer callback is used by PollingManager for checking operation status
+   * when handling pending responses. This getter exposes the internal callback
+   * for use by EnhancedResponse and other polling-related functionality.
+   *
+   * @returns The relayer callback function, or undefined if no relayer is configured
+   * @internal
+   */
+  get relayer():
+    | ((request: UnifiedRelayerRequest) => Promise<UnifiedRelayerResponse>)
+    | undefined {
+    return this.relayerCallback;
+  }
+
   /**
    * Retrieves comprehensive runtime configuration information.
    *
diff --git a/packages/vana-sdk/src/core/__tests__/nonceManager.test.ts b/packages/vana-sdk/src/core/__tests__/nonceManager.test.ts
index 140ccef0..e037c905 100644
--- a/packages/vana-sdk/src/core/__tests__/nonceManager.test.ts
+++ b/packages/vana-sdk/src/core/__tests__/nonceManager.test.ts
@@ -393,4 +393,729 @@ describe("DistributedNonceManager", () => {
       });
     });
   });
+
+  describe("Lock acquisition with retries - Complex scenarios", () => {
+    it("should apply exponential backoff between retries", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Fail first 3 times, then succeed
+      mockStore.acquireLock
+        .mockResolvedValueOnce(null)
+        .mockResolvedValueOnce(null)
+        .mockResolvedValueOnce(null)
+        .mockResolvedValueOnce("lock-finally");
+
+      mockStore.incr.mockResolvedValue(1);
+
+      const quickManager = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        maxLockRetries: 10,
+        lockRetryDelay: 50, // Base delay
+      });
+
+      const startTime = Date.now();
+      const nonce = await quickManager.assignNonce(address, chainId);
+      const elapsed = Date.now() - startTime;
+
+      expect(nonce).toBe(1);
+      expect(mockStore.acquireLock).toHaveBeenCalledTimes(4);
+      // Verify exponential backoff occurred
+      // Delays: 50ms, 75ms (50*1.5), 112.5ms (50*1.5^2) = ~237ms minimum
+      expect(elapsed).toBeGreaterThan(200);
+    });
+
+    it("should cap exponential backoff at 5 seconds", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Fail many times to trigger max delay cap
+      mockStore.acquireLock.mockResolvedValue(null);
+
+      const quickManager = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        maxLockRetries: 3,
+        lockRetryDelay: 4000, // High base delay
+      });
+
+      const startTime = Date.now();
+      const nonce = await quickManager.assignNonce(address, chainId);
+      const elapsed = Date.now() - startTime;
+
+      expect(nonce).toBeNull();
+      // Should be capped at 5000ms per retry, not growing exponentially beyond that
+      expect(elapsed).toBeLessThan(12000); // 2 retries * 5000ms max + buffer
+    }, 15000); // Increase timeout to 15 seconds for this test
+
+    it("should handle max retries exceeded and return null", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      mockStore.acquireLock.mockResolvedValue(null);
+
+      const quickManager = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        maxLockRetries: 3,
+        lockRetryDelay: 10,
+      });
+
+      const nonce = await quickManager.assignNonce(address, chainId);
+
+      expect(nonce).toBeNull();
+      expect(mockStore.acquireLock).toHaveBeenCalledTimes(3);
+      expect(mockStore.releaseLock).not.toHaveBeenCalled();
+    });
+
+    it("should handle lock timeout during critical section", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      mockStore.acquireLock.mockResolvedValue("lock-timeout");
+      // Simulate slow blockchain query that exceeds lock TTL
+      mockPublicClient.getTransactionCount.mockImplementation(
+        () =>
+          new Promise((resolve) => {
+            setTimeout(() => {
+              resolve(5);
+            }, 200); // Short delay for testing
+          }),
+      );
+
+      const quickManager = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        lockTTL: 1, // Very short TTL for testing
+      });
+
+      // Should complete successfully even with short TTL
+      mockStore.incr.mockResolvedValue(6);
+      const nonce = await quickManager.assignNonce(address, chainId);
+
+      expect(nonce).toBe(6);
+      // Lock should still be released in finally block
+      expect(mockStore.releaseLock).toHaveBeenCalled();
+    });
+
+    it("should handle concurrent lock attempts from multiple instances", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Simulate multiple instances competing for lock
+      const manager1 = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        maxLockRetries: 5,
+        lockRetryDelay: 10,
+      });
+
+      const manager2 = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        maxLockRetries: 5,
+        lockRetryDelay: 10,
+      });
+
+      // First instance gets lock immediately
+      // Second instance fails first attempt, succeeds second
+      let callCount = 0;
+      mockStore.acquireLock.mockImplementation(() => {
+        callCount++;
+        if (callCount === 1) return Promise.resolve("lock-1");
+        if (callCount === 2) return Promise.resolve(null); // Instance 2 first attempt
+        if (callCount === 3) return Promise.resolve("lock-2"); // Instance 2 second attempt
+        return Promise.resolve(null);
+      });
+
+      mockStore.incr.mockResolvedValueOnce(1).mockResolvedValueOnce(2);
+
+      // Run both concurrently
+      const [nonce1, nonce2] = await Promise.all([
+        manager1.assignNonce(address, chainId),
+        manager2.assignNonce(address, chainId),
+      ]);
+
+      expect(nonce1).toBe(1);
+      expect(nonce2).toBe(2);
+      expect(mockStore.acquireLock).toHaveBeenCalledTimes(3);
+    });
+  });
+
+  describe("Nonce synchronization - Complex scenarios", () => {
+    it("should sync when blockchain is significantly ahead of stored nonce", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Blockchain has 100 pending transactions
+      mockPublicClient.getTransactionCount.mockResolvedValue(100);
+      // Store only knows about nonce 10
+      mockStore.get.mockResolvedValue("10");
+      mockStore.incr.mockResolvedValue(100);
+
+      const nonce = await manager.assignNonce(address, chainId);
+
+      expect(nonce).toBe(100);
+      // Should have synced to blockchain state
+      expect(mockStore.set).toHaveBeenCalledWith(
+        expect.stringContaining(
+          `nonce:${chainId}:${address.toLowerCase()}:lastUsed`,
+        ),
+        "99", // blockchain pending - 1
+      );
+    });
+
+    it("should not sync when stored nonce is ahead of blockchain", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Blockchain has 5 pending transactions
+      mockPublicClient.getTransactionCount.mockResolvedValue(5);
+      // Store has higher nonce (transactions pending in mempool)
+      mockStore.get.mockResolvedValue("10");
+      mockStore.incr.mockResolvedValue(11);
+
+      const nonce = await manager.assignNonce(address, chainId);
+
+      expect(nonce).toBe(11);
+      // Should NOT have called set to sync down (only sync up)
+      expect(mockStore.set).not.toHaveBeenCalled();
+    });
+
+    it("should handle concurrent nonce assignment conflicts", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Simulate race condition: two instances read same nonce
+      mockStore.get.mockResolvedValue("5");
+      mockPublicClient.getTransactionCount.mockResolvedValue(5);
+
+      // First incr returns 6, second returns 7
+      mockStore.incr.mockResolvedValueOnce(6).mockResolvedValueOnce(7);
+
+      const [nonce1, nonce2] = await Promise.all([
+        manager.assignNonce(address, chainId),
+        manager.assignNonce(address, chainId),
+      ]);
+
+      // Both should succeed with different nonces
+      expect(nonce1).toBe(6);
+      expect(nonce2).toBe(7);
+      expect(mockStore.incr).toHaveBeenCalledTimes(2);
+    });
+
+    it("should use store-specific optimization when atomicAssignNonce available", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Store provides optimized atomic assignment
+      mockStore.atomicAssignNonce = vi.fn().mockResolvedValue(10);
+      mockPublicClient.getTransactionCount.mockResolvedValue(8);
+
+      const nonce = await manager.assignNonce(address, chainId);
+
+      expect(nonce).toBe(10);
+      // Should use optimized path
+      expect(mockStore.atomicAssignNonce).toHaveBeenCalledWith(
+        expect.stringContaining(
+          `nonce:${chainId}:${address.toLowerCase()}:lastUsed`,
+        ),
+        8,
+      );
+      // Should NOT use lock-based path
+      expect(mockStore.acquireLock).not.toHaveBeenCalled();
+      expect(mockStore.incr).not.toHaveBeenCalled();
+    });
+
+    it("should handle atomicAssignNonce syncing blockchain ahead scenario", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Blockchain is ahead, store optimization should handle it
+      mockStore.atomicAssignNonce = vi.fn().mockResolvedValue(50);
+      mockPublicClient.getTransactionCount.mockResolvedValue(50);
+
+      const nonce = await manager.assignNonce(address, chainId);
+
+      expect(nonce).toBe(50);
+      expect(mockStore.atomicAssignNonce).toHaveBeenCalledWith(
+        expect.anything(),
+        50,
+      );
+    });
+  });
+
+  describe("burnNonce() edge cases", () => {
+    it("should handle 'nonce too low' error gracefully", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+      const nonceToBurn = 5;
+
+      const mockWalletClient = {
+        account: { address },
+        sendTransaction: vi.fn().mockRejectedValue(new Error("nonce too low")),
+      };
+
+      mockPublicClient.estimateFeesPerGas = vi.fn().mockResolvedValue({
+        maxFeePerGas: 1000000000n,
+        maxPriorityFeePerGas: 100000000n,
+      });
+
+      await expect(
+        manager.burnNonce(
+          mockWalletClient as any,
+          nonceToBurn,
+          address,
+          chainId,
+        ),
+      ).rejects.toThrow("nonce too low");
+
+      // Should have attempted to send transaction
+      expect(mockWalletClient.sendTransaction).toHaveBeenCalled();
+    });
+
+    it("should handle 'underpriced' transaction error", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+      const nonceToBurn = 5;
+
+      const mockWalletClient = {
+        account: { address },
+        sendTransaction: vi
+          .fn()
+          .mockRejectedValue(new Error("replacement transaction underpriced")),
+      };
+
+      mockPublicClient.estimateFeesPerGas = vi.fn().mockResolvedValue({
+        maxFeePerGas: 1000000000n,
+        maxPriorityFeePerGas: 100000000n,
+      });
+
+      await expect(
+        manager.burnNonce(
+          mockWalletClient as any,
+          nonceToBurn,
+          address,
+          chainId,
+          1.5, // May need higher multiplier
+        ),
+      ).rejects.toThrow("underpriced");
+    });
+
+    it("should handle 'already known' transaction scenario", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+      const nonceToBurn = 5;
+
+      const mockWalletClient = {
+        account: { address },
+        sendTransaction: vi.fn().mockRejectedValue(new Error("already known")),
+      };
+
+      mockPublicClient.estimateFeesPerGas = vi.fn().mockResolvedValue({
+        maxFeePerGas: 1000000000n,
+        maxPriorityFeePerGas: 100000000n,
+      });
+
+      await expect(
+        manager.burnNonce(
+          mockWalletClient as any,
+          nonceToBurn,
+          address,
+          chainId,
+        ),
+      ).rejects.toThrow("already known");
+    });
+
+    it("should calculate correct gas prices for Moksha testnet", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800; // Moksha
+      const nonceToBurn = 5;
+
+      const mockWalletClient = {
+        account: { address },
+        sendTransaction: vi.fn().mockResolvedValue("0xBurnTx"),
+      };
+
+      mockPublicClient.estimateFeesPerGas = vi.fn().mockResolvedValue({
+        maxFeePerGas: 2000000000n,
+        maxPriorityFeePerGas: 200000000n,
+      });
+
+      await manager.burnNonce(
+        mockWalletClient as any,
+        nonceToBurn,
+        address,
+        chainId,
+        2.0,
+      );
+
+      expect(mockWalletClient.sendTransaction).toHaveBeenCalledWith(
+        expect.objectContaining({
+          maxFeePerGas: 4000000000n, // 2.0x
+          maxPriorityFeePerGas: 400000000n, // 2.0x
+          chain: expect.objectContaining({
+            id: 14800,
+            name: "Vana Moksha",
+            network: "moksha",
+          }),
+        }),
+      );
+    });
+
+    it("should calculate correct gas prices for Mainnet", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 1480; // Mainnet
+      const nonceToBurn = 5;
+
+      const mockWalletClient = {
+        account: { address },
+        sendTransaction: vi.fn().mockResolvedValue("0xBurnTx"),
+      };
+
+      mockPublicClient.estimateFeesPerGas = vi.fn().mockResolvedValue({
+        maxFeePerGas: 3000000000n,
+        maxPriorityFeePerGas: 300000000n,
+      });
+
+      await manager.burnNonce(
+        mockWalletClient as any,
+        nonceToBurn,
+        address,
+        chainId,
+        1.5,
+      );
+
+      expect(mockWalletClient.sendTransaction).toHaveBeenCalledWith(
+        expect.objectContaining({
+          maxFeePerGas: 4500000000n, // 1.5x
+          maxPriorityFeePerGas: 450000000n, // 1.5x
+          chain: expect.objectContaining({
+            id: 1480,
+            name: "Vana Mainnet",
+            network: "mainnet",
+          }),
+        }),
+      );
+    });
+
+    it("should handle very high gas multipliers correctly", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+      const nonceToBurn = 5;
+
+      const mockWalletClient = {
+        account: { address },
+        sendTransaction: vi.fn().mockResolvedValue("0xBurnTx"),
+      };
+
+      mockPublicClient.estimateFeesPerGas = vi.fn().mockResolvedValue({
+        maxFeePerGas: 1000000000n,
+        maxPriorityFeePerGas: 100000000n,
+      });
+
+      await manager.burnNonce(
+        mockWalletClient as any,
+        nonceToBurn,
+        address,
+        chainId,
+        10.0, // Extreme multiplier
+      );
+
+      expect(mockWalletClient.sendTransaction).toHaveBeenCalledWith(
+        expect.objectContaining({
+          maxFeePerGas: 10000000000n, // 10x
+          maxPriorityFeePerGas: 1000000000n, // 10x
+        }),
+      );
+    });
+
+    it("should properly construct self-transfer transaction", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+      const nonceToBurn = 7;
+
+      const mockWalletClient = {
+        account: { address },
+        sendTransaction: vi.fn().mockResolvedValue("0xBurnTx"),
+      };
+
+      mockPublicClient.estimateFeesPerGas = vi.fn().mockResolvedValue({
+        maxFeePerGas: 1000000000n,
+        maxPriorityFeePerGas: 100000000n,
+      });
+
+      await manager.burnNonce(
+        mockWalletClient as any,
+        nonceToBurn,
+        address,
+        chainId,
+      );
+
+      expect(mockWalletClient.sendTransaction).toHaveBeenCalledWith(
+        expect.objectContaining({
+          account: { address },
+          to: address, // Self-transfer
+          value: 0n, // Zero value
+          nonce: nonceToBurn,
+          gas: 21000n, // Minimal gas
+        }),
+      );
+    });
+  });
+
+  describe("resetNonce() failures", () => {
+    it("should handle blockchain query failures during reset", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      mockStore.acquireLock.mockResolvedValue("lock-reset");
+      mockPublicClient.getTransactionCount.mockRejectedValue(
+        new Error("RPC endpoint unavailable"),
+      );
+
+      await expect(manager.resetNonce(address, chainId)).rejects.toThrow(
+        "RPC endpoint unavailable",
+      );
+
+      // Lock should still be released
+      expect(mockStore.releaseLock).toHaveBeenCalledWith(
+        expect.stringContaining(
+          `nonce:${chainId}:${address.toLowerCase()}:lock`,
+        ),
+        "lock-reset",
+      );
+    });
+
+    it("should handle store.set failures during reset", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      mockStore.acquireLock.mockResolvedValue("lock-reset");
+      mockPublicClient.getTransactionCount.mockResolvedValue(10);
+      mockStore.set.mockRejectedValue(new Error("Redis connection lost"));
+
+      await expect(manager.resetNonce(address, chainId)).rejects.toThrow(
+        "Redis connection lost",
+      );
+
+      expect(mockStore.releaseLock).toHaveBeenCalled();
+    });
+
+    it("should retry lock acquisition during reset with exponential backoff", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // Fail twice, then succeed
+      mockStore.acquireLock
+        .mockResolvedValueOnce(null)
+        .mockResolvedValueOnce(null)
+        .mockResolvedValueOnce("lock-reset");
+
+      mockPublicClient.getTransactionCount.mockResolvedValue(5);
+
+      const startTime = Date.now();
+      await manager.resetNonce(address, chainId);
+      const elapsed = Date.now() - startTime;
+
+      expect(mockStore.acquireLock).toHaveBeenCalledTimes(3);
+      // Should have applied backoff
+      expect(elapsed).toBeGreaterThan(100);
+    });
+  });
+
+  describe("Distributed coordination - Complex scenarios", () => {
+    it("should handle multiple SDK instances competing for same address", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      const instance1 = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        maxLockRetries: 10,
+        lockRetryDelay: 10,
+      });
+
+      const instance2 = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        maxLockRetries: 10,
+        lockRetryDelay: 10,
+      });
+
+      const instance3 = new DistributedNonceManager({
+        atomicStore: mockStore,
+        publicClient: mockPublicClient,
+        maxLockRetries: 10,
+        lockRetryDelay: 10,
+      });
+
+      // Simulate lock contention
+      let lockCallCount = 0;
+      mockStore.acquireLock.mockImplementation(() => {
+        lockCallCount++;
+        // Only every 3rd call succeeds
+        if (lockCallCount % 3 === 0) {
+          return Promise.resolve(`lock-${lockCallCount}`);
+        }
+        return Promise.resolve(null);
+      });
+
+      mockStore.incr
+        .mockResolvedValueOnce(1)
+        .mockResolvedValueOnce(2)
+        .mockResolvedValueOnce(3);
+
+      const [nonce1, nonce2, nonce3] = await Promise.all([
+        instance1.assignNonce(address, chainId),
+        instance2.assignNonce(address, chainId),
+        instance3.assignNonce(address, chainId),
+      ]);
+
+      // All should eventually succeed with unique nonces
+      expect(new Set([nonce1, nonce2, nonce3]).size).toBe(3);
+      expect(mockStore.acquireLock.mock.calls.length).toBeGreaterThan(3);
+    });
+
+    it("should handle race conditions between assignNonce and resetNonce", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      // First call gets lock for assignment
+      // Second call gets lock for reset
+      mockStore.acquireLock
+        .mockResolvedValueOnce("lock-assign")
+        .mockResolvedValueOnce("lock-reset");
+
+      mockPublicClient.getTransactionCount.mockResolvedValue(10);
+      mockStore.incr.mockResolvedValue(11);
+
+      // Run assignment and reset concurrently
+      const [nonce] = await Promise.all([
+        manager.assignNonce(address, chainId),
+        manager.resetNonce(address, chainId),
+      ]);
+
+      // Both should complete without deadlock
+      expect(nonce).toBe(11);
+      expect(mockStore.acquireLock).toHaveBeenCalledTimes(2);
+      expect(mockStore.releaseLock).toHaveBeenCalledTimes(2);
+    });
+
+    it("should handle store failures during critical section after lock acquired", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      mockStore.acquireLock.mockResolvedValue("lock-123");
+      mockPublicClient.getTransactionCount.mockResolvedValue(5);
+      mockStore.get.mockResolvedValue("3");
+      // Store fails during critical section
+      mockStore.incr.mockRejectedValue(new Error("Store write failed"));
+
+      await expect(manager.assignNonce(address, chainId)).rejects.toThrow(
+        "Store write failed",
+      );
+
+      // Lock must be released even on failure
+      expect(mockStore.releaseLock).toHaveBeenCalledWith(
+        expect.stringContaining(
+          `nonce:${chainId}:${address.toLowerCase()}:lock`,
+        ),
+        "lock-123",
+      );
+    });
+
+    it("should handle lock release failures gracefully", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      mockStore.acquireLock.mockResolvedValue("lock-123");
+      mockPublicClient.getTransactionCount.mockResolvedValue(5);
+      mockStore.incr.mockResolvedValue(6);
+
+      // Attempt to get nonce
+      const noncePromise = manager.assignNonce(address, chainId);
+
+      // Wait a bit for the incr to complete, then make releaseLock fail
+      await new Promise((resolve) => setTimeout(resolve, 50));
+      mockStore.releaseLock.mockRejectedValueOnce(
+        new Error("Lock release failed"),
+      );
+
+      // Should still return nonce successfully despite lock release failure
+      const nonce = await noncePromise;
+      expect(nonce).toBe(6);
+
+      // Release should have been attempted
+      expect(mockStore.releaseLock).toHaveBeenCalled();
+    });
+
+    it("should handle store get failures during sync check", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      mockStore.acquireLock.mockResolvedValue("lock-123");
+      mockPublicClient.getTransactionCount.mockResolvedValue(5);
+      mockStore.get.mockRejectedValue(new Error("Store read failed"));
+
+      await expect(manager.assignNonce(address, chainId)).rejects.toThrow(
+        "Store read failed",
+      );
+
+      expect(mockStore.releaseLock).toHaveBeenCalled();
+    });
+
+    it("should maintain consistency when blockchain pending count changes during assignment", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chainId = 14800;
+
+      mockStore.acquireLock.mockResolvedValue("lock-123");
+
+      // Blockchain has 5 pending transactions (count=5, so pending nonce would be 4)
+      mockPublicClient.getTransactionCount.mockResolvedValue(5);
+
+      // Store has stored nonce 2 (lower than blockchain)
+      mockStore.get.mockResolvedValue("2");
+      mockStore.incr.mockResolvedValue(5);
+
+      const nonce = await manager.assignNonce(address, chainId);
+
+      expect(nonce).toBe(5);
+      // Should have synced to blockchain state (blockchain pending = 5-1 = 4)
+      expect(mockStore.set).toHaveBeenCalledWith(
+        expect.stringContaining(
+          `nonce:${chainId}:${address.toLowerCase()}:lastUsed`,
+        ),
+        "4", // blockchain pending: 5 - 1 = 4
+      );
+    });
+
+    it("should handle concurrent operations on different chains correctly", async () => {
+      const address = "0x1234567890123456789012345678901234567890" as Address;
+      const chain1 = 14800; // Moksha
+      const chain2 = 1480; // Mainnet
+
+      mockStore.acquireLock
+        .mockResolvedValueOnce("lock-chain1")
+        .mockResolvedValueOnce("lock-chain2");
+
+      mockPublicClient.getTransactionCount.mockResolvedValue(0);
+      mockStore.incr.mockResolvedValueOnce(0).mockResolvedValueOnce(0);
+
+      // Assign nonces on different chains concurrently
+      const [nonce1, nonce2] = await Promise.all([
+        manager.assignNonce(address, chain1),
+        manager.assignNonce(address, chain2),
+      ]);
+
+      expect(nonce1).toBe(0);
+      expect(nonce2).toBe(0);
+
+      // Should have acquired different locks (different chain IDs in key)
+      const lockCalls = mockStore.acquireLock.mock.calls;
+      expect(lockCalls[0][0]).toContain(`nonce:${chain1}:`);
+      expect(lockCalls[1][0]).toContain(`nonce:${chain2}:`);
+    });
+  });
 });
diff --git a/packages/vana-sdk/src/core/inMemoryNonceManager.ts b/packages/vana-sdk/src/core/inMemoryNonceManager.ts
index 16812f69..3f077543 100644
--- a/packages/vana-sdk/src/core/inMemoryNonceManager.ts
+++ b/packages/vana-sdk/src/core/inMemoryNonceManager.ts
@@ -126,8 +126,15 @@ export class InMemoryNonceManager {
       );
 
       // Send minimal self-transfer to burn the nonce
+      const account = walletClient.account;
+      if (!account) {
+        throw new Error(
+          "WalletClient must be configured with an account to burn stuck nonces",
+        );
+      }
+
       const burnTx = await walletClient.sendTransaction({
-        account: walletClient.account!,
+        account,
         to: address,
         value: 0n,
         nonce: nonceToBurn,
diff --git a/packages/vana-sdk/src/core/nonceManager.ts b/packages/vana-sdk/src/core/nonceManager.ts
index 42b5bed8..4d00a9d0 100644
--- a/packages/vana-sdk/src/core/nonceManager.ts
+++ b/packages/vana-sdk/src/core/nonceManager.ts
@@ -345,8 +345,15 @@ export class DistributedNonceManager {
       );
 
       // Send minimal self-transfer to burn the nonce
+      const account = walletClient.account;
+      if (!account) {
+        throw new Error(
+          "WalletClient must be configured with an account to burn stuck nonces",
+        );
+      }
+
       const burnTx = await walletClient.sendTransaction({
-        account: walletClient.account!, // WalletClient should have an account
+        account,
         to: address, // Self-transfer
         value: 0n,
         nonce: nonceToBurn,
diff --git a/packages/vana-sdk/src/core/pollingManager.ts b/packages/vana-sdk/src/core/pollingManager.ts
index 148786ba..7dfaa9e2 100644
--- a/packages/vana-sdk/src/core/pollingManager.ts
+++ b/packages/vana-sdk/src/core/pollingManager.ts
@@ -61,6 +61,32 @@ const DEFAULT_POLLING_OPTIONS: Required<PollingOptions> = {
   jitter: 0.2, // 20% randomization
 };
 
+/**
+ * Platform-agnostic timeout ID type.
+ *
+ * @remarks
+ * In Node.js, setTimeout returns a NodeJS.Timeout object.
+ * In browsers, setTimeout returns a number.
+ * This type union handles both platforms safely.
+ */
+type TimeoutId = ReturnType<typeof setTimeout>;
+
+/**
+ * Type guard to check if a result object has queue status.
+ *
+ * @internal
+ */
+function hasQueueStatus(
+  result: unknown,
+): result is { status: string; position?: number; estimatedWait?: number } {
+  return (
+    typeof result === "object" &&
+    result !== null &&
+    "status" in result &&
+    typeof (result as { status: unknown }).status === "string"
+  );
+}
+
 /**
  * Internal polling manager that handles asynchronous relayer operations.
  *
@@ -72,8 +98,8 @@ const DEFAULT_POLLING_OPTIONS: Required<PollingOptions> = {
  */
 export class PollingManager {
   private abortController?: AbortController;
-  private timeoutId?: NodeJS.Timeout | number;
-  private pollIntervalId?: NodeJS.Timeout | number;
+  private timeoutId?: TimeoutId;
+  private pollIntervalId?: TimeoutId;
 
   constructor(
     private readonly relayerCallback: (
@@ -266,16 +292,17 @@ export class PollingManager {
 
       case "direct":
         // Direct responses during polling might include queue info
-        const result = response.result as any;
-        if (result?.status === "queued") {
-          return {
-            type: "queued",
-            position: result.position,
-            estimatedWait: result.estimatedWait,
-          };
-        }
-        if (result?.status === "processing") {
-          return { type: "processing" };
+        if (hasQueueStatus(response.result)) {
+          if (response.result.status === "queued") {
+            return {
+              type: "queued",
+              position: response.result.position,
+              estimatedWait: response.result.estimatedWait,
+            };
+          }
+          if (response.result.status === "processing") {
+            return { type: "processing" };
+          }
         }
         // Fallback
         return { type: "pending", operationId };
@@ -340,7 +367,7 @@ export class PollingManager {
         reject(new Error("Polling cancelled"));
       });
 
-      this.pollIntervalId = timeoutId as any;
+      this.pollIntervalId = timeoutId;
     });
   }
 
@@ -359,7 +386,7 @@ export class PollingManager {
             this.getLastKnownStatus(context),
           ),
         );
-      }, context.options.timeout) as any;
+      }, context.options.timeout);
     });
   }
 
@@ -416,12 +443,12 @@ export class PollingManager {
    */
   private cleanup(): void {
     if (this.timeoutId) {
-      clearTimeout(this.timeoutId as any);
+      clearTimeout(this.timeoutId);
       this.timeoutId = undefined;
     }
 
     if (this.pollIntervalId) {
-      clearTimeout(this.pollIntervalId as any);
+      clearTimeout(this.pollIntervalId);
       this.pollIntervalId = undefined;
     }
 
diff --git a/packages/vana-sdk/src/index.browser.ts b/packages/vana-sdk/src/index.browser.ts
index 42b0c34e..07567c26 100644
--- a/packages/vana-sdk/src/index.browser.ts
+++ b/packages/vana-sdk/src/index.browser.ts
@@ -168,6 +168,8 @@ export * from "./errors";
 
 // Controllers
 export { PermissionsController } from "./controllers/permissions";
+// TODO: Re-enable when VanaRuntimePermissions contract is deployed and added to SDK
+// export { RuntimePermissionsController } from "./controllers/runtimePermissions";
 export { DataController } from "./controllers/data";
 export { ServerController } from "./controllers/server";
 export { ProtocolController } from "./controllers/protocol";
diff --git a/packages/vana-sdk/src/index.node.ts b/packages/vana-sdk/src/index.node.ts
index 46a627bd..fec815ee 100644
--- a/packages/vana-sdk/src/index.node.ts
+++ b/packages/vana-sdk/src/index.node.ts
@@ -221,7 +221,10 @@ export type {
 
 // Storage implementations
 export { RedisAtomicStore } from "./lib/redisAtomicStore";
-export type { RedisAtomicStoreConfig } from "./lib/redisAtomicStore";
+export type {
+  RedisAtomicStoreConfig,
+  IRedisClient,
+} from "./lib/redisAtomicStore";
 
 // Types - modular exports
 export type * from "./types";
@@ -256,6 +259,8 @@ export * from "./errors";
 
 // Controllers
 export { PermissionsController } from "./controllers/permissions";
+// TODO: Re-enable when VanaRuntimePermissions contract is deployed and added to SDK
+// export { RuntimePermissionsController } from "./controllers/runtimePermissions";
 export { DataController } from "./controllers/data";
 export { ServerController } from "./controllers/server";
 export { ProtocolController } from "./controllers/protocol";
diff --git a/packages/vana-sdk/src/lib/__tests__/redisAtomicStore.test.ts b/packages/vana-sdk/src/lib/__tests__/redisAtomicStore.test.ts
index d0934c17..0f24c4b5 100644
--- a/packages/vana-sdk/src/lib/__tests__/redisAtomicStore.test.ts
+++ b/packages/vana-sdk/src/lib/__tests__/redisAtomicStore.test.ts
@@ -1,4 +1,5 @@
 import { describe, it, expect, beforeEach, vi } from "vitest";
+import type { IRedisClient } from "../redisAtomicStore";
 import { RedisAtomicStore } from "../redisAtomicStore";
 
 // Mock ioredis
@@ -9,7 +10,7 @@ const mockRedis = {
   del: vi.fn(),
   eval: vi.fn(),
   setex: vi.fn(),
-};
+} as unknown as IRedisClient;
 
 describe("RedisAtomicStore", () => {
   let store: RedisAtomicStore;
@@ -17,14 +18,14 @@ describe("RedisAtomicStore", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     store = new RedisAtomicStore({
-      redis: mockRedis as any,
+      redis: mockRedis,
       keyPrefix: "test",
     });
   });
 
   describe("incr", () => {
     it("should atomically increment a counter", async () => {
-      mockRedis.incr.mockResolvedValue(42);
+      vi.mocked(mockRedis.incr).mockResolvedValue(42);
 
       const result = await store.incr("counter");
 
@@ -35,7 +36,7 @@ describe("RedisAtomicStore", () => {
 
   describe("acquireLock", () => {
     it("should acquire lock when available", async () => {
-      mockRedis.set.mockResolvedValue("OK");
+      vi.mocked(mockRedis.set).mockResolvedValue("OK");
 
       const lockId = await store.acquireLock("resource", 5);
 
@@ -51,7 +52,7 @@ describe("RedisAtomicStore", () => {
     });
 
     it("should return null when lock is held", async () => {
-      mockRedis.set.mockResolvedValue(null);
+      vi.mocked(mockRedis.set).mockResolvedValue(null);
 
       const lockId = await store.acquireLock("resource", 5);
 
@@ -61,7 +62,7 @@ describe("RedisAtomicStore", () => {
 
   describe("releaseLock", () => {
     it("should release lock with matching ID", async () => {
-      mockRedis.eval.mockResolvedValue(1);
+      vi.mocked(mockRedis.eval).mockResolvedValue(1);
 
       await store.releaseLock("resource", "lock-123");
 
@@ -74,7 +75,7 @@ describe("RedisAtomicStore", () => {
     });
 
     it("should warn when lock ID doesn't match", async () => {
-      mockRedis.eval.mockResolvedValue(0);
+      vi.mocked(mockRedis.eval).mockResolvedValue(0);
       const consoleSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
       await store.releaseLock("resource", "wrong-id");
@@ -88,7 +89,7 @@ describe("RedisAtomicStore", () => {
 
   describe("get/set", () => {
     it("should store and retrieve values", async () => {
-      mockRedis.get.mockResolvedValue("stored-value");
+      vi.mocked(mockRedis.get).mockResolvedValue("stored-value");
 
       await store.set("key", "stored-value");
       const value = await store.get("key");
@@ -98,7 +99,7 @@ describe("RedisAtomicStore", () => {
     });
 
     it("should return null for missing keys", async () => {
-      mockRedis.get.mockResolvedValue(null);
+      vi.mocked(mockRedis.get).mockResolvedValue(null);
 
       const value = await store.get("missing");
 
@@ -126,7 +127,7 @@ describe("RedisAtomicStore", () => {
     it("should validate redis client has required methods", () => {
       expect(() => {
         new RedisAtomicStore({
-          redis: {} as any,
+          redis: {} as unknown as IRedisClient,
         });
       }).toThrow("Invalid Redis client instance");
     });
@@ -134,7 +135,7 @@ describe("RedisAtomicStore", () => {
     it("should reject string redis connection", () => {
       expect(() => {
         new RedisAtomicStore({
-          redis: "redis://localhost:6379",
+          redis: "redis://localhost:6379" as unknown as IRedisClient,
         });
       }).toThrow("requires an initialized Redis client instance");
     });
diff --git a/packages/vana-sdk/src/lib/redisAtomicStore.ts b/packages/vana-sdk/src/lib/redisAtomicStore.ts
index cc02858f..49dbb27e 100644
--- a/packages/vana-sdk/src/lib/redisAtomicStore.ts
+++ b/packages/vana-sdk/src/lib/redisAtomicStore.ts
@@ -10,12 +10,45 @@
 
 import type { IAtomicStoreWithNonceSupport } from "../types/atomicStore";
 
+/**
+ * Minimal interface for Redis client compatibility.
+ *
+ * @remarks
+ * This interface defines the methods that RedisAtomicStore requires from a Redis client.
+ * It's compatible with ioredis (Redis instance) and other Redis clients that implement
+ * these core methods. Users should pass an already-instantiated Redis client.
+ *
+ * @internal
+ */
+export interface IRedisClient {
+  /** Atomic increment operation */
+  incr(key: string): Promise<number>;
+  /** SET with options (NX, EX, etc.) */
+  set(
+    key: string,
+    value: string,
+    ...args: Array<string | number>
+  ): Promise<string | null>;
+  /** GET operation */
+  get(key: string): Promise<string | null>;
+  /** Delete operation */
+  del(key: string): Promise<number>;
+  /** SETEX operation (SET with TTL) */
+  setex(key: string, seconds: number, value: string): Promise<string>;
+  /** Execute Lua script */
+  eval(
+    script: string,
+    numKeys: number,
+    ...args: Array<string | number>
+  ): Promise<unknown>;
+}
+
 /**
  * Configuration for RedisAtomicStore
  */
 export interface RedisAtomicStoreConfig {
-  /** Redis connection URL or ioredis options */
-  redis: string | any;
+  /** Redis client instance (ioredis.Redis or compatible) */
+  redis: IRedisClient;
   /** Key prefix for all operations (default: 'vana-sdk:atomic') */
   keyPrefix?: string;
 }
@@ -55,7 +88,7 @@ export interface RedisAtomicStoreConfig {
  * @category Storage
  */
 export class RedisAtomicStore implements IAtomicStoreWithNonceSupport {
-  private redis: any; // ioredis instance
+  private redis: IRedisClient;
   private keyPrefix: string;
 
   /**
@@ -200,7 +233,7 @@ export class RedisAtomicStore implements IAtomicStoreWithNonceSupport {
    * @param args - Array of arguments
    * @returns The script's return value
    */
-  async eval(script: string, keys: string[], args: string[]): Promise<any> {
+  async eval(script: string, keys: string[], args: string[]): Promise<unknown> {
     // Apply key prefix to all keys
     const prefixedKeys = keys.map((key) => `${this.keyPrefix}:${key}`);
 
diff --git a/packages/vana-sdk/src/server/relayerHandler.ts b/packages/vana-sdk/src/server/relayerHandler.ts
index 03e854e9..df549646 100644
--- a/packages/vana-sdk/src/server/relayerHandler.ts
+++ b/packages/vana-sdk/src/server/relayerHandler.ts
@@ -21,6 +21,7 @@ import type {
   ServerFilesAndPermissionTypedData,
   TypedDataPrimaryType,
 } from "../types/permissions";
+import type { RelayerHandlerSDK } from "../types/controller-context";
 import { SignatureError } from "../errors";
 import { recoverTypedDataAddress, getAddress, type Hash } from "viem";
 
@@ -168,13 +169,24 @@ export async function handleRelayerOperation(
               receipt = await publicClient.getTransactionReceipt({
                 hash: state.transactionHash,
               });
-            } catch (receiptError: any) {
+            } catch (receiptError: unknown) {
               // Transaction not found is expected - it may not be mined yet
-              if (receiptError?.name !== "TransactionReceiptNotFoundError") {
+              if (
+                typeof receiptError === "object" &&
+                receiptError !== null &&
+                "name" in receiptError &&
+                receiptError.name !== "TransactionReceiptNotFoundError"
+              ) {
                 // Unexpected error - log but don't fail
+                const errorMessage =
+                  typeof receiptError === "object" &&
+                  receiptError !== null &&
+                  "message" in receiptError
+                    ? (receiptError.message as unknown)
+                    : receiptError;
                 console.warn(
                   `⚠️ [Relayer] Unexpected error checking receipt:`,
-                  receiptError?.message ?? receiptError,
+                  errorMessage,
                 );
               }
               // Continue returning pending status
@@ -640,9 +652,10 @@ async function handleDirectOperation(
     case "storeGrantFile": {
       const grantFile = request.params;
 
-      // Access the data controller's context which has storage
-      const dataController = sdk.data as any;
-      const context = dataController.context;
+      // Access the data controller's context which has storage using type-safe interface.
+      // Cast through unknown first to safely bridge from VanaInstance to RelayerHandlerSDK.
+      const sdkForStorageAccess = sdk as unknown as RelayerHandlerSDK;
+      const context = sdkForStorageAccess.data.context;
 
       if (!context?.storageManager) {
         throw new Error(
diff --git a/packages/vana-sdk/src/subgraph/queries/data.graphql b/packages/vana-sdk/src/subgraph/queries/data.graphql
index 6eb2b792..eb4ad9e6 100644
--- a/packages/vana-sdk/src/subgraph/queries/data.graphql
+++ b/packages/vana-sdk/src/subgraph/queries/data.graphql
@@ -42,4 +42,4 @@ query GetUserTrustedServers($userId: ID!) {
       transactionHash
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/vana-sdk/src/subgraph/queries/files-paginated.graphql b/packages/vana-sdk/src/subgraph/queries/files-paginated.graphql
index b7c150cb..85ce0809 100644
--- a/packages/vana-sdk/src/subgraph/queries/files-paginated.graphql
+++ b/packages/vana-sdk/src/subgraph/queries/files-paginated.graphql
@@ -32,4 +32,4 @@ query GetUserFilesPaginated(
     }
     hasIndexingErrors
   }
-}
\ No newline at end of file
+}
diff --git a/packages/vana-sdk/src/subgraph/queries/files.graphql b/packages/vana-sdk/src/subgraph/queries/files.graphql
index c09c242d..9035c215 100644
--- a/packages/vana-sdk/src/subgraph/queries/files.graphql
+++ b/packages/vana-sdk/src/subgraph/queries/files.graphql
@@ -33,4 +33,4 @@ query GetDLP($id: ID!) {
     address
     owner
   }
-}
\ No newline at end of file
+}
diff --git a/packages/vana-sdk/src/subgraph/queries/meta.graphql b/packages/vana-sdk/src/subgraph/queries/meta.graphql
index 1614b7c6..e796a2f7 100644
--- a/packages/vana-sdk/src/subgraph/queries/meta.graphql
+++ b/packages/vana-sdk/src/subgraph/queries/meta.graphql
@@ -22,4 +22,4 @@ query GetSubgraphMetaAtBlock($blockNumber: Int!) {
     deployment
     hasIndexingErrors
   }
-}
\ No newline at end of file
+}
diff --git a/packages/vana-sdk/src/subgraph/queries/permissions-paginated.graphql b/packages/vana-sdk/src/subgraph/queries/permissions-paginated.graphql
index 68b30030..8f1c0788 100644
--- a/packages/vana-sdk/src/subgraph/queries/permissions-paginated.graphql
+++ b/packages/vana-sdk/src/subgraph/queries/permissions-paginated.graphql
@@ -42,4 +42,4 @@ query GetUserPermissionsPaginated(
     }
     hasIndexingErrors
   }
-}
\ No newline at end of file
+}
diff --git a/packages/vana-sdk/src/subgraph/queries/schemas.graphql b/packages/vana-sdk/src/subgraph/queries/schemas.graphql
index 4afd7625..6b2f620a 100644
--- a/packages/vana-sdk/src/subgraph/queries/schemas.graphql
+++ b/packages/vana-sdk/src/subgraph/queries/schemas.graphql
@@ -36,4 +36,4 @@ query CountSchemas {
   schemas(first: 1000) {
     id
   }
-}
\ No newline at end of file
+}
diff --git a/packages/vana-sdk/src/subgraph/queries/trusted-servers-paginated.graphql b/packages/vana-sdk/src/subgraph/queries/trusted-servers-paginated.graphql
index a69e839e..859bbb91 100644
--- a/packages/vana-sdk/src/subgraph/queries/trusted-servers-paginated.graphql
+++ b/packages/vana-sdk/src/subgraph/queries/trusted-servers-paginated.graphql
@@ -34,4 +34,4 @@ query GetUserTrustedServersPaginated(
     }
     hasIndexingErrors
   }
-}
\ No newline at end of file
+}
diff --git a/packages/vana-sdk/src/tests/permissions-server-files.test.ts b/packages/vana-sdk/src/tests/permissions-server-files.test.ts
index 432cdcfc..83e39aba 100644
--- a/packages/vana-sdk/src/tests/permissions-server-files.test.ts
+++ b/packages/vana-sdk/src/tests/permissions-server-files.test.ts
@@ -466,9 +466,8 @@ describe("Permissions Server Files and Permissions", () => {
       expect(writeContractCall).not.toHaveProperty("gasPrice");
     });
 
-    it("should include value parameter when provided", async () => {
+    it("should include gas parameter when provided", async () => {
       const options = {
-        value: 10n ** 18n, // 1 ETH
         gas: 21000n,
       };
 
@@ -477,9 +476,9 @@ describe("Permissions Server Files and Permissions", () => {
       expect(mockWalletClient.writeContract).toHaveBeenCalledWith(
         expect.objectContaining({
           gas: 21000n,
-          value: 10n ** 18n,
         }),
       );
+      // Note: addServerFilesAndPermissions is not a payable function, so value parameter is not supported
     });
 
     it("should work without any options (backward compatibility)", async () => {
diff --git a/packages/vana-sdk/src/tests/platform-index.test.ts b/packages/vana-sdk/src/tests/platform-index.test.ts
index d11f0d58..002500a7 100644
--- a/packages/vana-sdk/src/tests/platform-index.test.ts
+++ b/packages/vana-sdk/src/tests/platform-index.test.ts
@@ -27,4 +27,4 @@ describe("Platform Index", () => {
     expect(adapter.pgp).toBeDefined();
     expect(adapter.http).toBeDefined();
   });
-});
\ No newline at end of file
+});
diff --git a/packages/vana-sdk/src/types/controller-context.ts b/packages/vana-sdk/src/types/controller-context.ts
index b4894719..ed616514 100644
--- a/packages/vana-sdk/src/types/controller-context.ts
+++ b/packages/vana-sdk/src/types/controller-context.ts
@@ -85,3 +85,44 @@ export interface ControllerContext {
   /** Tracks async relayed transactions for resilient management. */
   operationStore?: IOperationStore | IRelayerStateStore;
 }
+
+/**
+ * Minimal SDK interface for enhanced response handling.
+ *
+ * @remarks
+ * This interface defines the minimal SDK surface that EnhancedTransactionResponse needs
+ * to avoid circular dependencies while maintaining type safety. It represents a subset
+ * of the full SDK functionality.
+ *
+ * @category Client
+ */
+export interface EnhancedResponseSDK {
+  /** Public client for blockchain queries. */
+  publicClient: PublicClient;
+  /** Waits for transaction confirmation and parses typed events. */
+  waitForTransactionEvents: WaitForTransactionEventsFn;
+  /** Relayer callback for polling pending operations. */
+  relayer?: (request: UnifiedRelayerRequest) => Promise<UnifiedRelayerResponse>;
+}
+
+/**
+ * SDK interface for accessing controllers with their context.
+ *
+ * @remarks
+ * This interface defines the minimal SDK surface needed by server-side relayer handlers
+ * to access controller contexts. It provides type-safe access to controllers without
+ * requiring the full SDK interface, avoiding unsafe type assertions.
+ *
+ * Note: The context property is protected on the actual DataController, so we use
+ * this interface as a type bridge to safely access it in server-side contexts where
+ * we know the SDK instance has been properly initialized with storage.
+ *
+ * @category Server
+ */
+export interface RelayerHandlerSDK {
+  /** Data controller for file operations and storage access. */
+  readonly data: {
+    /** Controller context containing storage and client configuration. Protected in actual class but exposed via type bridge. */
+    readonly context: ControllerContext;
+  };
+}
diff --git a/packages/vana-sdk/src/types/index.ts b/packages/vana-sdk/src/types/index.ts
index 03da14be..a4429650 100644
--- a/packages/vana-sdk/src/types/index.ts
+++ b/packages/vana-sdk/src/types/index.ts
@@ -202,6 +202,14 @@ export type {
   Permission,
 } from "./permissions";
 
+// Runtime Permissions types
+export type {
+  RuntimePermissionParams,
+  RuntimeGrantFile,
+  RuntimePermission,
+  RuntimePermissionResult,
+} from "./runtimePermissions";
+
 // Personal server types
 export type {
   PostRequestParams,
diff --git a/packages/vana-sdk/src/types/operationStore.ts b/packages/vana-sdk/src/types/operationStore.ts
index 63c0f8fd..4709571c 100644
--- a/packages/vana-sdk/src/types/operationStore.ts
+++ b/packages/vana-sdk/src/types/operationStore.ts
@@ -57,20 +57,25 @@ export interface IRelayerStateStore {
 
 /**
  * Represents a stored operation in the queue.
+ *
+ * @remarks
+ * Operations are stored with serialized data for recovery and processing.
+ * The metadata field allows storage of arbitrary key-value pairs for tracking
+ * additional context such as gas estimates, retry strategies, or user preferences.
  */
 export interface StoredOperation {
   /** Unique identifier for the operation */
   id: string;
   /** Current status of the operation */
   status: "queued" | "processing" | "submitted" | "completed" | "failed";
-  /** Serialized transaction or operation data */
+  /** Serialized transaction or operation data as JSON string */
   data: string;
   /** Number of retry attempts */
   retryCount?: number;
   /** Timestamp when the operation was created */
   createdAt?: number;
-  /** Additional metadata */
-  metadata?: any;
+  /** Additional metadata as key-value pairs */
+  metadata?: Record<string, unknown>;
 }
 
 /**
@@ -114,12 +119,15 @@ export interface IOperationStore {
    * Stores a new operation in the queue.
    *
    * @param operation - The operation to store
+   * @param operation.id - Unique identifier for the operation
+   * @param operation.data - Serialized operation data as JSON string
+   * @param operation.metadata - Optional metadata as key-value pairs
    * @returns Promise that resolves when the operation is stored
    */
   storeOperation(operation: {
     id: string;
-    data: any;
-    metadata?: any;
+    data: string;
+    metadata?: Record<string, unknown>;
   }): Promise<void>;
 
   /**
@@ -135,13 +143,13 @@ export interface IOperationStore {
    *
    * @param operationId - The ID of the operation to update
    * @param status - The new status
-   * @param metadata - Optional metadata to store with the update
+   * @param metadata - Optional metadata as key-value pairs to store with the update
    * @returns Promise that resolves when the status is updated
    */
   updateStatus(
     operationId: string,
     status: string,
-    metadata?: any,
+    metadata?: Record<string, unknown>,
   ): Promise<void>;
 
   /**
diff --git a/packages/vana-sdk/src/types/options.ts b/packages/vana-sdk/src/types/options.ts
index 04356638..cea6e7be 100644
--- a/packages/vana-sdk/src/types/options.ts
+++ b/packages/vana-sdk/src/types/options.ts
@@ -3,6 +3,8 @@
  * @module vana-sdk/types/options
  */
 
+import type { TransactionReceipt } from "viem";
+
 /**
  * Transaction options for blockchain write operations.
  *
@@ -134,7 +136,7 @@ export type OperationStatus =
       /** The transaction hash */
       hash: `0x${string}`;
       /** The transaction receipt if available */
-      receipt?: unknown;
+      receipt?: TransactionReceipt;
     }
   | {
       /** Operation failed with an error */
diff --git a/packages/vana-sdk/src/types/runtimePermissions.ts b/packages/vana-sdk/src/types/runtimePermissions.ts
new file mode 100644
index 00000000..2831ba22
--- /dev/null
+++ b/packages/vana-sdk/src/types/runtimePermissions.ts
@@ -0,0 +1,138 @@
+import type { Address, Hash } from "viem";
+
+/**
+ * Parameters for creating a runtime permission grant
+ *
+ * @remarks
+ * Defines access permissions for data consumers to execute operations on datasets
+ * via Vana Runtime. Similar to GrantPermissionParams but for VanaRuntimePermissions contract.
+ *
+ * @category Runtime Permissions
+ * @example
+ * ```typescript
+ * const params: RuntimePermissionParams = {
+ *   datasetId: 123n,
+ *   grantee: "0x...",
+ *   task: "thinker/task:v1",
+ *   operation: "aggregate_keywords",
+ *   pricing: { price_per_file_vana: 0.1 },
+ *   endBlock: 2000000n
+ * };
+ * ```
+ */
+export interface RuntimePermissionParams {
+  /** Dataset ID that this permission applies to */
+  datasetId: bigint;
+
+  /** Address of the data consumer (grantee) */
+  grantee: Address;
+
+  /** Task identifier (e.g., "thinker/task:v1") */
+  task: string;
+
+  /** Operation name (e.g., "train", "aggregate_keywords") */
+  operation: string;
+
+  /** Pricing configuration */
+  pricing: {
+    /** Price per file in VANA */
+    price_per_file_vana: number;
+    /** Optional minimum price in VANA */
+    minimum_price_vana?: number;
+    /** Optional maximum price in VANA */
+    maximum_price_vana?: number;
+  };
+
+  /** Operation parameters and constraints */
+  parameters?: Record<string, unknown>;
+
+  /** Optional start block (defaults to current block) */
+  startBlock?: bigint;
+
+  /** End block for permission expiry */
+  endBlock: bigint;
+
+  /** Optional: Pre-uploaded grant URL (IPFS) */
+  grantUrl?: string;
+}
+
+/**
+ * Grant file structure for runtime permissions
+ *
+ * @remarks
+ * Stored on IPFS and referenced on-chain via the grant field.
+ * Contains detailed permission parameters including pricing and operation constraints.
+ *
+ * @category Runtime Permissions
+ */
+export interface RuntimeGrantFile {
+  /** Address of the data consumer */
+  grantee: Address;
+
+  /** Task identifier */
+  task: string;
+
+  /** Operation name */
+  operation: string;
+
+  /** Pricing configuration */
+  pricing: {
+    price_per_file_vana: number;
+    minimum_price_vana?: number;
+    maximum_price_vana?: number;
+  };
+
+  /** Operation parameters and constraints */
+  parameters?: Record<string, unknown>;
+}
+
+/**
+ * On-chain permission structure
+ *
+ * @remarks
+ * Returned by VanaRuntimePermissions contract methods.
+ * The grant field contains an IPFS hash referencing the detailed RuntimeGrantFile.
+ *
+ * @category Runtime Permissions
+ */
+export interface RuntimePermission {
+  /** Unique permission identifier */
+  id: bigint;
+
+  /** Dataset this permission applies to */
+  datasetId: bigint;
+
+  /** Grantee identifier (consumer ID) */
+  granteeId: bigint;
+
+  /** IPFS hash of the grant file */
+  grant: string;
+
+  /** Nonce for replay protection */
+  nonce: bigint;
+
+  /** Block number when permission becomes active */
+  startBlock: bigint;
+
+  /** Block number when permission expires */
+  endBlock: bigint;
+}
+
+/**
+ * Result from creating a permission
+ *
+ * @remarks
+ * Contains the permission ID, transaction hash, and grant URL for reference.
+ *
+ * @category Runtime Permissions
+ */
+export interface RuntimePermissionResult {
+  /** On-chain permission ID */
+  permissionId: bigint;
+
+  /** Transaction hash */
+  hash: Hash;
+
+  /** IPFS URL of the grant file */
+  grantUrl: string;
+}
diff --git a/packages/vana-sdk/src/utils/__tests__/crypto-utils.test.ts b/packages/vana-sdk/src/utils/__tests__/crypto-utils.test.ts
new file mode 100644
index 00000000..71f45c75
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/crypto-utils.test.ts
@@ -0,0 +1,530 @@
+/**
+ * Tests for cryptographic utilities
+ *
+ * @remarks
+ * Tests platform-agnostic crypto utility functions for key processing,
+ * buffer parsing, validation, and byte array operations.
+ */
+
+import { describe, it, expect } from "vitest";
+import {
+  processWalletPublicKey,
+  processWalletPrivateKey,
+  parseEncryptedDataBuffer,
+  generateSeed,
+  bytesEqual,
+  copyBytes,
+  isValidPublicKeyFormat,
+  isValidPrivateKeyFormat,
+  assertUncompressedPublicKey,
+} from "../crypto-utils";
+
+describe("crypto-utils", () => {
+  describe("processWalletPublicKey", () => {
+    it("should convert hex string with 0x prefix to Uint8Array", () => {
+      const hex = "0x04" + "ab".repeat(64); // 65 bytes uncompressed key
+      const result = processWalletPublicKey(hex);
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBe(65);
+      expect(result[0]).toBe(0x04);
+    });
+
+    it("should convert hex string without 0x prefix to Uint8Array", () => {
+      const hex = "04" + "ab".repeat(64);
+      const result = processWalletPublicKey(hex);
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBe(65);
+      expect(result[0]).toBe(0x04);
+    });
+
+    it("should return Uint8Array unchanged", () => {
+      const bytes = new Uint8Array([0x04, 0xab, 0xcd, 0xef]);
+      const result = processWalletPublicKey(bytes);
+
+      expect(result).toBe(bytes); // Same reference
+      expect(result).toBeInstanceOf(Uint8Array);
+    });
+
+    it("should handle compressed public key (33 bytes)", () => {
+      const hex = "0x02" + "ab".repeat(32);
+      const result = processWalletPublicKey(hex);
+
+      expect(result.length).toBe(33);
+      expect(result[0]).toBe(0x02);
+    });
+
+    it("should handle uncompressed public key (65 bytes)", () => {
+      const hex = "0x04" + "12".repeat(64);
+      const result = processWalletPublicKey(hex);
+
+      expect(result.length).toBe(65);
+      expect(result[0]).toBe(0x04);
+    });
+
+    it("should preserve byte values when converting from hex", () => {
+      const hex = "0x0123456789abcdef";
+      const result = processWalletPublicKey(hex);
+
+      expect(Array.from(result)).toEqual([
+        0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+      ]);
+    });
+  });
+
+  describe("processWalletPrivateKey", () => {
+    it("should convert hex string with 0x prefix to Uint8Array", () => {
+      const hex = "0x" + "ab".repeat(32); // 32 bytes private key
+      const result = processWalletPrivateKey(hex);
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBe(32);
+    });
+
+    it("should convert hex string without 0x prefix to Uint8Array", () => {
+      const hex = "ab".repeat(32);
+      const result = processWalletPrivateKey(hex);
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBe(32);
+    });
+
+    it("should return Uint8Array unchanged", () => {
+      const bytes = new Uint8Array(32);
+      const result = processWalletPrivateKey(bytes);
+
+      expect(result).toBe(bytes); // Same reference
+    });
+
+    it("should handle standard private key (32 bytes)", () => {
+      const hex = "0x" + "ff".repeat(32);
+      const result = processWalletPrivateKey(hex);
+
+      expect(result.length).toBe(32);
+      expect(result.every((byte) => byte === 0xff)).toBe(true);
+    });
+
+    it("should preserve byte values when converting from hex", () => {
+      const hex =
+        "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
+      const result = processWalletPrivateKey(hex);
+
+      expect(result[0]).toBe(0x01);
+      expect(result[1]).toBe(0x23);
+      expect(result[result.length - 1]).toBe(0xef);
+    });
+  });
+
+  describe("parseEncryptedDataBuffer", () => {
+    it("should parse eccrypto format buffer correctly", () => {
+      // Create buffer: iv(16) + ephemPublicKey(65) + ciphertext(10) + mac(32)
+      const totalLength = 16 + 65 + 10 + 32; // 123 bytes
+      const buffer = new Uint8Array(totalLength);
+
+      // Fill with distinct patterns
+      buffer.fill(0x01, 0, 16); // iv
+      buffer.fill(0x02, 16, 81); // ephemPublicKey
+      buffer.fill(0x03, 81, 91); // ciphertext
+      buffer.fill(0x04, 91, 123); // mac
+
+      const result = parseEncryptedDataBuffer(buffer);
+
+      expect(result.iv.length).toBe(16);
+      expect(result.ephemPublicKey.length).toBe(65);
+      expect(result.ciphertext.length).toBe(10);
+      expect(result.mac.length).toBe(32);
+
+      expect(result.iv.every((byte) => byte === 0x01)).toBe(true);
+      expect(result.ephemPublicKey.every((byte) => byte === 0x02)).toBe(true);
+      expect(result.ciphertext.every((byte) => byte === 0x03)).toBe(true);
+      expect(result.mac.every((byte) => byte === 0x04)).toBe(true);
+    });
+
+    it("should handle minimum size buffer", () => {
+      // Minimum: iv(16) + ephemPublicKey(65) + ciphertext(0) + mac(32) = 113 bytes
+      const buffer = new Uint8Array(113);
+      const result = parseEncryptedDataBuffer(buffer);
+
+      expect(result.iv.length).toBe(16);
+      expect(result.ephemPublicKey.length).toBe(65);
+      expect(result.ciphertext.length).toBe(0);
+      expect(result.mac.length).toBe(32);
+    });
+
+    it("should handle large ciphertext", () => {
+      const ciphertextSize = 1000;
+      const buffer = new Uint8Array(16 + 65 + ciphertextSize + 32);
+      buffer.fill(0xaa, 81, 81 + ciphertextSize); // Fill ciphertext section
+
+      const result = parseEncryptedDataBuffer(buffer);
+
+      expect(result.ciphertext.length).toBe(ciphertextSize);
+      expect(result.ciphertext.every((byte) => byte === 0xaa)).toBe(true);
+    });
+
+    it("should correctly slice buffer boundaries", () => {
+      const buffer = new Uint8Array(123);
+      for (let i = 0; i < buffer.length; i++) {
+        buffer[i] = i % 256;
+      }
+
+      const result = parseEncryptedDataBuffer(buffer);
+
+      // Verify boundary values
+      expect(result.iv[0]).toBe(0);
+      expect(result.iv[15]).toBe(15);
+      expect(result.ephemPublicKey[0]).toBe(16);
+      expect(result.ephemPublicKey[64]).toBe(80);
+      expect(result.ciphertext[0]).toBe(81);
+      expect(result.mac[0]).toBe(91);
+      expect(result.mac[31]).toBe(122);
+    });
+
+    it("should return slices that share underlying buffer", () => {
+      const buffer = new Uint8Array(123);
+      const result = parseEncryptedDataBuffer(buffer);
+
+      // TypedArray.slice() creates views on the same buffer in some implementations
+      // Modify slices and verify they are independent from each other
+      result.iv[0] = 0xaa;
+      result.ephemPublicKey[0] = 0xbb;
+      result.mac[0] = 0xcc;
+
+      // Slices should be independent from each other
+      expect(result.iv[0]).toBe(0xaa);
+      expect(result.ephemPublicKey[0]).toBe(0xbb);
+      expect(result.mac[0]).toBe(0xcc);
+    });
+  });
+
+  describe("generateSeed", () => {
+    it("should generate seed from message", () => {
+      const message = "test message";
+      const result = generateSeed(message);
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBeGreaterThan(0);
+    });
+
+    it("should generate same seed for same message", () => {
+      const message = "deterministic";
+      const result1 = generateSeed(message);
+      const result2 = generateSeed(message);
+
+      expect(result1).toEqual(result2);
+    });
+
+    it("should generate different seeds for different messages", () => {
+      const seed1 = generateSeed("message1");
+      const seed2 = generateSeed("message2");
+
+      expect(seed1).not.toEqual(seed2);
+    });
+
+    it("should handle empty string", () => {
+      const result = generateSeed("");
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBe(0);
+    });
+
+    it("should handle unicode characters", () => {
+      const message = "Hello 世界 🌍";
+      const result = generateSeed(message);
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBeGreaterThan(message.length); // UTF-8 encoding
+    });
+
+    it("should handle special characters", () => {
+      const message = "!@#$%^&*()_+-={}[]|:;<>?,./";
+      const result = generateSeed(message);
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBe(message.length); // ASCII characters
+    });
+  });
+
+  describe("bytesEqual", () => {
+    it("should return true for equal arrays", () => {
+      const a = new Uint8Array([1, 2, 3, 4, 5]);
+      const b = new Uint8Array([1, 2, 3, 4, 5]);
+
+      expect(bytesEqual(a, b)).toBe(true);
+    });
+
+    it("should return false for different arrays", () => {
+      const a = new Uint8Array([1, 2, 3, 4, 5]);
+      const b = new Uint8Array([1, 2, 3, 4, 6]);
+
+      expect(bytesEqual(a, b)).toBe(false);
+    });
+
+    it("should return false for different lengths", () => {
+      const a = new Uint8Array([1, 2, 3]);
+      const b = new Uint8Array([1, 2, 3, 4]);
+
+      expect(bytesEqual(a, b)).toBe(false);
+    });
+
+    it("should return true for empty arrays", () => {
+      const a = new Uint8Array([]);
+      const b = new Uint8Array([]);
+
+      expect(bytesEqual(a, b)).toBe(true);
+    });
+
+    it("should return true for arrays with same reference", () => {
+      const a = new Uint8Array([1, 2, 3]);
+
+      expect(bytesEqual(a, a)).toBe(true);
+    });
+
+    it("should handle arrays with zeros", () => {
+      const a = new Uint8Array([0, 0, 0]);
+      const b = new Uint8Array([0, 0, 0]);
+
+      expect(bytesEqual(a, b)).toBe(true);
+    });
+
+    it("should detect difference at first byte", () => {
+      const a = new Uint8Array([1, 2, 3]);
+      const b = new Uint8Array([2, 2, 3]);
+
+      expect(bytesEqual(a, b)).toBe(false);
+    });
+
+    it("should detect difference at last byte", () => {
+      const a = new Uint8Array([1, 2, 3]);
+      const b = new Uint8Array([1, 2, 4]);
+
+      expect(bytesEqual(a, b)).toBe(false);
+    });
+  });
+
+  describe("copyBytes", () => {
+    it("should create independent copy", () => {
+      const original = new Uint8Array([1, 2, 3, 4, 5]);
+      const copy = copyBytes(original);
+
+      expect(copy).toEqual(original);
+      expect(copy).not.toBe(original); // Different reference
+    });
+
+    it("should not affect original when modifying copy", () => {
+      const original = new Uint8Array([1, 2, 3]);
+      const copy = copyBytes(original);
+
+      copy[0] = 99;
+
+      expect(original[0]).toBe(1);
+      expect(copy[0]).toBe(99);
+    });
+
+    it("should handle empty array", () => {
+      const original = new Uint8Array([]);
+      const copy = copyBytes(original);
+
+      expect(copy).toEqual(original);
+      expect(copy.length).toBe(0);
+    });
+
+    it("should handle large arrays", () => {
+      const original = new Uint8Array(10000);
+      original.fill(42);
+
+      const copy = copyBytes(original);
+
+      expect(copy.length).toBe(10000);
+      expect(copy.every((byte) => byte === 42)).toBe(true);
+      expect(copy).not.toBe(original);
+    });
+
+    it("should preserve all byte values", () => {
+      const original = new Uint8Array(256);
+      for (let i = 0; i < 256; i++) {
+        original[i] = i;
+      }
+
+      const copy = copyBytes(original);
+
+      expect(copy).toEqual(original);
+    });
+  });
+
+  describe("isValidPublicKeyFormat", () => {
+    it("should accept compressed key with 0x02 prefix (33 bytes)", () => {
+      const key = new Uint8Array(33);
+      key[0] = 0x02;
+
+      expect(isValidPublicKeyFormat(key)).toBe(true);
+    });
+
+    it("should accept compressed key with 0x03 prefix (33 bytes)", () => {
+      const key = new Uint8Array(33);
+      key[0] = 0x03;
+
+      expect(isValidPublicKeyFormat(key)).toBe(true);
+    });
+
+    it("should reject compressed key with wrong prefix (33 bytes)", () => {
+      const key = new Uint8Array(33);
+      key[0] = 0x04; // Wrong for compressed
+
+      expect(isValidPublicKeyFormat(key)).toBe(false);
+    });
+
+    it("should accept uncompressed key with 0x04 prefix (65 bytes)", () => {
+      const key = new Uint8Array(65);
+      key[0] = 0x04;
+
+      expect(isValidPublicKeyFormat(key)).toBe(true);
+    });
+
+    it("should reject uncompressed key with wrong prefix (65 bytes)", () => {
+      const key = new Uint8Array(65);
+      key[0] = 0x02; // Wrong for uncompressed
+
+      expect(isValidPublicKeyFormat(key)).toBe(false);
+    });
+
+    it("should accept raw coordinates (64 bytes)", () => {
+      const key = new Uint8Array(64);
+
+      expect(isValidPublicKeyFormat(key)).toBe(true);
+    });
+
+    it("should reject invalid lengths", () => {
+      expect(isValidPublicKeyFormat(new Uint8Array(32))).toBe(false);
+      expect(isValidPublicKeyFormat(new Uint8Array(34))).toBe(false);
+      expect(isValidPublicKeyFormat(new Uint8Array(63))).toBe(false);
+      expect(isValidPublicKeyFormat(new Uint8Array(66))).toBe(false);
+    });
+
+    it("should reject empty array", () => {
+      expect(isValidPublicKeyFormat(new Uint8Array(0))).toBe(false);
+    });
+
+    it("should reject too short keys", () => {
+      expect(isValidPublicKeyFormat(new Uint8Array(1))).toBe(false);
+      expect(isValidPublicKeyFormat(new Uint8Array(16))).toBe(false);
+    });
+  });
+
+  describe("isValidPrivateKeyFormat", () => {
+    it("should accept 32-byte private key", () => {
+      const key = new Uint8Array(32);
+
+      expect(isValidPrivateKeyFormat(key)).toBe(true);
+    });
+
+    it("should reject keys that are too short", () => {
+      expect(isValidPrivateKeyFormat(new Uint8Array(31))).toBe(false);
+      expect(isValidPrivateKeyFormat(new Uint8Array(16))).toBe(false);
+    });
+
+    it("should reject keys that are too long", () => {
+      expect(isValidPrivateKeyFormat(new Uint8Array(33))).toBe(false);
+      expect(isValidPrivateKeyFormat(new Uint8Array(64))).toBe(false);
+    });
+
+    it("should accept key with any byte values", () => {
+      const key = new Uint8Array(32);
+      key.fill(0xff);
+
+      expect(isValidPrivateKeyFormat(key)).toBe(true);
+    });
+
+    it("should accept key with all zeros", () => {
+      const key = new Uint8Array(32);
+
+      expect(isValidPrivateKeyFormat(key)).toBe(true);
+    });
+
+    it("should reject empty array", () => {
+      expect(isValidPrivateKeyFormat(new Uint8Array(0))).toBe(false);
+    });
+  });
+
+  describe("assertUncompressedPublicKey", () => {
+    it("should pass for valid uncompressed key", () => {
+      const key = new Uint8Array(65);
+      key[0] = 0x04;
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).not.toThrow();
+    });
+
+    it("should throw for compressed key (33 bytes)", () => {
+      const key = new Uint8Array(33);
+      key[0] = 0x02;
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).toThrow(/must be uncompressed \(65 bytes\)/);
+    });
+
+    it("should throw for raw coordinates (64 bytes)", () => {
+      const key = new Uint8Array(64);
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).toThrow(/must be uncompressed \(65 bytes\)/);
+    });
+
+    it("should throw for wrong length with byte count in message", () => {
+      const key = new Uint8Array(32);
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).toThrow(/got 32 bytes/);
+    });
+
+    it("should throw for wrong prefix", () => {
+      const key = new Uint8Array(65);
+      key[0] = 0x02;
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).toThrow(/must start with 0x04 prefix/);
+    });
+
+    it("should include prefix value in error message", () => {
+      const key = new Uint8Array(65);
+      key[0] = 0x03;
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).toThrow(/got 0x03/);
+    });
+
+    it("should mention normalizeToUncompressed in error", () => {
+      const key = new Uint8Array(33);
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).toThrow(/normalizeToUncompressed/);
+    });
+
+    it("should handle zero prefix with proper formatting", () => {
+      const key = new Uint8Array(65);
+      key[0] = 0x00;
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).toThrow(/got 0x00/);
+    });
+
+    it("should accept key with any values after valid prefix", () => {
+      const key = new Uint8Array(65);
+      key[0] = 0x04;
+      key.fill(0xff, 1);
+
+      expect(() => {
+        assertUncompressedPublicKey(key);
+      }).not.toThrow();
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/download.test.ts b/packages/vana-sdk/src/utils/__tests__/download.test.ts
new file mode 100644
index 00000000..5aa1d8d1
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/download.test.ts
@@ -0,0 +1,623 @@
+/**
+ * Tests for the universal download utility
+ *
+ * Covers:
+ * - Arweave URL protocol conversion
+ * - IPFS URL handling with gateway fallbacks
+ * - Direct HTTP/HTTPS fetches
+ * - Relayer fallback mechanisms
+ * - Error scenarios and edge cases
+ */
+
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { universalFetch } from "../download";
+
+// Mock the IPFS utilities
+vi.mock("../ipfs", () => ({
+  extractIpfsHash: vi.fn(),
+  fetchWithFallbacks: vi.fn(),
+}));
+
+import { extractIpfsHash, fetchWithFallbacks } from "../ipfs";
+const mockExtractIpfsHash = vi.mocked(extractIpfsHash);
+const mockFetchWithFallbacks = vi.mocked(fetchWithFallbacks);
+
+// Mock global fetch
+const mockFetch = vi.fn();
+global.fetch = mockFetch;
+
+describe("universalFetch", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockFetch.mockClear();
+    mockExtractIpfsHash.mockClear();
+    mockFetchWithFallbacks.mockClear();
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  describe("Arweave URL handling", () => {
+    it("should convert ar:// protocol to arweave.net HTTPS URL", async () => {
+      const txId = "abc123defXYZ";
+      const mockResponse = new Response("arweave content");
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(`ar://${txId}`);
+
+      expect(result).toBe(mockResponse);
+      expect(mockFetch).toHaveBeenCalledWith(`https://arweave.net/${txId}`);
+      expect(mockFetch).toHaveBeenCalledOnce();
+    });
+
+    it("should preserve arweave.net URL when fetching", async () => {
+      const mockResponse = new Response("arweave content");
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch("https://arweave.net/abc123");
+
+      expect(result).toBe(mockResponse);
+      expect(mockFetch).toHaveBeenCalledWith("https://arweave.net/abc123");
+    });
+
+    it("should handle arweave URLs with long transaction IDs", async () => {
+      const longTxId =
+        "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+      const mockResponse = new Response("content");
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      await universalFetch(`ar://${longTxId}`);
+
+      expect(mockFetch).toHaveBeenCalledWith(`https://arweave.net/${longTxId}`);
+    });
+  });
+
+  describe("IPFS URL handling", () => {
+    it("should use fetchWithFallbacks for IPFS URLs", async () => {
+      const ipfsUrl = "ipfs://QmXxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+      const mockResponse = new Response("ipfs content");
+      mockExtractIpfsHash.mockReturnValue("QmXxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+      mockFetchWithFallbacks.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(ipfsUrl);
+
+      expect(result).toBe(mockResponse);
+      expect(mockFetchWithFallbacks).toHaveBeenCalledWith(ipfsUrl);
+      expect(mockFetch).not.toHaveBeenCalled();
+    });
+
+    it("should handle gateway IPFS URLs (https://gateway.../ipfs/...)", async () => {
+      const gatewayUrl = "https://gateway.pinata.cloud/ipfs/QmHash123";
+      const hash = "QmHash123";
+      const mockResponse = new Response("content from gateway");
+      mockExtractIpfsHash.mockReturnValue(hash);
+      mockFetchWithFallbacks.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(gatewayUrl);
+
+      expect(result).toBe(mockResponse);
+      expect(mockFetchWithFallbacks).toHaveBeenCalledWith(gatewayUrl);
+    });
+
+    it("should extract hash from various IPFS URL formats", async () => {
+      const testCases = [
+        "ipfs://QmHash123",
+        "https://ipfs.io/ipfs/QmHash123",
+        "https://dweb.link/ipfs/QmHash123",
+        "QmHash123456789012345678901234567890123456",
+      ];
+
+      for (const url of testCases) {
+        vi.clearAllMocks();
+        const mockResponse = new Response("content");
+        mockExtractIpfsHash.mockReturnValue("QmHash123");
+        mockFetchWithFallbacks.mockResolvedValueOnce(mockResponse);
+
+        await universalFetch(url);
+
+        expect(mockFetchWithFallbacks).toHaveBeenCalled();
+      }
+    });
+  });
+
+  describe("Direct HTTP/HTTPS fetch", () => {
+    it("should fetch direct HTTPS URLs without relayer", async () => {
+      const url = "https://example.com/data.json";
+      const mockResponse = new Response("https content");
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(url);
+
+      expect(result).toBe(mockResponse);
+      expect(mockFetch).toHaveBeenCalledWith(url);
+      expect(mockFetchWithFallbacks).not.toHaveBeenCalled();
+    });
+
+    it("should fetch direct HTTP URLs without relayer", async () => {
+      const url = "http://example.com/file.pdf";
+      const mockResponse = new Response("http content");
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(url);
+
+      expect(result).toBe(mockResponse);
+      expect(mockFetch).toHaveBeenCalledWith(url);
+    });
+
+    it("should handle URLs with query parameters", async () => {
+      const url = "https://example.com/data?key=value&format=json";
+      const mockResponse = new Response("data with params");
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      await universalFetch(url);
+
+      expect(mockFetch).toHaveBeenCalledWith(url);
+    });
+
+    it("should handle URLs with fragments", async () => {
+      const url = "https://example.com/page#section";
+      const mockResponse = new Response("content with fragment");
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      await universalFetch(url);
+
+      expect(mockFetch).toHaveBeenCalledWith(url);
+    });
+  });
+
+  describe("Relayer fallback for non-IPFS URLs", () => {
+    it("should use relayer when direct fetch fails", async () => {
+      const url = "https://example.com/file.json";
+      const mockBlob = new Blob(["relayer content"]);
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockResolvedValueOnce(mockBlob),
+      };
+      const mockError = new Error("Network error");
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(mockError);
+
+      const result = await universalFetch(url, mockRelayer);
+
+      expect(mockRelayer.proxyDownload).toHaveBeenCalledWith(url);
+      expect(result.constructor.name).toBe("Response");
+    });
+
+    it("should convert relayer blob response to Response object", async () => {
+      const url = "https://cors-protected.example.com/data";
+      const mockBlob = new Blob(["blob data"]);
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockResolvedValueOnce(mockBlob),
+      };
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(new Error("CORS error"));
+
+      const result = await universalFetch(url, mockRelayer);
+
+      expect(result).toBeInstanceOf(Response);
+    });
+
+    it("should throw original error if relayer also fails", async () => {
+      const url = "https://example.com/file.json";
+      const originalError = new Error("Network timeout");
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockRejectedValueOnce(new Error("Relayer down")),
+      };
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(originalError);
+
+      await expect(universalFetch(url, mockRelayer)).rejects.toThrow(
+        originalError,
+      );
+      expect(mockRelayer.proxyDownload).toHaveBeenCalledWith(url);
+    });
+
+    it("should not use relayer if direct fetch succeeds", async () => {
+      const url = "https://example.com/file.json";
+      const mockResponse = new Response("success");
+      const mockRelayer = {
+        proxyDownload: vi.fn(),
+      };
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(url, mockRelayer);
+
+      expect(result).toBe(mockResponse);
+      expect(mockRelayer.proxyDownload).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("IPFS relayer fallback", () => {
+    it("should use relayer when all IPFS gateways fail", async () => {
+      const ipfsUrl = "ipfs://QmHash123";
+      const hash = "QmHash123";
+      const mockBlob = new Blob(["relayer ipfs content"]);
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockResolvedValueOnce(mockBlob),
+      };
+      const ipfsError = new Error("All IPFS gateways failed");
+
+      mockExtractIpfsHash.mockReturnValue(hash);
+      mockFetchWithFallbacks.mockRejectedValueOnce(ipfsError);
+
+      const result = await universalFetch(ipfsUrl, mockRelayer);
+
+      expect(mockRelayer.proxyDownload).toHaveBeenCalledWith(
+        `https://gateway.pinata.cloud/ipfs/${hash}`,
+      );
+      expect(result).toBeInstanceOf(Response);
+    });
+
+    it("should throw IPFS error if relayer also fails for IPFS URLs", async () => {
+      const ipfsUrl = "ipfs://QmHash123";
+      const hash = "QmHash123";
+      const ipfsError = new Error("All IPFS gateways failed");
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockRejectedValueOnce(new Error("Relayer down")),
+      };
+
+      mockExtractIpfsHash.mockReturnValue(hash);
+      mockFetchWithFallbacks.mockRejectedValueOnce(ipfsError);
+
+      await expect(universalFetch(ipfsUrl, mockRelayer)).rejects.toThrow(
+        ipfsError,
+      );
+    });
+
+    it("should not use relayer if IPFS fetch succeeds", async () => {
+      const ipfsUrl = "ipfs://QmHash123";
+      const mockResponse = new Response("ipfs content");
+      const mockRelayer = {
+        proxyDownload: vi.fn(),
+      };
+
+      mockExtractIpfsHash.mockReturnValue("QmHash123");
+      mockFetchWithFallbacks.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(ipfsUrl, mockRelayer);
+
+      expect(result).toBe(mockResponse);
+      expect(mockRelayer.proxyDownload).not.toHaveBeenCalled();
+    });
+
+    it("should use gateway.pinata.cloud for relayer fallback", async () => {
+      const ipfsUrl = "ipfs://QmVeryLongHashHere";
+      const hash = "QmVeryLongHashHere";
+      const mockBlob = new Blob(["content"]);
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockResolvedValueOnce(mockBlob),
+      };
+
+      mockExtractIpfsHash.mockReturnValue(hash);
+      mockFetchWithFallbacks.mockRejectedValueOnce(
+        new Error("All gateways failed"),
+      );
+
+      await universalFetch(ipfsUrl, mockRelayer);
+
+      expect(mockRelayer.proxyDownload).toHaveBeenCalledWith(
+        `https://gateway.pinata.cloud/ipfs/${hash}`,
+      );
+    });
+  });
+
+  describe("Error scenarios", () => {
+    it("should throw error with formatted message for direct fetch failure", async () => {
+      const url = "https://example.com/file.json";
+      const errorMessage = "Connection refused";
+      const mockError = new Error(errorMessage);
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(mockError);
+
+      await expect(universalFetch(url)).rejects.toThrow(
+        `Failed to fetch from ${url}: ${errorMessage}`,
+      );
+    });
+
+    it("should format error message with non-Error objects", async () => {
+      const url = "https://example.com/file.json";
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce("string error");
+
+      await expect(universalFetch(url)).rejects.toThrow(
+        `Failed to fetch from ${url}: Unknown error`,
+      );
+    });
+
+    it("should format error message with null error object", async () => {
+      const url = "https://example.com/file.json";
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(null);
+
+      await expect(universalFetch(url)).rejects.toThrow(
+        `Failed to fetch from ${url}: Unknown error`,
+      );
+    });
+
+    it("should include processed URL in error (arweave)", async () => {
+      const txId = "abc123";
+      const processedUrl = `https://arweave.net/${txId}`;
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(new Error("Not found"));
+
+      await expect(universalFetch(`ar://${txId}`)).rejects.toThrow(
+        `Failed to fetch from ${processedUrl}`,
+      );
+    });
+  });
+
+  describe("Network timeout scenarios", () => {
+    it("should handle fetch timeout errors", async () => {
+      const url = "https://slow-server.example.com/file";
+      const timeoutError = new Error("The operation timed out");
+      timeoutError.name = "AbortError";
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(timeoutError);
+
+      await expect(universalFetch(url)).rejects.toThrow();
+    });
+
+    it("should attempt relayer fallback on timeout", async () => {
+      const url = "https://slow-server.example.com/file";
+      const timeoutError = new Error("The operation timed out");
+      const mockBlob = new Blob(["fallback content"]);
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockResolvedValueOnce(mockBlob),
+      };
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(timeoutError);
+
+      const result = await universalFetch(url, mockRelayer);
+
+      expect(mockRelayer.proxyDownload).toHaveBeenCalledWith(url);
+      expect(result).toBeInstanceOf(Response);
+    });
+  });
+
+  describe("CORS error scenarios", () => {
+    it("should handle CORS errors with relayer bypass", async () => {
+      const url = "https://cors-api.example.com/data";
+      const corsError = new TypeError("Failed to fetch");
+      const mockBlob = new Blob(["cors bypassed content"]);
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockResolvedValueOnce(mockBlob),
+      };
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(corsError);
+
+      const result = await universalFetch(url, mockRelayer);
+
+      expect(mockRelayer.proxyDownload).toHaveBeenCalledWith(url);
+      expect(result).toBeInstanceOf(Response);
+    });
+
+    it("should throw original CORS error if relayer unavailable", async () => {
+      const url = "https://cors-api.example.com/data";
+      const corsError = new TypeError("Failed to fetch");
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(corsError);
+
+      await expect(universalFetch(url)).rejects.toThrow(
+        `Failed to fetch from ${url}: Failed to fetch`,
+      );
+    });
+  });
+
+  describe("Edge cases", () => {
+    it("should handle empty string URL", async () => {
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockRejectedValueOnce(new Error("Invalid URL"));
+
+      await expect(universalFetch("")).rejects.toThrow();
+    });
+
+    it("should handle very long URLs", async () => {
+      const longUrl =
+        "https://example.com/" + "a".repeat(1000) + "?param=" + "b".repeat(500);
+      const mockResponse = new Response("content");
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(longUrl);
+
+      expect(result).toBe(mockResponse);
+      expect(mockFetch).toHaveBeenCalledWith(longUrl);
+    });
+
+    it("should handle URLs with special characters", async () => {
+      const url =
+        "https://example.com/file%20with%20spaces.json?key=value&special=!@#$";
+      const mockResponse = new Response("content");
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      await universalFetch(url);
+
+      expect(mockFetch).toHaveBeenCalledWith(url);
+    });
+
+    it("should handle URLs with international characters", async () => {
+      const url = "https://example.com/файл.json";
+      const mockResponse = new Response("content");
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      await universalFetch(url);
+
+      expect(mockFetch).toHaveBeenCalledWith(url);
+    });
+
+    it("should handle IPFS hash that looks like a URL", async () => {
+      const fakeHashUrl = "QmAbcdEfghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS";
+      const mockResponse = new Response("content");
+
+      mockExtractIpfsHash.mockReturnValue(fakeHashUrl);
+      mockFetchWithFallbacks.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(fakeHashUrl);
+
+      expect(mockFetchWithFallbacks).toHaveBeenCalled();
+      expect(result).toBe(mockResponse);
+    });
+
+    it("should handle response objects with various status codes", async () => {
+      const url = "https://example.com/file";
+      const mockResponse = new Response("content", { status: 206 });
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(url);
+
+      expect(result.status).toBe(206);
+    });
+
+    it("should handle response objects with custom headers", async () => {
+      const url = "https://example.com/file";
+      const headers = new Headers({
+        "content-type": "application/json",
+        "x-custom-header": "value",
+      });
+      const mockResponse = new Response("content", { headers });
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(url);
+
+      expect(result.headers.get("x-custom-header")).toBe("value");
+    });
+  });
+
+  describe("Integration scenarios", () => {
+    it("should handle sequential calls with different URL types", async () => {
+      const responses = [
+        new Response("https content"),
+        new Response("ipfs content"),
+        new Response("arweave content"),
+      ];
+
+      // First call: HTTPS
+      mockExtractIpfsHash.mockReturnValueOnce(null);
+      mockFetch.mockResolvedValueOnce(responses[0]);
+      let result = await universalFetch("https://example.com/file");
+      expect(result).toBe(responses[0]);
+
+      // Second call: IPFS
+      mockExtractIpfsHash.mockReturnValueOnce("QmHash123");
+      mockFetchWithFallbacks.mockResolvedValueOnce(responses[1]);
+      result = await universalFetch("ipfs://QmHash123");
+      expect(result).toBe(responses[1]);
+
+      // Third call: Arweave
+      mockExtractIpfsHash.mockReturnValueOnce(null);
+      mockFetch.mockResolvedValueOnce(responses[2]);
+      result = await universalFetch("ar://abc123");
+      expect(result).toBe(responses[2]);
+
+      expect(mockFetch).toHaveBeenCalledTimes(2);
+      expect(mockFetchWithFallbacks).toHaveBeenCalledTimes(1);
+    });
+
+    it("should handle mixed success and failure scenarios", async () => {
+      const mockBlob = new Blob(["relayed content"]);
+      const mockRelayer = {
+        proxyDownload: vi.fn().mockResolvedValueOnce(mockBlob),
+      };
+
+      // First call succeeds directly
+      mockExtractIpfsHash.mockReturnValueOnce(null);
+      mockFetch.mockResolvedValueOnce(new Response("success"));
+      let result = await universalFetch("https://example.com/1");
+      expect(result.ok).toBeDefined();
+
+      // Second call fails then relayer succeeds
+      mockExtractIpfsHash.mockReturnValueOnce(null);
+      mockFetch.mockRejectedValueOnce(new Error("Network error"));
+      result = await universalFetch("https://example.com/2", mockRelayer);
+      expect(result).toBeInstanceOf(Response);
+
+      expect(mockRelayer.proxyDownload).toHaveBeenCalledOnce();
+    });
+
+    it("should preserve relayer across multiple calls", async () => {
+      const mockBlob1 = new Blob(["content1"]);
+      const mockBlob2 = new Blob(["content2"]);
+      const mockRelayer = {
+        proxyDownload: vi
+          .fn()
+          .mockResolvedValueOnce(mockBlob1)
+          .mockResolvedValueOnce(mockBlob2),
+      };
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch
+        .mockRejectedValueOnce(new Error("Error 1"))
+        .mockRejectedValueOnce(new Error("Error 2"));
+
+      await universalFetch("https://example.com/1", mockRelayer);
+      await universalFetch("https://example.com/2", mockRelayer);
+
+      expect(mockRelayer.proxyDownload).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe("IPFS hash extraction behavior", () => {
+    it("should not use IPFS fallback when extractIpfsHash returns null", async () => {
+      const url = "https://notipfs.example.com/file";
+      const mockResponse = new Response("content");
+
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(mockResponse);
+
+      const result = await universalFetch(url);
+
+      expect(mockFetchWithFallbacks).not.toHaveBeenCalled();
+      expect(mockFetch).toHaveBeenCalledWith(url);
+      expect(result).toBe(mockResponse);
+    });
+
+    it("should call extractIpfsHash before attempting fetch", async () => {
+      const url = "https://example.com/file";
+      mockExtractIpfsHash.mockReturnValue(null);
+      mockFetch.mockResolvedValueOnce(new Response("content"));
+
+      await universalFetch(url);
+
+      expect(mockExtractIpfsHash).toHaveBeenCalledWith(url);
+      expect(mockExtractIpfsHash).toHaveBeenCalledBefore(mockFetch as any);
+    });
+
+    it("should extract IPFS hash from processed URLs (not original ar:// format)", async () => {
+      const originalArweaveUrl = "ar://abc123";
+      const processedUrl = "https://arweave.net/abc123";
+      mockExtractIpfsHash.mockReturnValue(null); // Arweave URL won't have IPFS hash
+      mockFetch.mockResolvedValueOnce(new Response("content"));
+
+      await universalFetch(originalArweaveUrl);
+
+      // extractIpfsHash is called with the processed URL (after ar:// conversion)
+      expect(mockExtractIpfsHash).toHaveBeenCalledWith(processedUrl);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/encoding.test.ts b/packages/vana-sdk/src/utils/__tests__/encoding.test.ts
new file mode 100644
index 00000000..31806278
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/encoding.test.ts
@@ -0,0 +1,383 @@
+/**
+ * Tests for encoding utilities
+ *
+ * @remarks
+ * Tests platform-aware base64 encoding/decoding and environment detection.
+ */
+
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import {
+  toBase64,
+  fromBase64,
+  isNodeEnvironment,
+  isBrowserEnvironment,
+} from "../encoding";
+
+describe("encoding", () => {
+  describe("toBase64", () => {
+    it("should encode empty array", () => {
+      const data = new Uint8Array([]);
+      const result = toBase64(data);
+
+      expect(result).toBe("");
+    });
+
+    it("should encode single byte", () => {
+      const data = new Uint8Array([65]); // 'A'
+      const result = toBase64(data);
+
+      expect(result).toBe("QQ==");
+    });
+
+    it("should encode Hello", () => {
+      const data = new Uint8Array([72, 101, 108, 108, 111]); // "Hello"
+      const result = toBase64(data);
+
+      expect(result).toBe("SGVsbG8=");
+    });
+
+    it("should encode binary data", () => {
+      const data = new Uint8Array([0x00, 0xff, 0xaa, 0x55]);
+      const result = toBase64(data);
+
+      expect(result).toBeTruthy();
+      expect(typeof result).toBe("string");
+    });
+
+    it("should encode all zero bytes", () => {
+      const data = new Uint8Array([0, 0, 0, 0]);
+      const result = toBase64(data);
+
+      expect(result).toBe("AAAAAA==");
+    });
+
+    it("should encode all 0xff bytes", () => {
+      const data = new Uint8Array([0xff, 0xff, 0xff, 0xff]);
+      const result = toBase64(data);
+
+      expect(result).toBe("/////w==");
+    });
+
+    it("should handle large arrays", () => {
+      const data = new Uint8Array(1000);
+      data.fill(42);
+
+      const result = toBase64(data);
+
+      expect(result).toBeTruthy();
+      expect(typeof result).toBe("string");
+      expect(result.length).toBeGreaterThan(0);
+    });
+
+    it("should encode sequential bytes", () => {
+      const data = new Uint8Array([0, 1, 2, 3, 4, 5]);
+      const result = toBase64(data);
+
+      expect(result).toBe("AAECAwQF");
+    });
+
+    it("should produce valid base64 string", () => {
+      const data = new Uint8Array([1, 2, 3]);
+      const result = toBase64(data);
+
+      // Base64 uses [A-Za-z0-9+/=]
+      expect(result).toMatch(/^[A-Za-z0-9+/=]+$/);
+    });
+
+    it("should handle UTF-8 encoded text", () => {
+      const encoder = new TextEncoder();
+      const data = encoder.encode("Hello World!");
+      const result = toBase64(data);
+
+      expect(result).toBe("SGVsbG8gV29ybGQh");
+    });
+  });
+
+  describe("fromBase64", () => {
+    it("should decode empty string", () => {
+      const result = fromBase64("");
+
+      expect(result).toBeInstanceOf(Uint8Array);
+      expect(result.length).toBe(0);
+    });
+
+    it("should decode single character", () => {
+      const result = fromBase64("QQ==");
+
+      expect(result).toEqual(new Uint8Array([65])); // 'A'
+    });
+
+    it("should decode Hello", () => {
+      const result = fromBase64("SGVsbG8=");
+
+      expect(result).toEqual(new Uint8Array([72, 101, 108, 108, 111]));
+    });
+
+    it("should decode binary data", () => {
+      const original = new Uint8Array([0x00, 0xff, 0xaa, 0x55]);
+      const encoded = toBase64(original);
+      const decoded = fromBase64(encoded);
+
+      expect(decoded).toEqual(original);
+    });
+
+    it("should decode all zeros", () => {
+      const result = fromBase64("AAAAAA==");
+
+      expect(result).toEqual(new Uint8Array([0, 0, 0, 0]));
+    });
+
+    it("should decode all 0xff", () => {
+      const result = fromBase64("/////w==");
+
+      expect(result).toEqual(new Uint8Array([0xff, 0xff, 0xff, 0xff]));
+    });
+
+    it("should handle padding correctly", () => {
+      expect(fromBase64("QQ==").length).toBe(1);
+      expect(fromBase64("QUE=").length).toBe(2);
+      expect(fromBase64("QUFB").length).toBe(3);
+    });
+
+    it("should decode sequential bytes", () => {
+      const result = fromBase64("AAECAwQF");
+
+      expect(result).toEqual(new Uint8Array([0, 1, 2, 3, 4, 5]));
+    });
+
+    it("should roundtrip encode/decode", () => {
+      const original = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+      const encoded = toBase64(original);
+      const decoded = fromBase64(encoded);
+
+      expect(decoded).toEqual(original);
+    });
+
+    it("should roundtrip with large data", () => {
+      const original = new Uint8Array(1000);
+      for (let i = 0; i < 1000; i++) {
+        original[i] = i % 256;
+      }
+
+      const encoded = toBase64(original);
+      const decoded = fromBase64(encoded);
+
+      expect(decoded).toEqual(original);
+    });
+
+    it("should roundtrip with random data", () => {
+      const original = new Uint8Array(100);
+      for (let i = 0; i < 100; i++) {
+        original[i] = Math.floor(Math.random() * 256);
+      }
+
+      const encoded = toBase64(original);
+      const decoded = fromBase64(encoded);
+
+      expect(decoded).toEqual(original);
+    });
+
+    it("should decode UTF-8 text", () => {
+      const decoded = fromBase64("SGVsbG8gV29ybGQh");
+      const text = new TextDecoder().decode(decoded);
+
+      expect(text).toBe("Hello World!");
+    });
+  });
+
+  describe("toBase64 and fromBase64 integration", () => {
+    it("should preserve data through encode/decode cycle", () => {
+      const testCases = [
+        new Uint8Array([]),
+        new Uint8Array([0]),
+        new Uint8Array([255]),
+        new Uint8Array([0, 1, 2, 3]),
+        new Uint8Array([255, 254, 253, 252]),
+        new Uint8Array([72, 101, 108, 108, 111]), // Hello
+      ];
+
+      testCases.forEach((original) => {
+        const encoded = toBase64(original);
+        const decoded = fromBase64(encoded);
+
+        expect(decoded).toEqual(original);
+      });
+    });
+
+    it("should handle edge cases in roundtrip", () => {
+      // Single byte values across full range
+      for (let i = 0; i < 256; i++) {
+        const original = new Uint8Array([i]);
+        const encoded = toBase64(original);
+        const decoded = fromBase64(encoded);
+
+        expect(decoded[0]).toBe(i);
+      }
+    });
+
+    it("should preserve binary patterns", () => {
+      const patterns = [
+        new Uint8Array([0b10101010, 0b01010101]),
+        new Uint8Array([0b11110000, 0b00001111]),
+        new Uint8Array([0b11111111, 0b00000000]),
+      ];
+
+      patterns.forEach((pattern) => {
+        const encoded = toBase64(pattern);
+        const decoded = fromBase64(encoded);
+
+        expect(decoded).toEqual(pattern);
+      });
+    });
+  });
+
+  describe("isNodeEnvironment", () => {
+    it("should return boolean", () => {
+      const result = isNodeEnvironment();
+
+      expect(typeof result).toBe("boolean");
+    });
+
+    it("should detect Node.js environment", () => {
+      // In vitest with node environment, this should be true
+      const result = isNodeEnvironment();
+
+      // We're running in Node.js via vitest
+      expect(result).toBe(true);
+    });
+
+    it("should check for Buffer", () => {
+      // In Node.js, Buffer should exist
+      expect(typeof Buffer).not.toBe("undefined");
+      expect(typeof Buffer.from).toBe("function");
+    });
+
+    it("should check for process", () => {
+      // In Node.js, process should exist
+      expect(typeof process).not.toBe("undefined");
+      expect(process.versions?.node).toBeDefined();
+    });
+  });
+
+  describe("isBrowserEnvironment", () => {
+    it("should return boolean", () => {
+      const result = isBrowserEnvironment();
+
+      expect(typeof result).toBe("boolean");
+    });
+
+    it("should not detect browser in Node.js tests", () => {
+      // In vitest node environment, this should be false
+      const result = isBrowserEnvironment();
+
+      expect(result).toBe(false);
+    });
+
+    it("should check for window object", () => {
+      // In Node.js, window should not exist
+      expect(typeof window).toBe("undefined");
+    });
+  });
+
+  describe("Environment detection consistency", () => {
+    it("should have consistent environment detection", () => {
+      const isNode = isNodeEnvironment();
+      const isBrowser = isBrowserEnvironment();
+
+      // In most environments, should be one or the other (not both)
+      if (isNode) {
+        expect(isBrowser).toBe(false);
+      }
+      // Note: In some test environments, both might be false
+    });
+
+    it("should use Buffer in Node.js", () => {
+      if (isNodeEnvironment()) {
+        const data = new Uint8Array([72, 101, 108, 108, 111]);
+        const result = toBase64(data);
+
+        expect(result).toBe("SGVsbG8=");
+      }
+    });
+  });
+
+  describe("Error handling", () => {
+    let originalBuffer: typeof Buffer | undefined;
+    let originalBtoa: typeof btoa | undefined;
+    let originalAtob: typeof atob | undefined;
+
+    beforeEach(() => {
+      // Save originals
+      originalBuffer = globalThis.Buffer;
+      originalBtoa = (globalThis as any).btoa;
+      originalAtob = (globalThis as any).atob;
+    });
+
+    afterEach(() => {
+      // Restore originals
+      if (originalBuffer !== undefined) {
+        globalThis.Buffer = originalBuffer;
+      }
+      if (originalBtoa !== undefined) {
+        (globalThis as any).btoa = originalBtoa;
+      }
+      if (originalAtob !== undefined) {
+        (globalThis as any).atob = originalAtob;
+      }
+    });
+
+    it("should throw when no encoding method available", () => {
+      // Remove both Buffer and btoa
+      (globalThis as any).Buffer = undefined;
+      (globalThis as any).btoa = undefined;
+
+      const data = new Uint8Array([1, 2, 3]);
+
+      expect(() => {
+        toBase64(data);
+      }).toThrow(/No base64 encoding method available/);
+    });
+
+    it("should throw when no decoding method available", () => {
+      // Remove both Buffer and atob
+      (globalThis as any).Buffer = undefined;
+      (globalThis as any).atob = undefined;
+
+      expect(() => {
+        fromBase64("SGVsbG8=");
+      }).toThrow(/No base64 decoding method available/);
+    });
+
+    it("should use btoa fallback when Buffer unavailable", () => {
+      // Remove Buffer but keep btoa (simulate browser)
+      (globalThis as any).Buffer = undefined;
+      (globalThis as any).btoa = (str: string) => {
+        // Simple mock btoa
+        return originalBuffer
+          ? originalBuffer.from(str, "binary").toString("base64")
+          : "";
+      };
+
+      const data = new Uint8Array([72, 101, 108, 108, 111]);
+      const result = toBase64(data);
+
+      expect(result).toBeTruthy();
+      expect(typeof result).toBe("string");
+    });
+
+    it("should use atob fallback when Buffer unavailable", () => {
+      // Remove Buffer but keep atob (simulate browser)
+      (globalThis as any).Buffer = undefined;
+      (globalThis as any).atob = (str: string) => {
+        // Simple mock atob
+        return originalBuffer
+          ? originalBuffer.from(str, "base64").toString("binary")
+          : "";
+      };
+
+      const result = fromBase64("SGVsbG8=");
+
+      expect(result).toBeInstanceOf(Uint8Array);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/encryption.test.ts b/packages/vana-sdk/src/utils/__tests__/encryption.test.ts
new file mode 100644
index 00000000..cde938c2
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/encryption.test.ts
@@ -0,0 +1,670 @@
+/**
+ * Tests for encryption utilities
+ *
+ * @remarks
+ * Tests canonical Vana protocol encryption functions including key generation,
+ * asymmetric encryption/decryption, symmetric blob encryption, and PGP operations.
+ */
+
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import type { WalletClient, Account } from "viem";
+import type { VanaPlatformAdapter } from "../../platform/interface";
+import {
+  DEFAULT_ENCRYPTION_SEED,
+  generateEncryptionKey,
+  encryptWithWalletPublicKey,
+  decryptWithWalletPrivateKey,
+  encryptFileKey,
+  getEncryptionParameters,
+  decryptWithPrivateKey,
+  encryptBlobWithSignedKey,
+  decryptBlobWithSignedKey,
+  generateEncryptionKeyPair,
+  generatePGPKeyPair,
+} from "../encryption";
+
+// Mock signature cache
+vi.mock("../signatureCache", () => ({
+  withSignatureCache: vi.fn(async (_cache, _address, _message, fn) => {
+    return await fn();
+  }),
+}));
+
+describe("encryption", () => {
+  let mockWallet: WalletClient;
+  let mockPlatformAdapter: VanaPlatformAdapter;
+  let mockAccount: Account;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    // Mock account
+    mockAccount = {
+      address: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+      type: "json-rpc" as const,
+    };
+
+    // Mock wallet client
+    mockWallet = {
+      account: mockAccount,
+      signMessage: vi.fn(async ({ message }) => {
+        return `signature_of_${message}` as `0x${string}`;
+      }),
+    } as unknown as WalletClient;
+
+    // Mock platform adapter
+    mockPlatformAdapter = {
+      cache: {
+        get: vi.fn(),
+        set: vi.fn(),
+      },
+      crypto: {
+        encryptWithWalletPublicKey: vi.fn(async (data) => `encrypted_${data}`),
+        decryptWithWalletPrivateKey: vi.fn(async (data) =>
+          data.replace("encrypted_", ""),
+        ),
+        encryptWithPublicKey: vi.fn(async (data) => `enc_${data}`),
+        decryptWithPrivateKey: vi.fn(async (data) => data.replace("enc_", "")),
+        generateKeyPair: vi.fn(async () => ({
+          publicKey: "0xpublic1234567890abcdefghijklmnop",
+          privateKey: "0xprivate1234567890abcdefghijklmnopqrstuvwxyz",
+        })),
+        encryptWithPassword: vi.fn(async (data) => {
+          const encrypted = new Uint8Array(data.length + 10);
+          encrypted.set(data);
+          return encrypted;
+        }),
+        decryptWithPassword: vi.fn(async (data) => {
+          return new Uint8Array(data.slice(0, -10));
+        }),
+      },
+      pgp: {
+        generateKeyPair: vi.fn(async () => ({
+          publicKey: "-----BEGIN PGP PUBLIC KEY BLOCK-----",
+          privateKey: "-----BEGIN PGP PRIVATE KEY BLOCK-----",
+        })),
+      },
+    } as unknown as VanaPlatformAdapter;
+  });
+
+  describe("DEFAULT_ENCRYPTION_SEED", () => {
+    it("should have the correct default seed message", () => {
+      expect(DEFAULT_ENCRYPTION_SEED).toBe(
+        "Please sign to retrieve your encryption key",
+      );
+    });
+  });
+
+  describe("generateEncryptionKey", () => {
+    it("should generate encryption key from default seed", async () => {
+      const key = await generateEncryptionKey(mockWallet, mockPlatformAdapter);
+
+      expect(key).toBe(`signature_of_${DEFAULT_ENCRYPTION_SEED}`);
+      expect(mockWallet.signMessage).toHaveBeenCalledWith({
+        account: mockAccount,
+        message: DEFAULT_ENCRYPTION_SEED,
+      });
+    });
+
+    it("should generate encryption key from custom seed", async () => {
+      const customSeed = "my-custom-seed";
+      const key = await generateEncryptionKey(
+        mockWallet,
+        mockPlatformAdapter,
+        customSeed,
+      );
+
+      expect(key).toBe(`signature_of_${customSeed}`);
+      expect(mockWallet.signMessage).toHaveBeenCalledWith({
+        account: mockAccount,
+        message: customSeed,
+      });
+    });
+
+    it("should throw error when wallet has no account", async () => {
+      const walletWithoutAccount = {
+        ...mockWallet,
+        account: undefined,
+      } as unknown as WalletClient;
+
+      await expect(
+        generateEncryptionKey(walletWithoutAccount, mockPlatformAdapter),
+      ).rejects.toThrow(
+        "Wallet account is required for encryption key generation",
+      );
+    });
+
+    it("should use signature cache", async () => {
+      const { withSignatureCache } = await import("../signatureCache");
+
+      await generateEncryptionKey(mockWallet, mockPlatformAdapter);
+
+      expect(withSignatureCache).toHaveBeenCalledWith(
+        mockPlatformAdapter.cache,
+        mockAccount.address,
+        { message: DEFAULT_ENCRYPTION_SEED },
+        expect.any(Function),
+      );
+    });
+  });
+
+  describe("encryptWithWalletPublicKey", () => {
+    it("should encrypt string data", async () => {
+      const data = "sensitive information";
+      const publicKey = "0xpublic123";
+
+      const result = await encryptWithWalletPublicKey(
+        data,
+        publicKey,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBe("encrypted_sensitive information");
+      expect(
+        mockPlatformAdapter.crypto.encryptWithWalletPublicKey,
+      ).toHaveBeenCalledWith(data, publicKey);
+    });
+
+    it("should encrypt Blob data", async () => {
+      const blob = new Blob(["blob content"], { type: "text/plain" });
+      const publicKey = "0xpublic456";
+
+      const result = await encryptWithWalletPublicKey(
+        blob,
+        publicKey,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBe("encrypted_blob content");
+      expect(
+        mockPlatformAdapter.crypto.encryptWithWalletPublicKey,
+      ).toHaveBeenCalledWith("blob content", publicKey);
+    });
+
+    it("should handle encryption errors", async () => {
+      vi.mocked(
+        mockPlatformAdapter.crypto.encryptWithWalletPublicKey,
+      ).mockRejectedValueOnce(new Error("Encryption failed"));
+
+      await expect(
+        encryptWithWalletPublicKey("data", "0xkey", mockPlatformAdapter),
+      ).rejects.toThrow(
+        "Failed to encrypt with wallet public key: Error: Encryption failed",
+      );
+    });
+
+    it("should handle empty string", async () => {
+      const result = await encryptWithWalletPublicKey(
+        "",
+        "0xkey",
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBe("encrypted_");
+    });
+  });
+
+  describe("decryptWithWalletPrivateKey", () => {
+    it("should decrypt encrypted data", async () => {
+      const encryptedData = "encrypted_my secret";
+      const privateKey = "0xprivate123";
+
+      const result = await decryptWithWalletPrivateKey(
+        encryptedData,
+        privateKey,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBe("my secret");
+      expect(
+        mockPlatformAdapter.crypto.decryptWithWalletPrivateKey,
+      ).toHaveBeenCalledWith(encryptedData, privateKey);
+    });
+
+    it("should handle decryption errors", async () => {
+      vi.mocked(
+        mockPlatformAdapter.crypto.decryptWithWalletPrivateKey,
+      ).mockRejectedValueOnce(new Error("Decryption failed"));
+
+      await expect(
+        decryptWithWalletPrivateKey("data", "0xkey", mockPlatformAdapter),
+      ).rejects.toThrow(
+        "Failed to decrypt with wallet private key: Error: Decryption failed",
+      );
+    });
+
+    it("should handle empty encrypted data", async () => {
+      const result = await decryptWithWalletPrivateKey(
+        "encrypted_",
+        "0xkey",
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBe("");
+    });
+  });
+
+  describe("encryptFileKey", () => {
+    it("should encrypt file key with public key", async () => {
+      const fileKey = "file_encryption_key_123";
+      const publicKey = "0xdlp_public_key";
+
+      const result = await encryptFileKey(
+        fileKey,
+        publicKey,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBe("enc_file_encryption_key_123");
+      expect(
+        mockPlatformAdapter.crypto.encryptWithPublicKey,
+      ).toHaveBeenCalledWith(fileKey, publicKey);
+    });
+
+    it("should handle encryption errors", async () => {
+      vi.mocked(
+        mockPlatformAdapter.crypto.encryptWithPublicKey,
+      ).mockRejectedValueOnce(new Error("Invalid public key"));
+
+      await expect(
+        encryptFileKey("key", "0xinvalid", mockPlatformAdapter),
+      ).rejects.toThrow(
+        "Failed to encrypt file key: Error: Invalid public key",
+      );
+    });
+
+    it("should handle empty file key", async () => {
+      const result = await encryptFileKey("", "0xkey", mockPlatformAdapter);
+
+      expect(result).toBe("enc_");
+    });
+  });
+
+  describe("getEncryptionParameters", () => {
+    it("should generate encryption parameters", async () => {
+      const result = await getEncryptionParameters(mockPlatformAdapter);
+
+      expect(result).toHaveProperty("iv");
+      expect(result).toHaveProperty("key");
+      expect(result.iv).toBe("0xpublic12345678"); // First 16 chars
+      expect(result.key).toBe("0xprivate1234567890abcdefghijklm"); // First 32 chars
+      expect(mockPlatformAdapter.crypto.generateKeyPair).toHaveBeenCalled();
+    });
+
+    it("should extract correct substring lengths", async () => {
+      const result = await getEncryptionParameters(mockPlatformAdapter);
+
+      expect(result.iv.length).toBe(16);
+      expect(result.key.length).toBe(32);
+    });
+
+    it("should handle key generation errors", async () => {
+      vi.mocked(
+        mockPlatformAdapter.crypto.generateKeyPair,
+      ).mockRejectedValueOnce(new Error("Key generation failed"));
+
+      await expect(
+        getEncryptionParameters(mockPlatformAdapter),
+      ).rejects.toThrow(
+        "Failed to generate encryption parameters: Error: Key generation failed",
+      );
+    });
+  });
+
+  describe("decryptWithPrivateKey", () => {
+    it("should decrypt data with private key", async () => {
+      const encryptedData = "enc_decrypted_content";
+      const privateKey = "0xprivate456";
+
+      const result = await decryptWithPrivateKey(
+        encryptedData,
+        privateKey,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBe("decrypted_content");
+      expect(
+        mockPlatformAdapter.crypto.decryptWithPrivateKey,
+      ).toHaveBeenCalledWith(encryptedData, privateKey);
+    });
+
+    it("should handle decryption errors", async () => {
+      vi.mocked(
+        mockPlatformAdapter.crypto.decryptWithPrivateKey,
+      ).mockRejectedValueOnce(new Error("Wrong key"));
+
+      await expect(
+        decryptWithPrivateKey("data", "0xkey", mockPlatformAdapter),
+      ).rejects.toThrow("Failed to decrypt with private key: Error: Wrong key");
+    });
+
+    it("should handle empty encrypted data", async () => {
+      const result = await decryptWithPrivateKey(
+        "enc_",
+        "0xkey",
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBe("");
+    });
+  });
+
+  describe("encryptBlobWithSignedKey", () => {
+    it("should encrypt string data to Blob", async () => {
+      const data = "my data";
+      const key = "signature_key";
+
+      const result = await encryptBlobWithSignedKey(
+        data,
+        key,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBeInstanceOf(Blob);
+      expect(result.type).toBe("application/octet-stream");
+      expect(
+        mockPlatformAdapter.crypto.encryptWithPassword,
+      ).toHaveBeenCalledWith(expect.any(Uint8Array), key);
+    });
+
+    it("should encrypt Blob data to Blob", async () => {
+      const blob = new Blob(["blob data"], { type: "text/plain" });
+      const key = "signature_key";
+
+      const result = await encryptBlobWithSignedKey(
+        blob,
+        key,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBeInstanceOf(Blob);
+      expect(result.type).toBe("application/octet-stream");
+    });
+
+    it("should handle encryption errors", async () => {
+      vi.mocked(
+        mockPlatformAdapter.crypto.encryptWithPassword,
+      ).mockRejectedValueOnce(new Error("Encryption failed"));
+
+      await expect(
+        encryptBlobWithSignedKey("data", "key", mockPlatformAdapter),
+      ).rejects.toThrow("Failed to encrypt data: Error: Encryption failed");
+    });
+
+    it("should handle empty string", async () => {
+      const result = await encryptBlobWithSignedKey(
+        "",
+        "key",
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBeInstanceOf(Blob);
+      expect(result.size).toBeGreaterThan(0); // Has overhead from encryption
+    });
+
+    it("should handle empty Blob", async () => {
+      const emptyBlob = new Blob([]);
+
+      const result = await encryptBlobWithSignedKey(
+        emptyBlob,
+        "key",
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBeInstanceOf(Blob);
+    });
+
+    it("should convert data to Uint8Array for encryption", async () => {
+      await encryptBlobWithSignedKey("test", "key", mockPlatformAdapter);
+
+      expect(
+        mockPlatformAdapter.crypto.encryptWithPassword,
+      ).toHaveBeenCalledWith(expect.any(Uint8Array), "key");
+
+      const callArgs = vi.mocked(mockPlatformAdapter.crypto.encryptWithPassword)
+        .mock.calls[0];
+      expect(callArgs[0]).toBeInstanceOf(Uint8Array);
+    });
+  });
+
+  describe("decryptBlobWithSignedKey", () => {
+    it("should decrypt Blob data", async () => {
+      const encryptedBlob = new Blob([new Uint8Array([1, 2, 3, 4, 5])]);
+      const key = "signature_key";
+
+      const result = await decryptBlobWithSignedKey(
+        encryptedBlob,
+        key,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBeInstanceOf(Blob);
+      expect(result.type).toBe("text/plain");
+      expect(
+        mockPlatformAdapter.crypto.decryptWithPassword,
+      ).toHaveBeenCalledWith(expect.any(Uint8Array), key);
+    });
+
+    it("should decrypt string data", async () => {
+      const encryptedString = "encrypted_data";
+      const key = "signature_key";
+
+      const result = await decryptBlobWithSignedKey(
+        encryptedString,
+        key,
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBeInstanceOf(Blob);
+      expect(result.type).toBe("text/plain");
+    });
+
+    it("should handle decryption errors", async () => {
+      vi.mocked(
+        mockPlatformAdapter.crypto.decryptWithPassword,
+      ).mockRejectedValueOnce(new Error("Wrong key"));
+
+      await expect(
+        decryptBlobWithSignedKey("data", "key", mockPlatformAdapter),
+      ).rejects.toThrow("Failed to decrypt data: Error: Wrong key");
+    });
+
+    it("should handle empty Blob", async () => {
+      const emptyBlob = new Blob([]);
+
+      const result = await decryptBlobWithSignedKey(
+        emptyBlob,
+        "key",
+        mockPlatformAdapter,
+      );
+
+      expect(result).toBeInstanceOf(Blob);
+    });
+
+    it("should roundtrip encrypt/decrypt string", async () => {
+      const originalData = "test data";
+      const key = "test_key";
+
+      // Setup realistic mocks for roundtrip
+      vi.mocked(
+        mockPlatformAdapter.crypto.encryptWithPassword,
+      ).mockImplementation(async (data) => {
+        const encrypted = new Uint8Array(data.length + 4);
+        encrypted.set(data);
+        encrypted.set([0xff, 0xfe, 0xfd, 0xfc], data.length);
+        return encrypted;
+      });
+
+      vi.mocked(
+        mockPlatformAdapter.crypto.decryptWithPassword,
+      ).mockImplementation(async (data) => {
+        return new Uint8Array(data.slice(0, -4));
+      });
+
+      const encrypted = await encryptBlobWithSignedKey(
+        originalData,
+        key,
+        mockPlatformAdapter,
+      );
+      const decrypted = await decryptBlobWithSignedKey(
+        encrypted,
+        key,
+        mockPlatformAdapter,
+      );
+
+      const decryptedText = await decrypted.text();
+      expect(decryptedText).toBe(originalData);
+    });
+  });
+
+  describe("generateEncryptionKeyPair", () => {
+    it("should generate key pair", async () => {
+      const result = await generateEncryptionKeyPair(mockPlatformAdapter);
+
+      expect(result).toHaveProperty("publicKey");
+      expect(result).toHaveProperty("privateKey");
+      expect(result.publicKey).toBe("0xpublic1234567890abcdefghijklmnop");
+      expect(result.privateKey).toBe(
+        "0xprivate1234567890abcdefghijklmnopqrstuvwxyz",
+      );
+      expect(mockPlatformAdapter.crypto.generateKeyPair).toHaveBeenCalled();
+    });
+
+    it("should handle key generation errors", async () => {
+      vi.mocked(
+        mockPlatformAdapter.crypto.generateKeyPair,
+      ).mockRejectedValueOnce(new Error("Generation failed"));
+
+      await expect(
+        generateEncryptionKeyPair(mockPlatformAdapter),
+      ).rejects.toThrow(
+        "Failed to generate encryption key pair: Error: Generation failed",
+      );
+    });
+  });
+
+  describe("generatePGPKeyPair", () => {
+    it("should generate PGP key pair without options", async () => {
+      const result = await generatePGPKeyPair(mockPlatformAdapter);
+
+      expect(result).toHaveProperty("publicKey");
+      expect(result).toHaveProperty("privateKey");
+      expect(result.publicKey).toContain("BEGIN PGP PUBLIC KEY");
+      expect(result.privateKey).toContain("BEGIN PGP PRIVATE KEY");
+      expect(mockPlatformAdapter.pgp.generateKeyPair).toHaveBeenCalledWith(
+        undefined,
+      );
+    });
+
+    it("should generate PGP key pair with options", async () => {
+      const options = {
+        name: "John Doe",
+        email: "john@example.com",
+        passphrase: "secret",
+      };
+
+      const result = await generatePGPKeyPair(mockPlatformAdapter, options);
+
+      expect(result).toHaveProperty("publicKey");
+      expect(result).toHaveProperty("privateKey");
+      expect(mockPlatformAdapter.pgp.generateKeyPair).toHaveBeenCalledWith(
+        options,
+      );
+    });
+
+    it("should handle partial options", async () => {
+      const result = await generatePGPKeyPair(mockPlatformAdapter, {
+        name: "Jane Smith",
+      });
+
+      expect(result).toHaveProperty("publicKey");
+      expect(mockPlatformAdapter.pgp.generateKeyPair).toHaveBeenCalledWith({
+        name: "Jane Smith",
+      });
+    });
+
+    it("should handle PGP generation errors", async () => {
+      vi.mocked(mockPlatformAdapter.pgp.generateKeyPair).mockRejectedValueOnce(
+        new Error("PGP generation failed"),
+      );
+
+      await expect(generatePGPKeyPair(mockPlatformAdapter)).rejects.toThrow(
+        "Failed to generate PGP key pair: Error: PGP generation failed",
+      );
+    });
+  });
+
+  describe("Integration scenarios", () => {
+    it("should support full encryption/decryption workflow with wallet", async () => {
+      // Generate encryption key from wallet
+      const encryptionKey = await generateEncryptionKey(
+        mockWallet,
+        mockPlatformAdapter,
+      );
+
+      // Encrypt data
+      const data = "sensitive user data";
+      const encrypted = await encryptBlobWithSignedKey(
+        data,
+        encryptionKey,
+        mockPlatformAdapter,
+      );
+
+      // Decrypt data
+      const decrypted = await decryptBlobWithSignedKey(
+        encrypted,
+        encryptionKey,
+        mockPlatformAdapter,
+      );
+
+      expect(decrypted).toBeInstanceOf(Blob);
+    });
+
+    it("should support asymmetric encryption workflow", async () => {
+      // Generate key pair
+      const keyPair = await generateEncryptionKeyPair(mockPlatformAdapter);
+
+      // Encrypt with public key
+      const data = "shared secret";
+      const encrypted = await encryptWithWalletPublicKey(
+        data,
+        keyPair.publicKey,
+        mockPlatformAdapter,
+      );
+
+      // Decrypt with private key
+      const decrypted = await decryptWithWalletPrivateKey(
+        encrypted,
+        keyPair.privateKey,
+        mockPlatformAdapter,
+      );
+
+      expect(decrypted).toBe(data);
+    });
+
+    it("should support file key encryption workflow", async () => {
+      // Generate encryption parameters
+      const params = await getEncryptionParameters(mockPlatformAdapter);
+
+      // Encrypt file key for DLP
+      const fileKey = params.key;
+      const dlpPublicKey = "0xdlp_public";
+
+      const encryptedKey = await encryptFileKey(
+        fileKey,
+        dlpPublicKey,
+        mockPlatformAdapter,
+      );
+
+      // DLP decrypts the file key
+      const dlpPrivateKey = "0xdlp_private";
+      const decryptedKey = await decryptWithPrivateKey(
+        encryptedKey,
+        dlpPrivateKey,
+        mockPlatformAdapter,
+      );
+
+      expect(decryptedKey).toBe(fileKey);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/formatters.test.ts b/packages/vana-sdk/src/utils/__tests__/formatters.test.ts
new file mode 100644
index 00000000..b282e5eb
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/formatters.test.ts
@@ -0,0 +1,220 @@
+/**
+ * Tests for formatting utilities
+ *
+ * @remarks
+ * Tests number, ETH, token, and address formatting functions.
+ */
+
+import { describe, it, expect } from "vitest";
+import {
+  formatNumber,
+  formatEth,
+  formatToken,
+  shortenAddress,
+} from "../formatters";
+
+describe("formatters", () => {
+  describe("formatNumber", () => {
+    it("should format bigint to number", () => {
+      expect(formatNumber(123n)).toBe(123);
+      expect(formatNumber(0n)).toBe(0);
+      expect(formatNumber(999999n)).toBe(999999);
+    });
+
+    it("should format string to number", () => {
+      expect(formatNumber("123")).toBe(123);
+      expect(formatNumber("0")).toBe(0);
+      expect(formatNumber("999999")).toBe(999999);
+    });
+
+    it("should handle negative values", () => {
+      expect(formatNumber(-100n)).toBe(-100);
+      expect(formatNumber("-100")).toBe(-100);
+    });
+
+    it("should handle large values", () => {
+      const large = 1000000000000000000n;
+      expect(formatNumber(large)).toBe(1000000000000000000);
+    });
+
+    it("should handle number input", () => {
+      expect(formatNumber(123.45)).toBe(123.45);
+      expect(formatNumber(0)).toBe(0);
+    });
+
+    it("should convert values exceeding MAX_SAFE_INTEGER", () => {
+      const tooBig = 9007199254740993n; // MAX_SAFE_INTEGER + 2
+      // JavaScript Number() handles this, with potential precision loss
+      const result = formatNumber(tooBig);
+      expect(typeof result).toBe("number");
+    });
+  });
+
+  describe("formatEth", () => {
+    it("should format 1 ETH (18 decimals)", () => {
+      const oneEth = 1000000000000000000n;
+      expect(formatEth(oneEth)).toBe("1");
+    });
+
+    it("should format with custom decimal places", () => {
+      const oneEth = 1000000000000000000n;
+      expect(formatEth(oneEth, 2)).toBe("1");
+      expect(formatEth(oneEth, 6)).toBe("1");
+    });
+
+    it("should format fractional ETH", () => {
+      const halfEth = 500000000000000000n;
+      expect(formatEth(halfEth)).toBe("0.5");
+    });
+
+    it("should truncate small values", () => {
+      const verySmall = 10000000000000n; // 0.00001 ETH
+      expect(formatEth(verySmall, 4)).toBe("0.0000");
+    });
+
+    it("should handle zero", () => {
+      expect(formatEth(0n)).toBe("0");
+    });
+
+    it("should handle negative values", () => {
+      const negOne = -1000000000000000000n;
+      expect(formatEth(negOne)).toBe("-1");
+    });
+
+    it("should accept string input", () => {
+      expect(formatEth("1000000000000000000")).toBe("1");
+    });
+
+    it("should accept number input", () => {
+      expect(formatEth(1000000000000000000)).toBe("1");
+    });
+
+    it("should handle large values", () => {
+      const million = 1000000000000000000000000n; // 1 million ETH
+      const result = formatEth(million, 2);
+      // formatEther returns "1000000.0", slice(0, 4) = "1000"
+      expect(result).toBe("1000");
+    });
+  });
+
+  describe("formatToken", () => {
+    it("should format 18 decimal token", () => {
+      const oneToken = 1000000000000000000n;
+      expect(formatToken(oneToken)).toBe("1");
+    });
+
+    it("should format 6 decimal token (USDC)", () => {
+      const oneUSDC = 1000000n;
+      expect(formatToken(oneUSDC, 6)).toBe("1");
+    });
+
+    it("should format with custom display decimals", () => {
+      const value = 1500000000000000000n;
+      expect(formatToken(value, 18, 2)).toBe("1.5");
+      expect(formatToken(value, 18, 6)).toBe("1.5");
+    });
+
+    it("should handle whole numbers", () => {
+      const five = 5000000000000000000n;
+      expect(formatToken(five)).toBe("5");
+    });
+
+    it("should handle fractional amounts", () => {
+      const frac = 1234567890000000000n;
+      expect(formatToken(frac, 18, 6)).toBe("1.234567");
+    });
+
+    it("should handle zero", () => {
+      expect(formatToken(0n)).toBe("0");
+    });
+
+    it("should handle negative values", () => {
+      const neg = -1000000000000000000n;
+      expect(formatToken(neg, 18, 2)).toBe("-1");
+    });
+
+    it("should accept string input", () => {
+      expect(formatToken("1000000", 6)).toBe("1");
+    });
+
+    it("should accept number input", () => {
+      expect(formatToken(1000000, 6)).toBe("1");
+    });
+
+    it("should handle different decimal configurations", () => {
+      // 8 decimals (like some Bitcoin tokens)
+      const value8 = 100000000n;
+      expect(formatToken(value8, 8)).toBe("1");
+
+      // 0 decimals (whole number tokens)
+      const value0 = 100n;
+      expect(formatToken(value0, 0)).toBe("100");
+    });
+
+    it("should truncate extra decimals", () => {
+      const value = 1123456789000000000n;
+      expect(formatToken(value, 18, 2)).toBe("1.12");
+      expect(formatToken(value, 18, 4)).toBe("1.1234");
+    });
+  });
+
+  describe("shortenAddress", () => {
+    it("should shorten standard Ethereum address", () => {
+      const address = "0x742d35Cc6558Fd4D9e9E0E888F0462ef6919Bd36";
+      expect(shortenAddress(address)).toBe("0x742d...Bd36");
+    });
+
+    it("should preserve first 6 and last 4 characters", () => {
+      const address = "0xabcdefghijklmnopqrstuvwxyz1234";
+      const result = shortenAddress(address);
+      expect(result.startsWith("0xabcd")).toBe(true);
+      expect(result.endsWith("1234")).toBe(true);
+      expect(result).toContain("...");
+    });
+
+    it("should handle checksummed addresses", () => {
+      const checksummed = "0x742d35Cc6558Fd4D9e9E0E888F0462ef6919Bd36";
+      const result = shortenAddress(checksummed);
+      expect(result).toBe("0x742d...Bd36");
+      // Verify case is preserved: result = "0x742d...Bd36"
+      expect(result[2]).toBe("7"); // First char after 0x
+      expect(result[3]).toBe("4");
+    });
+
+    it("should handle lowercase addresses", () => {
+      const lowercase = "0x742d35cc6558fd4d9e9e0e888f0462ef6919bd36";
+      expect(shortenAddress(lowercase)).toBe("0x742d...bd36");
+    });
+
+    it("should return short addresses unchanged", () => {
+      expect(shortenAddress("0x123")).toBe("0x123");
+      expect(shortenAddress("0x12345")).toBe("0x12345");
+      expect(shortenAddress("0x1234567")).toBe("0x1234567"); // 9 chars < 10
+    });
+
+    it("should handle empty string", () => {
+      expect(shortenAddress("")).toBe("");
+    });
+
+    it("should handle non-address strings", () => {
+      const text = "this is a longer string";
+      const result = shortenAddress(text);
+      expect(result).toBe("this i...ring");
+    });
+
+    it("should handle exactly 10 characters", () => {
+      const ten = "0123456789";
+      // Length < 10 returns unchanged, so length 10 should be shortened
+      const result = shortenAddress(ten);
+      expect(result).not.toBe(ten);
+      expect(result).toContain("...");
+    });
+
+    it("should work with any string format", () => {
+      const custom = "PREFIX123456789SUFFIX";
+      const result = shortenAddress(custom);
+      expect(result.startsWith("PREFIX")).toBe(true);
+      expect(result.endsWith("FFIX")).toBe(true);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/grantFiles.test.ts b/packages/vana-sdk/src/utils/__tests__/grantFiles.test.ts
new file mode 100644
index 00000000..950b43da
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/grantFiles.test.ts
@@ -0,0 +1,816 @@
+/**
+ * Tests for grant file utilities
+ *
+ * @remarks
+ * Tests grant file creation, storage, retrieval, hashing, and validation.
+ */
+
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import {
+  createGrantFile,
+  storeGrantFile,
+  retrieveGrantFile,
+  getGrantFileHash,
+  validateGrantFile,
+} from "../grantFiles";
+import type { GrantPermissionParams, GrantFile } from "../../types/permissions";
+import { NetworkError } from "../../errors";
+
+// Mock the download utility
+vi.mock("../download", () => ({
+  universalFetch: vi.fn(),
+}));
+
+describe("grantFiles", () => {
+  describe("createGrantFile", () => {
+    it("should create basic grant file", () => {
+      const params: GrantPermissionParams = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "llm_inference",
+        files: [],
+        parameters: { model: "gpt-4" },
+      };
+
+      const grant = createGrantFile(params);
+
+      expect(grant).toEqual({
+        grantee: params.grantee,
+        operation: params.operation,
+        parameters: { model: "gpt-4" },
+      });
+    });
+
+    it("should include expiration when provided", () => {
+      const params: GrantPermissionParams = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        files: [],
+        parameters: {},
+        expiresAt: 1234567890,
+      };
+
+      const grant = createGrantFile(params);
+
+      expect(grant.expires).toBe(1234567890);
+    });
+
+    it("should include filters in parameters when provided", () => {
+      const params: GrantPermissionParams = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        files: [],
+        parameters: { version: "1.0" },
+        filters: { category: "documents" },
+      };
+
+      const grant = createGrantFile(params);
+
+      expect(grant.parameters.filters).toEqual({ category: "documents" });
+    });
+
+    it("should create independent copy of parameters", () => {
+      const originalParams = { model: "gpt-4" };
+      const params: GrantPermissionParams = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "llm_inference",
+        files: [],
+        parameters: originalParams,
+      };
+
+      const grant = createGrantFile(params);
+
+      // Modify original
+      originalParams.model = "gpt-3";
+
+      // Grant should have original value
+      expect(grant.parameters.model).toBe("gpt-4");
+    });
+
+    it("should handle empty parameters", () => {
+      const params: GrantPermissionParams = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        files: [],
+        parameters: {},
+      };
+
+      const grant = createGrantFile(params);
+
+      expect(grant.parameters).toEqual({});
+    });
+
+    it("should handle complex nested parameters", () => {
+      const params: GrantPermissionParams = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "compute",
+        files: [],
+        parameters: {
+          config: {
+            model: "gpt-4",
+            settings: {
+              temperature: 0.7,
+              maxTokens: 1000,
+            },
+          },
+          metadata: ["tag1", "tag2"],
+        },
+      };
+
+      const grant = createGrantFile(params);
+
+      expect(grant.parameters).toEqual(params.parameters);
+    });
+
+    it("should not include expires when not provided", () => {
+      const params: GrantPermissionParams = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        files: [],
+        parameters: {},
+      };
+
+      const grant = createGrantFile(params);
+
+      expect(grant).not.toHaveProperty("expires");
+    });
+
+    it("should not include filters when not provided", () => {
+      const params: GrantPermissionParams = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        files: [],
+        parameters: { version: "1.0" },
+      };
+
+      const grant = createGrantFile(params);
+
+      expect(grant.parameters).not.toHaveProperty("filters");
+    });
+  });
+
+  describe("storeGrantFile", () => {
+    beforeEach(() => {
+      global.fetch = vi.fn();
+      global.FormData = class FormData {
+        private data: Map<string, { value: Blob | string; filename?: string }> =
+          new Map();
+        append(name: string, value: Blob | string, filename?: string) {
+          this.data.set(name, { value, filename });
+        }
+        get(name: string) {
+          return this.data.get(name)?.value;
+        }
+      } as never;
+      global.Blob = class Blob {
+        constructor(
+          public parts: BlobPart[],
+          public options?: BlobPropertyBag,
+        ) {}
+      } as never;
+    });
+
+    it("should store grant file successfully", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      const mockResponse = {
+        success: true,
+        url: "ipfs://QmTest123",
+      };
+
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        json: async () => mockResponse,
+      });
+
+      const url = await storeGrantFile(
+        grantFile,
+        "https://relayer.example.com",
+      );
+
+      expect(url).toBe("ipfs://QmTest123");
+      expect(global.fetch).toHaveBeenCalledWith(
+        "https://relayer.example.com/api/ipfs/upload",
+        expect.objectContaining({
+          method: "POST",
+          body: expect.any(FormData),
+        }),
+      );
+    });
+
+    it("should throw NetworkError on HTTP error", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: false,
+        status: 404,
+        statusText: "Not Found",
+      });
+
+      await expect(
+        storeGrantFile(grantFile, "https://relayer.example.com"),
+      ).rejects.toThrow(NetworkError);
+      await expect(
+        storeGrantFile(grantFile, "https://relayer.example.com"),
+      ).rejects.toThrow(/Failed to store grant file: Not Found/);
+    });
+
+    it("should throw on unsuccessful upload", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        json: async () => ({ success: false, error: "Upload failed" }),
+      });
+
+      await expect(
+        storeGrantFile(grantFile, "https://relayer.example.com"),
+      ).rejects.toThrow(NetworkError);
+      await expect(
+        storeGrantFile(grantFile, "https://relayer.example.com"),
+      ).rejects.toThrow(/Upload failed/);
+    });
+
+    it("should throw when no URL returned", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        json: async () => ({ success: true }), // no url
+      });
+
+      await expect(
+        storeGrantFile(grantFile, "https://relayer.example.com"),
+      ).rejects.toThrow(NetworkError);
+      await expect(
+        storeGrantFile(grantFile, "https://relayer.example.com"),
+      ).rejects.toThrow(/no URL was returned/);
+    });
+
+    it("should throw NetworkError on network failure", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      (global.fetch as ReturnType<typeof vi.fn>).mockRejectedValue(
+        new Error("Network failure"),
+      );
+
+      await expect(
+        storeGrantFile(grantFile, "https://relayer.example.com"),
+      ).rejects.toThrow(NetworkError);
+      await expect(
+        storeGrantFile(grantFile, "https://relayer.example.com"),
+      ).rejects.toThrow(/Network error/);
+    });
+
+    it("should format grant file as JSON", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: { test: "value" },
+      };
+
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        json: async () => ({ success: true, url: "ipfs://test" }),
+      });
+
+      await storeGrantFile(grantFile, "https://relayer.example.com");
+
+      const call = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][1];
+      const formData = call.body as unknown as FormData;
+      const blob = formData.get("file") as unknown as Blob & {
+        parts: BlobPart[];
+      };
+
+      expect(blob).toBeDefined();
+      expect(blob.parts[0]).toContain(grantFile.grantee);
+      expect(blob.parts[0]).toContain(grantFile.operation);
+    });
+  });
+
+  describe("retrieveGrantFile", () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    it("should retrieve grant file successfully", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      const { universalFetch } = await import("../download");
+      (universalFetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        text: async () => JSON.stringify(grantFile),
+      });
+
+      const result = await retrieveGrantFile("ipfs://QmTest123");
+
+      expect(result).toEqual(grantFile);
+      expect(universalFetch).toHaveBeenCalledWith(
+        "ipfs://QmTest123",
+        undefined,
+      );
+    });
+
+    it("should pass download relayer", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      const mockRelayer = { proxyDownload: vi.fn() };
+
+      const { universalFetch } = await import("../download");
+      (universalFetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        text: async () => JSON.stringify(grantFile),
+      });
+
+      await retrieveGrantFile("ipfs://QmTest123", undefined, mockRelayer);
+
+      expect(universalFetch).toHaveBeenCalledWith(
+        "ipfs://QmTest123",
+        mockRelayer,
+      );
+    });
+
+    it("should warn on HTTP gateway URL", async () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      const consoleWarnSpy = vi
+        .spyOn(console, "warn")
+        .mockImplementation(() => {});
+
+      const { universalFetch } = await import("../download");
+      (universalFetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        text: async () => JSON.stringify(grantFile),
+      });
+
+      await retrieveGrantFile("https://ipfs.io/ipfs/QmTest123");
+
+      expect(consoleWarnSpy).toHaveBeenCalledWith(
+        expect.stringContaining("HTTP gateway format"),
+      );
+
+      consoleWarnSpy.mockRestore();
+    });
+
+    it("should throw NetworkError on HTTP error", async () => {
+      const { universalFetch } = await import("../download");
+      (universalFetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: false,
+        status: 404,
+      });
+
+      await expect(retrieveGrantFile("ipfs://QmTest123")).rejects.toThrow(
+        NetworkError,
+      );
+      await expect(retrieveGrantFile("ipfs://QmTest123")).rejects.toThrow(
+        /404/,
+      );
+    });
+
+    it("should throw on invalid JSON", async () => {
+      const { universalFetch } = await import("../download");
+      (universalFetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        text: async () => "invalid json{",
+      });
+
+      await expect(retrieveGrantFile("ipfs://QmTest123")).rejects.toThrow(
+        NetworkError,
+      );
+    });
+
+    it("should throw on invalid grant file format", async () => {
+      const invalidGrant = { invalid: "format" };
+
+      const { universalFetch } = await import("../download");
+      (universalFetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+        ok: true,
+        text: async () => JSON.stringify(invalidGrant),
+      });
+
+      await expect(retrieveGrantFile("ipfs://QmTest123")).rejects.toThrow(
+        NetworkError,
+      );
+      await expect(retrieveGrantFile("ipfs://QmTest123")).rejects.toThrow(
+        /Invalid grant file format/,
+      );
+    });
+
+    it("should throw NetworkError on network failure", async () => {
+      const { universalFetch } = await import("../download");
+      (universalFetch as ReturnType<typeof vi.fn>).mockRejectedValue(
+        new Error("Network failure"),
+      );
+
+      await expect(retrieveGrantFile("ipfs://QmTest123")).rejects.toThrow(
+        NetworkError,
+      );
+    });
+  });
+
+  describe("getGrantFileHash", () => {
+    it("should generate hash for grant file", () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      const consoleInfoSpy = vi
+        .spyOn(console, "info")
+        .mockImplementation(() => {});
+
+      const hash = getGrantFileHash(grantFile);
+
+      expect(hash).toMatch(/^0x[a-fA-F0-9]{64}$/);
+      expect(consoleInfoSpy).toHaveBeenCalled();
+
+      consoleInfoSpy.mockRestore();
+    });
+
+    it("should generate same hash for same grant file", () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: { model: "gpt-4" },
+      };
+
+      const consoleInfoSpy = vi
+        .spyOn(console, "info")
+        .mockImplementation(() => {});
+
+      const hash1 = getGrantFileHash(grantFile);
+      const hash2 = getGrantFileHash(grantFile);
+
+      expect(hash1).toBe(hash2);
+
+      consoleInfoSpy.mockRestore();
+    });
+
+    it("should generate same hash regardless of property order", () => {
+      const grantFile1: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: { a: "1", b: "2" },
+      };
+
+      const grantFile2: GrantFile = {
+        operation: "read",
+        parameters: { b: "2", a: "1" },
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+      };
+
+      const consoleInfoSpy = vi
+        .spyOn(console, "info")
+        .mockImplementation(() => {});
+
+      const hash1 = getGrantFileHash(grantFile1);
+      const hash2 = getGrantFileHash(grantFile2);
+
+      expect(hash1).toBe(hash2);
+
+      consoleInfoSpy.mockRestore();
+    });
+
+    it("should generate different hash for different grant files", () => {
+      const grantFile1: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      const grantFile2: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "write",
+        parameters: {},
+      };
+
+      const consoleInfoSpy = vi
+        .spyOn(console, "info")
+        .mockImplementation(() => {});
+
+      const hash1 = getGrantFileHash(grantFile1);
+      const hash2 = getGrantFileHash(grantFile2);
+
+      expect(hash1).not.toBe(hash2);
+
+      consoleInfoSpy.mockRestore();
+    });
+
+    it("should include expires in hash when present", () => {
+      const grantFile1: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+      };
+
+      const grantFile2: GrantFile = {
+        ...grantFile1,
+        expires: 1234567890,
+      };
+
+      const consoleInfoSpy = vi
+        .spyOn(console, "info")
+        .mockImplementation(() => {});
+
+      const hash1 = getGrantFileHash(grantFile1);
+      const hash2 = getGrantFileHash(grantFile2);
+
+      expect(hash1).not.toBe(hash2);
+
+      consoleInfoSpy.mockRestore();
+    });
+
+    it("should handle nested objects in parameters", () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "compute",
+        parameters: {
+          config: {
+            model: "gpt-4",
+            settings: {
+              temperature: 0.7,
+            },
+          },
+        },
+      };
+
+      const consoleInfoSpy = vi
+        .spyOn(console, "info")
+        .mockImplementation(() => {});
+
+      const hash = getGrantFileHash(grantFile);
+
+      expect(hash).toMatch(/^0x[a-fA-F0-9]{64}$/);
+
+      consoleInfoSpy.mockRestore();
+    });
+
+    it("should handle arrays in parameters", () => {
+      const grantFile: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read",
+        parameters: {
+          tags: ["tag1", "tag2", "tag3"],
+        },
+      };
+
+      const consoleInfoSpy = vi
+        .spyOn(console, "info")
+        .mockImplementation(() => {});
+
+      const hash = getGrantFileHash(grantFile);
+
+      expect(hash).toMatch(/^0x[a-fA-F0-9]{64}$/);
+
+      consoleInfoSpy.mockRestore();
+    });
+  });
+
+  describe("validateGrantFile", () => {
+    it("should validate valid grant file", () => {
+      const grantFile = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(grantFile)).toBe(true);
+    });
+
+    it("should reject non-object", () => {
+      expect(validateGrantFile(null)).toBe(false);
+      expect(validateGrantFile(undefined)).toBe(false);
+      expect(validateGrantFile("string")).toBe(false);
+      expect(validateGrantFile(123)).toBe(false);
+      expect(validateGrantFile([])).toBe(false);
+    });
+
+    it("should reject missing grantee", () => {
+      const invalid = {
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject invalid grantee format", () => {
+      const invalid = {
+        grantee: "not-an-address",
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject non-string grantee", () => {
+      const invalid = {
+        grantee: 123,
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject missing operation", () => {
+      const invalid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject empty operation", () => {
+      const invalid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject non-string operation", () => {
+      const invalid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: 123,
+        parameters: {},
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject missing parameters", () => {
+      const invalid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject non-object parameters", () => {
+      const invalid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: "not-an-object",
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should accept valid expires", () => {
+      const valid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: {},
+        expires: 1234567890,
+      };
+
+      expect(validateGrantFile(valid)).toBe(true);
+    });
+
+    it("should reject negative expires", () => {
+      const invalid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: {},
+        expires: -100,
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject non-integer expires", () => {
+      const invalid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: {},
+        expires: 123.45,
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject non-number expires", () => {
+      const invalid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: {},
+        expires: "not-a-number",
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should accept checksummed address", () => {
+      const valid = {
+        grantee: "0xAbCdEf1234567890AbCdEf1234567890AbCdEf12",
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(valid)).toBe(true);
+    });
+
+    it("should accept lowercase address", () => {
+      const valid = {
+        grantee: "0xabcdef1234567890abcdef1234567890abcdef12",
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(valid)).toBe(true);
+    });
+
+    it("should reject address without 0x prefix", () => {
+      const invalid = {
+        grantee: "1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should reject address with wrong length", () => {
+      const invalid = {
+        grantee: "0x1234", // too short
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(invalid)).toBe(false);
+    });
+
+    it("should accept complex parameters", () => {
+      const valid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "compute",
+        parameters: {
+          config: { model: "gpt-4" },
+          tags: ["tag1", "tag2"],
+          metadata: { version: "1.0" },
+        },
+      };
+
+      expect(validateGrantFile(valid)).toBe(true);
+    });
+
+    it("should accept grant file without expires", () => {
+      const valid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: {},
+      };
+
+      expect(validateGrantFile(valid)).toBe(true);
+    });
+
+    it("should accept zero expires", () => {
+      const valid = {
+        grantee: "0x1234567890123456789012345678901234567890",
+        operation: "read",
+        parameters: {},
+        expires: 0,
+      };
+
+      expect(validateGrantFile(valid)).toBe(true);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/grantValidation.test.ts b/packages/vana-sdk/src/utils/__tests__/grantValidation.test.ts
new file mode 100644
index 00000000..f1519d09
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/grantValidation.test.ts
@@ -0,0 +1,657 @@
+/**
+ * Tests for grant validation utilities
+ *
+ * @remarks
+ * Tests comprehensive validation of permission grant files including schema validation,
+ * business rule checking, expiration verification, and access control.
+ */
+
+import { describe, it, expect, vi } from "vitest";
+import {
+  validateGrant,
+  validateGranteeAccess,
+  validateGrantExpiry,
+  validateOperationAccess,
+  GrantValidationError,
+  GrantExpiredError,
+  GranteeMismatchError,
+  OperationNotAllowedError,
+  GrantSchemaError,
+} from "../grantValidation";
+import type { GrantFile } from "../../types/permissions";
+
+// Mock the grant file schema
+vi.mock("../../schemas/grantFile.schema.json", () => ({
+  default: {
+    type: "object",
+    required: ["grantee", "operation", "parameters"],
+    properties: {
+      grantee: { type: "string" },
+      operation: { type: "string" },
+      parameters: { type: "object" },
+      expires: { type: "number" },
+    },
+  },
+}));
+
+describe("grantValidation", () => {
+  const validGrantFile: GrantFile = {
+    grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+    operation: "llm_inference",
+    parameters: { model: "gpt-4" },
+    expires: Math.floor(Date.now() / 1000) + 3600, // 1 hour from now
+  };
+
+  describe("Error Classes", () => {
+    describe("GrantValidationError", () => {
+      it("should create error with message and details", () => {
+        const details = { field: "test" };
+        const error = new GrantValidationError("Test error", details);
+
+        expect(error).toBeInstanceOf(Error);
+        expect(error.name).toBe("GrantValidationError");
+        expect(error.message).toBe("Test error");
+        expect(error.details).toEqual(details);
+      });
+
+      it("should create error without details", () => {
+        const error = new GrantValidationError("Test error");
+
+        expect(error.details).toBeUndefined();
+      });
+    });
+
+    describe("GrantExpiredError", () => {
+      it("should create error with expiry details", () => {
+        const expires = 1000;
+        const currentTime = 2000;
+        const error = new GrantExpiredError(
+          "Grant expired",
+          expires,
+          currentTime,
+        );
+
+        expect(error).toBeInstanceOf(GrantValidationError);
+        expect(error.name).toBe("GrantExpiredError");
+        expect(error.message).toBe("Grant expired");
+        expect(error.expires).toBe(expires);
+        expect(error.currentTime).toBe(currentTime);
+        expect(error.details).toEqual({ expires, currentTime });
+      });
+    });
+
+    describe("GranteeMismatchError", () => {
+      it("should create error with address details", () => {
+        const grantee =
+          "0x1111111111111111111111111111111111111111" as `0x${string}`;
+        const requesting =
+          "0x2222222222222222222222222222222222222222" as `0x${string}`;
+        const error = new GranteeMismatchError(
+          "Address mismatch",
+          grantee,
+          requesting,
+        );
+
+        expect(error).toBeInstanceOf(GrantValidationError);
+        expect(error.name).toBe("GranteeMismatchError");
+        expect(error.grantee).toBe(grantee);
+        expect(error.requestingAddress).toBe(requesting);
+        expect(error.details).toEqual({
+          grantee,
+          requestingAddress: requesting,
+        });
+      });
+    });
+
+    describe("OperationNotAllowedError", () => {
+      it("should create error with operation details", () => {
+        const granted = "read";
+        const requested = "write";
+        const error = new OperationNotAllowedError(
+          "Operation not allowed",
+          granted,
+          requested,
+        );
+
+        expect(error).toBeInstanceOf(GrantValidationError);
+        expect(error.name).toBe("OperationNotAllowedError");
+        expect(error.grantedOperation).toBe(granted);
+        expect(error.requestedOperation).toBe(requested);
+        expect(error.details).toEqual({
+          grantedOperation: granted,
+          requestedOperation: requested,
+        });
+      });
+    });
+
+    describe("GrantSchemaError", () => {
+      it("should create error with schema validation details", () => {
+        const schemaErrors = [{ field: "grantee", message: "required" }];
+        const invalidData = { operation: "test" };
+        const error = new GrantSchemaError(
+          "Schema error",
+          schemaErrors,
+          invalidData,
+        );
+
+        expect(error).toBeInstanceOf(GrantValidationError);
+        expect(error.name).toBe("GrantSchemaError");
+        expect(error.schemaErrors).toEqual(schemaErrors);
+        expect(error.invalidData).toEqual(invalidData);
+        expect(error.details).toEqual({
+          errors: schemaErrors,
+          data: invalidData,
+        });
+      });
+    });
+  });
+
+  describe("validateGrant", () => {
+    describe("Schema Validation", () => {
+      it("should validate valid grant file", () => {
+        const result = validateGrant(validGrantFile);
+
+        expect(result).toEqual(validGrantFile);
+      });
+
+      it("should throw on missing required fields", () => {
+        const invalidGrant = {
+          operation: "test",
+          parameters: {},
+          // missing grantee
+        };
+
+        expect(() => validateGrant(invalidGrant)).toThrow(GrantValidationError);
+      });
+
+      it("should throw on invalid field types", () => {
+        const invalidGrant = {
+          grantee: 123, // should be string
+          operation: "test",
+          parameters: {},
+        };
+
+        expect(() => validateGrant(invalidGrant)).toThrow(GrantValidationError);
+      });
+
+      it("should skip schema validation when disabled", () => {
+        const invalidGrant = { invalid: "data" };
+
+        const result = validateGrant(invalidGrant, { schema: false });
+
+        expect(result).toEqual(invalidGrant);
+      });
+    });
+
+    describe("Business Rule Validation", () => {
+      it("should validate grantee access", () => {
+        const result = validateGrant(validGrantFile, {
+          grantee: validGrantFile.grantee,
+        });
+
+        expect(result).toEqual(validGrantFile);
+      });
+
+      it("should throw on grantee mismatch", () => {
+        const wrongAddress =
+          "0x9999999999999999999999999999999999999999" as `0x${string}`;
+
+        expect(() =>
+          validateGrant(validGrantFile, { grantee: wrongAddress }),
+        ).toThrow(GranteeMismatchError);
+      });
+
+      it("should validate grant expiry", () => {
+        const futureTime = Math.floor(Date.now() / 1000) - 100;
+
+        const result = validateGrant(validGrantFile, {
+          currentTime: futureTime,
+        });
+
+        expect(result).toEqual(validGrantFile);
+      });
+
+      it("should throw on expired grant", () => {
+        const pastGrant = {
+          ...validGrantFile,
+          expires: Math.floor(Date.now() / 1000) - 3600, // 1 hour ago
+        };
+
+        expect(() => validateGrant(pastGrant)).toThrow(GrantExpiredError);
+      });
+
+      it("should validate operation access", () => {
+        const result = validateGrant(validGrantFile, {
+          operation: validGrantFile.operation,
+        });
+
+        expect(result).toEqual(validGrantFile);
+      });
+
+      it("should throw on operation mismatch", () => {
+        expect(() =>
+          validateGrant(validGrantFile, { operation: "different_operation" }),
+        ).toThrow(OperationNotAllowedError);
+      });
+
+      it("should validate all business rules together", () => {
+        const result = validateGrant(validGrantFile, {
+          grantee: validGrantFile.grantee,
+          operation: validGrantFile.operation,
+          currentTime: Math.floor(Date.now() / 1000),
+        });
+
+        expect(result).toEqual(validGrantFile);
+      });
+    });
+
+    describe("Throwing vs Non-Throwing Mode", () => {
+      it("should throw error in throwing mode (default)", () => {
+        const invalidGrant = { invalid: "data" };
+
+        expect(() => validateGrant(invalidGrant)).toThrow();
+      });
+
+      it("should return result in non-throwing mode", () => {
+        const invalidGrant = { invalid: "data" };
+
+        const result = validateGrant(invalidGrant, { throwOnError: false });
+
+        expect(result.valid).toBe(false);
+        expect(result.errors).toHaveLength(1);
+        expect(result.errors[0].type).toBe("schema");
+      });
+
+      it("should return valid result for valid grant", () => {
+        const result = validateGrant(validGrantFile, { throwOnError: false });
+
+        expect(result.valid).toBe(true);
+        expect(result.errors).toHaveLength(0);
+        expect(result.grant).toEqual(validGrantFile);
+      });
+
+      it("should include all validation errors in non-throwing mode", () => {
+        const expiredGrant = {
+          ...validGrantFile,
+          expires: Math.floor(Date.now() / 1000) - 3600,
+        };
+
+        const result = validateGrant(expiredGrant, {
+          grantee:
+            "0x9999999999999999999999999999999999999999" as `0x${string}`,
+          operation: "wrong_operation",
+          throwOnError: false,
+        });
+
+        expect(result.valid).toBe(false);
+        expect(result.errors.length).toBeGreaterThan(1);
+        expect(result.errors.some((e) => e.field === "expires")).toBe(true);
+        expect(result.errors.some((e) => e.field === "grantee")).toBe(true);
+        expect(result.errors.some((e) => e.field === "operation")).toBe(true);
+      });
+    });
+
+    describe("Edge Cases", () => {
+      it("should handle grant without expiry", () => {
+        const noExpiryGrant = {
+          grantee: validGrantFile.grantee,
+          operation: validGrantFile.operation,
+          parameters: {},
+        };
+
+        const result = validateGrant(noExpiryGrant);
+
+        expect(result).toEqual(noExpiryGrant);
+      });
+
+      it("should handle grant with zero expiry as no expiration", () => {
+        const zeroExpiryGrant = {
+          ...validGrantFile,
+          expires: 0,
+        };
+
+        // expires: 0 is falsy, treated as no expiration
+        expect(() => validateGrant(zeroExpiryGrant)).not.toThrow();
+      });
+
+      it("should handle grant expiring exactly now", () => {
+        const now = Math.floor(Date.now() / 1000);
+        const expiringNowGrant = {
+          ...validGrantFile,
+          expires: now,
+        };
+
+        // Should not throw because we check now > expires
+        expect(() =>
+          validateGrant(expiringNowGrant, { currentTime: now }),
+        ).not.toThrow();
+      });
+
+      it("should handle grant expired by 1 second", () => {
+        const now = Math.floor(Date.now() / 1000);
+        const expiredGrant = {
+          ...validGrantFile,
+          expires: now - 1,
+        };
+
+        expect(() => validateGrant(expiredGrant, { currentTime: now })).toThrow(
+          GrantExpiredError,
+        );
+      });
+
+      it("should handle checksummed addresses", () => {
+        const checksummedGrant = {
+          ...validGrantFile,
+          grantee:
+            "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        };
+
+        // Pass same address in different case - should normalize and match
+        const result = validateGrant(checksummedGrant, {
+          grantee:
+            "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        });
+
+        expect(result).toEqual(checksummedGrant);
+      });
+
+      it("should handle empty parameters object", () => {
+        const emptyParamsGrant = {
+          ...validGrantFile,
+          parameters: {},
+        };
+
+        const result = validateGrant(emptyParamsGrant);
+
+        expect(result).toEqual(emptyParamsGrant);
+      });
+
+      it("should handle complex parameters", () => {
+        const complexGrant = {
+          ...validGrantFile,
+          parameters: {
+            nested: {
+              deep: {
+                value: 42,
+              },
+            },
+            array: [1, 2, 3],
+            string: "test",
+          },
+        };
+
+        const result = validateGrant(complexGrant);
+
+        expect(result).toEqual(complexGrant);
+      });
+    });
+
+    describe("Option Combinations", () => {
+      it("should validate with all options", () => {
+        const result = validateGrant(validGrantFile, {
+          schema: true,
+          grantee: validGrantFile.grantee,
+          operation: validGrantFile.operation,
+          currentTime: Math.floor(Date.now() / 1000),
+          throwOnError: false,
+        });
+
+        expect(result.valid).toBe(true);
+      });
+
+      it("should skip schema but validate business rules", () => {
+        const result = validateGrant(validGrantFile, {
+          schema: false,
+          grantee: validGrantFile.grantee,
+          operation: validGrantFile.operation,
+        });
+
+        expect(result).toEqual(validGrantFile);
+      });
+
+      it("should validate schema but skip business rules", () => {
+        const result = validateGrant(validGrantFile, {
+          schema: true,
+          // no grantee, operation, or currentTime
+        });
+
+        expect(result).toEqual(validGrantFile);
+      });
+    });
+  });
+
+  describe("validateGranteeAccess", () => {
+    it("should pass for matching grantee", () => {
+      expect(() => {
+        validateGranteeAccess(validGrantFile, validGrantFile.grantee);
+      }).not.toThrow();
+    });
+
+    it("should throw on mismatched grantee", () => {
+      const wrongAddress =
+        "0x9999999999999999999999999999999999999999" as `0x${string}`;
+
+      expect(() => {
+        validateGranteeAccess(validGrantFile, wrongAddress);
+      }).toThrow(GranteeMismatchError);
+    });
+
+    it("should normalize addresses for comparison", () => {
+      const lowercaseGrant = {
+        ...validGrantFile,
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+      };
+      const sameAddress =
+        "0x1234567890123456789012345678901234567890" as `0x${string}`;
+
+      expect(() => {
+        validateGranteeAccess(lowercaseGrant, sameAddress);
+      }).not.toThrow();
+    });
+
+    it("should include addresses in error details", () => {
+      const wrongAddress =
+        "0x9999999999999999999999999999999999999999" as `0x${string}`;
+
+      try {
+        validateGranteeAccess(validGrantFile, wrongAddress);
+        expect.fail("Should have thrown");
+      } catch (error) {
+        expect(error).toBeInstanceOf(GranteeMismatchError);
+        expect((error as GranteeMismatchError).grantee).toBe(
+          validGrantFile.grantee,
+        );
+        expect((error as GranteeMismatchError).requestingAddress).toBe(
+          wrongAddress,
+        );
+      }
+    });
+  });
+
+  describe("validateGrantExpiry", () => {
+    it("should pass for non-expired grant", () => {
+      expect(() => {
+        validateGrantExpiry(validGrantFile);
+      }).not.toThrow();
+    });
+
+    it("should pass for grant without expiry", () => {
+      const noExpiryGrant = {
+        ...validGrantFile,
+        expires: undefined,
+      };
+
+      expect(() => {
+        validateGrantExpiry(noExpiryGrant);
+      }).not.toThrow();
+    });
+
+    it("should throw on expired grant", () => {
+      const expiredGrant = {
+        ...validGrantFile,
+        expires: Math.floor(Date.now() / 1000) - 3600,
+      };
+
+      expect(() => {
+        validateGrantExpiry(expiredGrant);
+      }).toThrow(GrantExpiredError);
+    });
+
+    it("should use provided currentTime", () => {
+      const futureTime = Math.floor(Date.now() / 1000) + 7200; // 2 hours from now
+
+      expect(() => {
+        validateGrantExpiry(validGrantFile, futureTime);
+      }).toThrow(GrantExpiredError);
+    });
+
+    it("should handle expiry at exact second", () => {
+      const now = Math.floor(Date.now() / 1000);
+      const expiringNowGrant = {
+        ...validGrantFile,
+        expires: now,
+      };
+
+      // Should not throw because now == expires (not >)
+      expect(() => {
+        validateGrantExpiry(expiringNowGrant, now);
+      }).not.toThrow();
+    });
+
+    it("should include timestamps in error details", () => {
+      const now = Math.floor(Date.now() / 1000);
+      const expiredGrant = {
+        ...validGrantFile,
+        expires: now - 100,
+      };
+
+      try {
+        validateGrantExpiry(expiredGrant, now);
+        expect.fail("Should have thrown");
+      } catch (error) {
+        expect(error).toBeInstanceOf(GrantExpiredError);
+        expect((error as GrantExpiredError).expires).toBe(now - 100);
+        expect((error as GrantExpiredError).currentTime).toBe(now);
+      }
+    });
+
+    it("should use current time when not provided", () => {
+      const expiredGrant = {
+        ...validGrantFile,
+        expires: 1, // Very old timestamp
+      };
+
+      expect(() => {
+        validateGrantExpiry(expiredGrant);
+      }).toThrow(GrantExpiredError);
+    });
+  });
+
+  describe("validateOperationAccess", () => {
+    it("should pass for matching operation", () => {
+      expect(() => {
+        validateOperationAccess(validGrantFile, validGrantFile.operation);
+      }).not.toThrow();
+    });
+
+    it("should throw on mismatched operation", () => {
+      expect(() => {
+        validateOperationAccess(validGrantFile, "different_operation");
+      }).toThrow(OperationNotAllowedError);
+    });
+
+    it("should be case-sensitive", () => {
+      expect(() => {
+        validateOperationAccess(validGrantFile, "LLM_INFERENCE");
+      }).toThrow(OperationNotAllowedError);
+    });
+
+    it("should include operations in error details", () => {
+      const requestedOp = "write";
+
+      try {
+        validateOperationAccess(validGrantFile, requestedOp);
+        expect.fail("Should have thrown");
+      } catch (error) {
+        expect(error).toBeInstanceOf(OperationNotAllowedError);
+        expect((error as OperationNotAllowedError).grantedOperation).toBe(
+          validGrantFile.operation,
+        );
+        expect((error as OperationNotAllowedError).requestedOperation).toBe(
+          requestedOp,
+        );
+      }
+    });
+
+    it("should handle special characters in operations", () => {
+      const specialOpGrant = {
+        ...validGrantFile,
+        operation: "llm:inference:v2",
+      };
+
+      expect(() => {
+        validateOperationAccess(specialOpGrant, "llm:inference:v2");
+      }).not.toThrow();
+    });
+  });
+
+  describe("Integration Scenarios", () => {
+    it("should validate complete grant lifecycle", () => {
+      const now = Math.floor(Date.now() / 1000);
+      const grantForAlice: GrantFile = {
+        grantee: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        operation: "data_download",
+        parameters: { fileId: "123" },
+        expires: now + 86400, // 24 hours
+      };
+
+      // Alice validates her grant
+      const result = validateGrant(grantForAlice, {
+        grantee: grantForAlice.grantee,
+        operation: "data_download",
+        currentTime: now,
+      });
+
+      expect(result).toEqual(grantForAlice);
+    });
+
+    it("should reject invalid grant in complete workflow", () => {
+      const now = Math.floor(Date.now() / 1000);
+      const expiredGrantForBob: GrantFile = {
+        grantee: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        operation: "data_upload",
+        parameters: {},
+        expires: now - 100, // Expired
+      };
+
+      // Bob tries to use expired grant
+      expect(() =>
+        validateGrant(expiredGrantForBob, {
+          grantee: expiredGrantForBob.grantee,
+          operation: "data_upload",
+          currentTime: now,
+        }),
+      ).toThrow(GrantExpiredError);
+    });
+
+    it("should handle grant with multiple validation failures", () => {
+      const now = Math.floor(Date.now() / 1000);
+      const badGrant: GrantFile = {
+        grantee: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        operation: "read",
+        parameters: {},
+        expires: now - 100, // Expired
+      };
+
+      const result = validateGrant(badGrant, {
+        grantee: "0x9999999999999999999999999999999999999999" as `0x${string}`, // Wrong
+        operation: "write", // Wrong
+        currentTime: now,
+        throwOnError: false,
+      });
+
+      expect(result.valid).toBe(false);
+      expect(result.errors.length).toBeGreaterThanOrEqual(3);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/grants.test.ts b/packages/vana-sdk/src/utils/__tests__/grants.test.ts
new file mode 100644
index 00000000..ed083518
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/grants.test.ts
@@ -0,0 +1,424 @@
+/**
+ * Tests for grant management utilities
+ *
+ * @remarks
+ * Tests high-level grant creation, storage, retrieval, validation, and utility functions.
+ */
+
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import {
+  createValidatedGrant,
+  createAndStoreGrant,
+  retrieveAndValidateGrant,
+  checkGrantAccess,
+  isGrantExpired,
+  getGrantTimeRemaining,
+  summarizeGrant,
+} from "../grants";
+import type { GrantFile, GrantPermissionParams } from "../../types/permissions";
+import { GrantValidationError } from "../grantValidation";
+
+// Mock dependencies
+vi.mock("../grantFiles", () => ({
+  createGrantFile: vi.fn((params) => ({
+    grantee: params.grantee,
+    operation: params.operation,
+    parameters: params.parameters,
+    ...(params.expiresAt && { expires: params.expiresAt }),
+  })),
+  storeGrantFile: vi.fn(async () => "ipfs://QmTestHash123"),
+  retrieveGrantFile: vi.fn(async () => ({
+    grantee: "0x1234567890123456789012345678901234567890",
+    operation: "test_operation",
+    parameters: {},
+  })),
+}));
+
+vi.mock("../grantValidation", () => ({
+  validateGrant: vi.fn(),
+  GrantValidationError: class GrantValidationError extends Error {
+    constructor(
+      message: string,
+      public details?: unknown,
+    ) {
+      super(message);
+      this.name = "GrantValidationError";
+    }
+  },
+}));
+
+// Import mocked modules to access in tests
+import * as grantFilesModule from "../grantFiles";
+import * as grantValidationModule from "../grantValidation";
+
+describe("grants", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe("createValidatedGrant", () => {
+    const validParams: GrantPermissionParams = {
+      grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+      operation: "test_op",
+      files: [1, 2, 3],
+      parameters: { key: "value" },
+    };
+
+    it("should create and validate grant", () => {
+      const result = createValidatedGrant(validParams);
+
+      expect(result.grantee).toBe(validParams.grantee);
+      expect(result.operation).toBe(validParams.operation);
+      expect(result.parameters).toEqual(validParams.parameters);
+    });
+
+    it("should throw GrantValidationError on validation failure", () => {
+      vi.mocked(grantValidationModule.validateGrant).mockImplementationOnce(
+        () => {
+          throw new Error("Validation failed");
+        },
+      );
+
+      expect(() => createValidatedGrant(validParams)).toThrow(
+        GrantValidationError,
+      );
+    });
+
+    it("should include grant file in validation error details", () => {
+      vi.mocked(grantValidationModule.validateGrant).mockImplementationOnce(
+        () => {
+          throw new Error("Invalid grant");
+        },
+      );
+
+      try {
+        createValidatedGrant(validParams);
+        expect.fail("Should have thrown");
+      } catch (error) {
+        expect(error).toBeInstanceOf(GrantValidationError);
+        expect((error as GrantValidationError).message).toContain(
+          "Invalid grant",
+        );
+      }
+    });
+
+    it("should pass validation options to validateGrant", () => {
+      createValidatedGrant(validParams);
+
+      expect(grantValidationModule.validateGrant).toHaveBeenCalledWith(
+        expect.any(Object),
+        expect.objectContaining({
+          schema: true,
+          grantee: validParams.grantee,
+          operation: validParams.operation,
+        }),
+      );
+    });
+  });
+
+  describe("createAndStoreGrant", () => {
+    const validParams: GrantPermissionParams = {
+      grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+      operation: "store_test",
+      files: [],
+      parameters: {},
+    };
+
+    it("should create and store grant", async () => {
+      const result = await createAndStoreGrant(
+        validParams,
+        "https://relayer.test",
+      );
+
+      expect(result.grantFile).toBeDefined();
+      expect(result.grantUrl).toBe("ipfs://QmTestHash123");
+    });
+
+    it("should return both grant file and URL", async () => {
+      const result = await createAndStoreGrant(
+        validParams,
+        "https://relayer.test",
+      );
+
+      expect(result).toHaveProperty("grantFile");
+      expect(result).toHaveProperty("grantUrl");
+      expect(result.grantFile.grantee).toBe(validParams.grantee);
+    });
+
+    it("should propagate validation errors", async () => {
+      vi.mocked(grantValidationModule.validateGrant).mockImplementationOnce(
+        () => {
+          throw new Error("Invalid");
+        },
+      );
+
+      await expect(
+        createAndStoreGrant(validParams, "https://relayer.test"),
+      ).rejects.toThrow(GrantValidationError);
+    });
+
+    it("should propagate storage errors", async () => {
+      vi.mocked(grantFilesModule.storeGrantFile).mockRejectedValueOnce(
+        new Error("Storage failed"),
+      );
+
+      await expect(
+        createAndStoreGrant(validParams, "https://relayer.test"),
+      ).rejects.toThrow("Storage failed");
+    });
+  });
+
+  describe("retrieveAndValidateGrant", () => {
+    it("should retrieve grant from IPFS", async () => {
+      const result = await retrieveAndValidateGrant("ipfs://QmTest");
+
+      expect(result).toBeDefined();
+      expect(result.grantee).toBeDefined();
+      expect(result.operation).toBeDefined();
+    });
+
+    it("should pass relayer URL to retrieveGrantFile", async () => {
+      await retrieveAndValidateGrant("ipfs://QmTest", "https://relayer.test");
+
+      expect(grantFilesModule.retrieveGrantFile).toHaveBeenCalledWith(
+        "ipfs://QmTest",
+        "https://relayer.test",
+      );
+    });
+
+    it("should work without relayer URL", async () => {
+      const result = await retrieveAndValidateGrant("ipfs://QmTest");
+
+      expect(result).toBeDefined();
+    });
+
+    it("should propagate retrieval errors", async () => {
+      vi.mocked(grantFilesModule.retrieveGrantFile).mockRejectedValueOnce(
+        new Error("Not found"),
+      );
+
+      await expect(retrieveAndValidateGrant("ipfs://QmTest")).rejects.toThrow(
+        "Not found",
+      );
+    });
+  });
+
+  describe("checkGrantAccess", () => {
+    const mockGrant: GrantFile = {
+      grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+      operation: "read",
+      parameters: {},
+    };
+
+    beforeEach(() => {
+      vi.mocked(grantFilesModule.retrieveGrantFile).mockResolvedValue(
+        mockGrant,
+      );
+    });
+
+    it("should return allowed=true for valid grant", async () => {
+      const result = await checkGrantAccess(
+        "ipfs://QmTest",
+        mockGrant.grantee,
+        "read",
+        [1, 2],
+      );
+
+      expect(result.allowed).toBe(true);
+      expect(result.grantFile).toBeDefined();
+    });
+
+    it("should return allowed=false for validation error", async () => {
+      vi.mocked(grantValidationModule.validateGrant).mockImplementationOnce(
+        () => {
+          throw new GrantValidationError("Invalid grantee");
+        },
+      );
+
+      const result = await checkGrantAccess(
+        "ipfs://QmTest",
+        "0x9999999999999999999999999999999999999999" as `0x${string}`,
+        "read",
+        [],
+      );
+
+      expect(result.allowed).toBe(false);
+      expect(result.reason).toContain("Invalid grantee");
+    });
+
+    it("should return allowed=false for retrieval errors", async () => {
+      vi.mocked(grantFilesModule.retrieveGrantFile).mockRejectedValueOnce(
+        new Error("Network error"),
+      );
+
+      const result = await checkGrantAccess(
+        "ipfs://QmTest",
+        mockGrant.grantee,
+        "read",
+        [],
+      );
+
+      expect(result.allowed).toBe(false);
+      expect(result.reason).toContain("Network error");
+    });
+
+    it("should include grant file in allowed response", async () => {
+      const result = await checkGrantAccess(
+        "ipfs://QmTest",
+        mockGrant.grantee,
+        "read",
+        [],
+      );
+
+      expect(result.grantFile).toEqual(mockGrant);
+    });
+  });
+
+  describe("isGrantExpired", () => {
+    it("should return false for grant without expiration", () => {
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+      };
+
+      expect(isGrantExpired(grant)).toBe(false);
+    });
+
+    it("should return true for expired grant", () => {
+      const pastTime = Math.floor(Date.now() / 1000) - 3600; // 1 hour ago
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+        expires: pastTime,
+      };
+
+      expect(isGrantExpired(grant)).toBe(true);
+    });
+
+    it("should return false for future expiration", () => {
+      const futureTime = Math.floor(Date.now() / 1000) + 3600; // 1 hour from now
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+        expires: futureTime,
+      };
+
+      expect(isGrantExpired(grant)).toBe(false);
+    });
+
+    it("should handle expiration at exact current time", () => {
+      const now = Math.floor(Date.now() / 1000);
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+        expires: now,
+      };
+
+      // At exact time, should not be expired (now > expires)
+      expect(isGrantExpired(grant)).toBe(false);
+    });
+  });
+
+  describe("getGrantTimeRemaining", () => {
+    it("should return null for grant without expiration", () => {
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+      };
+
+      expect(getGrantTimeRemaining(grant)).toBeNull();
+    });
+
+    it("should return positive time for future expiration", () => {
+      const futureTime = Math.floor(Date.now() / 1000) + 3600; // 1 hour
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+        expires: futureTime,
+      };
+
+      const remaining = getGrantTimeRemaining(grant);
+      expect(remaining).toBeGreaterThan(3500); // ~1 hour (with some margin)
+      expect(remaining).toBeLessThan(3700);
+    });
+
+    it("should return 0 for expired grant", () => {
+      const pastTime = Math.floor(Date.now() / 1000) - 3600; // 1 hour ago
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+        expires: pastTime,
+      };
+
+      expect(getGrantTimeRemaining(grant)).toBe(0);
+    });
+
+    it("should never return negative time", () => {
+      const pastTime = Math.floor(Date.now() / 1000) - 10000;
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+        expires: pastTime,
+      };
+
+      expect(getGrantTimeRemaining(grant)).toBe(0);
+    });
+  });
+
+  describe("summarizeGrant", () => {
+    it("should create summary for grant without expiration", () => {
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "read_data",
+        parameters: {},
+      };
+
+      const summary = summarizeGrant(grant);
+
+      expect(summary).toContain(grant.grantee);
+      expect(summary).toContain(grant.operation);
+      expect(summary).toContain("No expiration");
+    });
+
+    it("should create summary with expiration", () => {
+      const expires = Math.floor(Date.now() / 1000) + 3600;
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "write_data",
+        parameters: {},
+        expires,
+      };
+
+      const summary = summarizeGrant(grant);
+
+      expect(summary).toContain(grant.grantee);
+      expect(summary).toContain(grant.operation);
+      expect(summary).not.toContain("No expiration");
+      // Should contain ISO date format
+      expect(summary).toMatch(/\d{4}-\d{2}-\d{2}T/);
+    });
+
+    it("should format expiration as ISO string", () => {
+      const expires = 1234567890; // Known timestamp
+      const grant: GrantFile = {
+        grantee: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        operation: "test",
+        parameters: {},
+        expires,
+      };
+
+      const summary = summarizeGrant(grant);
+      const expectedDate = new Date(expires * 1000).toISOString();
+
+      expect(summary).toContain(expectedDate);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/ipfs.test.ts b/packages/vana-sdk/src/utils/__tests__/ipfs.test.ts
new file mode 100644
index 00000000..b4910a68
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/ipfs.test.ts
@@ -0,0 +1,520 @@
+/**
+ * Tests for IPFS utilities
+ *
+ * @remarks
+ * Tests IPFS URL handling, gateway conversion, hash extraction, and fallback fetching.
+ */
+
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import {
+  isIpfsUrl,
+  convertIpfsUrl,
+  extractIpfsHash,
+  getGatewayUrls,
+  convertIpfsUrlWithFallbacks,
+  fetchWithFallbacks,
+  DEFAULT_IPFS_GATEWAY,
+  IPFS_GATEWAYS,
+} from "../ipfs";
+
+describe("ipfs", () => {
+  describe("isIpfsUrl", () => {
+    it("should return true for ipfs:// URLs", () => {
+      expect(isIpfsUrl("ipfs://QmHash123")).toBe(true);
+      expect(
+        isIpfsUrl(
+          "ipfs://bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",
+        ),
+      ).toBe(true);
+    });
+
+    it("should return false for non-IPFS URLs", () => {
+      expect(isIpfsUrl("https://example.com")).toBe(false);
+      expect(isIpfsUrl("http://example.com")).toBe(false);
+      expect(isIpfsUrl("ftp://example.com")).toBe(false);
+    });
+
+    it("should return false for gateway URLs", () => {
+      expect(isIpfsUrl("https://ipfs.io/ipfs/QmHash123")).toBe(false);
+      expect(isIpfsUrl("https://gateway.pinata.cloud/ipfs/QmHash123")).toBe(
+        false,
+      );
+    });
+
+    it("should return false for standalone hashes", () => {
+      expect(isIpfsUrl("QmHash1234567890123456789012345678901234567890")).toBe(
+        false,
+      );
+    });
+
+    it("should return false for empty string", () => {
+      expect(isIpfsUrl("")).toBe(false);
+    });
+
+    it("should handle case sensitivity", () => {
+      expect(isIpfsUrl("IPFS://QmHash123")).toBe(false);
+      expect(isIpfsUrl("Ipfs://QmHash123")).toBe(false);
+    });
+  });
+
+  describe("convertIpfsUrl", () => {
+    it("should convert ipfs:// URL to gateway URL", () => {
+      const result = convertIpfsUrl("ipfs://QmHash123");
+      expect(result).toBe(`${DEFAULT_IPFS_GATEWAY}QmHash123`);
+    });
+
+    it("should use custom gateway when provided", () => {
+      const customGateway = "https://custom.gateway.com/ipfs/";
+      const result = convertIpfsUrl("ipfs://QmHash123", customGateway);
+      expect(result).toBe("https://custom.gateway.com/ipfs/QmHash123");
+    });
+
+    it("should return original URL if not IPFS", () => {
+      const httpUrl = "https://example.com/file.json";
+      expect(convertIpfsUrl(httpUrl)).toBe(httpUrl);
+    });
+
+    it("should handle CIDv1 hashes", () => {
+      const cidv1 =
+        "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi";
+      const result = convertIpfsUrl(`ipfs://${cidv1}`);
+      expect(result).toBe(`${DEFAULT_IPFS_GATEWAY}${cidv1}`);
+    });
+
+    it("should handle trailing slash in gateway", () => {
+      const gateway = "https://gateway.example.com/ipfs/";
+      const result = convertIpfsUrl("ipfs://QmHash123", gateway);
+      expect(result).toBe("https://gateway.example.com/ipfs/QmHash123");
+    });
+
+    it("should handle gateway without trailing slash", () => {
+      const gateway = "https://gateway.example.com/ipfs";
+      const result = convertIpfsUrl("ipfs://QmHash123", gateway);
+      expect(result).toBe("https://gateway.example.com/ipfsQmHash123"); // Note: no slash between
+    });
+
+    it("should preserve hash exactly as provided", () => {
+      const hash = "QmHash123WithMixedCase";
+      const result = convertIpfsUrl(`ipfs://${hash}`);
+      expect(result).toContain(hash);
+    });
+  });
+
+  describe("extractIpfsHash", () => {
+    it("should extract hash from ipfs:// URL", () => {
+      expect(extractIpfsHash("ipfs://QmHash123")).toBe("QmHash123");
+    });
+
+    it("should extract hash from gateway URL", () => {
+      expect(extractIpfsHash("https://ipfs.io/ipfs/QmHash123")).toBe(
+        "QmHash123",
+      );
+      expect(
+        extractIpfsHash("https://gateway.pinata.cloud/ipfs/QmHash123"),
+      ).toBe("QmHash123");
+    });
+
+    it("should extract hash from standalone hash string (46+ chars)", () => {
+      const hash = "QmHash1234567890123456789012345678901234567890";
+      expect(extractIpfsHash(hash)).toBe(hash);
+    });
+
+    it("should return null for short standalone strings", () => {
+      expect(extractIpfsHash("QmHash123")).toBeNull();
+      expect(extractIpfsHash("short")).toBeNull();
+    });
+
+    it("should return null for non-IPFS URLs", () => {
+      expect(extractIpfsHash("https://example.com/file.json")).toBeNull();
+      expect(extractIpfsHash("http://example.com")).toBeNull();
+    });
+
+    it("should return null for ipfs:// with subdirectory", () => {
+      expect(extractIpfsHash("ipfs://QmHash123/subdirectory")).toBeNull();
+    });
+
+    it("should extract hash from gateway URL even with subdirectory", () => {
+      // The regex pattern actually matches and extracts the hash part
+      expect(extractIpfsHash("https://ipfs.io/ipfs/QmHash123/file.json")).toBe(
+        "QmHash123",
+      );
+    });
+
+    it("should handle CIDv1 hashes", () => {
+      const cidv1 =
+        "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi";
+      expect(extractIpfsHash(`ipfs://${cidv1}`)).toBe(cidv1);
+      expect(extractIpfsHash(`https://ipfs.io/ipfs/${cidv1}`)).toBe(cidv1);
+    });
+
+    it("should return null for empty string", () => {
+      expect(extractIpfsHash("")).toBeNull();
+    });
+
+    it("should return null for malformed ipfs:// URL", () => {
+      expect(extractIpfsHash("ipfs://")).toBeNull();
+    });
+
+    it("should handle different gateway formats", () => {
+      expect(extractIpfsHash("https://dweb.link/ipfs/QmHash123")).toBe(
+        "QmHash123",
+      );
+      expect(extractIpfsHash("https://ipfs.filebase.io/ipfs/QmHash123")).toBe(
+        "QmHash123",
+      );
+    });
+  });
+
+  describe("getGatewayUrls", () => {
+    it("should return array of gateway URLs", () => {
+      const hash = "QmHash123";
+      const urls = getGatewayUrls(hash);
+
+      expect(urls).toHaveLength(IPFS_GATEWAYS.length);
+      expect(urls).toContain(`${IPFS_GATEWAYS[0]}${hash}`);
+      expect(urls).toContain(`${IPFS_GATEWAYS[1]}${hash}`);
+    });
+
+    it("should handle CIDv1 hashes", () => {
+      const cidv1 =
+        "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi";
+      const urls = getGatewayUrls(cidv1);
+
+      expect(urls).toHaveLength(IPFS_GATEWAYS.length);
+      urls.forEach((url) => {
+        expect(url).toContain(cidv1);
+      });
+    });
+
+    it("should return URLs in same order as IPFS_GATEWAYS", () => {
+      const hash = "QmHash123";
+      const urls = getGatewayUrls(hash);
+
+      IPFS_GATEWAYS.forEach((gateway, index) => {
+        expect(urls[index]).toBe(`${gateway}${hash}`);
+      });
+    });
+
+    it("should handle empty hash", () => {
+      const urls = getGatewayUrls("");
+
+      expect(urls).toHaveLength(IPFS_GATEWAYS.length);
+      urls.forEach((url) => {
+        expect(url).toMatch(/\/ipfs\/$/);
+      });
+    });
+  });
+
+  describe("convertIpfsUrlWithFallbacks", () => {
+    it("should return multiple gateway URLs for ipfs:// URL", () => {
+      const urls = convertIpfsUrlWithFallbacks("ipfs://QmHash123");
+
+      expect(urls).toHaveLength(IPFS_GATEWAYS.length);
+      expect(urls[0]).toContain("QmHash123");
+    });
+
+    it("should return multiple gateway URLs for gateway URL", () => {
+      const urls = convertIpfsUrlWithFallbacks(
+        "https://ipfs.io/ipfs/QmHash123",
+      );
+
+      expect(urls).toHaveLength(IPFS_GATEWAYS.length);
+      expect(urls[0]).toContain("QmHash123");
+    });
+
+    it("should return array with original URL for non-IPFS URLs", () => {
+      const httpUrl = "https://example.com/file.json";
+      const urls = convertIpfsUrlWithFallbacks(httpUrl);
+
+      expect(urls).toHaveLength(1);
+      expect(urls[0]).toBe(httpUrl);
+    });
+
+    it("should handle CIDv1 hashes", () => {
+      const cidv1 =
+        "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi";
+      const urls = convertIpfsUrlWithFallbacks(`ipfs://${cidv1}`);
+
+      expect(urls).toHaveLength(IPFS_GATEWAYS.length);
+      urls.forEach((url) => {
+        expect(url).toContain(cidv1);
+      });
+    });
+
+    it("should return singleton array for standalone hash", () => {
+      const hash = "QmHash1234567890123456789012345678901234567890";
+      const urls = convertIpfsUrlWithFallbacks(hash);
+
+      expect(urls).toHaveLength(IPFS_GATEWAYS.length);
+    });
+  });
+
+  describe("fetchWithFallbacks", () => {
+    beforeEach(() => {
+      global.fetch = vi.fn();
+      vi.useFakeTimers();
+    });
+
+    afterEach(() => {
+      vi.restoreAllMocks();
+      vi.useRealTimers();
+    });
+
+    it("should fetch from first gateway on success", async () => {
+      const mockResponse = { ok: true, status: 200 };
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
+        mockResponse,
+      );
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+
+      // Fast-forward timers if needed
+      await vi.runAllTimersAsync();
+
+      const result = await resultPromise;
+
+      expect(result).toEqual(mockResponse);
+      expect(global.fetch).toHaveBeenCalledTimes(1);
+      expect(global.fetch).toHaveBeenCalledWith(
+        expect.stringContaining("QmHash123"),
+        expect.objectContaining({
+          signal: expect.any(AbortSignal),
+        }),
+      );
+    });
+
+    it("should try next gateway on HTTP error", async () => {
+      const errorResponse = { ok: false, status: 404 };
+      const successResponse = { ok: true, status: 200 };
+
+      (global.fetch as ReturnType<typeof vi.fn>)
+        .mockResolvedValueOnce(errorResponse)
+        .mockResolvedValueOnce(successResponse);
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+
+      // Fast-forward timers
+      await vi.runAllTimersAsync();
+
+      const result = await resultPromise;
+
+      expect(result).toEqual(successResponse);
+      expect(global.fetch).toHaveBeenCalledTimes(2);
+    });
+
+    it("should skip rate-limited gateway immediately", async () => {
+      const rateLimitedResponse = { ok: false, status: 429 };
+      const successResponse = { ok: true, status: 200 };
+
+      (global.fetch as ReturnType<typeof vi.fn>)
+        .mockResolvedValueOnce(rateLimitedResponse)
+        .mockResolvedValueOnce(successResponse);
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+
+      // Fast-forward timers
+      await vi.runAllTimersAsync();
+
+      const result = await resultPromise;
+
+      expect(result).toEqual(successResponse);
+      expect(global.fetch).toHaveBeenCalledTimes(2);
+    });
+
+    it("should throw error when all gateways fail", async () => {
+      const errorResponse = { ok: false, status: 404 };
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
+        errorResponse,
+      );
+
+      // Start the fetch and advance timers
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+
+      // Advance timers asynchronously
+      const timerPromise = vi.runAllTimersAsync();
+
+      await expect(resultPromise).rejects.toThrow(/All IPFS gateways failed/);
+      await timerPromise; // Wait for timers to complete
+      expect(global.fetch).toHaveBeenCalledTimes(IPFS_GATEWAYS.length);
+    });
+
+    it("should fetch non-IPFS URL directly", async () => {
+      const mockResponse = { ok: true, status: 200 };
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
+        mockResponse,
+      );
+
+      const httpUrl = "https://example.com/file.json";
+      const result = await fetchWithFallbacks(httpUrl);
+
+      expect(result).toEqual(mockResponse);
+      expect(global.fetch).toHaveBeenCalledTimes(1);
+      expect(global.fetch).toHaveBeenCalledWith(httpUrl, undefined);
+    });
+
+    it("should handle network errors with retry", async () => {
+      const networkError = new Error("Network failure");
+      const successResponse = { ok: true, status: 200 };
+
+      (global.fetch as ReturnType<typeof vi.fn>)
+        .mockRejectedValueOnce(networkError)
+        .mockResolvedValueOnce(successResponse);
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+
+      // Fast-forward timers
+      await vi.runAllTimersAsync();
+
+      const result = await resultPromise;
+
+      expect(result).toEqual(successResponse);
+      expect(global.fetch).toHaveBeenCalledTimes(2);
+    });
+
+    it("should pass through fetch options", async () => {
+      const mockResponse = { ok: true, status: 200 };
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
+        mockResponse,
+      );
+
+      const options: RequestInit = {
+        headers: { "Custom-Header": "value" },
+        method: "POST",
+      };
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123", options);
+
+      await vi.runAllTimersAsync();
+
+      await resultPromise;
+
+      expect(global.fetch).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          headers: { "Custom-Header": "value" },
+          method: "POST",
+          signal: expect.any(AbortSignal),
+        }),
+      );
+    });
+
+    it("should handle timeout errors", async () => {
+      const timeoutError = new Error("Timeout");
+      timeoutError.name = "TimeoutError";
+      const successResponse = { ok: true, status: 200 };
+
+      (global.fetch as ReturnType<typeof vi.fn>)
+        .mockRejectedValueOnce(timeoutError)
+        .mockResolvedValueOnce(successResponse);
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+
+      await vi.runAllTimersAsync();
+
+      const result = await resultPromise;
+
+      expect(result).toEqual(successResponse);
+      expect(global.fetch).toHaveBeenCalledTimes(2);
+    });
+
+    it("should handle errors with 429 in message", async () => {
+      const error429 = new Error("HTTP 429 Too Many Requests");
+      const successResponse = { ok: true, status: 200 };
+
+      (global.fetch as ReturnType<typeof vi.fn>)
+        .mockRejectedValueOnce(error429)
+        .mockResolvedValueOnce(successResponse);
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+
+      await vi.runAllTimersAsync();
+
+      const result = await resultPromise;
+
+      expect(result).toEqual(successResponse);
+      expect(global.fetch).toHaveBeenCalledTimes(2);
+    });
+
+    it("should include last error in thrown error", async () => {
+      const lastError = new Error("Gateway timeout");
+      (global.fetch as ReturnType<typeof vi.fn>).mockRejectedValue(lastError);
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+      const timerPromise = vi.runAllTimersAsync();
+
+      await expect(resultPromise).rejects.toThrow(/Gateway timeout/);
+      await timerPromise;
+    });
+
+    it("should try all gateways before throwing", async () => {
+      (global.fetch as ReturnType<typeof vi.fn>).mockRejectedValue(
+        new Error("Failed"),
+      );
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+      const timerPromise = vi.runAllTimersAsync();
+
+      await expect(resultPromise).rejects.toThrow();
+      await timerPromise;
+      expect(global.fetch).toHaveBeenCalledTimes(IPFS_GATEWAYS.length);
+    });
+
+    it("should handle non-Error objects thrown", async () => {
+      const nonErrorObject = "string error";
+      const successResponse = { ok: true, status: 200 };
+
+      (global.fetch as ReturnType<typeof vi.fn>)
+        .mockRejectedValueOnce(nonErrorObject)
+        .mockResolvedValueOnce(successResponse);
+
+      const resultPromise = fetchWithFallbacks("ipfs://QmHash123");
+
+      await vi.runAllTimersAsync();
+
+      const result = await resultPromise;
+
+      expect(result).toEqual(successResponse);
+    });
+
+    it("should handle CIDv1 hashes", async () => {
+      const mockResponse = { ok: true, status: 200 };
+      (global.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
+        mockResponse,
+      );
+
+      const cidv1 =
+        "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi";
+      const resultPromise = fetchWithFallbacks(`ipfs://${cidv1}`);
+
+      await vi.runAllTimersAsync();
+
+      await resultPromise;
+
+      expect(global.fetch).toHaveBeenCalledWith(
+        expect.stringContaining(cidv1),
+        expect.any(Object),
+      );
+    });
+  });
+
+  describe("Constants", () => {
+    it("should export DEFAULT_IPFS_GATEWAY", () => {
+      expect(DEFAULT_IPFS_GATEWAY).toBeDefined();
+      expect(typeof DEFAULT_IPFS_GATEWAY).toBe("string");
+      expect(DEFAULT_IPFS_GATEWAY).toContain("ipfs");
+    });
+
+    it("should export IPFS_GATEWAYS array", () => {
+      expect(IPFS_GATEWAYS).toBeDefined();
+      expect(Array.isArray(IPFS_GATEWAYS)).toBe(true);
+      expect(IPFS_GATEWAYS.length).toBeGreaterThan(0);
+    });
+
+    it("should have valid gateway URLs in IPFS_GATEWAYS", () => {
+      IPFS_GATEWAYS.forEach((gateway) => {
+        expect(gateway).toMatch(/^https?:\/\//);
+        expect(gateway).toContain("ipfs");
+      });
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/lazy-import.test.ts b/packages/vana-sdk/src/utils/__tests__/lazy-import.test.ts
new file mode 100644
index 00000000..9690a992
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/lazy-import.test.ts
@@ -0,0 +1,366 @@
+/**
+ * Tests for lazy import utilities
+ *
+ * @remarks
+ * Tests cached lazy module loading to prevent Temporal Dead Zone issues.
+ */
+
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { lazyImport } from "../lazy-import";
+
+describe("lazy-import", () => {
+  describe("lazyImport", () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    it("should lazy load module on first call", async () => {
+      const mockModule = { value: "test" };
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+
+      // Import not called yet
+      expect(importFn).not.toHaveBeenCalled();
+
+      const result = await loader();
+
+      expect(importFn).toHaveBeenCalledTimes(1);
+      expect(result).toBe(mockModule);
+    });
+
+    it("should cache the import promise", async () => {
+      const mockModule = { value: "test" };
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+
+      const result1 = await loader();
+      const result2 = await loader();
+      const result3 = await loader();
+
+      // Import function called only once
+      expect(importFn).toHaveBeenCalledTimes(1);
+      expect(result1).toBe(mockModule);
+      expect(result2).toBe(mockModule);
+      expect(result3).toBe(mockModule);
+    });
+
+    it("should handle concurrent first calls without race conditions", async () => {
+      const mockModule = { value: "test" };
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+
+      // Call loader multiple times concurrently
+      const results = await Promise.all([loader(), loader(), loader()]);
+
+      // Import function called only once despite concurrent calls
+      expect(importFn).toHaveBeenCalledTimes(1);
+      expect(results).toEqual([mockModule, mockModule, mockModule]);
+    });
+
+    it("should clear cache on import failure", async () => {
+      const error = new Error("Import failed");
+      let callCount = 0;
+      const importFn = vi.fn(() => {
+        callCount++;
+        if (callCount === 1) {
+          return Promise.reject(error);
+        }
+        return Promise.resolve({ value: "success" });
+      });
+
+      const loader = lazyImport(importFn);
+
+      // First call should fail
+      await expect(loader()).rejects.toThrow("Failed to load module");
+      expect(importFn).toHaveBeenCalledTimes(1);
+
+      // Second call should retry (cache was cleared)
+      const result = await loader();
+      expect(importFn).toHaveBeenCalledTimes(2);
+      expect(result).toEqual({ value: "success" });
+    });
+
+    it("should wrap import errors with context", async () => {
+      const originalError = new Error("Module not found");
+      const importFn = vi.fn(() => Promise.reject(originalError));
+
+      const loader = lazyImport(importFn);
+
+      await expect(loader()).rejects.toThrow("Failed to load module");
+
+      try {
+        await loader();
+      } catch (err) {
+        expect(err).toBeInstanceOf(Error);
+        expect((err as Error).message).toBe("Failed to load module");
+        expect((err as { cause?: Error }).cause).toBe(originalError);
+      }
+    });
+
+    it("should handle modules with complex exports", async () => {
+      const mockModule = {
+        default: { main: "value" },
+        namedExport1: "export1",
+        namedExport2: "export2",
+        nestedObject: {
+          deep: {
+            value: 42,
+          },
+        },
+      };
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+      const result = await loader();
+
+      expect(result).toEqual(mockModule);
+      expect(result.default.main).toBe("value");
+      expect(result.namedExport1).toBe("export1");
+      expect(result.nestedObject.deep.value).toBe(42);
+    });
+
+    it("should handle module with class exports", async () => {
+      class TestClass {
+        constructor(public value: string) {}
+      }
+
+      const mockModule = {
+        TestClass,
+        instance: new TestClass("test"),
+      };
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+      const result = await loader();
+
+      expect(result.TestClass).toBe(TestClass);
+      expect(result.instance).toBeInstanceOf(TestClass);
+      expect(result.instance.value).toBe("test");
+    });
+
+    it("should handle module with function exports", async () => {
+      const mockFunction = vi.fn((x: number) => x * 2);
+      const mockModule = {
+        multiply: mockFunction,
+        add: (a: number, b: number) => a + b,
+      };
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+      const result = await loader();
+
+      expect(result.multiply(5)).toBe(10);
+      expect(result.add(3, 4)).toBe(7);
+      expect(mockFunction).toHaveBeenCalledWith(5);
+    });
+
+    it("should preserve module state across calls", async () => {
+      let counter = 0;
+      const mockModule = {
+        getCount: () => counter,
+        increment: () => ++counter,
+      };
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+
+      const module1 = await loader();
+      expect(module1.getCount()).toBe(0);
+      module1.increment();
+
+      const module2 = await loader();
+      expect(module2.getCount()).toBe(1); // State preserved
+      expect(module2).toBe(module1); // Same instance
+    });
+
+    it("should handle delay in module loading", async () => {
+      const mockModule = { value: "loaded" };
+      const importFn = vi.fn(
+        () =>
+          new Promise<typeof mockModule>((resolve) => {
+            setTimeout(() => {
+              resolve(mockModule);
+            }, 100);
+          }),
+      );
+
+      const loader = lazyImport(importFn);
+
+      const startTime = Date.now();
+      const result = await loader();
+      const endTime = Date.now();
+
+      expect(result).toBe(mockModule);
+      expect(endTime - startTime).toBeGreaterThanOrEqual(100);
+    });
+
+    it("should handle empty module exports", async () => {
+      const mockModule = {};
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+      const result = await loader();
+
+      expect(result).toEqual({});
+    });
+
+    it("should handle module with null/undefined values", async () => {
+      const mockModule = {
+        nullValue: null,
+        undefinedValue: undefined,
+        zeroValue: 0,
+        emptyString: "",
+      };
+      const importFn = vi.fn(() => Promise.resolve(mockModule));
+
+      const loader = lazyImport(importFn);
+      const result = await loader();
+
+      expect(result.nullValue).toBeNull();
+      expect(result.undefinedValue).toBeUndefined();
+      expect(result.zeroValue).toBe(0);
+      expect(result.emptyString).toBe("");
+    });
+
+    it("should create independent loaders for different modules", async () => {
+      const module1 = { name: "module1" };
+      const module2 = { name: "module2" };
+
+      const importFn1 = vi.fn(() => Promise.resolve(module1));
+      const importFn2 = vi.fn(() => Promise.resolve(module2));
+
+      const loader1 = lazyImport(importFn1);
+      const loader2 = lazyImport(importFn2);
+
+      const result1 = await loader1();
+      const result2 = await loader2();
+
+      expect(result1).toBe(module1);
+      expect(result2).toBe(module2);
+      expect(importFn1).toHaveBeenCalledTimes(1);
+      expect(importFn2).toHaveBeenCalledTimes(1);
+    });
+
+    it("should handle synchronous errors in import function", async () => {
+      const syncError = new Error("Sync error");
+      const importFn = vi.fn(() => {
+        // Synchronous throw in Promise executor
+        return new Promise(() => {
+          throw syncError;
+        });
+      });
+
+      const loader = lazyImport(importFn);
+
+      // Should handle as import failure
+      await expect(loader()).rejects.toThrow("Failed to load module");
+    });
+
+    it("should allow retry after multiple failures", async () => {
+      let attempts = 0;
+      const importFn = vi.fn(() => {
+        attempts++;
+        if (attempts < 3) {
+          return Promise.reject(new Error(`Attempt ${attempts} failed`));
+        }
+        return Promise.resolve({ value: "success" });
+      });
+
+      const loader = lazyImport(importFn);
+
+      // First attempt fails
+      await expect(loader()).rejects.toThrow("Failed to load module");
+      expect(attempts).toBe(1);
+
+      // Second attempt fails
+      await expect(loader()).rejects.toThrow("Failed to load module");
+      expect(attempts).toBe(2);
+
+      // Third attempt succeeds
+      const result = await loader();
+      expect(result).toEqual({ value: "success" });
+      expect(attempts).toBe(3);
+
+      // Fourth call uses cached success
+      await loader();
+      expect(attempts).toBe(3); // No additional import
+    });
+
+    it("should handle Promise rejection with non-Error values", async () => {
+      const importFn = vi.fn(() => Promise.reject("string error"));
+
+      const loader = lazyImport(importFn);
+
+      await expect(loader()).rejects.toThrow("Failed to load module");
+    });
+
+    it("should type check correctly with generic type parameter", async () => {
+      interface TestModule {
+        version: string;
+        initialize: () => void;
+      }
+
+      const mockModule: TestModule = {
+        version: "1.0.0",
+        initialize: vi.fn(),
+      };
+
+      const importFn = () => Promise.resolve(mockModule);
+      const loader = lazyImport<TestModule>(importFn);
+
+      const result = await loader();
+
+      // Type checking (compile time)
+      const version: string = result.version;
+      const initialize: () => void = result.initialize;
+
+      expect(version).toBe("1.0.0");
+      expect(initialize).toBeDefined();
+    });
+
+    it("should handle large module objects", async () => {
+      const largeModule: Record<string, number> = {};
+      for (let i = 0; i < 1000; i++) {
+        largeModule[`key${i}`] = i;
+      }
+
+      const importFn = vi.fn(() => Promise.resolve(largeModule));
+      const loader = lazyImport(importFn);
+
+      const result = await loader();
+
+      expect(Object.keys(result)).toHaveLength(1000);
+      expect(result.key500).toBe(500);
+    });
+
+    it("should cache promise not just result", async () => {
+      let resolveImport: (value: { data: string }) => void;
+      const importPromise = new Promise<{ data: string }>((resolve) => {
+        resolveImport = resolve;
+      });
+
+      const importFn = vi.fn(() => importPromise);
+      const loader = lazyImport(importFn);
+
+      // Start first call (doesn't await)
+      const promise1 = loader();
+      // Start second call while first is pending
+      const promise2 = loader();
+
+      // Both should get same promise
+      expect(importFn).toHaveBeenCalledTimes(1);
+
+      // Resolve the import
+      resolveImport!({ data: "test" });
+
+      const [result1, result2] = await Promise.all([promise1, promise2]);
+
+      expect(result1).toEqual({ data: "test" });
+      expect(result2).toEqual({ data: "test" });
+      expect(result1).toBe(result2);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/multicall.test.ts b/packages/vana-sdk/src/utils/__tests__/multicall.test.ts
new file mode 100644
index 00000000..b7a1d677
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/multicall.test.ts
@@ -0,0 +1,1112 @@
+/**
+ * @file Comprehensive tests for multicall utility
+ *
+ * This test suite covers the gas-aware multicall batching algorithm,
+ * including edge cases, error handling, and optimization strategies.
+ */
+
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { type PublicClient, type Address, parseEther } from "viem";
+import { mainnet } from "viem/chains";
+import {
+  gasAwareMulticall,
+  analyzeCallsForOptimalConfig,
+  type ContractFunctionConfig,
+  type GasAwareMulticallOptions,
+} from "../multicall";
+
+// Mock viem functions
+vi.mock("viem", async () => {
+  const actual = await vi.importActual<typeof import("viem")>("viem");
+  return {
+    ...actual,
+    size: vi.fn((hex: string) => {
+      // Simple approximation: 2 chars per byte in hex (minus 0x prefix)
+      return Math.floor((hex.length - 2) / 2);
+    }),
+  };
+});
+
+// Mock generated/addresses module
+vi.mock("../../generated/addresses", () => ({
+  getUtilityAddress: vi
+    .fn()
+    .mockReturnValue("0xcA11bde05977b3631167028862bE2a173976CA11"),
+}));
+
+// Test data - minimal ERC20-like ABI
+const mockAddress = "0x0000000000000000000000000000000000000001" as Address;
+const mockAbi = [
+  {
+    name: "balanceOf",
+    type: "function",
+    stateMutability: "view",
+    inputs: [{ name: "account", type: "address" }],
+    outputs: [{ name: "balance", type: "uint256" }],
+  },
+  {
+    name: "transfer",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [
+      { name: "to", type: "address" },
+      { name: "amount", type: "uint256" },
+    ],
+    outputs: [{ name: "success", type: "bool" }],
+  },
+] as const;
+
+describe("multicall utility - comprehensive tests", () => {
+  let mockClient: PublicClient;
+  let estimateGasSpy: ReturnType<typeof vi.fn>;
+  let multicallSpy: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    // Create mock client with all required methods
+    mockClient = {
+      chain: mainnet,
+      multicall: vi.fn().mockResolvedValue([]),
+      estimateGas: vi.fn().mockResolvedValue(100_000n),
+      getChainId: vi.fn().mockResolvedValue(1),
+    } as unknown as PublicClient;
+
+    estimateGasSpy = vi.mocked(mockClient.estimateGas);
+    multicallSpy = vi.mocked(mockClient.multicall);
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe("gasAwareMulticall - empty and minimal cases", () => {
+    it("should handle empty contracts array", async () => {
+      const result = await gasAwareMulticall(mockClient, { contracts: [] });
+
+      expect(result).toEqual([]);
+      expect(multicallSpy).not.toHaveBeenCalled();
+      expect(estimateGasSpy).not.toHaveBeenCalled();
+    });
+
+    it("should handle undefined contracts gracefully", async () => {
+      const result = await gasAwareMulticall(mockClient, {
+        contracts: undefined as unknown as [],
+      });
+
+      expect(result).toEqual([]);
+      expect(multicallSpy).not.toHaveBeenCalled();
+    });
+
+    it("should handle single contract call without gas estimation", async () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        },
+      ] as const;
+
+      multicallSpy.mockResolvedValueOnce([parseEther("100")]);
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toEqual([parseEther("100")]);
+      expect(multicallSpy).toHaveBeenCalledOnce();
+      expect(estimateGasSpy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("gasAwareMulticall - gas limit scenarios", () => {
+    it("should split batches when estimated gas exceeds limit", async () => {
+      const contracts = Array(100)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "transfer",
+          args: [mockAddress, parseEther("1")],
+        })) as ContractFunctionConfig[];
+
+      // First checkpoint hits gas limit
+      estimateGasSpy
+        .mockResolvedValueOnce(12_000_000n) // Over 10M default limit
+        .mockResolvedValue(5_000_000n); // Subsequent estimates
+
+      multicallSpy.mockImplementation((args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        return Promise.resolve(Array(params.contracts.length).fill(true));
+      });
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(100);
+      expect(multicallSpy.mock.calls.length).toBeGreaterThan(1);
+    });
+
+    it("should respect custom maxGasPerBatch option", async () => {
+      const contracts = Array(50)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      const options: GasAwareMulticallOptions = {
+        maxGasPerBatch: 3_000_000n, // Lower than default
+      };
+
+      estimateGasSpy.mockResolvedValueOnce(4_000_000n); // Over custom limit
+
+      multicallSpy
+        .mockResolvedValueOnce(Array(32).fill(parseEther("1")))
+        .mockResolvedValueOnce(Array(18).fill(parseEther("1")));
+
+      await gasAwareMulticall(mockClient, { contracts }, options);
+
+      expect(multicallSpy).toHaveBeenCalledTimes(2);
+    });
+
+    it("should use extrapolation for gas estimation between checkpoints", async () => {
+      const contracts = Array(40)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      // Gas grows progressively, triggering extrapolation
+      estimateGasSpy
+        .mockResolvedValueOnce(8_000_000n) // At checkpoint (call 32)
+        .mockResolvedValue(3_000_000n);
+
+      multicallSpy.mockImplementation((args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        return Promise.resolve(
+          Array(params.contracts.length).fill(parseEther("1")),
+        );
+      });
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(40);
+    });
+
+    it("should handle gas estimation failure at checkpoint", async () => {
+      const contracts = Array(50)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      // First checkpoint fails
+      estimateGasSpy.mockRejectedValueOnce(new Error("RPC error"));
+
+      // Should split batch in half when estimation fails
+      multicallSpy
+        .mockResolvedValueOnce(Array(16).fill(parseEther("1")))
+        .mockResolvedValueOnce(Array(34).fill(parseEther("1")));
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(50);
+      expect(multicallSpy).toHaveBeenCalledTimes(2);
+    });
+
+    it("should throw on estimation failure with allowFailure=false for single call", async () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        },
+      ] as const;
+
+      // Make it reach checkpoint by having 32+ calls in batch initially
+      const manyContracts = Array(35)
+        .fill(null)
+        .map(() => contracts[0]) as ContractFunctionConfig[];
+
+      estimateGasSpy.mockRejectedValue(new Error("Gas estimation failed"));
+
+      const options: GasAwareMulticallOptions = {
+        allowFailure: false,
+      };
+
+      // When batch is split to single call and estimation still fails
+      multicallSpy.mockRejectedValue(new Error("Gas estimation failed"));
+
+      await expect(
+        gasAwareMulticall(mockClient, { contracts: manyContracts }, options),
+      ).rejects.toThrow();
+    });
+
+    it("should continue on estimation failure with allowFailure=true", async () => {
+      const contracts = Array(35)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      estimateGasSpy.mockRejectedValue(new Error("Estimation failed"));
+
+      const options: GasAwareMulticallOptions = {
+        allowFailure: true,
+      };
+
+      multicallSpy.mockImplementation((args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        return Promise.resolve(
+          Array(params.contracts.length).fill({
+            success: true,
+            value: parseEther("1"),
+          }),
+        );
+      });
+
+      const result = await gasAwareMulticall(
+        mockClient,
+        { contracts },
+        options,
+      );
+
+      expect(result.length).toBeGreaterThan(0);
+    });
+
+    it("should throw when single call fails estimation with allowFailure=false", async () => {
+      // Create exactly 32 calls to hit checkpoint immediately
+      const contracts = Array(32)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      let estimateCallCount = 0;
+      // Make estimation fail each time, forcing recursive splits down to single call
+      estimateGasSpy.mockImplementation(() => {
+        estimateCallCount++;
+        throw new Error(`RPC error ${estimateCallCount}`);
+      });
+
+      const options: GasAwareMulticallOptions = {
+        allowFailure: false,
+        checkpointFrequency: { calls: 1, bytes: 1 }, // Force immediate checkpoints
+      };
+
+      await expect(
+        gasAwareMulticall(mockClient, { contracts }, options),
+      ).rejects.toThrow("Gas estimation failed for call");
+    });
+
+    it("should skip single call when estimation fails with allowFailure=true", async () => {
+      // Create calls that will hit checkpoint
+      const contracts = Array(32)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      let estimateCallCount = 0;
+      // Make estimation fail, forcing recursive splits down to single call
+      estimateGasSpy.mockImplementation(() => {
+        estimateCallCount++;
+        throw new Error(`RPC error ${estimateCallCount}`);
+      });
+
+      const options: GasAwareMulticallOptions = {
+        allowFailure: true,
+        checkpointFrequency: { calls: 1, bytes: 1 }, // Force immediate checkpoints
+      };
+
+      // Should not throw, just skip problematic calls
+      multicallSpy.mockImplementation((args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        return Promise.resolve(
+          Array(params.contracts.length).fill({
+            success: true,
+            value: parseEther("1"),
+          }),
+        );
+      });
+
+      // This should complete without throwing
+      const result = await gasAwareMulticall(
+        mockClient,
+        { contracts },
+        options,
+      );
+
+      // Some calls may be skipped, but should return results
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe("gasAwareMulticall - calldata size scenarios", () => {
+    it("should split batches when calldata exceeds maxCalldataBytes", async () => {
+      // Create calls with large calldata
+      const largeArray = Array(1000).fill(mockAddress);
+      const contracts = Array(10)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: [
+            {
+              name: "batchTransfer",
+              type: "function",
+              stateMutability: "nonpayable",
+              inputs: [{ name: "recipients", type: "address[]" }],
+              outputs: [],
+            },
+          ] as const,
+          functionName: "batchTransfer",
+          args: [largeArray],
+        })) as ContractFunctionConfig[];
+
+      const options: GasAwareMulticallOptions = {
+        maxCalldataBytes: 30_000, // 30KB
+      };
+
+      multicallSpy.mockImplementation((args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        return Promise.resolve(Array(params.contracts.length).fill(true));
+      });
+
+      const result = await gasAwareMulticall(
+        mockClient,
+        { contracts },
+        options,
+      );
+
+      expect(result).toHaveLength(10);
+      // Should split due to calldata size
+      expect(multicallSpy.mock.calls.length).toBeGreaterThan(1);
+    });
+
+    it("should handle mixed small and large calldata efficiently", async () => {
+      const contracts: ContractFunctionConfig[] = [
+        // Small calls
+        ...Array(10)
+          .fill(null)
+          .map(() => ({
+            address: mockAddress,
+            abi: mockAbi,
+            functionName: "balanceOf",
+            args: [mockAddress],
+          })),
+        // One large call
+        {
+          address: mockAddress,
+          abi: [
+            {
+              name: "batchTransfer",
+              type: "function",
+              stateMutability: "nonpayable",
+              inputs: [{ name: "recipients", type: "address[]" }],
+              outputs: [],
+            },
+          ] as const,
+          functionName: "batchTransfer",
+          args: [Array(3000).fill(mockAddress)], // ~60KB
+        },
+        // More small calls
+        ...Array(10)
+          .fill(null)
+          .map(() => ({
+            address: mockAddress,
+            abi: mockAbi,
+            functionName: "balanceOf",
+            args: [mockAddress],
+          })),
+      ];
+
+      const options: GasAwareMulticallOptions = {
+        maxCalldataBytes: 70_000, // 70KB
+      };
+
+      multicallSpy.mockImplementation((args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        return Promise.resolve(
+          Array(params.contracts.length).fill(parseEther("1")),
+        );
+      });
+
+      const result = await gasAwareMulticall(
+        mockClient,
+        { contracts },
+        options,
+      );
+
+      expect(result).toHaveLength(21);
+    });
+
+    it("should respect custom maxCalldataBytes limit", async () => {
+      const contracts = Array(20)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      const options: GasAwareMulticallOptions = {
+        maxCalldataBytes: 500, // Very small limit
+      };
+
+      multicallSpy.mockImplementation((args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        return Promise.resolve(
+          Array(params.contracts.length).fill(parseEther("1")),
+        );
+      });
+
+      const result = await gasAwareMulticall(
+        mockClient,
+        { contracts },
+        options,
+      );
+
+      expect(result).toHaveLength(20);
+      // Should create at least 2 batches due to small limit
+      expect(multicallSpy.mock.calls.length).toBeGreaterThan(1);
+    });
+  });
+
+  describe("gasAwareMulticall - checkpoint frequency", () => {
+    it("should checkpoint at configured call frequency", async () => {
+      const contracts = Array(60)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      const options: GasAwareMulticallOptions = {
+        checkpointFrequency: { calls: 10, bytes: 100_000 },
+      };
+
+      estimateGasSpy.mockResolvedValue(2_000_000n);
+      multicallSpy.mockResolvedValue(Array(60).fill(parseEther("1")));
+
+      await gasAwareMulticall(mockClient, { contracts }, options);
+
+      // Should checkpoint approximately every 10 calls (6 checkpoints for 60 calls)
+      expect(estimateGasSpy.mock.calls.length).toBeGreaterThanOrEqual(4);
+    });
+
+    it("should checkpoint based on bytes accumulated", async () => {
+      const contracts = Array(20)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: [
+            {
+              name: "batchOp",
+              type: "function",
+              stateMutability: "nonpayable",
+              inputs: [{ name: "data", type: "bytes" }],
+              outputs: [],
+            },
+          ] as const,
+          functionName: "batchOp",
+          args: ["0x" + "00".repeat(1000)], // 1KB of data per call
+        })) as ContractFunctionConfig[];
+
+      const options: GasAwareMulticallOptions = {
+        checkpointFrequency: { calls: 100, bytes: 5000 }, // Every 5KB
+      };
+
+      estimateGasSpy.mockResolvedValue(2_000_000n);
+      multicallSpy.mockResolvedValue(Array(20).fill(true));
+
+      await gasAwareMulticall(mockClient, { contracts }, options);
+
+      // Should checkpoint based on bytes (20KB total / 5KB = ~4 checkpoints)
+      expect(estimateGasSpy.mock.calls.length).toBeGreaterThanOrEqual(3);
+    });
+
+    it("should not checkpoint on first call", async () => {
+      const contracts = Array(5)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      estimateGasSpy.mockResolvedValue(100_000n);
+      multicallSpy.mockResolvedValue(Array(5).fill(parseEther("1")));
+
+      await gasAwareMulticall(mockClient, { contracts });
+
+      // Should not need any gas estimation for small batch
+      expect(estimateGasSpy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("gasAwareMulticall - progress callbacks", () => {
+    it("should call onProgress callback with correct values", async () => {
+      const contracts = Array(100)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      const onProgress = vi.fn();
+      const options: GasAwareMulticallOptions = { onProgress };
+
+      // Force multiple batches
+      estimateGasSpy.mockResolvedValueOnce(12_000_000n);
+      multicallSpy
+        .mockResolvedValueOnce(Array(32).fill(parseEther("1")))
+        .mockResolvedValueOnce(Array(68).fill(parseEther("1")));
+
+      await gasAwareMulticall(mockClient, { contracts }, options);
+
+      expect(onProgress).toHaveBeenCalled();
+      // Last call should be (total, total)
+      expect(onProgress).toHaveBeenLastCalledWith(100, 100);
+      // Should have intermediate progress calls
+      expect(onProgress.mock.calls.length).toBeGreaterThan(1);
+    });
+
+    it("should not call onProgress on first batch", async () => {
+      const contracts = Array(50)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      const onProgress = vi.fn();
+      const options: GasAwareMulticallOptions = { onProgress };
+
+      multicallSpy.mockResolvedValue(Array(50).fill(parseEther("1")));
+
+      await gasAwareMulticall(mockClient, { contracts }, options);
+
+      // Should only call at the end (100, 100)
+      expect(onProgress).toHaveBeenCalledOnce();
+      expect(onProgress).toHaveBeenCalledWith(50, 50);
+    });
+
+    it("should report accurate progress across multiple batches", async () => {
+      const contracts = Array(90)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      const progressCalls: Array<[number, number]> = [];
+      const onProgress = vi.fn((completed, total) => {
+        progressCalls.push([completed, total]);
+      });
+
+      const options: GasAwareMulticallOptions = { onProgress };
+
+      // Force 3 batches
+      estimateGasSpy
+        .mockResolvedValueOnce(12_000_000n)
+        .mockResolvedValueOnce(12_000_000n);
+
+      multicallSpy
+        .mockResolvedValueOnce(Array(32).fill(parseEther("1")))
+        .mockResolvedValueOnce(Array(32).fill(parseEther("1")))
+        .mockResolvedValueOnce(Array(26).fill(parseEther("1")));
+
+      await gasAwareMulticall(mockClient, { contracts }, options);
+
+      // Should have progress updates
+      expect(progressCalls.length).toBeGreaterThan(1);
+      // All progress calls should have total = 90
+      progressCalls.forEach(([, total]) => {
+        expect(total).toBe(90);
+      });
+      // Last call should be complete
+      expect(progressCalls[progressCalls.length - 1]).toEqual([90, 90]);
+    });
+  });
+
+  describe("gasAwareMulticall - allowFailure option", () => {
+    it("should pass allowFailure to multicall from parameters", async () => {
+      const contracts = Array(3)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      multicallSpy.mockResolvedValue([
+        { success: true, value: parseEther("1") },
+        { success: false, error: new Error("Reverted") },
+        { success: true, value: parseEther("2") },
+      ]);
+
+      await gasAwareMulticall(mockClient, {
+        contracts,
+        allowFailure: true,
+      });
+
+      expect(multicallSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          allowFailure: true,
+        }),
+      );
+    });
+
+    it("should override option allowFailure with parameter allowFailure", async () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        },
+      ] as const;
+
+      multicallSpy.mockResolvedValue([parseEther("1")]);
+
+      // Options say false, but parameters say true - parameters win
+      await gasAwareMulticall(
+        mockClient,
+        { contracts, allowFailure: true },
+        { allowFailure: false },
+      );
+
+      expect(multicallSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          allowFailure: true,
+        }),
+      );
+    });
+
+    it("should use option allowFailure when parameter not specified", async () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        },
+      ] as const;
+
+      multicallSpy.mockResolvedValue([parseEther("1")]);
+
+      await gasAwareMulticall(
+        mockClient,
+        { contracts },
+        { allowFailure: true },
+      );
+
+      expect(multicallSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          allowFailure: true,
+        }),
+      );
+    });
+  });
+
+  describe("gasAwareMulticall - multicall address", () => {
+    it("should use custom multicall address when provided", async () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        },
+      ] as const;
+
+      const customAddress =
+        "0x1234567890123456789012345678901234567890" as Address;
+      const options: GasAwareMulticallOptions = {
+        multicallAddress: customAddress,
+      };
+
+      multicallSpy.mockResolvedValue([parseEther("1")]);
+
+      await gasAwareMulticall(mockClient, { contracts }, options);
+
+      expect(multicallSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          multicallAddress: customAddress,
+        }),
+      );
+    });
+
+    it("should use chain-specific multicall address by default", async () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        },
+      ] as const;
+
+      multicallSpy.mockResolvedValue([parseEther("1")]);
+
+      await gasAwareMulticall(mockClient, { contracts });
+
+      expect(multicallSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          multicallAddress: "0xcA11bde05977b3631167028862bE2a173976CA11",
+        }),
+      );
+    });
+  });
+
+  describe("gasAwareMulticall - parallel batch execution", () => {
+    it("should execute multiple batches in parallel", async () => {
+      const contracts = Array(100)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      // Force multiple batches
+      estimateGasSpy.mockResolvedValueOnce(12_000_000n);
+
+      const batchCallTimes: number[] = [];
+
+      multicallSpy.mockImplementation(async (args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        const batchSize = params.contracts.length;
+        const startTime = Date.now();
+
+        // Simulate async delay
+        await new Promise((resolve) => setTimeout(resolve, 5));
+
+        batchCallTimes.push(startTime);
+        return Array(batchSize).fill(parseEther("1"));
+      });
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(100);
+      // Should have created multiple batches
+      expect(multicallSpy.mock.calls.length).toBeGreaterThan(1);
+      // All batches should be called (tracking via timestamps)
+      expect(batchCallTimes.length).toBeGreaterThan(1);
+    });
+  });
+
+  describe("gasAwareMulticall - edge cases and stress tests", () => {
+    it("should handle very large number of calls (1000+)", async () => {
+      const contracts = Array(1500)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      estimateGasSpy.mockResolvedValue(8_000_000n);
+
+      multicallSpy.mockImplementation((args: unknown) => {
+        const params = args as { contracts: ContractFunctionConfig[] };
+        return Promise.resolve(
+          Array(params.contracts.length).fill(parseEther("1")),
+        );
+      });
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(1500);
+      // Verify all calls were processed
+      const totalProcessed = multicallSpy.mock.calls.reduce(
+        (sum: number, call: unknown[]) => {
+          const args = call[0] as { contracts: ContractFunctionConfig[] };
+          return sum + args.contracts.length;
+        },
+        0,
+      );
+      expect(totalProcessed).toBe(1500);
+    }, 15000);
+
+    it("should handle calls with no args", async () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: [
+            {
+              name: "totalSupply",
+              type: "function",
+              stateMutability: "view",
+              inputs: [],
+              outputs: [{ name: "supply", type: "uint256" }],
+            },
+          ] as const,
+          functionName: "totalSupply",
+          args: [],
+        },
+      ] as const;
+
+      multicallSpy.mockResolvedValue([parseEther("1000000")]);
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toEqual(parseEther("1000000"));
+    });
+
+    it("should handle calls with undefined args", async () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: [
+            {
+              name: "totalSupply",
+              type: "function",
+              stateMutability: "view",
+              inputs: [],
+              outputs: [{ name: "supply", type: "uint256" }],
+            },
+          ] as const,
+          functionName: "totalSupply",
+          // args intentionally undefined
+        },
+      ] as ContractFunctionConfig[];
+
+      multicallSpy.mockResolvedValue([parseEther("1000000")]);
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(1);
+    });
+
+    it("should handle multiple contract addresses in same batch", async () => {
+      const addresses = Array(5)
+        .fill(null)
+        .map(
+          (_, i) => `0x000000000000000000000000000000000000000${i}` as Address,
+        );
+
+      const contracts = addresses.map((addr) => ({
+        address: addr,
+        abi: mockAbi,
+        functionName: "balanceOf",
+        args: [mockAddress],
+      })) as ContractFunctionConfig[];
+
+      multicallSpy.mockResolvedValue(Array(5).fill(parseEther("1")));
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(5);
+    });
+
+    it("should handle different function names in same batch", async () => {
+      const contracts: ContractFunctionConfig[] = [
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        },
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "transfer",
+          args: [mockAddress, parseEther("1")],
+        },
+      ];
+
+      multicallSpy.mockResolvedValue([parseEther("100"), true]);
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toEqual([parseEther("100"), true]);
+    });
+
+    it("should handle batch that becomes exactly one call after split", async () => {
+      const contracts = Array(33)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      // Fail estimation, forcing split
+      estimateGasSpy.mockRejectedValueOnce(new Error("Gas estimation failed"));
+
+      // After split: 16 calls in first batch, 17 remaining
+      multicallSpy
+        .mockResolvedValueOnce(Array(16).fill(parseEther("1")))
+        .mockResolvedValueOnce(Array(17).fill(parseEther("1")));
+
+      const result = await gasAwareMulticall(mockClient, { contracts });
+
+      expect(result).toHaveLength(33);
+    });
+  });
+
+  describe("analyzeCallsForOptimalConfig", () => {
+    it("should suggest default config for small calls", () => {
+      const contracts = Array(10)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      const config = analyzeCallsForOptimalConfig(contracts);
+
+      expect(config.checkpointFrequency?.calls).toBe(32);
+      expect(config.checkpointFrequency?.bytes).toBe(8192);
+      expect(config.maxCalldataBytes).toBe(100_000);
+    });
+
+    it("should suggest frequent checkpoints for large calls", () => {
+      const contracts = Array(10)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: [
+            {
+              name: "batchOp",
+              type: "function",
+              stateMutability: "nonpayable",
+              inputs: [{ name: "data", type: "bytes" }],
+              outputs: [],
+            },
+          ] as const,
+          functionName: "batchOp",
+          args: ["0x" + "00".repeat(2000)], // 2KB per call (avg > 500 bytes)
+        })) as ContractFunctionConfig[];
+
+      const config = analyzeCallsForOptimalConfig(contracts);
+
+      expect(config.checkpointFrequency?.calls).toBe(16);
+      expect(config.checkpointFrequency?.bytes).toBe(4096);
+    });
+
+    it("should suggest higher calldata limit for many calls", () => {
+      const contracts = Array(1000)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        })) as ContractFunctionConfig[];
+
+      const config = analyzeCallsForOptimalConfig(contracts);
+
+      expect(config.maxCalldataBytes).toBe(128_000);
+    });
+
+    it("should suggest higher calldata limit for large total bytes", () => {
+      const contracts = Array(100)
+        .fill(null)
+        .map(() => ({
+          address: mockAddress,
+          abi: [
+            {
+              name: "batchOp",
+              type: "function",
+              stateMutability: "nonpayable",
+              inputs: [{ name: "data", type: "bytes" }],
+              outputs: [],
+            },
+          ] as const,
+          functionName: "batchOp",
+          args: ["0x" + "00".repeat(1000)], // 1KB per call = 100KB total
+        })) as ContractFunctionConfig[];
+
+      const config = analyzeCallsForOptimalConfig(contracts);
+
+      expect(config.maxCalldataBytes).toBe(128_000);
+    });
+
+    it("should handle single call analysis", () => {
+      const contracts = [
+        {
+          address: mockAddress,
+          abi: mockAbi,
+          functionName: "balanceOf",
+          args: [mockAddress],
+        },
+      ] as ContractFunctionConfig[];
+
+      const config = analyzeCallsForOptimalConfig(contracts);
+
+      expect(config.checkpointFrequency).toBeDefined();
+      expect(config.maxCalldataBytes).toBeDefined();
+    });
+
+    it("should analyze calls with mixed sizes correctly", () => {
+      const contracts: ContractFunctionConfig[] = [
+        // 5 small calls
+        ...Array(5)
+          .fill(null)
+          .map(() => ({
+            address: mockAddress,
+            abi: mockAbi,
+            functionName: "balanceOf",
+            args: [mockAddress],
+          })),
+        // 5 large calls
+        ...Array(5)
+          .fill(null)
+          .map(() => ({
+            address: mockAddress,
+            abi: [
+              {
+                name: "batchOp",
+                type: "function",
+                stateMutability: "nonpayable",
+                inputs: [{ name: "data", type: "bytes" }],
+                outputs: [],
+              },
+            ] as const,
+            functionName: "batchOp",
+            args: ["0x" + "00".repeat(2000)], // 2KB
+          })),
+      ];
+
+      const config = analyzeCallsForOptimalConfig(contracts);
+
+      // Average is (5 * small + 5 * 2000) / 10 > 500
+      expect(config.checkpointFrequency?.calls).toBe(16);
+      expect(config.checkpointFrequency?.bytes).toBe(4096);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/parseTransactionPojo.test.ts b/packages/vana-sdk/src/utils/__tests__/parseTransactionPojo.test.ts
new file mode 100644
index 00000000..9b21b7d7
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/parseTransactionPojo.test.ts
@@ -0,0 +1,872 @@
+/**
+ * Tests for parseTransaction (POJO-based parser)
+ *
+ * @remarks
+ * Tests event parsing with ZERO heuristics, registry lookups, and edge cases.
+ */
+
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { parseTransaction } from "../parseTransactionPojo";
+import type { TransactionReceipt } from "viem";
+import type { TransactionResult } from "../../types/operations";
+
+// Mock the event registry module
+vi.mock("../../generated/eventRegistry", () => {
+  const mockEventTopic =
+    "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`;
+
+  return {
+    EVENT_REGISTRY: {
+      "DataPortabilityPermissions.addPermission": {
+        contract: "DataPortabilityPermissions",
+        fn: "addPermission",
+        eventNames: ["PermissionAdded"],
+      },
+      "DataPortabilityPermissions.revokePermission": {
+        contract: "DataPortabilityPermissions",
+        fn: "revokePermission",
+        eventNames: ["PermissionRevoked"],
+      },
+      "DataRegistry.addFile": {
+        contract: "DataRegistry",
+        fn: "addFile",
+        eventNames: ["FileAdded", "MetadataUpdated"],
+      },
+    },
+    TOPIC_TO_ABIS: new Map([
+      [
+        mockEventTopic,
+        [
+          {
+            type: "event",
+            name: "PermissionAdded",
+            inputs: [
+              {
+                indexed: true,
+                name: "permissionId",
+                type: "uint256",
+              },
+              {
+                indexed: true,
+                name: "user",
+                type: "address",
+              },
+              {
+                indexed: true,
+                name: "granteeId",
+                type: "uint256",
+              },
+              {
+                indexed: false,
+                name: "grant",
+                type: "string",
+              },
+              {
+                indexed: false,
+                name: "fileIds",
+                type: "uint256[]",
+              },
+            ],
+          },
+        ],
+      ],
+    ]),
+  };
+});
+
+// Mock viem's decodeEventLog
+vi.mock("viem", async () => {
+  const actual = await vi.importActual<typeof import("viem")>("viem");
+  return {
+    ...actual,
+    decodeEventLog: vi.fn((params: unknown) => {
+      const { topics } = params as {
+        topics: [`0x${string}`, ...`0x${string}`[]];
+      };
+      const topic0 = topics[0];
+
+      // Mock successful decode for known topic
+      if (
+        topic0 ===
+        "0x1234567890123456789012345678901234567890123456789012345678901234"
+      ) {
+        return {
+          eventName: "PermissionAdded",
+          args: {
+            permissionId: 1n,
+            user: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+            granteeId: 5n,
+            grant: "0xgrantdata",
+            fileIds: [42n],
+          },
+        };
+      }
+
+      // Simulate decode failure for unknown topics
+      throw new Error("Event signature not found in ABI");
+    }),
+  };
+});
+
+describe("parseTransaction", () => {
+  const mockTransactionResult: TransactionResult<
+    "DataPortabilityPermissions",
+    "addPermission"
+  > = {
+    hash: "0xabc123" as `0x${string}`,
+    from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+    contract: "DataPortabilityPermissions",
+    fn: "addPermission",
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  describe("Basic Event Parsing", () => {
+    it("should parse transaction with expected events", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.hash).toBe(mockTransactionResult.hash);
+      expect(result.from).toBe(mockTransactionResult.from);
+      expect(result.contract).toBe("DataPortabilityPermissions");
+      expect(result.fn).toBe("addPermission");
+      expect(result.hasExpectedEvents).toBe(true);
+      expect(result.expectedEvents).toHaveProperty("PermissionAdded");
+      expect(result.allEvents).toHaveLength(1);
+      expect(result.allEvents[0].eventName).toBe("PermissionAdded");
+      expect(result.allEvents[0].contractAddress).toBe(
+        "0x2222222222222222222222222222222222222222",
+      );
+    });
+
+    it("should parse transaction with no events", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.hasExpectedEvents).toBe(false);
+      expect(result.expectedEvents).toEqual({});
+      expect(result.allEvents).toEqual([]);
+    });
+
+    it("should parse transaction with undefined logs", () => {
+      const receipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: undefined,
+        logsBloom: "0x" as `0x${string}`,
+        status: "success" as const,
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2" as const,
+      };
+
+      const result = parseTransaction(
+        mockTransactionResult,
+        receipt as unknown as TransactionReceipt,
+      );
+
+      expect(result.hasExpectedEvents).toBe(false);
+      expect(result.allEvents).toEqual([]);
+    });
+  });
+
+  describe("Registry Lookup", () => {
+    it("should use function-scoped registry for expected events", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      // Event is in registry for this function
+      expect(result.hasExpectedEvents).toBe(true);
+      expect(result.expectedEvents).toHaveProperty("PermissionAdded");
+    });
+
+    it("should not mark events as expected when registry key missing", () => {
+      const unknownFunctionTx = {
+        hash: "0xabc123" as `0x${string}`,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        contract: "UnknownContract",
+        fn: "unknownFunction",
+      };
+
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(unknownFunctionTx as any, receipt);
+
+      // Event is decoded but not marked as expected (not in registry)
+      expect(result.hasExpectedEvents).toBe(false);
+      expect(result.expectedEvents).toEqual({});
+      expect(result.allEvents).toHaveLength(1); // Still in allEvents
+    });
+
+    it("should handle function with multiple expected events", () => {
+      const multiEventTx: TransactionResult<"DataRegistry", "addFile"> = {
+        hash: "0xabc123" as `0x${string}`,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        contract: "DataRegistry",
+        fn: "addFile",
+      };
+
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(multiEventTx, receipt);
+
+      // Function expects FileAdded and MetadataUpdated, but only PermissionGranted emitted
+      expect(result.hasExpectedEvents).toBe(false); // PermissionGranted not in expected list
+      expect(result.allEvents).toHaveLength(1);
+    });
+  });
+
+  describe("Unknown Events", () => {
+    it("should handle unknown event topics", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcd" as `0x${string}`,
+            ],
+            data: "0x1234",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.allEvents).toHaveLength(1);
+      expect(result.allEvents[0].eventName).toBe("Unknown");
+      expect(result.allEvents[0].args).toHaveProperty("topic0");
+      expect(result.allEvents[0].args).toHaveProperty("data");
+      expect(result.allEvents[0].args.topic0).toBe(
+        "0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcd",
+      );
+    });
+
+    it("should handle events with no topics", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      // Logs with no topics should be skipped
+      expect(result.allEvents).toHaveLength(0);
+    });
+
+    it("should handle logs with undefined topics", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: undefined as never,
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      // Logs with undefined topics should be skipped
+      expect(result.allEvents).toHaveLength(0);
+    });
+  });
+
+  describe("Multiple Logs", () => {
+    it("should parse multiple logs in correct order", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+          {
+            address:
+              "0x3333333333333333333333333333333333333333" as `0x${string}`,
+            topics: [
+              "0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcd" as `0x${string}`,
+            ],
+            data: "0x5678",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 1,
+            removed: false,
+          },
+          {
+            address:
+              "0x4444444444444444444444444444444444444444" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 2,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.allEvents).toHaveLength(3);
+      expect(result.allEvents[0].contractAddress).toBe(
+        "0x2222222222222222222222222222222222222222",
+      );
+      expect(result.allEvents[0].logIndex).toBe(0);
+      expect(result.allEvents[1].eventName).toBe("Unknown");
+      expect(result.allEvents[1].logIndex).toBe(1);
+      expect(result.allEvents[2].contractAddress).toBe(
+        "0x4444444444444444444444444444444444444444",
+      );
+      expect(result.allEvents[2].logIndex).toBe(2);
+    });
+
+    it("should handle mix of decodable and unknown events", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+          {
+            address:
+              "0x3333333333333333333333333333333333333333" as `0x${string}`,
+            topics: [
+              "0xunknownunknownunknownunknownunknownunknownunknownunknownunknownun" as `0x${string}`,
+            ],
+            data: "0x9999",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 1,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.allEvents).toHaveLength(2);
+      expect(result.allEvents[0].eventName).toBe("PermissionAdded");
+      expect(result.allEvents[1].eventName).toBe("Unknown");
+    });
+  });
+
+  describe("Log Field Handling", () => {
+    it("should handle missing log address", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address: undefined as never,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.allEvents).toHaveLength(1);
+      expect(result.allEvents[0].contractAddress).toBe("");
+    });
+
+    it("should handle missing logIndex", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: undefined as never,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.allEvents).toHaveLength(1);
+      expect(result.allEvents[0].logIndex).toBe(0);
+    });
+  });
+
+  describe("TransactionResult Fields", () => {
+    it("should preserve all transaction result fields", () => {
+      const extendedTxResult: TransactionResult<
+        "DataPortabilityPermissions",
+        "addPermission"
+      > = {
+        hash: "0xabc123" as `0x${string}`,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        contract: "DataPortabilityPermissions",
+        fn: "addPermission",
+        chainId: 14800,
+        value: 1000000000000000000n,
+        nonce: 42,
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+      };
+
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(extendedTxResult, receipt);
+
+      expect(result.hash).toBe(extendedTxResult.hash);
+      expect(result.from).toBe(extendedTxResult.from);
+      expect(result.contract).toBe(extendedTxResult.contract);
+      expect(result.fn).toBe(extendedTxResult.fn);
+    });
+
+    it("should work with minimal transaction result", () => {
+      const minimalTxResult: TransactionResult<
+        "DataPortabilityPermissions",
+        "addPermission"
+      > = {
+        hash: "0xabc123" as `0x${string}`,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        contract: "DataPortabilityPermissions",
+        fn: "addPermission",
+      };
+
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(minimalTxResult, receipt);
+
+      expect(result.hash).toBe(minimalTxResult.hash);
+      expect(result.from).toBe(minimalTxResult.from);
+      expect(result.contract).toBe(minimalTxResult.contract);
+      expect(result.fn).toBe(minimalTxResult.fn);
+      expect(result.hasExpectedEvents).toBe(false);
+    });
+  });
+
+  describe("Event Args Extraction", () => {
+    it("should preserve decoded event args structure", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.expectedEvents.PermissionAdded).toBeDefined();
+      const permissionEvent = result.expectedEvents
+        .PermissionAdded as unknown as {
+        fileIds: readonly bigint[];
+        user: `0x${string}`;
+      };
+
+      expect(permissionEvent.fileIds[0]).toBe(42n);
+      expect(permissionEvent.user).toBe(
+        "0x1234567890123456789012345678901234567890",
+      );
+    });
+
+    it("should handle args as Record<string, unknown> in allEvents", () => {
+      const receipt: TransactionReceipt = {
+        blockHash: "0xblock123" as `0x${string}`,
+        blockNumber: 100n,
+        contractAddress: null,
+        cumulativeGasUsed: 1000000n,
+        effectiveGasPrice: 1000000000n,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        gasUsed: 50000n,
+        logs: [
+          {
+            address:
+              "0x2222222222222222222222222222222222222222" as `0x${string}`,
+            topics: [
+              "0x1234567890123456789012345678901234567890123456789012345678901234" as `0x${string}`,
+            ],
+            data: "0x",
+            blockNumber: 100n,
+            transactionHash: "0xabc123" as `0x${string}`,
+            transactionIndex: 0,
+            blockHash: "0xblock123" as `0x${string}`,
+            logIndex: 0,
+            removed: false,
+          },
+        ],
+        logsBloom: "0x" as `0x${string}`,
+        status: "success",
+        to: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        transactionHash: "0xabc123" as `0x${string}`,
+        transactionIndex: 0,
+        type: "0x2",
+      };
+
+      const result = parseTransaction(mockTransactionResult, receipt);
+
+      expect(result.allEvents[0].args).toBeDefined();
+      expect(typeof result.allEvents[0].args).toBe("object");
+      expect(result.allEvents[0].args).toHaveProperty("permissionId");
+      expect(result.allEvents[0].args).toHaveProperty("user");
+      expect(result.allEvents[0].args).toHaveProperty("granteeId");
+      expect(result.allEvents[0].args).toHaveProperty("grant");
+      expect(result.allEvents[0].args).toHaveProperty("fileIds");
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/schemaValidation.test.ts b/packages/vana-sdk/src/utils/__tests__/schemaValidation.test.ts
new file mode 100644
index 00000000..15119453
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/schemaValidation.test.ts
@@ -0,0 +1,794 @@
+/**
+ * Tests for schema validation utilities
+ *
+ * @remarks
+ * Tests data schema validation against Vana meta-schema, data validation against schemas,
+ * SQLite DDL validation, and schema fetching from URLs.
+ */
+
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import {
+  SchemaValidator,
+  SchemaValidationError,
+  validateDataSchemaAgainstMetaSchema,
+  validateDataAgainstSchema,
+  fetchAndValidateSchema,
+  schemaValidator,
+  type DataSchema,
+} from "../schemaValidation";
+
+// Mock the dataSchema.schema.json import
+vi.mock("../../schemas/dataSchema.schema.json", () => ({
+  default: {
+    type: "object",
+    required: ["name", "version", "dialect", "schema"],
+    properties: {
+      name: { type: "string" },
+      version: { type: "string" },
+      description: { type: "string" },
+      dialect: { type: "string", enum: ["sqlite", "json"] },
+      dialectVersion: { type: "string" },
+      schema: { oneOf: [{ type: "string" }, { type: "object" }] },
+    },
+  },
+}));
+
+describe("schemaValidation", () => {
+  describe("SchemaValidationError", () => {
+    it("should create error with message and errors array", () => {
+      const errors = [
+        {
+          instancePath: "/name",
+          schemaPath: "#/properties/name/type",
+          keyword: "type",
+          params: { type: "string" },
+          message: "must be string",
+        },
+      ];
+
+      const error = new SchemaValidationError("Validation failed", errors);
+
+      expect(error).toBeInstanceOf(Error);
+      expect(error.name).toBe("SchemaValidationError");
+      expect(error.message).toBe("Validation failed");
+      expect(error.errors).toEqual(errors);
+    });
+
+    it("should handle empty errors array", () => {
+      const error = new SchemaValidationError("No specific errors", []);
+
+      expect(error.errors).toEqual([]);
+    });
+  });
+
+  describe("SchemaValidator", () => {
+    let validator: SchemaValidator;
+
+    beforeEach(() => {
+      validator = new SchemaValidator();
+    });
+
+    describe("validateDataSchemaAgainstMetaSchema", () => {
+      it("should validate valid JSON schema", () => {
+        const schema = {
+          name: "User Profile",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: {
+              name: { type: "string" },
+              age: { type: "number" },
+            },
+          },
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(schema);
+        }).not.toThrow();
+      });
+
+      it("should validate JSON schema with optional description", () => {
+        const schema = {
+          name: "User Profile",
+          version: "1.0.0",
+          description: "A schema for user profiles",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: { name: { type: "string" } },
+          },
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(schema);
+        }).not.toThrow();
+      });
+
+      it("should validate valid SQLite schema", () => {
+        const schema = {
+          name: "User Table",
+          version: "1.0.0",
+          dialect: "sqlite",
+          schema: "CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT)",
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(schema);
+        }).not.toThrow();
+      });
+
+      it("should validate SQLite schema with dialectVersion", () => {
+        const schema = {
+          name: "User Table",
+          version: "1.0.0",
+          dialect: "sqlite",
+          dialectVersion: "3",
+          schema: "CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT)",
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(schema);
+        }).not.toThrow();
+      });
+
+      it("should throw on missing required fields", () => {
+        const invalidSchema = {
+          name: "Incomplete",
+          version: "1.0.0",
+          // missing dialect and schema
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(invalidSchema);
+        }).toThrow(SchemaValidationError);
+      });
+
+      it("should throw on invalid dialect", () => {
+        const invalidSchema = {
+          name: "Invalid",
+          version: "1.0.0",
+          dialect: "mongodb", // not allowed
+          schema: "{}",
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(invalidSchema);
+        }).toThrow(SchemaValidationError);
+      });
+
+      it("should throw on invalid JSON schema definition", () => {
+        const invalidSchema = {
+          name: "Invalid JSON Schema",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "invalid_type", // not a valid JSON Schema type
+          },
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(invalidSchema);
+        }).toThrow(SchemaValidationError);
+      });
+
+      it("should throw on invalid SQLite DDL", () => {
+        const invalidSchema = {
+          name: "Invalid SQLite",
+          version: "1.0.0",
+          dialect: "sqlite",
+          schema: "INVALID SQL SYNTAX", // no CREATE TABLE
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(invalidSchema);
+        }).toThrow(SchemaValidationError);
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(invalidSchema);
+        }).toThrow(/CREATE TABLE/);
+      });
+
+      // Note: The meta-schema uses if/then to conditionally validate schema type,
+      // but Ajv may not enforce this as strictly as expected. These cases are
+      // handled at runtime when using validateSQLiteDDL or validateDataAgainstSchema.
+
+      it("should handle complex nested JSON schemas", () => {
+        const schema = {
+          name: "Complex Schema",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: {
+              user: {
+                type: "object",
+                properties: {
+                  name: { type: "string" },
+                  contacts: {
+                    type: "array",
+                    items: {
+                      type: "object",
+                      properties: {
+                        type: { type: "string" },
+                        value: { type: "string" },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        };
+
+        expect(() => {
+          validator.validateDataSchemaAgainstMetaSchema(schema);
+        }).not.toThrow();
+      });
+    });
+
+    describe("validateDataAgainstSchema", () => {
+      it("should validate valid data against JSON schema", () => {
+        const schema: DataSchema = {
+          name: "User",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: {
+              name: { type: "string" },
+              age: { type: "number" },
+            },
+            required: ["name"],
+          },
+        };
+
+        const validData = { name: "Alice", age: 30 };
+
+        expect(() => {
+          validator.validateDataAgainstSchema(validData, schema);
+        }).not.toThrow();
+      });
+
+      it("should throw on invalid data against JSON schema", () => {
+        const schema: DataSchema = {
+          name: "User",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: {
+              name: { type: "string" },
+              age: { type: "number" },
+            },
+            required: ["name"],
+          },
+        };
+
+        const invalidData = { age: 30 }; // missing required name
+
+        expect(() => {
+          validator.validateDataAgainstSchema(invalidData, schema);
+        }).toThrow(SchemaValidationError);
+        expect(() => {
+          validator.validateDataAgainstSchema(invalidData, schema);
+        }).toThrow(/Data validation failed/);
+      });
+
+      it("should skip validation for SQLite dialect", () => {
+        const schema: DataSchema = {
+          name: "User Table",
+          version: "1.0.0",
+          dialect: "sqlite",
+          schema: "CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT)",
+        };
+
+        const consoleWarnSpy = vi
+          .spyOn(console, "warn")
+          .mockImplementation(() => {});
+
+        const anyData = { random: "data" };
+
+        expect(() => {
+          validator.validateDataAgainstSchema(anyData, schema);
+        }).not.toThrow();
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+          expect.stringContaining("Data validation skipped"),
+        );
+
+        consoleWarnSpy.mockRestore();
+      });
+
+      it("should throw if JSON schema is not an object", () => {
+        const schema: DataSchema = {
+          name: "Invalid",
+          version: "1.0.0",
+          dialect: "json",
+          schema: "not an object" as never,
+        };
+
+        expect(() => {
+          validator.validateDataAgainstSchema({}, schema);
+        }).toThrow(SchemaValidationError);
+        expect(() => {
+          validator.validateDataAgainstSchema({}, schema);
+        }).toThrow(/must have an object schema/);
+      });
+
+      it("should validate data with nested objects", () => {
+        const schema: DataSchema = {
+          name: "Nested",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: {
+              user: {
+                type: "object",
+                properties: {
+                  name: { type: "string" },
+                },
+              },
+            },
+          },
+        };
+
+        const validData = { user: { name: "Alice" } };
+
+        expect(() => {
+          validator.validateDataAgainstSchema(validData, schema);
+        }).not.toThrow();
+      });
+
+      it("should validate data with arrays", () => {
+        const schema: DataSchema = {
+          name: "Array Schema",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: {
+              items: {
+                type: "array",
+                items: { type: "number" },
+              },
+            },
+          },
+        };
+
+        const validData = { items: [1, 2, 3] };
+
+        expect(() => {
+          validator.validateDataAgainstSchema(validData, schema);
+        }).not.toThrow();
+      });
+
+      it("should throw on array with wrong item types", () => {
+        const schema: DataSchema = {
+          name: "Array Schema",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: {
+              items: {
+                type: "array",
+                items: { type: "number" },
+              },
+            },
+          },
+        };
+
+        const invalidData = { items: [1, "two", 3] };
+
+        expect(() => {
+          validator.validateDataAgainstSchema(invalidData, schema);
+        }).toThrow(SchemaValidationError);
+      });
+
+      it("should handle additional properties validation", () => {
+        const schema: DataSchema = {
+          name: "Strict Schema",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: {
+              name: { type: "string" },
+            },
+            additionalProperties: false,
+          },
+        };
+
+        const invalidData = { name: "Alice", extra: "field" };
+
+        expect(() => {
+          validator.validateDataAgainstSchema(invalidData, schema);
+        }).toThrow(SchemaValidationError);
+      });
+    });
+
+    describe("validateSQLiteDDL", () => {
+      it("should validate valid SQLite DDL", () => {
+        const ddl = "CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT)";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).not.toThrow();
+      });
+
+      it("should validate DDL with multiple tables", () => {
+        const ddl = `
+          CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT);
+          CREATE TABLE posts (id INTEGER, user_id INTEGER, content TEXT);
+        `;
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).not.toThrow();
+      });
+
+      it("should validate DDL with version 3", () => {
+        const ddl = "CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT)";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl, "3");
+        }).not.toThrow();
+      });
+
+      it("should throw on empty DDL string", () => {
+        expect(() => {
+          validator.validateSQLiteDDL("");
+        }).toThrow(SchemaValidationError);
+        expect(() => {
+          validator.validateSQLiteDDL("");
+        }).toThrow(/non-empty string/);
+      });
+
+      it("should throw on whitespace-only DDL", () => {
+        expect(() => {
+          validator.validateSQLiteDDL("   \n\t  ");
+        }).toThrow(SchemaValidationError);
+      });
+
+      it("should throw on non-string DDL", () => {
+        expect(() => {
+          validator.validateSQLiteDDL(123 as never);
+        }).toThrow(SchemaValidationError);
+      });
+
+      it("should throw on DDL without CREATE TABLE", () => {
+        const ddl = "SELECT * FROM users";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).toThrow(SchemaValidationError);
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).toThrow(/CREATE TABLE/);
+      });
+
+      it("should throw on unsupported dialect version", () => {
+        const ddl = "CREATE TABLE users (id INTEGER PRIMARY KEY)";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl, "2");
+        }).toThrow(SchemaValidationError);
+        expect(() => {
+          validator.validateSQLiteDDL(ddl, "2");
+        }).toThrow(/Unsupported.*version/);
+      });
+
+      it("should throw on unbalanced opening parentheses", () => {
+        const ddl = "CREATE TABLE users (id INTEGER PRIMARY KEY";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).toThrow(SchemaValidationError);
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).toThrow(/unbalanced parentheses/);
+      });
+
+      it("should throw on unbalanced closing parentheses", () => {
+        const ddl = "CREATE TABLE users id INTEGER PRIMARY KEY)";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).toThrow(SchemaValidationError);
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).toThrow(/unbalanced parentheses/);
+      });
+
+      it("should throw on extra closing parentheses", () => {
+        const ddl = "CREATE TABLE users (id INTEGER PRIMARY KEY))";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).toThrow(SchemaValidationError);
+      });
+
+      it("should handle case-insensitive CREATE TABLE", () => {
+        const ddl = "create table users (id INTEGER PRIMARY KEY)";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).not.toThrow();
+      });
+
+      it("should handle mixed case", () => {
+        const ddl = "CrEaTe TaBlE users (id INTEGER PRIMARY KEY)";
+
+        expect(() => {
+          validator.validateSQLiteDDL(ddl);
+        }).not.toThrow();
+      });
+    });
+
+    describe("fetchAndValidateSchema", () => {
+      beforeEach(() => {
+        vi.resetModules();
+      });
+
+      it("should fetch and validate valid schema from URL", async () => {
+        const mockSchema = {
+          name: "Remote Schema",
+          version: "1.0.0",
+          dialect: "json",
+          schema: { type: "object" },
+        };
+
+        const mockUniversalFetch = vi.fn().mockResolvedValue({
+          ok: true,
+          status: 200,
+          json: vi.fn().mockResolvedValue(mockSchema),
+        });
+
+        vi.doMock("../download", () => ({
+          universalFetch: mockUniversalFetch,
+        }));
+
+        const result = await validator.fetchAndValidateSchema(
+          "https://example.com/schema.json",
+        );
+
+        expect(result).toEqual(mockSchema);
+        expect(mockUniversalFetch).toHaveBeenCalledWith(
+          "https://example.com/schema.json",
+          undefined,
+        );
+      });
+
+      it("should fetch with download relayer", async () => {
+        const mockSchema = {
+          name: "Remote Schema",
+          version: "1.0.0",
+          dialect: "json",
+          schema: { type: "object" },
+        };
+
+        const mockRelayer = {
+          proxyDownload: vi.fn(),
+        };
+
+        const mockUniversalFetch = vi.fn().mockResolvedValue({
+          ok: true,
+          json: vi.fn().mockResolvedValue(mockSchema),
+        });
+
+        vi.doMock("../download", () => ({
+          universalFetch: mockUniversalFetch,
+        }));
+
+        await validator.fetchAndValidateSchema(
+          "https://example.com/schema.json",
+          mockRelayer,
+        );
+
+        expect(mockUniversalFetch).toHaveBeenCalledWith(
+          "https://example.com/schema.json",
+          mockRelayer,
+        );
+      });
+
+      it("should throw on HTTP error", async () => {
+        const mockUniversalFetch = vi.fn().mockResolvedValue({
+          ok: false,
+          status: 404,
+          statusText: "Not Found",
+        });
+
+        vi.doMock("../download", () => ({
+          universalFetch: mockUniversalFetch,
+        }));
+
+        await expect(
+          validator.fetchAndValidateSchema("https://example.com/missing.json"),
+        ).rejects.toThrow(SchemaValidationError);
+        await expect(
+          validator.fetchAndValidateSchema("https://example.com/missing.json"),
+        ).rejects.toThrow(/404/);
+      });
+
+      it("should throw on network error", async () => {
+        const mockUniversalFetch = vi
+          .fn()
+          .mockRejectedValue(new Error("Network error"));
+
+        vi.doMock("../download", () => ({
+          universalFetch: mockUniversalFetch,
+        }));
+
+        await expect(
+          validator.fetchAndValidateSchema("https://example.com/schema.json"),
+        ).rejects.toThrow(SchemaValidationError);
+        await expect(
+          validator.fetchAndValidateSchema("https://example.com/schema.json"),
+        ).rejects.toThrow(/Failed to fetch/);
+      });
+
+      it("should throw on invalid schema from URL", async () => {
+        const invalidSchema = {
+          name: "Invalid",
+          // missing required fields
+        };
+
+        const mockUniversalFetch = vi.fn().mockResolvedValue({
+          ok: true,
+          json: vi.fn().mockResolvedValue(invalidSchema),
+        });
+
+        vi.doMock("../download", () => ({
+          universalFetch: mockUniversalFetch,
+        }));
+
+        await expect(
+          validator.fetchAndValidateSchema("https://example.com/invalid.json"),
+        ).rejects.toThrow(SchemaValidationError);
+      });
+
+      it("should validate SQLite DDL after fetching", async () => {
+        const sqliteSchema = {
+          name: "SQLite Schema",
+          version: "1.0.0",
+          dialect: "sqlite",
+          schema: "INVALID SQL", // no CREATE TABLE
+        };
+
+        const mockUniversalFetch = vi.fn().mockResolvedValue({
+          ok: true,
+          json: vi.fn().mockResolvedValue(sqliteSchema),
+        });
+
+        vi.doMock("../download", () => ({
+          universalFetch: mockUniversalFetch,
+        }));
+
+        await expect(
+          validator.fetchAndValidateSchema("https://example.com/sqlite.json"),
+        ).rejects.toThrow(SchemaValidationError);
+        await expect(
+          validator.fetchAndValidateSchema("https://example.com/sqlite.json"),
+        ).rejects.toThrow(/CREATE TABLE/);
+      });
+    });
+  });
+
+  describe("Convenience Functions", () => {
+    describe("validateDataSchemaAgainstMetaSchema", () => {
+      it("should validate and return valid schema", () => {
+        const schema = {
+          name: "Test",
+          version: "1.0.0",
+          dialect: "json",
+          schema: { type: "object" },
+        };
+
+        const result = validateDataSchemaAgainstMetaSchema(schema);
+
+        expect(result).toEqual(schema);
+      });
+
+      it("should throw on invalid schema", () => {
+        const invalidSchema = { name: "Incomplete" };
+
+        expect(() =>
+          validateDataSchemaAgainstMetaSchema(invalidSchema),
+        ).toThrow(SchemaValidationError);
+      });
+    });
+
+    describe("validateDataAgainstSchema", () => {
+      it("should validate data against schema", () => {
+        const schema: DataSchema = {
+          name: "Test",
+          version: "1.0.0",
+          dialect: "json",
+          schema: { type: "object" },
+        };
+
+        expect(() => {
+          validateDataAgainstSchema({}, schema);
+        }).not.toThrow();
+      });
+
+      it("should throw on invalid data", () => {
+        const schema: DataSchema = {
+          name: "Test",
+          version: "1.0.0",
+          dialect: "json",
+          schema: {
+            type: "object",
+            properties: { name: { type: "string" } },
+            required: ["name"],
+          },
+        };
+
+        expect(() => {
+          validateDataAgainstSchema({}, schema);
+        }).toThrow(SchemaValidationError);
+      });
+    });
+
+    describe("fetchAndValidateSchema", () => {
+      it("should fetch and validate schema", async () => {
+        const mockSchema = {
+          name: "Remote",
+          version: "1.0.0",
+          dialect: "json",
+          schema: { type: "object" },
+        };
+
+        const mockUniversalFetch = vi.fn().mockResolvedValue({
+          ok: true,
+          json: vi.fn().mockResolvedValue(mockSchema),
+        });
+
+        vi.doMock("../download", () => ({
+          universalFetch: mockUniversalFetch,
+        }));
+
+        const result = await fetchAndValidateSchema(
+          "https://example.com/schema.json",
+        );
+
+        expect(result).toEqual(mockSchema);
+      });
+    });
+  });
+
+  describe("Global Instance", () => {
+    it("should provide global schemaValidator instance", () => {
+      expect(schemaValidator).toBeInstanceOf(SchemaValidator);
+    });
+
+    it("should be reusable across multiple validations", () => {
+      const schema1 = {
+        name: "Schema 1",
+        version: "1.0.0",
+        dialect: "json",
+        schema: { type: "object" },
+      };
+
+      const schema2 = {
+        name: "Schema 2",
+        version: "2.0.0",
+        dialect: "json",
+        schema: { type: "array" },
+      };
+
+      // Extract method with explicit type to satisfy TS2775
+      const validate: (schema: DataSchema) => void =
+        schemaValidator.validateDataSchemaAgainstMetaSchema.bind(
+          schemaValidator,
+        );
+
+      expect(() => {
+        validate(schema1 as DataSchema);
+      }).not.toThrow();
+      expect(() => {
+        validate(schema2 as DataSchema);
+      }).not.toThrow();
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/signatureFormatter.test.ts b/packages/vana-sdk/src/utils/__tests__/signatureFormatter.test.ts
new file mode 100644
index 00000000..7f8a196a
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/signatureFormatter.test.ts
@@ -0,0 +1,206 @@
+/**
+ * Tests for signature formatting utilities
+ *
+ * @remarks
+ * Tests ECDSA signature v-value adjustment for Ethereum contract compatibility.
+ */
+
+import { describe, it, expect } from "vitest";
+import { formatSignatureForContract } from "../signatureFormatter";
+import type { Hash } from "viem";
+
+describe("signatureFormatter", () => {
+  describe("formatSignatureForContract", () => {
+    it("should adjust v-value from 0 to 27 (0x1b)", () => {
+      // Signature with v = 0 (last byte = 00)
+      const signature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef00" as Hash;
+
+      const result = formatSignatureForContract(signature);
+
+      // Should have v = 27 (0x1b)
+      expect(result).toMatch(/1b$/);
+      expect(result).not.toBe(signature);
+    });
+
+    it("should adjust v-value from 1 to 28 (0x1c)", () => {
+      // Signature with v = 1 (last byte = 01)
+      const signature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef01" as Hash;
+
+      const result = formatSignatureForContract(signature);
+
+      // Should have v = 28 (0x1c)
+      expect(result).toMatch(/1c$/);
+      expect(result).not.toBe(signature);
+    });
+
+    it("should not modify v-value when already 27 (0x1b)", () => {
+      const signature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1b" as Hash;
+
+      const result = formatSignatureForContract(signature);
+
+      expect(result).toBe(signature);
+    });
+
+    it("should not modify v-value when already 28 (0x1c)", () => {
+      const signature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1c" as Hash;
+
+      const result = formatSignatureForContract(signature);
+
+      expect(result).toBe(signature);
+    });
+
+    it("should handle all v-values less than 27", () => {
+      for (let v = 0; v < 27; v++) {
+        const vHex = v.toString(16).padStart(2, "0");
+        const signature =
+          `0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef${vHex}` as Hash;
+
+        const result = formatSignatureForContract(signature);
+
+        // Verify v-value was adjusted by 27
+        const expectedV = (v + 27).toString(16).padStart(2, "0");
+        expect(result).toMatch(new RegExp(`${expectedV}$`));
+      }
+    });
+
+    it("should not modify v-values 27 and above", () => {
+      for (let v = 27; v <= 35; v++) {
+        const vHex = v.toString(16).padStart(2, "0");
+        const signature =
+          `0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef${vHex}` as Hash;
+
+        const result = formatSignatureForContract(signature);
+
+        expect(result).toBe(signature);
+      }
+    });
+
+    it("should return original signature if length is not 65 bytes", () => {
+      // Too short (64 bytes = 130 hex chars + 2 for 0x)
+      const shortSignature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcd" as Hash;
+
+      expect(formatSignatureForContract(shortSignature)).toBe(shortSignature);
+
+      // Too long (66 bytes = 134 hex chars + 2 for 0x)
+      const longSignature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef0011" as Hash;
+
+      expect(formatSignatureForContract(longSignature)).toBe(longSignature);
+    });
+
+    it("should handle empty signature", () => {
+      const empty = "0x" as Hash;
+      expect(formatSignatureForContract(empty)).toBe(empty);
+    });
+
+    it("should handle minimal signature", () => {
+      const minimal = "0x00" as Hash;
+      expect(formatSignatureForContract(minimal)).toBe(minimal);
+    });
+
+    it("should preserve r and s components while adjusting v", () => {
+      const rComponent =
+        "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef";
+      const sComponent =
+        "fedcba0987654321fedcba0987654321fedcba0987654321fedcba0987654321";
+      const vOriginal = "00";
+
+      const signature = `0x${rComponent}${sComponent}${vOriginal}` as Hash;
+      const result = formatSignatureForContract(signature);
+
+      // Verify r and s are unchanged
+      expect(result.slice(0, 66)).toBe(`0x${rComponent}`);
+      expect(result.slice(66, 130)).toBe(sComponent);
+      // Verify v is adjusted
+      expect(result.slice(130)).toBe("1b");
+    });
+
+    it("should be idempotent for already formatted signatures", () => {
+      const formatted =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1b" as Hash;
+
+      const result1 = formatSignatureForContract(formatted);
+      const result2 = formatSignatureForContract(result1);
+      const result3 = formatSignatureForContract(result2);
+
+      expect(result1).toBe(formatted);
+      expect(result2).toBe(formatted);
+      expect(result3).toBe(formatted);
+    });
+
+    it("should handle real-world signature examples", () => {
+      // Example from wallet with v=0 (proper 65-byte signature = 132 hex chars)
+      const walletSignature =
+        "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb00" as Hash;
+
+      const formatted = formatSignatureForContract(walletSignature);
+
+      expect(formatted).toMatch(/1b$/);
+      expect(formatted.length).toBe(walletSignature.length);
+    });
+
+    it("should handle signatures with all zeros", () => {
+      const zeros =
+        "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" as Hash;
+
+      const result = formatSignatureForContract(zeros);
+
+      expect(result).toMatch(/1b$/); // v adjusted from 0 to 27
+    });
+
+    it("should handle signatures with all ones", () => {
+      const ones =
+        "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01" as Hash;
+
+      const result = formatSignatureForContract(ones);
+
+      expect(result).toMatch(/1c$/); // v adjusted from 1 to 28
+    });
+
+    it("should handle mixed case hex strings", () => {
+      const mixedCase =
+        "0xAbCdEf1234567890AbCdEf1234567890AbCdEf1234567890AbCdEf1234567890FeDcBa0987654321FeDcBa0987654321FeDcBa0987654321FeDcBa098765432100" as Hash;
+
+      const result = formatSignatureForContract(mixedCase);
+
+      expect(result.toLowerCase()).toMatch(/1b$/);
+    });
+
+    it("should handle v-value at exact boundary (26)", () => {
+      const signature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1a" as Hash;
+
+      const result = formatSignatureForContract(signature);
+
+      // v = 26 (0x1a) should become 53 (0x35)
+      expect(result).toMatch(/35$/);
+    });
+
+    it("should handle chain-specific v-values correctly", () => {
+      // EIP-155 chain-specific v-values (v = chainId * 2 + 35/36)
+      // For chainId = 1 (mainnet): v = 37 or 38
+      const eip155Signature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef25" as Hash;
+
+      const result = formatSignatureForContract(eip155Signature);
+
+      // v = 37 (0x25) should remain unchanged
+      expect(result).toBe(eip155Signature);
+    });
+
+    it("should produce valid hex output", () => {
+      const signature =
+        "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef00" as Hash;
+
+      const result = formatSignatureForContract(signature);
+
+      expect(result).toMatch(/^0x[0-9a-fA-F]+$/);
+      expect(result.length).toBe(132); // 0x + 130 hex chars
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/subgraphMetaCache.test.ts b/packages/vana-sdk/src/utils/__tests__/subgraphMetaCache.test.ts
new file mode 100644
index 00000000..4ab55313
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/subgraphMetaCache.test.ts
@@ -0,0 +1,592 @@
+/**
+ * Tests for SubgraphMetaCache
+ *
+ * @remarks
+ * Tests LRU eviction, TTL expiration, and cache statistics.
+ */
+
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { SubgraphMetaCache, globalMetaCache } from "../subgraphMetaCache";
+import type { SubgraphMeta } from "../subgraphConsistency";
+
+describe("SubgraphMetaCache", () => {
+  let cache: SubgraphMetaCache;
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    cache = new SubgraphMetaCache(2000, 3); // 2s TTL, max 3 entries
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.useRealTimers();
+  });
+
+  describe("Basic Operations", () => {
+    it("should return undefined for missing entries", () => {
+      expect(cache.get("https://example.com/subgraph")).toBeUndefined();
+    });
+
+    it("should store and retrieve metadata", () => {
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest123",
+      };
+
+      cache.set("https://example.com/subgraph", meta);
+
+      expect(cache.get("https://example.com/subgraph")).toEqual(meta);
+    });
+
+    it("should handle multiple entries", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest1",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmTest2",
+      };
+
+      cache.set("https://example.com/subgraph1", meta1);
+      cache.set("https://example.com/subgraph2", meta2);
+
+      expect(cache.get("https://example.com/subgraph1")).toEqual(meta1);
+      expect(cache.get("https://example.com/subgraph2")).toEqual(meta2);
+    });
+
+    it("should overwrite existing entries", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmOld",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmNew",
+      };
+
+      cache.set("https://example.com/subgraph", meta1);
+      cache.set("https://example.com/subgraph", meta2);
+
+      expect(cache.get("https://example.com/subgraph")).toEqual(meta2);
+    });
+
+    it("should clear all entries", () => {
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      cache.set("https://example.com/subgraph1", meta);
+      cache.set("https://example.com/subgraph2", meta);
+
+      cache.clear();
+
+      expect(cache.get("https://example.com/subgraph1")).toBeUndefined();
+      expect(cache.get("https://example.com/subgraph2")).toBeUndefined();
+      expect(cache.stats().size).toBe(0);
+    });
+  });
+
+  describe("TTL Expiration", () => {
+    it("should return undefined for expired entries", () => {
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      cache.set("https://example.com/subgraph", meta);
+
+      // Advance time beyond TTL (2000ms)
+      vi.advanceTimersByTime(2001);
+
+      expect(cache.get("https://example.com/subgraph")).toBeUndefined();
+    });
+
+    it("should remove expired entries from cache", () => {
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      cache.set("https://example.com/subgraph", meta);
+      expect(cache.stats().size).toBe(1);
+
+      vi.advanceTimersByTime(2001);
+      cache.get("https://example.com/subgraph");
+
+      // Expired entry should be removed
+      expect(cache.stats().size).toBe(0);
+    });
+
+    it("should return valid entries before TTL expires", () => {
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      cache.set("https://example.com/subgraph", meta);
+
+      // Advance time but stay within TTL
+      vi.advanceTimersByTime(1999);
+
+      expect(cache.get("https://example.com/subgraph")).toEqual(meta);
+    });
+
+    it("should handle entries with different ages", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmOld",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmNew",
+      };
+
+      cache.set("https://example.com/old", meta1);
+      vi.advanceTimersByTime(1500);
+      cache.set("https://example.com/new", meta2);
+
+      // Advance to expire first entry but not second
+      vi.advanceTimersByTime(600); // Total: 2100ms for old, 600ms for new
+
+      expect(cache.get("https://example.com/old")).toBeUndefined();
+      expect(cache.get("https://example.com/new")).toEqual(meta2);
+    });
+
+    it("should reset timestamp when overwriting entry", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmOld",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmNew",
+      };
+
+      cache.set("https://example.com/subgraph", meta1);
+      vi.advanceTimersByTime(1500);
+      cache.set("https://example.com/subgraph", meta2); // Reset timestamp
+
+      vi.advanceTimersByTime(1999); // Total: 3499ms from first set, 1999ms from second
+
+      // Should still be valid because timestamp was reset
+      expect(cache.get("https://example.com/subgraph")).toEqual(meta2);
+    });
+  });
+
+  describe("LRU Eviction", () => {
+    it("should evict oldest entry when maxSize reached", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmFirst",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmSecond",
+      };
+      const meta3: SubgraphMeta = {
+        blockNumber: 300,
+        hasIndexingErrors: false,
+        deployment: "QmThird",
+      };
+      const meta4: SubgraphMeta = {
+        blockNumber: 400,
+        hasIndexingErrors: false,
+        deployment: "QmFourth",
+      };
+
+      cache.set("https://example.com/1", meta1);
+      cache.set("https://example.com/2", meta2);
+      cache.set("https://example.com/3", meta3);
+
+      expect(cache.stats().size).toBe(3);
+
+      // Adding 4th entry should evict first
+      cache.set("https://example.com/4", meta4);
+
+      expect(cache.stats().size).toBe(3);
+      expect(cache.get("https://example.com/1")).toBeUndefined(); // Evicted
+      expect(cache.get("https://example.com/2")).toEqual(meta2);
+      expect(cache.get("https://example.com/3")).toEqual(meta3);
+      expect(cache.get("https://example.com/4")).toEqual(meta4);
+    });
+
+    it("should move accessed entry to end (LRU)", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmFirst",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmSecond",
+      };
+      const meta3: SubgraphMeta = {
+        blockNumber: 300,
+        hasIndexingErrors: false,
+        deployment: "QmThird",
+      };
+      const meta4: SubgraphMeta = {
+        blockNumber: 400,
+        hasIndexingErrors: false,
+        deployment: "QmFourth",
+      };
+
+      cache.set("https://example.com/1", meta1);
+      cache.set("https://example.com/2", meta2);
+      cache.set("https://example.com/3", meta3);
+
+      // Access first entry, moving it to end
+      cache.get("https://example.com/1");
+
+      // Adding 4th entry should now evict second (now oldest)
+      cache.set("https://example.com/4", meta4);
+
+      expect(cache.get("https://example.com/1")).toEqual(meta1); // Still present
+      expect(cache.get("https://example.com/2")).toBeUndefined(); // Evicted
+      expect(cache.get("https://example.com/3")).toEqual(meta3);
+      expect(cache.get("https://example.com/4")).toEqual(meta4);
+    });
+
+    it("should not evict when overwriting existing entry", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmFirst",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmSecond",
+      };
+      const meta3: SubgraphMeta = {
+        blockNumber: 300,
+        hasIndexingErrors: false,
+        deployment: "QmThird",
+      };
+      const meta3Updated: SubgraphMeta = {
+        blockNumber: 350,
+        hasIndexingErrors: false,
+        deployment: "QmThirdUpdated",
+      };
+
+      cache.set("https://example.com/1", meta1);
+      cache.set("https://example.com/2", meta2);
+      cache.set("https://example.com/3", meta3);
+
+      // Overwrite third entry - should not evict
+      cache.set("https://example.com/3", meta3Updated);
+
+      expect(cache.stats().size).toBe(3);
+      expect(cache.get("https://example.com/1")).toEqual(meta1);
+      expect(cache.get("https://example.com/2")).toEqual(meta2);
+      expect(cache.get("https://example.com/3")).toEqual(meta3Updated);
+    });
+
+    it("should handle single entry cache", () => {
+      const singleCache = new SubgraphMetaCache(2000, 1);
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmFirst",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmSecond",
+      };
+
+      singleCache.set("https://example.com/1", meta1);
+      expect(singleCache.stats().size).toBe(1);
+
+      singleCache.set("https://example.com/2", meta2);
+      expect(singleCache.stats().size).toBe(1);
+      expect(singleCache.get("https://example.com/1")).toBeUndefined();
+      expect(singleCache.get("https://example.com/2")).toEqual(meta2);
+    });
+  });
+
+  describe("Combined TTL and LRU", () => {
+    it("should handle expired entries not counting toward maxSize", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmFirst",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmSecond",
+      };
+      const meta3: SubgraphMeta = {
+        blockNumber: 300,
+        hasIndexingErrors: false,
+        deployment: "QmThird",
+      };
+      const meta4: SubgraphMeta = {
+        blockNumber: 400,
+        hasIndexingErrors: false,
+        deployment: "QmFourth",
+      };
+
+      cache.set("https://example.com/1", meta1);
+      cache.set("https://example.com/2", meta2);
+
+      // Expire first two entries
+      vi.advanceTimersByTime(2001);
+
+      cache.set("https://example.com/3", meta3);
+      cache.set("https://example.com/4", meta4);
+
+      // Accessing expired entries removes them
+      expect(cache.get("https://example.com/1")).toBeUndefined();
+      expect(cache.get("https://example.com/2")).toBeUndefined();
+
+      // Size should be 2 (only new entries)
+      expect(cache.stats().size).toBe(2);
+      expect(cache.get("https://example.com/3")).toEqual(meta3);
+      expect(cache.get("https://example.com/4")).toEqual(meta4);
+    });
+
+    it("should prioritize LRU over TTL for eviction", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmFirst",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmSecond",
+      };
+      const meta3: SubgraphMeta = {
+        blockNumber: 300,
+        hasIndexingErrors: false,
+        deployment: "QmThird",
+      };
+      const meta4: SubgraphMeta = {
+        blockNumber: 400,
+        hasIndexingErrors: false,
+        deployment: "QmFourth",
+      };
+
+      cache.set("https://example.com/1", meta1);
+      vi.advanceTimersByTime(500);
+      cache.set("https://example.com/2", meta2);
+      vi.advanceTimersByTime(500);
+      cache.set("https://example.com/3", meta3);
+
+      // All entries still valid (1000ms < 2000ms TTL)
+      // But adding 4th will evict oldest by insertion order
+      cache.set("https://example.com/4", meta4);
+
+      expect(cache.get("https://example.com/1")).toBeUndefined(); // Evicted (oldest)
+      expect(cache.get("https://example.com/2")).toEqual(meta2);
+      expect(cache.get("https://example.com/3")).toEqual(meta3);
+      expect(cache.get("https://example.com/4")).toEqual(meta4);
+    });
+  });
+
+  describe("Stats", () => {
+    it("should report correct initial stats", () => {
+      expect(cache.stats()).toEqual({
+        size: 0,
+        ttl: 2000,
+        maxSize: 3,
+      });
+    });
+
+    it("should report correct stats after additions", () => {
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      cache.set("https://example.com/1", meta);
+      cache.set("https://example.com/2", meta);
+
+      expect(cache.stats()).toEqual({
+        size: 2,
+        ttl: 2000,
+        maxSize: 3,
+      });
+    });
+
+    it("should maintain custom TTL and maxSize", () => {
+      const customCache = new SubgraphMetaCache(5000, 20);
+
+      expect(customCache.stats()).toEqual({
+        size: 0,
+        ttl: 5000,
+        maxSize: 20,
+      });
+    });
+
+    it("should report size after clear", () => {
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      cache.set("https://example.com/1", meta);
+      cache.clear();
+
+      expect(cache.stats().size).toBe(0);
+    });
+  });
+
+  describe("Edge Cases", () => {
+    it("should handle zero maxSize gracefully", () => {
+      const zeroCache = new SubgraphMetaCache(2000, 0);
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      // Should evict immediately since maxSize is 0
+      zeroCache.set("https://example.com/1", meta);
+      expect(zeroCache.stats().size).toBe(1); // Still gets added
+    });
+
+    it("should handle very short TTL", () => {
+      const shortCache = new SubgraphMetaCache(1, 10); // 1ms TTL
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      shortCache.set("https://example.com/1", meta);
+      vi.advanceTimersByTime(2);
+
+      expect(shortCache.get("https://example.com/1")).toBeUndefined();
+    });
+
+    it("should handle very long TTL", () => {
+      const longCache = new SubgraphMetaCache(1000000, 10); // 1000s TTL
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      longCache.set("https://example.com/1", meta);
+      vi.advanceTimersByTime(999999);
+
+      expect(longCache.get("https://example.com/1")).toEqual(meta);
+    });
+
+    it("should handle URLs with special characters", () => {
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      cache.set(
+        "https://example.com/subgraph?api_key=test&version=1.0.0#fragment",
+        meta,
+      );
+
+      expect(
+        cache.get(
+          "https://example.com/subgraph?api_key=test&version=1.0.0#fragment",
+        ),
+      ).toEqual(meta);
+    });
+
+    it("should treat different URLs as separate entries", () => {
+      const meta1: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest1",
+      };
+      const meta2: SubgraphMeta = {
+        blockNumber: 200,
+        hasIndexingErrors: false,
+        deployment: "QmTest2",
+      };
+
+      cache.set("https://example.com/subgraph", meta1);
+      cache.set("https://example.com/subgraph?version=2", meta2);
+
+      expect(cache.get("https://example.com/subgraph")).toEqual(meta1);
+      expect(cache.get("https://example.com/subgraph?version=2")).toEqual(
+        meta2,
+      );
+    });
+
+    it("should handle metadata with missing optional fields", () => {
+      const minimalMeta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmMinimal",
+      };
+
+      cache.set("https://example.com/subgraph", minimalMeta);
+
+      expect(cache.get("https://example.com/subgraph")).toEqual(minimalMeta);
+    });
+
+    it("should handle metadata with all fields", () => {
+      const fullMeta: SubgraphMeta = {
+        blockNumber: 100,
+        blockHash: "0xabc123",
+        blockTimestamp: 1234567890,
+        deployment: "QmTest123",
+        hasIndexingErrors: false,
+      };
+
+      cache.set("https://example.com/subgraph", fullMeta);
+
+      expect(cache.get("https://example.com/subgraph")).toEqual(fullMeta);
+    });
+  });
+
+  describe("Global Cache Instance", () => {
+    it("should provide global cache instance", () => {
+      expect(globalMetaCache).toBeInstanceOf(SubgraphMetaCache);
+    });
+
+    it("should have default configuration", () => {
+      const stats = globalMetaCache.stats();
+      expect(stats.ttl).toBe(2000);
+      expect(stats.maxSize).toBe(10);
+    });
+
+    it("should be usable like any cache instance", () => {
+      globalMetaCache.clear(); // Ensure clean state
+
+      const meta: SubgraphMeta = {
+        blockNumber: 100,
+        hasIndexingErrors: false,
+        deployment: "QmTest",
+      };
+
+      globalMetaCache.set("https://example.com/global", meta);
+      expect(globalMetaCache.get("https://example.com/global")).toEqual(meta);
+
+      globalMetaCache.clear(); // Clean up
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/typeGuards.test.ts b/packages/vana-sdk/src/utils/__tests__/typeGuards.test.ts
new file mode 100644
index 00000000..7bf845b6
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/typeGuards.test.ts
@@ -0,0 +1,786 @@
+/**
+ * Tests for type guard utility functions
+ */
+
+import { describe, it, expect } from "vitest";
+import {
+  isDefined,
+  assertDefined,
+  isNonEmptyString,
+  assertNonEmptyString,
+  isObject,
+  isArray,
+  hasProperty,
+  assertHasProperties,
+  ensureError,
+  safeGet,
+  safeArrayAccess,
+  ensureDefault,
+} from "../typeGuards";
+
+describe("typeGuards", () => {
+  describe("isDefined", () => {
+    it("should return true for non-null, non-undefined values", () => {
+      expect(isDefined(0)).toBe(true);
+      expect(isDefined(false)).toBe(true);
+      expect(isDefined("")).toBe(true);
+      expect(isDefined("hello")).toBe(true);
+      expect(isDefined(123)).toBe(true);
+      expect(isDefined({})).toBe(true);
+      expect(isDefined([])).toBe(true);
+    });
+
+    it("should return false for undefined", () => {
+      expect(isDefined(undefined)).toBe(false);
+    });
+
+    it("should return false for null", () => {
+      expect(isDefined(null)).toBe(false);
+    });
+
+    it("should work with generic types", () => {
+      const value: string | undefined = "test";
+      if (isDefined(value)) {
+        // TypeScript should narrow type to string
+        expect(typeof value).toBe("string");
+      }
+    });
+
+    it("should filter arrays correctly", () => {
+      const values = [1, undefined, 3, null, 5, 0, false, ""];
+      const defined = values.filter(isDefined);
+      expect(defined).toEqual([1, 3, 5, 0, false, ""]);
+    });
+  });
+
+  describe("assertDefined", () => {
+    it("should not throw for defined values", () => {
+      expect(() => {
+        assertDefined(0, "Should be defined");
+      }).not.toThrow();
+
+      expect(() => {
+        assertDefined(false, "Should be defined");
+      }).not.toThrow();
+
+      expect(() => {
+        assertDefined("", "Should be defined");
+      }).not.toThrow();
+
+      expect(() => {
+        assertDefined({}, "Should be defined");
+      }).not.toThrow();
+    });
+
+    it("should throw for undefined with custom message", () => {
+      expect(() => {
+        assertDefined(undefined, "Value must be defined");
+      }).toThrow("Value must be defined");
+    });
+
+    it("should throw for null with custom message", () => {
+      expect(() => {
+        assertDefined(null, "Value cannot be null");
+      }).toThrow("Value cannot be null");
+    });
+
+    it("should throw Error instance", () => {
+      expect(() => {
+        assertDefined(undefined, "Test error");
+      }).toThrow(Error);
+    });
+
+    it("should narrow type after assertion", () => {
+      const value: string | undefined = "test";
+      assertDefined(value, "Must be defined");
+      // TypeScript should know this is safe now
+      expect(value.length).toBe(4);
+    });
+  });
+
+  describe("isNonEmptyString", () => {
+    it("should return true for non-empty strings", () => {
+      expect(isNonEmptyString("hello")).toBe(true);
+      expect(isNonEmptyString("a")).toBe(true);
+      expect(isNonEmptyString("test string")).toBe(true);
+    });
+
+    it("should return false for empty strings", () => {
+      expect(isNonEmptyString("")).toBe(false);
+    });
+
+    it("should return false for whitespace-only strings", () => {
+      expect(isNonEmptyString(" ")).toBe(false);
+      expect(isNonEmptyString("  ")).toBe(false);
+      expect(isNonEmptyString("\t")).toBe(false);
+      expect(isNonEmptyString("\n")).toBe(false);
+      expect(isNonEmptyString("  \t  ")).toBe(false);
+    });
+
+    it("should return false for non-string values", () => {
+      expect(isNonEmptyString(null)).toBe(false);
+      expect(isNonEmptyString(undefined)).toBe(false);
+      expect(isNonEmptyString(123)).toBe(false);
+      expect(isNonEmptyString(0)).toBe(false);
+      expect(isNonEmptyString(true)).toBe(false);
+      expect(isNonEmptyString(false)).toBe(false);
+      expect(isNonEmptyString({})).toBe(false);
+      expect(isNonEmptyString([])).toBe(false);
+    });
+
+    it("should return true for strings with leading/trailing whitespace", () => {
+      expect(isNonEmptyString("  hello  ")).toBe(true);
+      expect(isNonEmptyString("\thello\n")).toBe(true);
+    });
+  });
+
+  describe("assertNonEmptyString", () => {
+    it("should not throw for non-empty strings", () => {
+      expect(() => {
+        assertNonEmptyString("hello", "Must be non-empty string");
+      }).not.toThrow();
+
+      expect(() => {
+        assertNonEmptyString("a", "Must be non-empty string");
+      }).not.toThrow();
+    });
+
+    it("should throw for empty strings", () => {
+      expect(() => {
+        assertNonEmptyString("", "Custom error message");
+      }).toThrow("Custom error message");
+    });
+
+    it("should throw for whitespace-only strings", () => {
+      expect(() => {
+        assertNonEmptyString("  ", "Custom error message");
+      }).toThrow("Custom error message");
+
+      expect(() => {
+        assertNonEmptyString("\t\n", "Custom error message");
+      }).toThrow("Custom error message");
+    });
+
+    it("should throw for non-string values", () => {
+      expect(() => {
+        assertNonEmptyString(null, "Not a string");
+      }).toThrow("Not a string");
+
+      expect(() => {
+        assertNonEmptyString(123, "Not a string");
+      }).toThrow("Not a string");
+
+      expect(() => {
+        assertNonEmptyString({}, "Not a string");
+      }).toThrow("Not a string");
+    });
+
+    it("should throw Error instance", () => {
+      expect(() => {
+        assertNonEmptyString(null, "Test error");
+      }).toThrow(Error);
+    });
+
+    it("should narrow type after assertion", () => {
+      const value: unknown = "test";
+      assertNonEmptyString(value, "Must be non-empty string");
+      // TypeScript should know this is safe now
+      expect(value.length).toBe(4);
+    });
+  });
+
+  describe("isObject", () => {
+    it("should return true for plain objects", () => {
+      expect(isObject({})).toBe(true);
+      expect(isObject({ key: "value" })).toBe(true);
+      expect(isObject({ nested: { key: "value" } })).toBe(true);
+    });
+
+    it("should return true for object instances", () => {
+      expect(isObject(new Object())).toBe(true);
+      expect(isObject(new Date())).toBe(true);
+      expect(isObject(new Error("test"))).toBe(true);
+      expect(isObject(/regex/)).toBe(true);
+    });
+
+    it("should return true for arrays", () => {
+      expect(isObject([])).toBe(true);
+      expect(isObject([1, 2, 3])).toBe(true);
+    });
+
+    it("should return false for null", () => {
+      expect(isObject(null)).toBe(false);
+    });
+
+    it("should return false for primitives", () => {
+      expect(isObject(undefined)).toBe(false);
+      expect(isObject("string")).toBe(false);
+      expect(isObject(123)).toBe(false);
+      expect(isObject(true)).toBe(false);
+      expect(isObject(false)).toBe(false);
+    });
+
+    it("should return false for functions", () => {
+      expect(isObject(() => {})).toBe(false);
+      expect(isObject(function () {})).toBe(false);
+    });
+  });
+
+  describe("isArray", () => {
+    it("should return true for arrays", () => {
+      expect(isArray([])).toBe(true);
+      expect(isArray([1, 2, 3])).toBe(true);
+      expect(isArray(["a", "b", "c"])).toBe(true);
+      expect(isArray([{ key: "value" }])).toBe(true);
+    });
+
+    it("should return false for non-arrays", () => {
+      expect(isArray(null)).toBe(false);
+      expect(isArray(undefined)).toBe(false);
+      expect(isArray("string")).toBe(false);
+      expect(isArray(123)).toBe(false);
+      expect(isArray(true)).toBe(false);
+      expect(isArray(false)).toBe(false);
+      expect(isArray({})).toBe(false);
+      expect(isArray(() => {})).toBe(false);
+    });
+
+    it("should work with generic type parameter", () => {
+      const value: unknown = [1, 2, 3];
+      if (isArray<number>(value)) {
+        expect(value[0]).toBe(1);
+      }
+    });
+
+    it("should distinguish arrays from array-like objects", () => {
+      const arrayLike = { 0: "a", 1: "b", length: 2 };
+      expect(isArray(arrayLike)).toBe(false);
+    });
+  });
+
+  describe("hasProperty", () => {
+    it("should return true for existing properties", () => {
+      const obj = { key: "value", nested: { inner: "data" } };
+
+      expect(hasProperty(obj, "key")).toBe(true);
+      expect(hasProperty(obj, "nested")).toBe(true);
+    });
+
+    it("should return false for missing properties", () => {
+      const obj = { key: "value" };
+
+      expect(hasProperty(obj, "missing")).toBe(false);
+      expect(hasProperty(obj, "other")).toBe(false);
+    });
+
+    it("should return false for non-objects", () => {
+      expect(hasProperty(null, "prop")).toBe(false);
+      expect(hasProperty(undefined, "prop")).toBe(false);
+      expect(hasProperty("string", "prop")).toBe(false);
+      expect(hasProperty(123, "prop")).toBe(false);
+      expect(hasProperty([], "prop")).toBe(false);
+    });
+
+    it("should work with nested objects", () => {
+      const obj = { user: { name: "John", address: { city: "NYC" } } };
+
+      expect(hasProperty(obj, "user")).toBe(true);
+      expect(hasProperty(obj.user, "name")).toBe(true);
+      if (hasProperty(obj, "user") && hasProperty(obj.user, "address")) {
+        expect(hasProperty(obj.user.address, "city")).toBe(true);
+      }
+    });
+
+    it("should handle properties with falsy values", () => {
+      const obj = { zero: 0, empty: "", falsy: false, nullVal: null };
+
+      expect(hasProperty(obj, "zero")).toBe(true);
+      expect(hasProperty(obj, "empty")).toBe(true);
+      expect(hasProperty(obj, "falsy")).toBe(true);
+      expect(hasProperty(obj, "nullVal")).toBe(true);
+    });
+
+    it("should distinguish between own and inherited properties", () => {
+      const parent = { inherited: "value" };
+      const child = Object.create(parent);
+      child.own = "own value";
+
+      expect(hasProperty(child, "own")).toBe(true);
+      expect(hasProperty(child, "inherited")).toBe(true);
+    });
+
+    it("should narrow type after check", () => {
+      const value: unknown = { error: "Something went wrong" };
+
+      if (hasProperty(value, "error")) {
+        // TypeScript should narrow type to { error: unknown }
+        expect(value.error).toBe("Something went wrong");
+      }
+    });
+  });
+
+  describe("assertHasProperties", () => {
+    it("should not throw when all properties exist", () => {
+      const obj = { id: 1, name: "John", email: "john@example.com" };
+
+      expect(() => {
+        assertHasProperties(obj, ["id", "name", "email"], "Invalid object");
+      }).not.toThrow();
+    });
+
+    it("should not throw for single property", () => {
+      const obj = { id: 1 };
+
+      expect(() => {
+        assertHasProperties(obj, ["id"], "Missing id");
+      }).not.toThrow();
+    });
+
+    it("should not throw for empty properties array", () => {
+      const obj = { key: "value" };
+
+      expect(() => {
+        assertHasProperties(obj, [], "Invalid object");
+      }).not.toThrow();
+    });
+
+    it("should throw when object is not an object", () => {
+      expect(() => {
+        assertHasProperties(null, ["prop"], "Must be object");
+      }).toThrow("Must be object: Value is not an object");
+
+      expect(() => {
+        assertHasProperties("string", ["prop"], "Must be object");
+      }).toThrow("Must be object: Value is not an object");
+
+      expect(() => {
+        assertHasProperties(123, ["prop"], "Must be object");
+      }).toThrow("Must be object: Value is not an object");
+    });
+
+    it("should throw when required property is missing", () => {
+      const obj = { id: 1, name: "John" };
+
+      expect(() => {
+        assertHasProperties(obj, ["id", "email"], "Invalid user");
+      }).toThrow("Invalid user: Missing required property 'email'");
+    });
+
+    it("should throw for first missing property only", () => {
+      const obj = { id: 1 };
+
+      expect(() => {
+        assertHasProperties(obj, ["name", "email"], "Invalid");
+      }).toThrow("Invalid: Missing required property 'name'");
+    });
+
+    it("should handle properties with falsy values", () => {
+      const obj = { zero: 0, empty: "", falsy: false };
+
+      expect(() => {
+        assertHasProperties(obj, ["zero", "empty", "falsy"], "Invalid");
+      }).not.toThrow();
+    });
+
+    it("should throw Error instance", () => {
+      expect(() => {
+        assertHasProperties({}, ["prop"], "Error message");
+      }).toThrow(Error);
+    });
+
+    it("should narrow type after assertion", () => {
+      const value: unknown = { id: 1, name: "John" };
+      assertHasProperties(value, ["id", "name"], "Invalid");
+      // TypeScript should narrow to Record<string, unknown> with properties
+      expect(value.id).toBe(1);
+      expect(value.name).toBe("John");
+    });
+  });
+
+  describe("ensureError", () => {
+    it("should return Error objects as-is", () => {
+      const error = new Error("Test error");
+      const result = ensureError(error, "Fallback");
+
+      expect(result).toBe(error);
+      expect(result.message).toBe("Test error");
+    });
+
+    it("should convert strings to Error", () => {
+      const result = ensureError("Error message", "Fallback");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("Error message");
+    });
+
+    it("should extract message from error-like objects", () => {
+      const errorLike = { message: "Extracted message" };
+      const result = ensureError(errorLike, "Fallback");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("Extracted message");
+    });
+
+    it("should use fallback for unknown error types", () => {
+      const result = ensureError(42, "Fallback message");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("Fallback message");
+    });
+
+    it("should use fallback for null", () => {
+      const result = ensureError(null, "Null fallback");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("Null fallback");
+    });
+
+    it("should use fallback for undefined", () => {
+      const result = ensureError(undefined, "Undefined fallback");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("Undefined fallback");
+    });
+
+    it("should use fallback for objects without message", () => {
+      const result = ensureError({ data: "no message" }, "Fallback");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("Fallback");
+    });
+
+    it("should use fallback for objects with non-string message", () => {
+      const result = ensureError({ message: 123 }, "Fallback");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("Fallback");
+    });
+
+    it("should work with TypeError", () => {
+      const error = new TypeError("Type error");
+      const result = ensureError(error, "Fallback");
+
+      expect(result).toBe(error);
+      expect(result.message).toBe("Type error");
+    });
+
+    it("should work with custom Error subclasses", () => {
+      class CustomError extends Error {
+        constructor(message: string) {
+          super(message);
+          this.name = "CustomError";
+        }
+      }
+
+      const error = new CustomError("Custom message");
+      const result = ensureError(error, "Fallback");
+
+      expect(result).toBe(error);
+      expect(result.message).toBe("Custom message");
+    });
+
+    it("should handle empty strings", () => {
+      const result = ensureError("", "Fallback");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("");
+    });
+
+    it("should handle arrays as unknown type", () => {
+      const result = ensureError([1, 2, 3], "Array fallback");
+
+      expect(result).toBeInstanceOf(Error);
+      expect(result.message).toBe("Array fallback");
+    });
+  });
+
+  describe("safeGet", () => {
+    it("should get existing properties from objects", () => {
+      const obj = { id: 1, name: "John", email: "john@example.com" };
+
+      expect(safeGet(obj, "id")).toBe(1);
+      expect(safeGet(obj, "name")).toBe("John");
+      expect(safeGet(obj, "email")).toBe("john@example.com");
+    });
+
+    it("should return undefined for missing properties", () => {
+      const obj = { id: 1 };
+
+      expect(safeGet(obj, "name" as keyof typeof obj)).toBeUndefined();
+    });
+
+    it("should return undefined for null objects", () => {
+      expect(safeGet(null as any, "prop" as any)).toBeUndefined();
+    });
+
+    it("should return undefined for undefined objects", () => {
+      expect(safeGet(undefined as any, "prop" as any)).toBeUndefined();
+    });
+
+    it("should work with falsy property values", () => {
+      const obj = { zero: 0, empty: "", falsy: false, nullVal: null };
+
+      expect(safeGet(obj, "zero")).toBe(0);
+      expect(safeGet(obj, "empty")).toBe("");
+      expect(safeGet(obj, "falsy")).toBe(false);
+      expect(safeGet(obj, "nullVal")).toBeNull();
+    });
+
+    it("should handle nested object access", () => {
+      const config = { wallet: { address: "0x123", balance: 100 } };
+
+      expect(safeGet(config, "wallet")).toEqual({
+        address: "0x123",
+        balance: 100,
+      });
+    });
+
+    it("should safely chain access with optional chaining", () => {
+      const config = { wallet: { address: "0x123" } };
+
+      const address = safeGet(config, "wallet")?.address;
+      expect(address).toBe("0x123");
+    });
+
+    it("should handle undefined safe access", () => {
+      const config: { wallet?: { address: string } } = {};
+
+      const wallet = safeGet(config, "wallet");
+      expect(wallet).toBeUndefined();
+    });
+  });
+
+  describe("safeArrayAccess", () => {
+    it("should access valid array indices", () => {
+      const arr = [10, 20, 30, 40, 50];
+
+      expect(safeArrayAccess(arr, 0)).toBe(10);
+      expect(safeArrayAccess(arr, 2)).toBe(30);
+      expect(safeArrayAccess(arr, 4)).toBe(50);
+    });
+
+    it("should return undefined for out-of-bounds indices", () => {
+      const arr = [10, 20, 30];
+
+      expect(safeArrayAccess(arr, 5)).toBeUndefined();
+      expect(safeArrayAccess(arr, 100)).toBeUndefined();
+    });
+
+    it("should return undefined for negative indices", () => {
+      const arr = [10, 20, 30];
+
+      expect(safeArrayAccess(arr, -1)).toBeUndefined();
+      expect(safeArrayAccess(arr, -10)).toBeUndefined();
+    });
+
+    it("should return undefined for null array", () => {
+      expect(safeArrayAccess(null as any, 0)).toBeUndefined();
+    });
+
+    it("should return undefined for undefined array", () => {
+      expect(safeArrayAccess(undefined as any, 0)).toBeUndefined();
+    });
+
+    it("should work with arrays containing falsy values", () => {
+      const arr = [0, false, "", null, undefined];
+
+      expect(safeArrayAccess(arr, 0)).toBe(0);
+      expect(safeArrayAccess(arr, 1)).toBe(false);
+      expect(safeArrayAccess(arr, 2)).toBe("");
+      expect(safeArrayAccess(arr, 3)).toBeNull();
+      expect(safeArrayAccess(arr, 4)).toBeUndefined();
+    });
+
+    it("should work with arrays of objects", () => {
+      const items = [
+        { id: 1, name: "Item 1" },
+        { id: 2, name: "Item 2" },
+        { id: 3, name: "Item 3" },
+      ];
+
+      expect(safeArrayAccess(items, 0)).toEqual({ id: 1, name: "Item 1" });
+      expect(safeArrayAccess(items, 2)).toEqual({ id: 3, name: "Item 3" });
+      expect(safeArrayAccess(items, 5)).toBeUndefined();
+    });
+
+    it("should handle empty arrays", () => {
+      const arr: number[] = [];
+
+      expect(safeArrayAccess(arr, 0)).toBeUndefined();
+      expect(safeArrayAccess(arr, 1)).toBeUndefined();
+    });
+
+    it("should handle index 0 on non-empty array", () => {
+      const arr = ["first"];
+
+      expect(safeArrayAccess(arr, 0)).toBe("first");
+    });
+
+    it("should work with sparse arrays", () => {
+      const arr: (number | undefined)[] = [];
+      arr[5] = 100;
+
+      expect(safeArrayAccess(arr, 5)).toBe(100);
+      expect(safeArrayAccess(arr, 0)).toBeUndefined();
+      expect(safeArrayAccess(arr, 3)).toBeUndefined();
+    });
+  });
+
+  describe("ensureDefault", () => {
+    it("should return value when defined", () => {
+      expect(ensureDefault("hello", "default")).toBe("hello");
+      expect(ensureDefault(123, 456)).toBe(123);
+      expect(ensureDefault(true, false)).toBe(true);
+      expect(ensureDefault({}, { default: "value" })).toEqual({});
+    });
+
+    it("should return default when value is undefined", () => {
+      expect(ensureDefault(undefined, "default")).toBe("default");
+      expect(ensureDefault(undefined, 999)).toBe(999);
+    });
+
+    it("should return default when value is null", () => {
+      expect(ensureDefault(null, "default")).toBe("default");
+      expect(ensureDefault(null, 0)).toBe(0);
+    });
+
+    it("should return value for falsy but defined values", () => {
+      expect(ensureDefault(0, 99)).toBe(0);
+      expect(ensureDefault(false, true)).toBe(false);
+      expect(ensureDefault("", "default")).toBe("");
+      expect(ensureDefault([], ["default"])).toEqual([]);
+    });
+
+    it("should work with objects as values", () => {
+      const value = { id: 1, name: "Test" };
+      const defaultValue = { id: 999 };
+
+      expect(ensureDefault(value, defaultValue)).toBe(value);
+      expect(ensureDefault(null, defaultValue)).toBe(defaultValue);
+    });
+
+    it("should handle timeout configuration", () => {
+      const timeout = ensureDefault(undefined, 5000);
+      expect(timeout).toBe(5000);
+
+      const customTimeout = ensureDefault(3000, 5000);
+      expect(customTimeout).toBe(3000);
+    });
+
+    it("should preserve undefined in arrays/objects", () => {
+      const defaultArray = [1, 2, 3];
+      expect(ensureDefault(null, defaultArray)).toEqual([1, 2, 3]);
+
+      const defaultObj = { key: "value" };
+      expect(ensureDefault(undefined, defaultObj)).toEqual({ key: "value" });
+    });
+
+    it("should work with function return values", () => {
+      const getValue = (): string | undefined => undefined;
+      const value = getValue();
+      const result = ensureDefault(value, "fallback");
+      expect(result).toBe("fallback");
+    });
+
+    it("should work with zero as default", () => {
+      expect(ensureDefault(null, 0)).toBe(0);
+      expect(ensureDefault(undefined, 0)).toBe(0);
+    });
+
+    it("should work with false as default", () => {
+      expect(ensureDefault(null, false)).toBe(false);
+      expect(ensureDefault(undefined, false)).toBe(false);
+    });
+
+    it("should work with empty string as default", () => {
+      expect(ensureDefault(null, "")).toBe("");
+      expect(ensureDefault(undefined, "")).toBe("");
+    });
+  });
+
+  describe("integration tests", () => {
+    it("should compose multiple guards for validation", () => {
+      const validateUser = (user: unknown) => {
+        if (!isObject(user)) return false;
+        if (!hasProperty(user, "id")) return false;
+        if (!hasProperty(user, "name")) return false;
+        return true;
+      };
+
+      expect(validateUser({ id: 1, name: "John" })).toBe(true);
+      expect(validateUser({ id: 1 })).toBe(false);
+      expect(validateUser(null)).toBe(false);
+    });
+
+    it("should handle nullable configuration objects", () => {
+      const getConfigValue = (
+        config: { timeout?: number } | null | undefined,
+      ) => {
+        if (!isObject(config)) {
+          return 5000;
+        }
+        const timeout = safeGet(config, "timeout");
+        return ensureDefault(timeout, 5000);
+      };
+
+      expect(getConfigValue(null)).toBe(5000);
+      expect(getConfigValue(undefined)).toBe(5000);
+      expect(getConfigValue({ timeout: 3000 })).toBe(3000);
+      expect(getConfigValue({})).toBe(5000);
+    });
+
+    it("should validate and extract error messages safely", () => {
+      const handleError = (error: unknown) => {
+        const errorObj = ensureError(error, "Unknown error");
+        return isNonEmptyString(errorObj.message)
+          ? errorObj.message
+          : "No error message";
+      };
+
+      expect(handleError(new Error("Test"))).toBe("Test");
+      expect(handleError("String error")).toBe("String error");
+      expect(handleError({ message: "Object error" })).toBe("Object error");
+      expect(handleError(null)).toBe("Unknown error");
+      // Empty string message gets extracted but fails isNonEmptyString
+      expect(handleError({ message: "" })).toBe("No error message");
+    });
+
+    it("should safely access nested array data", () => {
+      const users = [
+        { id: 1, name: "Alice" },
+        { id: 2, name: "Bob" },
+        { id: 3, name: "Charlie" },
+      ];
+
+      const firstUser = safeArrayAccess(users, 0);
+      if (isDefined(firstUser) && hasProperty(firstUser, "name")) {
+        expect(firstUser.name).toBe("Alice");
+      }
+
+      expect(safeArrayAccess(users, 10)).toBeUndefined();
+      expect(safeArrayAccess(null as any, 0)).toBeUndefined();
+    });
+
+    it("should build safe data access chains", () => {
+      const response = {
+        status: 200,
+        data: {
+          items: [
+            { id: 1, value: "first" },
+            { id: 2, value: "second" },
+          ],
+        },
+      };
+
+      const items = safeGet(response, "data")?.items;
+      const firstItem = isDefined(items)
+        ? safeArrayAccess(items, 0)
+        : undefined;
+      const firstValue = isDefined(firstItem)
+        ? safeGet(firstItem, "value")
+        : undefined;
+
+      expect(firstValue).toBe("first");
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/typedDataConverter.test.ts b/packages/vana-sdk/src/utils/__tests__/typedDataConverter.test.ts
new file mode 100644
index 00000000..63aef1c1
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/typedDataConverter.test.ts
@@ -0,0 +1,524 @@
+/**
+ * Tests for typed data conversion utilities
+ *
+ * @remarks
+ * Tests conversion between Vana's GenericTypedData and viem's TypedDataDefinition formats.
+ */
+
+import { describe, it, expect } from "vitest";
+import { toViemTypedDataDefinition } from "../typedDataConverter";
+import type { GenericTypedData } from "../../types/permissions";
+import type { TypedDataDefinition } from "viem";
+
+describe("typedDataConverter", () => {
+  describe("toViemTypedDataDefinition", () => {
+    it("should convert basic typed data structure", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Permission: [
+            { name: "grantee", type: "address" },
+            { name: "operation", type: "string" },
+          ],
+        },
+        primaryType: "Permission",
+        message: {
+          grantee: "0x1234567890123456789012345678901234567890",
+          operation: "read",
+        },
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.domain).toEqual(vanaTypedData.domain);
+      expect(result.primaryType).toBe("Permission");
+      expect(result.message).toEqual(vanaTypedData.message);
+      expect(result.types.Permission).toBeDefined();
+      expect(result.types.Permission).toHaveLength(2);
+    });
+
+    it("should preserve domain fields", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "TestDApp",
+          version: "2.0",
+          chainId: 1,
+          verifyingContract: "0xabcdef1234567890abcdef1234567890abcdef12",
+        },
+        types: {
+          Test: [{ name: "value", type: "uint256" }],
+        },
+        primaryType: "Test",
+        message: { value: "100" },
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.domain).toBeDefined();
+      expect(result.domain?.name).toBe("TestDApp");
+      expect(result.domain?.version).toBe("2.0");
+      expect(result.domain?.chainId).toBe(1);
+      expect(result.domain?.verifyingContract).toBe(
+        "0xabcdef1234567890abcdef1234567890abcdef12",
+      );
+    });
+
+    it("should handle multiple type definitions", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Person: [
+            { name: "name", type: "string" },
+            { name: "wallet", type: "address" },
+          ],
+          Mail: [
+            { name: "from", type: "Person" },
+            { name: "to", type: "Person" },
+            { name: "contents", type: "string" },
+          ],
+        },
+        primaryType: "Mail",
+        message: {
+          from: { name: "Alice", wallet: "0x1111..." },
+          to: { name: "Bob", wallet: "0x2222..." },
+          contents: "Hello",
+        },
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.types.Person).toBeDefined();
+      expect(result.types.Person).toHaveLength(2);
+      expect(result.types.Mail).toBeDefined();
+      expect(result.types.Mail).toHaveLength(3);
+    });
+
+    it("should convert all field types correctly", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          AllTypes: [
+            { name: "addressField", type: "address" },
+            { name: "uint256Field", type: "uint256" },
+            { name: "uint8Field", type: "uint8" },
+            { name: "int256Field", type: "int256" },
+            { name: "boolField", type: "bool" },
+            { name: "bytes32Field", type: "bytes32" },
+            { name: "bytesField", type: "bytes" },
+            { name: "stringField", type: "string" },
+          ],
+        },
+        primaryType: "AllTypes",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      const allTypes = result.types.AllTypes as readonly {
+        name: string;
+        type: string;
+      }[];
+      expect(allTypes[0]).toEqual({ name: "addressField", type: "address" });
+      expect(allTypes[1]).toEqual({ name: "uint256Field", type: "uint256" });
+      expect(allTypes[2]).toEqual({ name: "uint8Field", type: "uint8" });
+      expect(allTypes[3]).toEqual({ name: "int256Field", type: "int256" });
+      expect(allTypes[4]).toEqual({ name: "boolField", type: "bool" });
+      expect(allTypes[5]).toEqual({ name: "bytes32Field", type: "bytes32" });
+      expect(allTypes[6]).toEqual({ name: "bytesField", type: "bytes" });
+      expect(allTypes[7]).toEqual({ name: "stringField", type: "string" });
+    });
+
+    it("should handle array types", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          ArrayTest: [
+            { name: "addresses", type: "address[]" },
+            { name: "numbers", type: "uint256[]" },
+            { name: "fixedArray", type: "bytes32[3]" },
+          ],
+        },
+        primaryType: "ArrayTest",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      const arrayTypes = result.types.ArrayTest as readonly {
+        name: string;
+        type: string;
+      }[];
+      expect(arrayTypes[0].type).toBe("address[]");
+      expect(arrayTypes[1].type).toBe("uint256[]");
+      expect(arrayTypes[2].type).toBe("bytes32[3]");
+    });
+
+    it("should handle nested custom types", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Inner: [{ name: "value", type: "uint256" }],
+          Outer: [
+            { name: "inner", type: "Inner" },
+            { name: "data", type: "string" },
+          ],
+        },
+        primaryType: "Outer",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      const outerTypes = result.types.Outer as readonly {
+        name: string;
+        type: string;
+      }[];
+      expect(outerTypes[0].type).toBe("Inner");
+      expect(result.types.Inner).toBeDefined();
+    });
+
+    it("should preserve message structure", () => {
+      const complexMessage = {
+        user: "0x1234567890123456789012345678901234567890",
+        amount: "1000000000000000000",
+        deadline: 1234567890,
+        nested: {
+          field1: "value1",
+          field2: 42,
+        },
+        array: [1, 2, 3],
+      };
+
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Test: [{ name: "value", type: "string" }],
+        },
+        primaryType: "Test",
+        message: complexMessage,
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.message).toEqual(complexMessage);
+      // Note: The converter does not deep copy the message, it's passed by reference
+      expect(result.message).toBe(complexMessage);
+    });
+
+    it("should handle empty types object", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {},
+        primaryType: "Empty",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.types).toEqual({});
+    });
+
+    it("should handle type with no fields", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Empty: [],
+        },
+        primaryType: "Empty",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.types.Empty).toBeDefined();
+      expect(result.types.Empty).toHaveLength(0);
+    });
+
+    it("should handle minimal domain", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Test",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Test: [{ name: "value", type: "string" }],
+        },
+        primaryType: "Test",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.domain).toEqual({
+        name: "Test",
+        version: "1",
+        chainId: 14800,
+        verifyingContract: "0x0000000000000000000000000000000000000000",
+      });
+    });
+
+    it("should create independent copies of type arrays", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Test: [
+            { name: "field1", type: "string" },
+            { name: "field2", type: "uint256" },
+          ],
+        },
+        primaryType: "Test",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      // Modifying the original should not affect the result
+      vanaTypedData.types.Test.push({ name: "field3", type: "address" });
+
+      expect(result.types.Test).toHaveLength(2);
+      expect(vanaTypedData.types.Test).toHaveLength(3);
+    });
+
+    it("should handle EIP-712 permission example", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "DataPortabilityPermissions",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x1234567890123456789012345678901234567890",
+        },
+        types: {
+          PermissionGrant: [
+            { name: "grantee", type: "address" },
+            { name: "fileId", type: "uint256" },
+            { name: "expiresAt", type: "uint256" },
+            { name: "serverUrl", type: "string" },
+          ],
+        },
+        primaryType: "PermissionGrant",
+        message: {
+          grantee: "0xabcdef1234567890abcdef1234567890abcdef12",
+          fileId: "42",
+          expiresAt: "1234567890",
+          serverUrl: "https://example.com",
+        },
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result).toMatchObject({
+        domain: {
+          name: "DataPortabilityPermissions",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x1234567890123456789012345678901234567890",
+        },
+        primaryType: "PermissionGrant",
+        message: {
+          grantee: "0xabcdef1234567890abcdef1234567890abcdef12",
+          fileId: "42",
+          expiresAt: "1234567890",
+          serverUrl: "https://example.com",
+        },
+      });
+
+      expect(result.types.PermissionGrant).toBeDefined();
+      expect(result.types.PermissionGrant).toHaveLength(4);
+    });
+
+    it("should handle type names with special characters", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Test",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          "Type_With-Special.Chars": [{ name: "value", type: "uint256" }],
+        },
+        primaryType: "Type_With-Special.Chars",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.types["Type_With-Special.Chars"]).toBeDefined();
+    });
+
+    it("should handle field names with underscores", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Test",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Test: [
+            { name: "_privateField", type: "uint256" },
+            { name: "public_field", type: "address" },
+            { name: "__doubleUnderscore", type: "bool" },
+          ],
+        },
+        primaryType: "Test",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      const testTypes = result.types.Test as readonly {
+        name: string;
+        type: string;
+      }[];
+      expect(testTypes[0].name).toBe("_privateField");
+      expect(testTypes[1].name).toBe("public_field");
+      expect(testTypes[2].name).toBe("__doubleUnderscore");
+    });
+
+    it("should be compatible with viem's TypedDataDefinition type", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Test: [{ name: "value", type: "string" }],
+        },
+        primaryType: "Test",
+        message: { value: "test" },
+      };
+
+      const result: TypedDataDefinition =
+        toViemTypedDataDefinition(vanaTypedData);
+
+      // If this compiles, type compatibility is verified
+      expect(result).toBeDefined();
+      expect(result.domain).toBeDefined();
+      expect(result.types).toBeDefined();
+      expect(result.message).toBeDefined();
+    });
+
+    it("should handle very long type definitions", () => {
+      const fields = Array.from({ length: 50 }, (_, i) => ({
+        name: `field${i}`,
+        type: i % 2 === 0 ? "uint256" : "string",
+      }));
+
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Test",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          LargeType: fields,
+        },
+        primaryType: "LargeType",
+        message: {},
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.types.LargeType).toHaveLength(50);
+    });
+
+    it("should handle unicode in string values", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Vana 🚀",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Test: [{ name: "message", type: "string" }],
+        },
+        primaryType: "Test",
+        message: { message: "Hello 世界! 🌍" },
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.domain?.name).toBe("Vana 🚀");
+      expect(result.message.message).toBe("Hello 世界! 🌍");
+    });
+
+    it("should preserve numeric types in message", () => {
+      const vanaTypedData: GenericTypedData = {
+        domain: {
+          name: "Test",
+          version: "1",
+          chainId: 14800,
+          verifyingContract: "0x0000000000000000000000000000000000000000",
+        },
+        types: {
+          Numbers: [
+            { name: "bigNumber", type: "uint256" },
+            { name: "smallNumber", type: "uint8" },
+          ],
+        },
+        primaryType: "Numbers",
+        message: {
+          bigNumber: 999999999999999999n,
+          smallNumber: 255,
+        },
+      };
+
+      const result = toViemTypedDataDefinition(vanaTypedData);
+
+      expect(result.message.bigNumber).toBe(999999999999999999n);
+      expect(result.message.smallNumber).toBe(255);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/wallet.test.ts b/packages/vana-sdk/src/utils/__tests__/wallet.test.ts
new file mode 100644
index 00000000..cef94350
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/wallet.test.ts
@@ -0,0 +1,606 @@
+/**
+ * Tests for wallet utility functions
+ */
+
+import { describe, it, expect } from "vitest";
+import type { Account, Address } from "viem";
+import { extractAddress, extractAddressSafe, hasAddress } from "../wallet";
+
+describe("wallet utilities", () => {
+  // Valid test address
+  const validAddress = "0x742d35Cc6634C0532925a3b844Bc9e7595f0b0Bb" as Address;
+  const validAddressLowercase =
+    "0x742d35cc6634c0532925a3b844bc9e7595f0b0bb" as Address;
+  const validAddressUppercase =
+    "0x742D35CC6634C0532925A3B844BC9E7595F0B0BB" as Address;
+  const anotherValidAddress =
+    "0x1234567890123456789012345678901234567890" as Address;
+
+  describe("extractAddress()", () => {
+    describe("valid string addresses", () => {
+      it("should extract address from valid hex string", () => {
+        const result = extractAddress(validAddress);
+        expect(result).toBe(validAddress);
+      });
+
+      it("should extract address with lowercase hex characters", () => {
+        const result = extractAddress(validAddressLowercase);
+        expect(result).toBe(validAddressLowercase);
+      });
+
+      it("should extract address with uppercase hex characters", () => {
+        const result = extractAddress(validAddressUppercase);
+        expect(result).toBe(validAddressUppercase);
+      });
+
+      it("should extract address with mixed case hex characters", () => {
+        const result = extractAddress(validAddress);
+        expect(result).toBe(validAddress);
+      });
+    });
+
+    describe("valid account objects", () => {
+      it("should extract address from simple Account object", () => {
+        const account: Account = {
+          address: validAddress,
+          type: "json-rpc",
+        };
+        const result = extractAddress(account);
+        expect(result).toBe(validAddress);
+      });
+
+      it("should extract address from Account-like object with extra properties", () => {
+        const account = {
+          address: validAddress,
+          type: "json-rpc",
+          publicKey: "0x...",
+          name: "test",
+        };
+        const result = extractAddress(account as any);
+        expect(result).toBe(validAddress);
+      });
+
+      it("should extract address from object with only address property", () => {
+        const account = { address: validAddress };
+        const result = extractAddress(account as any);
+        expect(result).toBe(validAddress);
+      });
+
+      it("should extract address from LocalAccount-like object", () => {
+        const localAccount = {
+          address: validAddress,
+          type: "local" as const,
+          signMessage: () => Promise.resolve("0x..."),
+          signTransaction: () => Promise.resolve("0x..."),
+          signTypedData: () => Promise.resolve("0x..."),
+        };
+        const result = extractAddress(localAccount as any);
+        expect(result).toBe(validAddress);
+      });
+
+      it("should handle different address values in objects", () => {
+        const account = { address: anotherValidAddress };
+        const result = extractAddress(account as any);
+        expect(result).toBe(anotherValidAddress);
+      });
+    });
+
+    describe("null/undefined inputs", () => {
+      it("should throw error for undefined account", () => {
+        expect(() => extractAddress(undefined)).toThrow("No account provided");
+      });
+
+      it("should throw error for null account", () => {
+        expect(() => extractAddress(null)).toThrow("No account provided");
+      });
+    });
+
+    describe("invalid account formats", () => {
+      it("should throw error for empty string (falsy value)", () => {
+        expect(() => extractAddress("" as any)).toThrow("No account provided");
+      });
+
+      it("should throw error for object without address property", () => {
+        const account = { notAddress: validAddress };
+        expect(() => extractAddress(account as any)).toThrow(
+          "Unable to determine wallet address from account",
+        );
+      });
+
+      it("should throw error for object with null address", () => {
+        const account = { address: null };
+        expect(() => extractAddress(account as any)).toThrow(
+          "Unable to determine wallet address from account",
+        );
+      });
+
+      it("should throw error for object with undefined address", () => {
+        const account = { address: undefined };
+        expect(() => extractAddress(account as any)).toThrow(
+          "Unable to determine wallet address from account",
+        );
+      });
+
+      it("should throw error for invalid hex address format (wrong length)", () => {
+        // Note: extractAddress doesn't validate format, but the caller should use hasAddress
+        // This test documents that extractAddress returns invalid strings as-is
+        const invalidAddress = "0x123"; // Too short
+        const account = { address: invalidAddress };
+        // extractAddress doesn't validate, it just returns the address
+        const result = extractAddress(account as any);
+        expect(result).toBe(invalidAddress);
+      });
+
+      it("should throw error for number", () => {
+        expect(() => extractAddress(123 as unknown as Address)).toThrow(
+          "Unable to determine wallet address from account",
+        );
+      });
+
+      it("should throw error for array", () => {
+        expect(() => extractAddress([] as unknown as Address)).toThrow(
+          "Unable to determine wallet address from account",
+        );
+      });
+
+      it("should throw error for boolean", () => {
+        expect(() => extractAddress(true as unknown as Address)).toThrow(
+          "Unable to determine wallet address from account",
+        );
+      });
+    });
+
+    describe("error messages", () => {
+      it("should have descriptive error message for null/undefined", () => {
+        try {
+          extractAddress(null);
+          expect.fail("Should have thrown");
+        } catch (error) {
+          expect((error as Error).message).toBe("No account provided");
+        }
+      });
+
+      it("should have descriptive error message for invalid format", () => {
+        try {
+          extractAddress({} as any);
+          expect.fail("Should have thrown");
+        } catch (error) {
+          expect((error as Error).message).toBe(
+            "Unable to determine wallet address from account",
+          );
+        }
+      });
+    });
+  });
+
+  describe("extractAddressSafe()", () => {
+    describe("valid inputs", () => {
+      it("should extract address from valid hex string", () => {
+        const result = extractAddressSafe(validAddress);
+        expect(result).toBe(validAddress);
+      });
+
+      it("should extract address from valid Account object", () => {
+        const account: Account = {
+          address: validAddress,
+          type: "json-rpc",
+        };
+        const result = extractAddressSafe(account);
+        expect(result).toBe(validAddress);
+      });
+
+      it("should extract address with various case formats", () => {
+        expect(extractAddressSafe(validAddressLowercase)).toBe(
+          validAddressLowercase,
+        );
+        expect(extractAddressSafe(validAddressUppercase)).toBe(
+          validAddressUppercase,
+        );
+        expect(extractAddressSafe(validAddress)).toBe(validAddress);
+      });
+    });
+
+    describe("invalid inputs - returns undefined instead of throwing", () => {
+      it("should return undefined for null", () => {
+        const result = extractAddressSafe(null);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for undefined", () => {
+        const result = extractAddressSafe(undefined);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for empty string", () => {
+        const result = extractAddressSafe("" as any);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for object without address property", () => {
+        const account = { notAddress: validAddress };
+        const result = extractAddressSafe(account as any);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for object with null address", () => {
+        const account = { address: null };
+        const result = extractAddressSafe(account as any);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for object with undefined address", () => {
+        const account = { address: undefined };
+        const result = extractAddressSafe(account as any);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for number", () => {
+        const result = extractAddressSafe(123 as unknown as Address);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for array", () => {
+        const result = extractAddressSafe([] as unknown as Address);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for boolean", () => {
+        const result = extractAddressSafe(true as unknown as Address);
+        expect(result).toBeUndefined();
+      });
+
+      it("should return undefined for plain object without address", () => {
+        const result = extractAddressSafe({} as any);
+        expect(result).toBeUndefined();
+      });
+    });
+
+    describe("graceful degradation", () => {
+      it("should handle partial Account objects", () => {
+        const partialAccount = { address: validAddress };
+        const result = extractAddressSafe(partialAccount as any);
+        expect(result).toBe(validAddress);
+      });
+
+      it("should be suitable for optional chaining", () => {
+        const user = { wallet: null };
+        const address = extractAddressSafe(user.wallet);
+        expect(address).toBeUndefined();
+      });
+
+      it("should work with nullish coalescing operator", () => {
+        const address =
+          extractAddressSafe(null) ??
+          "0x0000000000000000000000000000000000000000";
+        expect(address).toBe("0x0000000000000000000000000000000000000000");
+      });
+
+      it("should enable conditional logic without try-catch", () => {
+        const maybeAddress = extractAddressSafe({ invalidData: true } as any);
+        let result: string | undefined;
+        if (maybeAddress) {
+          result = maybeAddress;
+        } else {
+          result = undefined;
+        }
+        expect(result).toBeUndefined();
+      });
+    });
+  });
+
+  describe("hasAddress()", () => {
+    describe("valid Ethereum address strings", () => {
+      it("should return true for valid lowercase hex address", () => {
+        expect(hasAddress(validAddressLowercase)).toBe(true);
+      });
+
+      it("should return true for valid uppercase hex address", () => {
+        expect(hasAddress(validAddressUppercase)).toBe(true);
+      });
+
+      it("should return true for valid mixed case hex address", () => {
+        expect(hasAddress(validAddress)).toBe(true);
+      });
+
+      it("should return true for another valid address", () => {
+        expect(hasAddress(anotherValidAddress)).toBe(true);
+      });
+
+      it("should return true for address with all zeros", () => {
+        const zeroAddress =
+          "0x0000000000000000000000000000000000000000" as Address;
+        expect(hasAddress(zeroAddress)).toBe(true);
+      });
+
+      it("should return true for address with all f's", () => {
+        const maxAddress = "0xffffffffffffffffffffffffffffffffffffffff";
+        expect(hasAddress(maxAddress)).toBe(true);
+      });
+    });
+
+    describe("valid Account objects with addresses", () => {
+      it("should return true for Account object with valid address", () => {
+        const account: Account = {
+          address: validAddress,
+          type: "json-rpc",
+        };
+        expect(hasAddress(account)).toBe(true);
+      });
+
+      it("should return true for object with address property", () => {
+        const obj = { address: validAddress };
+        expect(hasAddress(obj)).toBe(true);
+      });
+
+      it("should return true for Account-like object with extra properties", () => {
+        const account = {
+          address: validAddress,
+          type: "local",
+          publicKey: "0x...",
+        };
+        expect(hasAddress(account)).toBe(true);
+      });
+
+      it("should return true for LocalAccount-like object", () => {
+        const localAccount = {
+          address: validAddress,
+          type: "local" as const,
+          signMessage: () => Promise.resolve("0x..."),
+        };
+        expect(hasAddress(localAccount)).toBe(true);
+      });
+    });
+
+    describe("invalid address formats", () => {
+      it("should return false for address without 0x prefix", () => {
+        expect(hasAddress("742d35Cc6634C0532925a3b844Bc9e7595f0b0Bb")).toBe(
+          false,
+        );
+      });
+
+      it("should return false for address with wrong hex length (too short)", () => {
+        expect(hasAddress("0x742d35Cc6634C0532925a3b844Bc9e7595f0b")).toBe(
+          false,
+        );
+      });
+
+      it("should return false for address with wrong hex length (too long)", () => {
+        expect(hasAddress("0x742d35Cc6634C0532925a3b844Bc9e7595f0b0Bb00")).toBe(
+          false,
+        );
+      });
+
+      it("should return false for address with invalid hex characters", () => {
+        expect(hasAddress("0xZZZZ35Cc6634C0532925a3b844Bc9e7595f0b0Bb")).toBe(
+          false,
+        );
+      });
+
+      it("should return false for empty string", () => {
+        expect(hasAddress("")).toBe(false);
+      });
+
+      it("should return false for string with only 0x prefix", () => {
+        expect(hasAddress("0x")).toBe(false);
+      });
+
+      it("should return false for string with spaces", () => {
+        expect(hasAddress("0x742d35Cc6634C0532925a3b844Bc9e7595f0b0B b")).toBe(
+          false,
+        );
+      });
+    });
+
+    describe("null/undefined inputs", () => {
+      it("should return false for null", () => {
+        expect(hasAddress(null)).toBe(false);
+      });
+
+      it("should return false for undefined", () => {
+        expect(hasAddress(undefined)).toBe(false);
+      });
+    });
+
+    describe("non-string/non-object inputs", () => {
+      it("should return false for number", () => {
+        expect(hasAddress(123)).toBe(false);
+      });
+
+      it("should return false for boolean", () => {
+        expect(hasAddress(true)).toBe(false);
+      });
+
+      it("should return false for array", () => {
+        expect(hasAddress([validAddress])).toBe(false);
+      });
+
+      it("should return false for symbol", () => {
+        expect(hasAddress(Symbol("address"))).toBe(false);
+      });
+    });
+
+    describe("objects without address property", () => {
+      it("should return false for empty object", () => {
+        expect(hasAddress({})).toBe(false);
+      });
+
+      it("should return false for object with different property", () => {
+        expect(hasAddress({ wallet: validAddress })).toBe(false);
+      });
+
+      it("should return false for object with null address property", () => {
+        expect(hasAddress({ address: null })).toBe(false);
+      });
+
+      it("should return false for object with undefined address property", () => {
+        expect(hasAddress({ address: undefined })).toBe(false);
+      });
+
+      it("should return false for object with non-string address property", () => {
+        expect(hasAddress({ address: 123 })).toBe(false);
+      });
+
+      it("should return false for object with number address property", () => {
+        const obj = { address: 0x742d35cc6634c0532925a3b844bc9e7595f0b0bb };
+        expect(hasAddress(obj)).toBe(false);
+      });
+
+      it("should return false for object with array address property", () => {
+        expect(hasAddress({ address: [validAddress] })).toBe(false);
+      });
+    });
+
+    describe("address format validation", () => {
+      it("should validate 0x prefix requirement", () => {
+        const addressWithoutPrefix = "742d35Cc6634C0532925a3b844Bc9e7595f0b0Bb";
+        expect(hasAddress(addressWithoutPrefix)).toBe(false);
+        expect(hasAddress(`0x${addressWithoutPrefix}`)).toBe(true);
+      });
+
+      it("should validate exactly 40 hex characters after 0x", () => {
+        const baseAddress = "742d35Cc6634C0532925a3b844Bc9e7595f0b0B";
+        expect(hasAddress(`0x${baseAddress}`)).toBe(false); // 39 chars
+        expect(hasAddress(`0x${baseAddress}b`)).toBe(true); // 40 chars
+        expect(hasAddress(`0x${baseAddress}b0`)).toBe(false); // 41 chars
+      });
+
+      it("should be case-insensitive for hex validation", () => {
+        const testCases = [
+          "0x742d35cc6634c0532925a3b844bc9e7595f0b0bb", // lowercase
+          "0x742D35CC6634C0532925A3B844BC9E7595F0B0BB", // uppercase
+          "0x742d35Cc6634C0532925a3b844Bc9e7595f0b0Bb", // mixed
+        ];
+        testCases.forEach((addr) => {
+          expect(hasAddress(addr)).toBe(true);
+        });
+      });
+
+      it("should reject invalid hex characters", () => {
+        const invalidChars = ["g", "h", "i", "j", "k", "z", "G", "X", " "];
+        invalidChars.forEach((char) => {
+          const invalidAddr = `0x7${char}2d35Cc6634C0532925a3b844Bc9e7595f0b0B`;
+          expect(hasAddress(invalidAddr)).toBe(false);
+        });
+      });
+    });
+
+    describe("type guard behavior", () => {
+      it("should work as a type guard in conditional", () => {
+        const maybeAddress: unknown = validAddress;
+        if (hasAddress(maybeAddress)) {
+          // TypeScript should narrow to Account | Address
+          const narrowed: Account | Address = maybeAddress;
+          expect(typeof narrowed).toMatch(/string|object/);
+        }
+      });
+
+      it("should work with array filter", () => {
+        const items: unknown[] = [
+          validAddress,
+          null,
+          { address: anotherValidAddress },
+          "invalid",
+          { address: null },
+        ];
+        const validItems = items.filter(hasAddress);
+        expect(validItems).toHaveLength(2);
+        expect(validItems[0]).toBe(validAddress);
+        expect(validItems[1]).toHaveProperty("address", anotherValidAddress);
+      });
+
+      it("should narrow both string and object types", () => {
+        const stringItem: unknown = validAddress;
+        const objectItem: unknown = { address: validAddress };
+
+        if (hasAddress(stringItem)) {
+          expect(typeof stringItem).toBe("string");
+        }
+
+        if (hasAddress(objectItem)) {
+          expect(typeof objectItem).toBe("object");
+        }
+      });
+    });
+  });
+
+  describe("integration tests", () => {
+    it("should use hasAddress to validate before extractAddress", () => {
+      const account: unknown = validAddress;
+      if (hasAddress(account)) {
+        const result = extractAddress(account);
+        expect(result).toBe(validAddress);
+      }
+    });
+
+    it("should use hasAddress to validate before extractAddressSafe", () => {
+      const account: unknown = { address: validAddress };
+      if (hasAddress(account)) {
+        const result = extractAddressSafe(account);
+        expect(result).toBe(validAddress);
+      }
+    });
+
+    it("should handle mixed array of accounts", () => {
+      const accounts: unknown[] = [
+        validAddress,
+        null,
+        { address: anotherValidAddress },
+        undefined,
+        "invalid",
+        { address: "0x123" },
+      ];
+
+      const validAccounts = accounts.filter(hasAddress);
+      const addresses = validAccounts.map(extractAddress);
+
+      expect(validAccounts).toHaveLength(2);
+      expect(addresses).toHaveLength(2);
+      expect(addresses).toEqual([validAddress, anotherValidAddress]);
+    });
+
+    it("should use extractAddressSafe for optional account handling", () => {
+      const userA = { account: { address: validAddress } };
+      const userB = { account: null };
+      const userC = { account: undefined };
+
+      const addrA = extractAddressSafe(userA.account as any);
+      const addrB = extractAddressSafe(userB.account);
+      const addrC = extractAddressSafe(userC.account);
+
+      expect(addrA).toBe(validAddress);
+      expect(addrB).toBeUndefined();
+      expect(addrC).toBeUndefined();
+    });
+
+    it("should handle wallet connection scenarios", () => {
+      // Scenario 1: Connected wallet returning Account
+      const connectedWallet: Account = {
+        address: validAddress,
+        type: "json-rpc",
+      };
+      expect(hasAddress(connectedWallet)).toBe(true);
+      expect(extractAddress(connectedWallet)).toBe(validAddress);
+
+      // Scenario 2: Disconnected wallet (null)
+      const disconnectedWallet = null;
+      expect(hasAddress(disconnectedWallet)).toBe(false);
+      expect(extractAddressSafe(disconnectedWallet)).toBeUndefined();
+
+      // Scenario 3: String address
+      const stringAddress = validAddress;
+      expect(hasAddress(stringAddress)).toBe(true);
+      expect(extractAddress(stringAddress)).toBe(validAddress);
+    });
+
+    it("should handle fallback address pattern", () => {
+      const primaryWallet = null;
+      const backupWallet = { address: validAddress };
+
+      const address =
+        extractAddressSafe(primaryWallet) ??
+        extractAddressSafe(backupWallet as any);
+
+      expect(address).toBe(validAddress);
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/__tests__/withEvents.test.ts b/packages/vana-sdk/src/utils/__tests__/withEvents.test.ts
new file mode 100644
index 00000000..dc1b566d
--- /dev/null
+++ b/packages/vana-sdk/src/utils/__tests__/withEvents.test.ts
@@ -0,0 +1,548 @@
+/**
+ * Tests for withEvents helpers
+ *
+ * @remarks
+ * Tests event waiting and transformation helpers for POJO-based transactions.
+ */
+
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { withEvents, txWithEvents, txForRelayed } from "../withEvents";
+import type { TransactionResult } from "../../types/operations";
+import type { TypedTransactionResult } from "../../generated/event-types";
+
+describe("withEvents", () => {
+  const mockWaitFor = vi.fn();
+
+  const mockTransactionResult: TransactionResult<
+    "DataPortabilityPermissions",
+    "addPermission"
+  > = {
+    hash: "0xabc123" as `0x${string}`,
+    from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+    contract: "DataPortabilityPermissions",
+    fn: "addPermission",
+  };
+
+  const mockTypedResult: TypedTransactionResult<
+    "DataPortabilityPermissions",
+    "addPermission"
+  > = {
+    hash: "0xabc123" as `0x${string}`,
+    from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+    contract: "DataPortabilityPermissions",
+    fn: "addPermission",
+    expectedEvents: {
+      PermissionAdded: {
+        permissionId: 1n,
+        user: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+        granteeId: 5n,
+        grant: "0xgrantdata",
+        fileIds: [42n],
+      },
+    },
+    allEvents: [
+      {
+        contractAddress: "0x2222222222222222222222222222222222222222",
+        eventName: "PermissionAdded",
+        args: {
+          permissionId: 1n,
+          user: "0x1234567890123456789012345678901234567890" as `0x${string}`,
+          granteeId: 5n,
+          grant: "0xgrantdata",
+          fileIds: [42n],
+        },
+        logIndex: 0,
+      },
+    ],
+    hasExpectedEvents: true,
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockWaitFor.mockResolvedValue(mockTypedResult);
+  });
+
+  describe("withEvents", () => {
+    it("should wait for events and apply selector", async () => {
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => {
+        return {
+          fileId: (
+            result.expectedEvents.PermissionAdded as {
+              fileIds: readonly bigint[];
+            }
+          ).fileIds[0],
+          success: true,
+        };
+      };
+
+      const result = await withEvents(
+        mockWaitFor,
+        mockTransactionResult,
+        select,
+      );
+
+      expect(mockWaitFor).toHaveBeenCalledWith(mockTransactionResult);
+      expect(result).toEqual({
+        fileId: 42n,
+        success: true,
+      });
+    });
+
+    it("should pass through typed result to selector", async () => {
+      const select = vi.fn((result) => result.hash);
+
+      await withEvents(mockWaitFor, mockTransactionResult, select);
+
+      expect(select).toHaveBeenCalledWith(mockTypedResult);
+      expect(select).toHaveReturnedWith("0xabc123");
+    });
+
+    it("should handle selector returning primitive values", async () => {
+      const select = () => 123;
+
+      const result = await withEvents(
+        mockWaitFor,
+        mockTransactionResult,
+        select,
+      );
+
+      expect(result).toBe(123);
+    });
+
+    it("should handle selector returning objects", async () => {
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => ({
+        hash: result.hash,
+        eventCount: result.allEvents.length,
+      });
+
+      const result = await withEvents(
+        mockWaitFor,
+        mockTransactionResult,
+        select,
+      );
+
+      expect(result).toEqual({
+        hash: "0xabc123",
+        eventCount: 1,
+      });
+    });
+
+    it("should handle selector returning arrays", async () => {
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => result.allEvents.map((e) => e.eventName);
+
+      const result = await withEvents(
+        mockWaitFor,
+        mockTransactionResult,
+        select,
+      );
+
+      expect(result).toEqual(["PermissionAdded"]);
+    });
+
+    it("should handle selector extracting event data", async () => {
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => {
+        const event = result.expectedEvents.PermissionAdded as unknown as {
+          fileIds: readonly bigint[];
+          user: `0x${string}`;
+        };
+        return {
+          fileId: Number(event.fileIds[0]),
+          grantee: event.user,
+        };
+      };
+
+      const result = await withEvents(
+        mockWaitFor,
+        mockTransactionResult,
+        select,
+      );
+
+      expect(result).toEqual({
+        fileId: 42,
+        grantee: "0x1234567890123456789012345678901234567890",
+      });
+    });
+
+    it("should propagate errors from waitFor", async () => {
+      mockWaitFor.mockRejectedValue(new Error("Transaction reverted"));
+
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => result.hash;
+
+      await expect(
+        withEvents(mockWaitFor, mockTransactionResult, select),
+      ).rejects.toThrow("Transaction reverted");
+    });
+
+    it("should propagate errors from selector", async () => {
+      const select = () => {
+        throw new Error("Selector failed");
+      };
+
+      await expect(
+        withEvents(mockWaitFor, mockTransactionResult, select),
+      ).rejects.toThrow("Selector failed");
+    });
+
+    it("should handle selector with no expected events", async () => {
+      const noEventResult: TypedTransactionResult<
+        "DataPortabilityPermissions",
+        "addPermission"
+      > = {
+        ...mockTypedResult,
+        expectedEvents: {},
+        hasExpectedEvents: false,
+      };
+
+      mockWaitFor.mockResolvedValue(noEventResult);
+
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => ({
+        hasEvents: result.hasExpectedEvents,
+        hash: result.hash,
+      });
+
+      const result = await withEvents(
+        mockWaitFor,
+        mockTransactionResult,
+        select,
+      );
+
+      expect(result).toEqual({
+        hasEvents: false,
+        hash: "0xabc123",
+      });
+    });
+
+    it("should work with different contract/function combinations", async () => {
+      const fileRegistryTx: TransactionResult<"DataRegistry", "addFile"> = {
+        hash: "0xdef456" as `0x${string}`,
+        from: "0x5555555555555555555555555555555555555555" as `0x${string}`,
+        contract: "DataRegistry",
+        fn: "addFile",
+      };
+
+      const fileRegistryResult: TypedTransactionResult<
+        "DataRegistry",
+        "addFile"
+      > = {
+        hash: "0xdef456" as `0x${string}`,
+        from: "0x5555555555555555555555555555555555555555" as `0x${string}`,
+        contract: "DataRegistry",
+        fn: "addFile",
+        expectedEvents: {
+          FileAdded: {
+            fileId: 99n,
+            ownerAddress:
+              "0x5555555555555555555555555555555555555555" as `0x${string}`,
+            url: "ipfs://test",
+          },
+        },
+        allEvents: [],
+        hasExpectedEvents: true,
+      };
+
+      const fileWaitFor = vi.fn().mockResolvedValue(fileRegistryResult);
+
+      const select = (
+        result: TypedTransactionResult<"DataRegistry", "addFile">,
+      ) => {
+        const event = result.expectedEvents.FileAdded as unknown as {
+          fileId: bigint;
+        };
+        return event.fileId;
+      };
+
+      const result = await withEvents(fileWaitFor, fileRegistryTx, select);
+
+      expect(result).toBe(99n);
+    });
+  });
+
+  describe("txWithEvents", () => {
+    it("should create tx result and wait for events", async () => {
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => result.hash;
+
+      const result = await txWithEvents(
+        mockWaitFor,
+        {
+          hash: "0xabc123" as `0x${string}`,
+          from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+          contract: "DataPortabilityPermissions",
+          fn: "addPermission",
+        },
+        select,
+      );
+
+      expect(mockWaitFor).toHaveBeenCalled();
+      expect(result).toBe("0xabc123");
+    });
+
+    it("should pass all fields to tx creator", async () => {
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => result.hash;
+
+      await txWithEvents(
+        mockWaitFor,
+        {
+          hash: "0xabc123" as `0x${string}`,
+          from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+          contract: "DataPortabilityPermissions",
+          fn: "addPermission",
+        },
+        select,
+      );
+
+      const callArg = mockWaitFor.mock.calls[0][0];
+      expect(callArg.hash).toBe("0xabc123");
+      expect(callArg.from).toBe("0x1111111111111111111111111111111111111111");
+      expect(callArg.contract).toBe("DataPortabilityPermissions");
+      expect(callArg.fn).toBe("addPermission");
+    });
+
+    it("should work with complex selectors", async () => {
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => ({
+        success: result.hasExpectedEvents,
+        events: result.allEvents.length,
+      });
+
+      const result = await txWithEvents(
+        mockWaitFor,
+        {
+          hash: "0xabc123" as `0x${string}`,
+          from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+          contract: "DataPortabilityPermissions",
+          fn: "addPermission",
+        },
+        select,
+      );
+
+      expect(result).toEqual({
+        success: true,
+        events: 1,
+      });
+    });
+
+    it("should propagate errors from waitFor", async () => {
+      mockWaitFor.mockRejectedValue(new Error("Wait failed"));
+
+      const select = (
+        result: TypedTransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        >,
+      ) => result.hash;
+
+      await expect(
+        txWithEvents(
+          mockWaitFor,
+          {
+            hash: "0xabc123" as `0x${string}`,
+            from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+            contract: "DataPortabilityPermissions",
+            fn: "addPermission",
+          },
+          select,
+        ),
+      ).rejects.toThrow("Wait failed");
+    });
+
+    it("should propagate errors from selector", async () => {
+      const select = () => {
+        throw new Error("Selector error");
+      };
+
+      await expect(
+        txWithEvents(
+          mockWaitFor,
+          {
+            hash: "0xabc123" as `0x${string}`,
+            from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+            contract: "DataPortabilityPermissions",
+            fn: "addPermission",
+          },
+          select,
+        ),
+      ).rejects.toThrow("Selector error");
+    });
+  });
+
+  describe("txForRelayed", () => {
+    it("should create TransactionResult POJO", () => {
+      const result = txForRelayed({
+        hash: "0xabc123" as `0x${string}`,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        contract: "DataPortabilityPermissions",
+        fn: "addPermission",
+      });
+
+      expect(result).toEqual({
+        hash: "0xabc123",
+        from: "0x1111111111111111111111111111111111111111",
+        contract: "DataPortabilityPermissions",
+        fn: "addPermission",
+      });
+    });
+
+    it("should preserve all input fields", () => {
+      const result = txForRelayed({
+        hash: "0xdef456" as `0x${string}`,
+        from: "0x2222222222222222222222222222222222222222" as `0x${string}`,
+        contract: "DataRegistry",
+        fn: "addFile",
+      });
+
+      expect(result.hash).toBe("0xdef456");
+      expect(result.from).toBe("0x2222222222222222222222222222222222222222");
+      expect(result.contract).toBe("DataRegistry");
+      expect(result.fn).toBe("addFile");
+    });
+
+    it("should return proper type for different contracts", () => {
+      const result = txForRelayed({
+        hash: "0x999" as `0x${string}`,
+        from: "0x3333333333333333333333333333333333333333" as `0x${string}`,
+        contract: "ComputeEngine",
+        fn: "registerJob",
+      });
+
+      expect(result.contract).toBe("ComputeEngine");
+      expect(result.fn).toBe("registerJob");
+    });
+
+    it("should create independent POJO instances", () => {
+      const input = {
+        hash: "0xabc123" as `0x${string}`,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        contract: "DataPortabilityPermissions" as const,
+        fn: "addPermission" as const,
+      };
+
+      const result1 = txForRelayed(input);
+      const result2 = txForRelayed(input);
+
+      expect(result1).toEqual(result2);
+      expect(result1).not.toBe(result2); // Different object instances
+    });
+  });
+
+  describe("Integration Patterns", () => {
+    it("should support typical controller usage pattern", async () => {
+      // Simulating a controller method that grants permission
+      const grantPermission = async (_fileId: number, _grantee: string) => {
+        const tx: TransactionResult<
+          "DataPortabilityPermissions",
+          "addPermission"
+        > = {
+          hash: "0xabc123" as `0x${string}`,
+          from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+          contract: "DataPortabilityPermissions",
+          fn: "addPermission",
+        };
+
+        return withEvents(mockWaitFor, tx, (result) => {
+          const event = result.expectedEvents.PermissionAdded as unknown as {
+            fileIds: readonly bigint[];
+            user: `0x${string}`;
+          };
+          return {
+            fileId: Number(event.fileIds[0]),
+            grantee: event.user,
+          };
+        });
+      };
+
+      const result = await grantPermission(
+        42,
+        "0x1234567890123456789012345678901234567890",
+      );
+
+      expect(result).toEqual({
+        fileId: 42,
+        grantee: "0x1234567890123456789012345678901234567890",
+      });
+    });
+
+    it("should support relayed transaction pattern", async () => {
+      // Step 1: Submit via relayer
+      const txResult = txForRelayed({
+        hash: "0xabc123" as `0x${string}`,
+        from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+        contract: "DataPortabilityPermissions",
+        fn: "addPermission",
+      });
+
+      // Step 2: Wait externally (user code)
+      const finalResult = await withEvents(
+        mockWaitFor,
+        txResult,
+        (result) => result.hash,
+      );
+
+      expect(finalResult).toBe("0xabc123");
+    });
+
+    it("should support immediate wait pattern with txWithEvents", async () => {
+      const result = await txWithEvents(
+        mockWaitFor,
+        {
+          hash: "0xabc123" as `0x${string}`,
+          from: "0x1111111111111111111111111111111111111111" as `0x${string}`,
+          contract: "DataPortabilityPermissions",
+          fn: "addPermission",
+        },
+        (result) => ({
+          hash: result.hash,
+          success: result.hasExpectedEvents,
+        }),
+      );
+
+      expect(result).toEqual({
+        hash: "0xabc123",
+        success: true,
+      });
+    });
+  });
+});
diff --git a/packages/vana-sdk/src/utils/ipfs.ts b/packages/vana-sdk/src/utils/ipfs.ts
index 7d95f005..e34602c8 100644
--- a/packages/vana-sdk/src/utils/ipfs.ts
+++ b/packages/vana-sdk/src/utils/ipfs.ts
@@ -5,6 +5,11 @@
  * and extracting IPFS hashes from various URL formats.
  */
 
+// @ts-expect-error - multiformats package.json exports may not resolve correctly
+import { CID } from "multiformats/cid";
+// @ts-expect-error - multiformats package.json exports may not resolve correctly
+import * as base32 from "multiformats/bases/base32";
+
 /**
  * Default IPFS gateway URL
  */
@@ -20,6 +25,15 @@ export const IPFS_GATEWAYS = [
   "https://ipfs.filebase.io/ipfs/", // Filebase - emerging reliable option
 ] as const;
 
+/**
+ * Gateways that support and prefer subdomain format for better origin isolation
+ */
+const SUBDOMAIN_GATEWAYS = new Set([
+  "https://dweb.link",
+  "https://w3s.link",
+  "https://nftstorage.link",
+]);
+
 /**
  * Check if a URL is an IPFS URL (starts with ipfs://)
  *
@@ -94,6 +108,71 @@ export function extractIpfsHash(url: string): string | null {
   return null;
 }
 
+/**
+ * Convert a CID to CIDv1 in base32 encoding (required for subdomain gateways)
+ *
+ * @param cidString - The CID string (can be CIDv0 or CIDv1)
+ * @returns CIDv1 in base32 encoding, or null if invalid
+ * @example
+ * ```ts
+ * convertToBase32CIDv1("QmHash123") // Returns: "bafybeida6ainxibwil5..."
+ * convertToBase32CIDv1("bafybeida6ainxibwil5...") // Returns: "bafybeida6ainxibwil5..."
+ * ```
+ */
+export function convertToBase32CIDv1(cidString: string): string | null {
+  try {
+    const cid = CID.parse(cidString);
+    // Convert to CIDv1 if it's CIDv0
+    const cidv1 = cid.version === 0 ? cid.toV1() : cid;
+    // Encode in base32 (case-insensitive, required for subdomain)
+    return cidv1.toString(base32.base32);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Check if a gateway supports subdomain format
+ *
+ * @param gateway - The gateway URL (e.g., "https://dweb.link/ipfs/")
+ * @returns True if the gateway supports subdomain format
+ * @internal Reserved for future use
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function supportsSubdomainFormat(gateway: string): boolean {
+  try {
+    const url = new URL(gateway);
+    const baseUrl = `${url.protocol}//${url.hostname}`;
+    return SUBDOMAIN_GATEWAYS.has(baseUrl);
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Convert a CID to a subdomain gateway URL
+ *
+ * @param cidString - The IPFS CID
+ * @param gateway - The gateway base URL (e.g., "https://dweb.link/ipfs/")
+ * @returns Subdomain URL (e.g., "https://bafybeida....ipfs.dweb.link/")
+ * @internal Reserved for future use
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function toSubdomainGatewayUrl(cidString: string, gateway: string): string | null {
+  const cidv1Base32 = convertToBase32CIDv1(cidString);
+  if (!cidv1Base32) {
+    return null;
+  }
+
+  try {
+    const url = new URL(gateway);
+    // Format: https://<cid>.ipfs.<gateway-host>/
+    return `${url.protocol}//${cidv1Base32}.ipfs.${url.hostname}/`;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * Get multiple gateway URLs for an IPFS hash (useful for fallback)
  *
diff --git a/packages/vana-sdk/src/utils/runtimeGrantFiles.ts b/packages/vana-sdk/src/utils/runtimeGrantFiles.ts
new file mode 100644
index 00000000..35e6b0c1
--- /dev/null
+++ b/packages/vana-sdk/src/utils/runtimeGrantFiles.ts
@@ -0,0 +1,141 @@
+import type {
+  RuntimePermissionParams,
+  RuntimeGrantFile,
+} from "../types/runtimePermissions";
+import { NetworkError } from "../errors";
+
+/**
+ * Creates runtime grant file structure for permission storage
+ *
+ * @remarks
+ * Similar to createGrantFile() but for runtime permissions.
+ * Constructs the JSON structure that will be stored on IPFS.
+ *
+ * @param params - Permission parameters to create the grant file from
+ * @returns Grant file object for IPFS storage
+ *
+ * @category Runtime Permissions
+ * @example
+ * ```typescript
+ * const grantFile = createRuntimeGrantFile({
+ *   datasetId: 123n,
+ *   grantee: "0x...",
+ *   task: "thinker/task:v1",
+ *   operation: "aggregate_keywords",
+ *   pricing: { price_per_file_vana: 0.1 },
+ *   endBlock: 2000000n
+ * });
+ * ```
+ */
+export function createRuntimeGrantFile(
+  params: RuntimePermissionParams,
+): RuntimeGrantFile {
+  return {
+    grantee: params.grantee,
+    task: params.task,
+    operation: params.operation,
+    pricing: {
+      price_per_file_vana: params.pricing.price_per_file_vana,
+      ...(params.pricing.minimum_price_vana && {
+        minimum_price_vana: params.pricing.minimum_price_vana,
+      }),
+      ...(params.pricing.maximum_price_vana && {
+        maximum_price_vana: params.pricing.maximum_price_vana,
+      }),
+    },
+    parameters: params.parameters || {},
+  };
+}
+
+/**
+ * Stores grant file via relayer or direct IPFS
+ *
+ * @remarks
+ * Reuses the same upload pattern as data portability grants.
+ * If relayerUrl is provided, uploads via relayer. Otherwise, requires storageManager.
+ *
+ * @param grantFile - The grant file to store
+ * @param relayerUrl - Optional URL of the relayer service
+ * @returns Promise resolving to the IPFS URL
+ * @throws {NetworkError} When the upload fails
+ *
+ * @category Runtime Permissions
+ * @example
+ * ```typescript
+ * const grantFile = createRuntimeGrantFile(params);
+ * const ipfsUrl = await storeRuntimeGrantFile(grantFile, relayerUrl);
+ * console.log(`Grant stored at: ${ipfsUrl}`);
+ * ```
+ */
+export async function storeRuntimeGrantFile(
+  grantFile: RuntimeGrantFile,
+  relayerUrl?: string,
+): Promise<string> {
+  if (relayerUrl) {
+    // Use relayer if available
+    const response = await fetch(`${relayerUrl}/upload`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(grantFile),
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new NetworkError(
+        `Failed to upload grant file via relayer: ${errorText}`,
+      );
+    }
+
+    const data = await response.json();
+    if (!data.url) {
+      throw new NetworkError("Relayer did not return a URL");
+    }
+
+    return data.url;
+  } else {
+    // Direct IPFS upload would require storageManager
+    // For now, throw error - can be implemented if needed
+    throw new Error(
+      "Direct IPFS upload not yet implemented. Use relayer or provide grantUrl.",
+    );
+  }
+}
+
+/**
+ * Retrieves grant file from IPFS
+ *
+ * @remarks
+ * Converts ipfs:// URLs to gateway URLs and fetches the grant file.
+ * Uses Pinata gateway by default.
+ *
+ * @param ipfsHash - IPFS hash or full IPFS URL
+ * @returns Promise resolving to the parsed grant file
+ * @throws {NetworkError} When the fetch fails
+ *
+ * @category Runtime Permissions
+ * @example
+ * ```typescript
+ * const permission = await sdk.runtimePermissions.getPermission(1024n);
+ * const grantFile = await retrieveRuntimeGrantFile(permission.grant);
+ * console.log(`Price: ${grantFile.pricing.price_per_file_vana} VANA`);
+ * ```
+ */
+export async function retrieveRuntimeGrantFile(
+  ipfsHash: string,
+): Promise<RuntimeGrantFile> {
+  // Convert ipfs:// to gateway URL if needed
+  const url = ipfsHash.startsWith("ipfs://")
+    ? `https://gateway.pinata.cloud/ipfs/${ipfsHash.slice(7)}`
+    : ipfsHash.startsWith("http")
+      ? ipfsHash
+      : `https://gateway.pinata.cloud/ipfs/${ipfsHash}`;
+
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new NetworkError(
+      `Failed to fetch grant file from ${url}: ${response.statusText}`,
+    );
+  }
+
+  return await response.json();
+}
diff --git a/packages/vana-sdk/src/utils/subgraphConsistency.ts b/packages/vana-sdk/src/utils/subgraphConsistency.ts
index 260a65df..a7f32c1b 100644
--- a/packages/vana-sdk/src/utils/subgraphConsistency.ts
+++ b/packages/vana-sdk/src/utils/subgraphConsistency.ts
@@ -263,7 +263,15 @@ export function addMetaToQuery(baseQuery: string): string {
     return baseQuery; // Can't parse, return as-is
   }
 
-  const insertPoint = queryMatch.index! + queryMatch[0].length;
+  const insertPoint = (() => {
+    const index = queryMatch.index;
+    if (index === undefined) {
+      throw new Error(
+        "Failed to calculate insertion point for query metadata - regex match index is undefined",
+      );
+    }
+    return index + queryMatch[0].length;
+  })();
   return (
     baseQuery.slice(0, insertPoint) +
     `