@evefrontier/dapp-kit 0.1.1 → 0.1.2

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evefrontier/dapp-kit",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "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: "",
   loading: true,
   error: null,
-  setSelectedObjectId: () => {},
   refetch: async () => {},
 });
 
@@ -56,6 +64,7 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
     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/character 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,17 +90,22 @@ 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);
+        const {
+          moveObject,
+          character: characterInfo,
+          energySource,
+        } = await getAssemblyWithOwner(objectId);
 
         if (!moveObject) {
           console.warn(
@@ -101,6 +121,7 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
         const dataHash = JSON.stringify({
           moveObject,
           character: characterInfo,
+          energySource,
         });
 
         // Only update state if the data changed (optimization for polling)
@@ -132,6 +153,7 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
             {
               character: characterInfo,
               datahubInfo,
+              energySource: energySource,
             },
           );
 
@@ -158,39 +180,40 @@ 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
@@ -202,12 +225,16 @@ const SmartObjectProvider = ({ children }: { children: ReactNode }) => {
       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,
         loading,
         error,
-        setSelectedObjectId: handleSetSelectedObjectId,
         refetch: handleRefetch,
       }}
     >

package/types/contexts.ts

@@ -29,10 +29,8 @@ export enum SupportedWallets {
 export interface SmartObjectContextType {
   assembly: AssemblyType<Assemblies> | null;
   character: DetailedSmartCharacterResponse | null;
-  selectedObjectId: string;
   loading: boolean;
   error: string | null;
-  setSelectedObjectId: (id: string) => void;
   refetch: () => Promise<void>;
 }
 

package/utils/transforms.ts

@@ -41,6 +41,8 @@ export interface TransformOptions {
   character?: CharacterInfo | null;
   /** Pre-fetched datahub game info (name, description, image) */
   datahubInfo?: DatahubGameInfo | null;
+  /** Energy source information */
+  energySource?: RawSuiObjectData | null;
 }
 
 /**
@@ -86,6 +88,9 @@ export async function transformToAssembly(
 
   // Use pre-fetched datahub info for defaults
   const datahubInfo = options?.datahubInfo;
+  const energySource = options?.energySource;
+
+  const parentState = parseStatus(energySource?.status?.status?.["@variant"]);
 
   const baseAssembly = {
     id: rawData.id || objectId,
@@ -94,6 +99,7 @@ export async function transformToAssembly(
     name: rawData.metadata?.name || "",
     description: rawData.metadata?.description || "",
     dappURL: rawData.metadata?.url || "",
+    energySourceId: energySource?.id || rawData.energy_source_id || "", // Parent network node ID
     state,
     typeId: parseInt(typeId, 10) || 0,
     energyUsage: 0,
@@ -107,6 +113,7 @@ export async function transformToAssembly(
     character: options?.character || undefined,
     // Include raw data for debugging/extension
     _raw: moveObject,
+    _options: options,
   };
 
   // Add module-specific data based on assembly type
@@ -141,7 +148,7 @@ export async function transformToAssembly(
             items: inventoryItems,
           },
           ephemeralInventories: [],
-          isParentNodeOnline: state === State.ONLINE,
+          isParentNodeOnline: parentState === State.ONLINE,
         },
       } as AssemblyType<Assemblies.SmartStorageUnit>;
 
@@ -149,7 +156,7 @@ export async function transformToAssembly(
       return {
         ...baseAssembly,
         turret: {
-          isParentNodeOnline: state === State.ONLINE,
+          isParentNodeOnline: parentState === State.ONLINE,
         },
       } as AssemblyType<Assemblies.SmartTurret>;
 
@@ -158,9 +165,9 @@ export async function transformToAssembly(
         ...baseAssembly,
         gate: {
           linked: false,
-          destinationId: undefined,
+          destinationId: rawData.linked_gate_id,
           inRange: [],
-          isParentNodeOnline: state === State.ONLINE,
+          isParentNodeOnline: parentState === State.ONLINE,
         },
       } as AssemblyType<Assemblies.SmartGate>;
 

package/vite-env.d.ts

@@ -5,8 +5,8 @@ interface ImportMetaEnv {
   readonly VITE_SUI_GRAPHQL_ENDPOINT: string;
   /** EVE World package ID on Sui (required) */
   readonly VITE_EVE_WORLD_PACKAGE_ID: string;
-  /** Optional smart assembly item ID override */
-  readonly VITE_ITEM_ID?: string;
+  /** Optional smart assembly Sui object ID override */
+  readonly VITE_OBJECT_ID?: string;
 }
 
 interface ImportMeta {

package/wallet/features.ts

@@ -42,8 +42,6 @@ export interface SponsoredTransactionInput {
   assemblyType: SponsoredTransactionAssemblyType;
   /** The Sui chain to execute on (e.g., "sui:testnet", "sui:mainnet") */
   chain: `sui:${string}`;
-  /** Additional properties */
-  [key: string]: unknown;
 }
 
 /** Sponsored tx args with assembly object; id and assemblyType are derived. Tenant is optional; the hook resolves it from args, URL query param, or default. */
@@ -54,6 +52,8 @@ export type SponsoredTransactionArgs = Omit<
   assembly: AssemblyType<Assemblies>;
   account?: string;
   tenant?: string;
+  txAction: SponsoredTransactionActions;
+  chain: `sui:${string}`;
 };
 
 /**