@evefrontier/dapp-kit 0.1.1 → 0.1.3

package/hooks/useSmartObject.ts

@@ -7,17 +7,15 @@ import { SmartObjectContextType } from "../types";
  *
  * Provides reactive access to the currently selected smart assembly (Smart Storage Unit,
  * Smart Turret, Smart Gate, Network Node, etc.) with automatic polling for updates.
- * The assembly ID is determined from environment variables (`VITE_ITEM_ID`)
- * or URL query parameters (`?itemId=` and `?tenant=`).
+ * The assembly ID is determined from URL query parameters (`?itemId=` and `?tenant=`)
+ * or environment variables as a Sui object ID (`VITE_OBJECT_ID`).
  *
  * @category Hooks
  * @returns Object containing assembly state and methods:
  *   - `assembly` - The transformed assembly data (or null if not loaded)
  *   - `character` - The owner character information (or null)
- *   - `selectedObjectId` - The current assembly's Sui object ID
  *   - `loading` - Boolean indicating if data is being fetched
  *   - `error` - Error message string (or null)
- *   - `setSelectedObjectId` - Function to change the selected assembly
  *   - `refetch` - Function to manually refresh assembly data
  * @throws {Error} If used outside of `EveFrontierProvider`
  *
@@ -56,14 +54,6 @@ import { SmartObjectContextType } from "../types";
  * );
  * ```
  *
- * @example Changing the selected assembly
- * ```tsx
- * const { setSelectedObjectId } = useSmartObject();
- *
- * const handleSelectAssembly = (newId: string) => {
- *   setSelectedObjectId(newId);
- * };
- * ```
  */
 export function useSmartObject(): SmartObjectContextType {
   const context = useContext(SmartObjectContext);

package/hooks/useSponsoredTransaction.ts

@@ -74,6 +74,58 @@ export class WalletNoAccountSelectedError extends Error {
   }
 }
 
+/**
+ * Error thrown when assembly ID cannot be resolved or is invalid.
+ * Assembly ID must come from the assembly object (item_id) or the URL query param (itemId), and must be a valid non-negative integer.
+ *
+ * @category Errors
+ */
+export class AssemblyIdRequiredError extends Error {
+  constructor(reason?: string) {
+    super(
+      reason ??
+        "Assembly ID is required: pass an assembly object with item_id or set the itemId query param to a valid non-negative integer",
+    );
+    this.name = "AssemblyIdRequiredError";
+  }
+}
+
+// ============================================================================
+// Assembly ID resolution
+// ============================================================================
+
+/**
+ * Resolves assembly ID to a non-negative integer from the assembly object or query param.
+ * Fails fast with {@link AssemblyIdRequiredError} if neither source provides a valid id.
+ */
+function resolveAssemblyId(
+  assemblyItemId: number | undefined,
+  queryItemId: string | null,
+): number {
+  const fromAssembly =
+    typeof assemblyItemId === "number" &&
+    Number.isInteger(assemblyItemId) &&
+    assemblyItemId >= 0
+      ? assemblyItemId
+      : undefined;
+
+  if (fromAssembly !== undefined) {
+    return fromAssembly;
+  }
+
+  if (queryItemId != null && queryItemId.trim() !== "") {
+    const parsed = parseInt(queryItemId.trim(), 10);
+    if (Number.isNaN(parsed) || parsed < 0) {
+      throw new AssemblyIdRequiredError(
+        `Query param itemId must be a non-negative integer; got "${queryItemId}"`,
+      );
+    }
+    return parsed;
+  }
+
+  throw new AssemblyIdRequiredError();
+}
+
 // ============================================================================
 // Hook Types
 // ============================================================================
@@ -87,6 +139,7 @@ export type UseSponsoredTransactionError =
   | WalletSponsoredTransactionNotSupportedError
   | WalletNotConnectedError
   | WalletNoAccountSelectedError
+  | AssemblyIdRequiredError
   | Error;
 
 /**
@@ -129,10 +182,9 @@ export type UseSponsoredTransactionMutationOptions = Omit<
  * **Input** (passed to `mutate` / `mutateAsync`):
  * - `txAction` (required) – The sponsored action to run (e.g. BRING_ONLINE, BRING_OFFLINE).
  * - `chain` (required) – Sui chain id, e.g. `"sui:testnet"` or `"sui:mainnet"`.
- * - `assembly` (required) – Full assembly object (`AssemblyType<Assemblies>`). Must include `type` and `item_id`; `item_id` falls back to the URL query param (e.g. `item_id`) when present.
+ * - `assembly` (required) – Full assembly object (`AssemblyType<Assemblies>`). Must include `type` and `item_id` (number). If `item_id` is missing or invalid, the hook falls back to the URL query param `itemId` (parsed as a non-negative integer). Fails with {@link AssemblyIdRequiredError} if neither source provides a valid id.
  * - `tenant` (optional) – Tenant ID. When omitted, the hook resolves it from the URL query param (e.g. `tenant`) with fallback to `"testevenet"`. Pass explicitly to override.
  * - `account` (optional) – Signer address. If omitted, the currently connected wallet account is used.
- * - `destination` (optional) – Additional destination payload when required by the action.
  *
  * **Output** (on success, in `data` or resolved from `mutateAsync`):
  * - `digest` (required) – Transaction digest.
@@ -152,6 +204,7 @@ export type UseSponsoredTransactionMutationOptions = Omit<
  * @throws {WalletNotConnectedError} If no wallet is connected
  * @throws {WalletNoAccountSelectedError} If no account is selected
  * @throws {WalletSponsoredTransactionNotSupportedError} If wallet doesn't support sponsored transactions
+ * @throws {AssemblyIdRequiredError} If assembly ID is missing or invalid (neither assembly.item_id nor itemId query param is a valid non-negative integer)
  *
  * @example Basic bring online transaction
  * ```tsx
@@ -235,9 +288,6 @@ export function useSponsoredTransaction({
   const queryItemId = queryParams.get(QueryParams.ITEM_ID);
   const queryTenant = queryParams.get(QueryParams.TENANT);
 
-  console.log("queryItemId", queryItemId);
-  console.log("queryTenant", queryTenant);
-
   return useMutation({
     mutationKey: [
       "evefrontier",
@@ -323,13 +373,14 @@ export function useSponsoredTransaction({
         );
       }
 
+      const assemblyId = resolveAssemblyId(args.assembly.item_id, queryItemId);
+
       const payload: SponsoredTransactionInput = {
-        txAction: args.txAction as SponsoredTransactionActions,
-        assembly: args.assembly.item_id ?? queryItemId,
+        txAction: args.txAction,
+        assembly: assemblyId,
         assemblyType: getAssemblyTypeApiString(args.assembly.type),
-        chain: args.chain as `sui:${string}`,
+        chain: args.chain,
         tenant,
-        ...(args.destination != null ? { destination: args.destination } : {}),
       };
 
       console.log("payload", payload);

package/index.ts

@@ -44,82 +44,18 @@ export * from "./utils";
 // =========================================
 // GraphQL - Query execution & helper functions
 // =========================================
-export {
-  executeGraphQLQuery,
-  getObjectByAddress,
-  getObjectWithDynamicFields,
-  getObjectWithJson,
-  getObjectOwnerAndOwnedObjectsByType,
-  getObjectAndCharacterOwner,
-  getOwnedObjectsByType,
-  getOwnedObjectsByPackage,
-  getSingletonObjectByType,
-  getObjectsByType,
-  // Character/owner resolution
-  getAssemblyWithOwner,
-} from "./graphql";
-
-// GraphQL - Query strings
-export {
-  // Core object queries
-  GET_OBJECT_BY_ADDRESS,
-  GET_OBJECT_WITH_DYNAMIC_FIELDS,
-  GET_OBJECT_WITH_JSON,
-  // Owner & ownership queries
-  GET_OBJECT_OWNER_AND_OWNED_OBJECTS_BY_TYPE,
-  GET_OBJECT_OWNER_AND_OWNED_OBJECTS_WITH_JSON,
-  GET_OWNED_OBJECTS_BY_TYPE,
-  GET_OWNED_OBJECTS_BY_PACKAGE,
-  // Singleton & type-based queries
-  GET_SINGLETON_OBJECT_BY_TYPE,
-  GET_OBJECTS_BY_TYPE,
-} from "./graphql";
-
-// GraphQL - Types
-export type {
-  // Base types
-  GraphQLResponse,
-  PageInfo,
-  // Move object types
-  MoveObjectContents,
-  DynamicFieldNode,
-  MoveObjectData,
-  // Object response types
-  SuiObjectResponse,
-  GetObjectResponse,
-  // GetObjectByAddress types
-  GetObjectByAddressResponse,
-  // GetObjectWithJson types
-  GetObjectWithJsonResponse,
-  // Owner & owned objects types
-  OwnedObjectNode,
-  AddressOwner,
-  GetObjectOwnerAndOwnedObjectsResponse,
-  // Owner & owned objects with JSON types
-  OwnedObjectNodeWithJson,
-  AddressOwnerWithJson,
-  GetObjectOwnerAndOwnedObjectsWithJsonResponse,
-  // GetOwnedObjectsByType types
-  OwnedObjectAddressNode,
-  GetOwnedObjectsByTypeResponse,
-  // GetOwnedObjectsByPackage types
-  OwnedObjectFullNode,
-  GetOwnedObjectsByPackageResponse,
-  // Singleton & type-based types
-  GetSingletonObjectByTypeResponse,
-  ObjectWithContentsNode,
-  GetObjectsByTypeResponse,
-  // EVE Frontier specific types
-  RawSuiObjectData,
-  OwnerCapData,
-  RawCharacterData,
-  CharacterInfo,
-} from "./graphql";
+export * from "./graphql";
 
 // =========================================
 // Config
 // =========================================
 export { dAppKit } from "./config/dapp-kit";
+export {
+  getEnergyConfig,
+  getFuelEfficiencyConfig,
+  getFuelEfficiencyForType,
+  getEnergyUsageForType,
+} from "./utils/config";
 
 // =========================================
 // Constants & Configuration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evefrontier/dapp-kit",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "React SDK for EVE Frontier dApps on Sui",
   "main": "index.ts",
   "author": "",

package/providers/SmartObjectProvider.tsx

@@ -25,14 +25,22 @@ import { getDatahubGameInfo } from "../utils/datahub";
 import { useConnection } from "../hooks/useConnection";
 import { SmartObjectContextType } from "../types";
 
+/** Tenant when not provided via URL ?tenant= (e.g. dev/default chain). */
+const DEFAULT_TENANT = "testevenet";
+
+/** Input for fetching object data: either itemId + tenant (derive object ID) or a Sui object ID directly.
+ * @category Types
+ */
+export type FetchObjectDataInput =
+  | { itemId: string; selectedTenant: string }
+  | { objectId: string };
+
 /** @category Providers */
 export const SmartObjectContext = createContext<SmartObjectContextType>({
   assembly: null,
-  character: null,
-  selectedObjectId: "",
+  assemblyOwner: null,
   loading: true,
   error: null,
-  setSelectedObjectId: () => {},
   refetch: async () => {},
 });
 
@@ -41,10 +49,10 @@ export const SmartObjectContext = createContext<SmartObjectContextType>({
  * It uses GraphQL queries to fetch objects on the Sui blockchain
  * from the EVE Frontier package, with optional polling for updates.
  *
- * The provider fetches both the assembly data and its owner (character) information:
+ * The provider fetches both the assembly data and its owner (assemblyOwner) information:
  * 1. Fetches assembly data with dynamic fields
  * 2. Uses owner_cap_id to resolve the Character OwnerCap
- * 3. Fetches full character data from the Character ID
+ * 3. Fetches full assemblyOwner data from the Character ID
  *
  * @category Providers
  */
@@ -52,10 +60,11 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
   const [assembly, setAssembly] = useState<AssemblyType<Assemblies> | null>(
     null,
   );
-  const [character, setCharacter] =
+  const [assemblyOwner, setAssemblyOwner] =
     useState<DetailedSmartCharacterResponse | null>(null);
   const [selectedObjectId, setSelectedObjectId] = useState<string>("");
   const [selectedTenant, setSelectedTenant] = useState<string>("");
+  const [isObjectIdDirect, setIsObjectIdDirect] = useState<boolean>(false); // Whether selectedObjectId is a Sui object ID or derived from itemId + tenant.
   const [loading, setLoading] = useState<boolean>(true);
   const [error, setError] = useState<string | null>(null);
 
@@ -64,10 +73,16 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
 
   const { isConnected } = useConnection();
 
-  // Fetch object data with owner/character info
+  // Fetch object data with owner/assemblyOwner info.
+  // Accepts either { itemId, selectedTenant } (derive Sui object ID) or { objectId } (use directly).
   const fetchObjectData = useCallback(
-    async (itemId: string, selectedTenant: string, isInitialFetch = false) => {
-      if (!itemId || !selectedTenant) return;
+    async (input: FetchObjectDataInput, isInitialFetch = false) => {
+      const hasItemId = "itemId" in input && "selectedTenant" in input;
+      if (hasItemId) {
+        if (!input.itemId || !input.selectedTenant) return;
+      } else {
+        if (!input.objectId) return;
+      }
 
       if (isInitialFetch) {
         setLoading(true);
@@ -75,24 +90,30 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
       setError(null);
 
       try {
+        const objectId = hasItemId
+          ? await getObjectId(input.itemId, input.selectedTenant)
+          : input.objectId;
         console.log(
-          "[DappKit] SmartObjectProvider: Fetching object with item ID and tenant:",
-          itemId,
-          selectedTenant,
+          "[DappKit] SmartObjectProvider: Fetching object:",
+          hasItemId
+            ? { itemId: input.itemId, selectedTenant: input.selectedTenant }
+            : { objectId },
         );
 
-        const objectId = await getObjectId(itemId, selectedTenant);
-
-        // Fetch both assembly and character data
-        const { moveObject, character: characterInfo } =
-          await getAssemblyWithOwner(objectId);
+        // Fetch both assembly and assemblyOwner data
+        const {
+          moveObject,
+          assemblyOwner: characterInfo,
+          energySource,
+          destinationGate,
+        } = await getAssemblyWithOwner(objectId);
 
         if (!moveObject) {
           console.warn(
             "[DappKit] SmartObjectProvider: Object not found or not a Move object",
           );
           setAssembly(null);
-          setCharacter(null);
+          setAssemblyOwner(null);
           setError("Object not found or not a Move object");
           return;
         }
@@ -100,7 +121,8 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
         // Create a hash of the data to check for changes
         const dataHash = JSON.stringify({
           moveObject,
-          character: characterInfo,
+          assemblyOwner: characterInfo,
+          energySource,
         });
 
         // Only update state if the data changed (optimization for polling)
@@ -125,24 +147,26 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
             );
           }
 
-          // Transform assembly with character and datahub info
+          // Transform assembly with assemblyOwner and datahub info
           const transformed = await transformToAssembly(
             objectId,
             moveObject as MoveObjectData,
             {
               character: characterInfo,
               datahubInfo,
+              energySource: energySource,
+              destinationGate: destinationGate,
             },
           );
 
           setAssembly(transformed);
 
-          // Transform and set character
+          // Transform and set assemblyOwner: owner of the assembly
           if (characterInfo) {
             const transformedCharacter = transformToCharacter(characterInfo);
-            setCharacter(transformedCharacter);
+            setAssemblyOwner(transformedCharacter);
           } else {
-            setCharacter(null);
+            setAssemblyOwner(null);
           }
         }
         setError(null);
@@ -158,56 +182,59 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
     [],
   );
 
-  // Initialize the object ID from env or query params
+  // Initialize the object ID (env or query params) and tenant (query params).
+  // Tenant comes from URL ?tenant= with fallback DEFAULT_TENANT.
   useEffect(() => {
     console.log("[DappKit] SmartObjectProvider: Checking for item ID");
 
+    const queryParams = new URLSearchParams(window.location.search);
+    const queryTenant =
+      queryParams.get(QueryParams.TENANT)?.trim() || DEFAULT_TENANT;
+
     // Check if an object ID exists in the .env file
-    const envItemId = import.meta.env.VITE_ITEM_ID;
+    const envObjectId = import.meta.env.VITE_OBJECT_ID;
 
-    if (envItemId) {
+    if (envObjectId) {
       console.log(
-        "[DappKit] SmartObjectProvider: Using item ID from env:",
-        envItemId,
+        "[DappKit] SmartObjectProvider: Using Sui object ID from env:",
+        envObjectId,
       );
-      setSelectedObjectId(envItemId);
+      setSelectedObjectId(envObjectId);
+      setSelectedTenant(queryTenant);
+      setIsObjectIdDirect(true);
       return;
     }
 
-    // Check if an object ID has been passed via query param
-    const queryParams = new URLSearchParams(window.location.search);
+    // Else, derive object ID from item ID and tenant and passed via query param
     const queryItemId = queryParams.get(QueryParams.ITEM_ID);
-    const queryTenant = queryParams.get(QueryParams.TENANT);
 
     if (queryItemId) {
       setSelectedObjectId(queryItemId);
+      setSelectedTenant(queryTenant);
+      setIsObjectIdDirect(false);
     } else {
       console.error("[DappKit] SmartObjectProvider: No object ID provided");
       setLoading(false);
     }
-
-    if (queryTenant) {
-      setSelectedTenant(queryTenant);
-    } else {
-      console.error("[DappKit] SmartObjectProvider: No tenant provided");
-    }
   }, []);
 
   // Fetch and poll for object data
   useEffect(() => {
     if (!selectedObjectId || !isConnected) {
-      if (!selectedObjectId) {
-        setLoading(false);
-      }
+      setLoading(false);
       return;
     }
 
+    const input: FetchObjectDataInput = isObjectIdDirect
+      ? { objectId: selectedObjectId }
+      : { itemId: selectedObjectId, selectedTenant };
+
     // Initial fetch
-    fetchObjectData(selectedObjectId, selectedTenant, true);
+    fetchObjectData(input, true);
 
     // Set up polling
     pollingRef.current = setInterval(() => {
-      fetchObjectData(selectedObjectId, selectedTenant, false);
+      fetchObjectData(input, false);
     }, POLLING_INTERVAL);
 
     console.log(
@@ -223,29 +250,29 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
       }
       lastDataHashRef.current = null;
     };
-  }, [selectedObjectId, isConnected, fetchObjectData]);
-
-  const handleSetSelectedObjectId = useCallback((id: string) => {
-    console.log("[DappKit] SmartObjectProvider: Setting new object ID:", id);
-    lastDataHashRef.current = null;
-    setSelectedObjectId(id);
-  }, []);
+  }, [
+    selectedObjectId,
+    selectedTenant,
+    isObjectIdDirect,
+    isConnected,
+    fetchObjectData,
+  ]);
 
   const handleRefetch = useCallback(async () => {
-    if (selectedObjectId) {
-      await fetchObjectData(selectedObjectId, selectedTenant, true);
-    }
-  }, [selectedObjectId, selectedTenant, fetchObjectData]);
+    if (!selectedObjectId) return;
+    const input: FetchObjectDataInput = isObjectIdDirect
+      ? { objectId: selectedObjectId }
+      : { itemId: selectedObjectId, selectedTenant };
+    await fetchObjectData(input, true);
+  }, [selectedObjectId, selectedTenant, isObjectIdDirect, fetchObjectData]);
 
   return (
     <SmartObjectContext.Provider
       value={{
         assembly,
-        character,
-        selectedObjectId,
+        assemblyOwner,
         loading,
         error,
-        setSelectedObjectId: handleSetSelectedObjectId,
         refetch: handleRefetch,
       }}
     >

package/types/contexts.ts

@@ -28,11 +28,9 @@ export enum SupportedWallets {
  * @category Types */
 export interface SmartObjectContextType {
   assembly: AssemblyType<Assemblies> | null;
-  character: DetailedSmartCharacterResponse | null;
-  selectedObjectId: string;
+  assemblyOwner: DetailedSmartCharacterResponse | null;
   loading: boolean;
   error: string | null;
-  setSelectedObjectId: (id: string) => void;
   refetch: () => Promise<void>;
 }
 

package/types/sponsoredTransaction.ts

@@ -54,6 +54,7 @@ export const ASSEMBLY_TYPE_API_STRING: Record<Assemblies, string> = {
   [Assemblies.NetworkNode]: "network-nodes",
   [Assemblies.Manufacturing]: "manufacturing",
   [Assemblies.Refinery]: "refineries",
+  [Assemblies.Assembly]: "assemblies",
 } as const;
 
 /** API slug for assembly type in sponsored transaction payloads (e.g. "storage-units"). */

package/types/types.ts

@@ -73,6 +73,7 @@ export enum Assemblies {
   NetworkNode = "NetworkNode",
   Manufacturing = "Manufacturing",
   Refinery = "Refinery",
+  Assembly = "Assembly",
 }
 
 /** @category Types */
@@ -86,16 +87,18 @@ export type AssemblyType<T extends Assemblies> = {
   [K in T]: K extends Assemblies.SmartStorageUnit
     ? AssemblyProperties<K> & { storage: StorageModule }
     : K extends Assemblies.SmartTurret
-    ? AssemblyProperties<K> & { turret: TurretModule }
-    : K extends Assemblies.SmartGate
-    ? AssemblyProperties<K> & { gate: GateModule }
-    : K extends Assemblies.NetworkNode
-    ? AssemblyProperties<K> & { networkNode: NetworkNodeModule }
-    : K extends Assemblies.Refinery
-    ? AssemblyProperties<K> & { refinery: RefineryModule }
-    : K extends Assemblies.Manufacturing
-    ? AssemblyProperties<K> & { manufacturing: ManufacturingModule }
-    : never;
+      ? AssemblyProperties<K> & { turret: TurretModule }
+      : K extends Assemblies.SmartGate
+        ? AssemblyProperties<K> & { gate: GateModule }
+        : K extends Assemblies.NetworkNode
+          ? AssemblyProperties<K> & { networkNode: NetworkNodeModule }
+          : K extends Assemblies.Refinery
+            ? AssemblyProperties<K> & { refinery: RefineryModule }
+            : K extends Assemblies.Manufacturing
+              ? AssemblyProperties<K> & { manufacturing: ManufacturingModule }
+              : K extends Assemblies.Assembly
+                ? AssemblyProperties<K>
+                : never;
 }[T];
 
 // =========================================
@@ -111,3 +114,42 @@ export interface DetailedSmartCharacterResponse {
   smartAssemblies: Assemblies[];
   portrait: string;
 }
+
+// =========================================
+// Datahub Game Info
+// =========================================
+
+/**
+ * Game item/type information from the EVE Frontier Datahub API.
+ *
+ * Contains metadata about items, assemblies, and other game objects
+ * including display names, descriptions, icons, and physical properties.
+ *
+ * @category Types
+ */
+export interface DatahubGameInfo {
+  /** The type ID (matches on-chain type_id) */
+  id: number;
+  /** Display name of the item/type */
+  name: string;
+  /** Description text */
+  description: string;
+  /** Mass in kg */
+  mass: number;
+  /** Radius in meters */
+  radius: number;
+  /** Volume in cubic meters */
+  volume: number;
+  /** Portion size for stacking */
+  portionSize: number;
+  /** Category group name (e.g., "Structures") */
+  groupName: string;
+  /** Category group ID */
+  groupId: number;
+  /** Top-level category name */
+  categoryName: string;
+  /** Top-level category ID */
+  categoryId: number;
+  /** URL to the item's icon image */
+  iconUrl: string;
+}