refactor + knip + prettier

.knip.json

@@ -6,7 +6,7 @@
     "**/vitest**",
     "client/apps/game/src/setupTests.ts",
 
-    "client/sdk/packages/**",
+    "packages/**",
 
     "**/**__test__**/**",
     "**/**__tests__**/**",
@@ -21,6 +21,11 @@
     "client/apps/game-docs/docs/**",
     "client/apps/game-docs/vocs.config.ts",
 
-    "client/apps/game/src/ui/modules/chat/**"
+    "client/apps/game/src/ui/modules/chat/**",
+
+    "config/**",
+    "contracts/**",
+
+    "**/global.d.ts"
   ]
 }

client/apps/game-docs/.gitignore

@@ -1 +1,3 @@
-dist/
+dist/
+node_modules/
+vocs.config.ts.timestamp-*.mjs

client/apps/game-docs/docs/components/QuestRewards.tsx

@@ -1,3 +1,4 @@
+import { ETERNUM_CONFIG } from "@/utils/config";
 import { QuestType, findResourceById } from "@bibliothecadao/eternum";
 import { addSpacesBeforeCapitals, formatAmount } from "../utils/formatting";
 import ResourceIcon from "./ResourceIcon";

client/apps/game-docs/docs/components/ResourceTable.tsx

@@ -1,24 +1,22 @@
-import {
-  findResourceById,
-  RESOURCE_PRODUCTION_INPUT_RESOURCES,
-  RESOURCE_PRODUCTION_OUTPUT_AMOUNTS,
-  ResourcesIds,
-} from "@bibliothecadao/eternum";
+import { ETERNUM_CONFIG } from "@/utils/config";
+import { findResourceById, RESOURCE_PRECISION, ResourcesIds } from "@bibliothecadao/eternum";
 import { useMemo } from "react";
 import ResourceIcon from "./ResourceIcon";
 
+const eternumConfig = ETERNUM_CONFIG();
+
 export default function ResourceTable() {
   const resourceTable = useMemo(() => {
     const resources = [];
-    for (const resourceId of Object.keys(RESOURCE_PRODUCTION_INPUT_RESOURCES) as unknown as ResourcesIds[]) {
+    for (const resourceId of Object.keys(eternumConfig.resources.resourceInputs) as unknown as ResourcesIds[]) {
       if (resourceId === ResourcesIds.Lords) continue;
       const calldata = {
         resource: findResourceById(Number(resourceId)),
-        amount: RESOURCE_PRODUCTION_OUTPUT_AMOUNTS[resourceId],
+        amount: eternumConfig.resources.resourceInputs[resourceId],
         resource_type: resourceId,
-        cost: RESOURCE_PRODUCTION_INPUT_RESOURCES[resourceId].map((cost: any) => ({
+        cost: eternumConfig.resources.resourceInputs[resourceId].map((cost: any) => ({
           ...cost,
-          amount: cost.amount * ETERNUM_CONFIG().resources.resourcePrecision,
+          amount: cost.amount * RESOURCE_PRECISION,
           name: findResourceById(cost.resource)?.trait || "",
         })),
       };

client/apps/game-docs/docs/components/TroopsTable.tsx

@@ -1,7 +1,10 @@
+import { ETERNUM_CONFIG } from "@/utils/config";
 import { ResourcesIds, TROOPS_FOOD_CONSUMPTION, TROOPS_STAMINAS, findResourceById } from "@bibliothecadao/eternum";
 import { formatAmount, formatNumberWithSpaces } from "../utils/formatting";
 import ResourceIcon from "./ResourceIcon";
 
+const eternumConfig = ETERNUM_CONFIG();
+
 type TroopId = keyof typeof TROOPS_STAMINAS;
 
 export default function TroopsTable() {
@@ -61,12 +64,12 @@ export default function TroopsTable() {
               <div className="grid grid-cols-3 gap-2">
                 <div className="text-left">
                   <div>Travel</div>
-                  <div className="text-gray-400">{formatNumberWithSpaces(ETERNUM_CONFIG().stamina.travelCost)}</div>
+                  <div className="text-gray-400">{formatNumberWithSpaces(eternumConfig.stamina.travelCost)}</div>
                 </div>
 
                 <div className="text-left">
                   <div>Explore</div>
-                  <div className="text-gray-400">{formatNumberWithSpaces(ETERNUM_CONFIG().stamina.exploreCost)}</div>
+                  <div className="text-gray-400">{formatNumberWithSpaces(eternumConfig.stamina.exploreCost)}</div>
                 </div>
 
                 <div className="flex justify-center items-center mt-4">

client/apps/game-docs/docs/utils/config.ts

@@ -0,0 +1,7 @@
+import { Chain, getConfigFromNetwork } from "@config";
+import { env } from "../../env";
+
+export const ETERNUM_CONFIG = () => {
+  const config = getConfigFromNetwork(env.VITE_PUBLIC_CHAIN! as Chain);
+  return config;
+};

client/apps/game-docs/docs/utils/formatting.tsx → client/apps/game-docs/docs/utils/formatting.ts

@@ -1,3 +1,5 @@
+import { RESOURCE_PRECISION } from "@bibliothecadao/eternum";
+
 export function addSpacesBeforeCapitals(str: string): string {
   return str.replace(/([A-Z])/g, " $1").trim();
 }
@@ -8,11 +10,11 @@ export function formatNumberWithSpaces(number: number): string {
 
 export const formatAmount = (amount: number) => {
   if (amount < 1) {
-    return `${amount * ETERNUM_CONFIG().resources.resourcePrecision}`;
-  } else if (amount < ETERNUM_CONFIG().resources.resourcePrecision) {
+    return `${amount * RESOURCE_PRECISION}`;
+  } else if (amount < RESOURCE_PRECISION) {
     return `${amount.toFixed(amount % 1 === 0 ? 0 : (amount % 1) % 0.1 === 0 ? 1 : 2)}K`;
   } else {
-    return `${(amount / ETERNUM_CONFIG().resources.resourcePrecision).toFixed(amount % ETERNUM_CONFIG().resources.resourcePrecision === 0 ? 0 : (amount % ETERNUM_CONFIG().resources.resourcePrecision) % 10 === 0 ? 1 : 2)}M`;
+    return `${(amount / RESOURCE_PRECISION).toFixed(amount % RESOURCE_PRECISION === 0 ? 0 : (amount % RESOURCE_PRECISION) % 10 === 0 ? 1 : 2)}M`;
   }
 };
 
@@ -31,5 +33,5 @@ export function formatNumberWithCommas(number: number): string {
 }
 
 export const currencyFormat = (num: number, decimals: number): string => {
-  return formatNumber(num / ETERNUM_CONFIG().resources.resourcePrecision, decimals);
+  return formatNumber(num / RESOURCE_PRECISION, decimals);
 };

client/apps/game-docs/env.ts

@@ -0,0 +1,3 @@
+export const env = {
+  VITE_PUBLIC_CHAIN: process.env.VITE_PUBLIC_CHAIN || "mainnet",
+} as const;

client/apps/game-docs/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "jsx": "preserve",
+    "paths": {
+      "@/*": ["./docs/*"],
+      "@config/*": ["../../../config/utils/utils/*"],
+      "@config": ["../../../config/utils/utils"]
+    },
+    "baseUrl": ".",
+    "skipLibCheck": true
+  },
+  "include": ["**/*.ts", "**/*.tsx", "**/*.md", "**/*.mdx"],
+  "exclude": ["node_modules"]
+}

client/apps/game-docs/vocs.config.ts

@@ -21,6 +21,7 @@ export default defineConfig({
     resolve: {
       alias: {
         "@": path.resolve(__dirname, "./docs"),
+        "@config": path.resolve(__dirname, "../../../config/utils/utils"),
       },
     },
     publicDir: "../../common/public",

client/apps/game/dojoConfig.ts

@@ -1,5 +1,5 @@
 import { ETERNUM_CONFIG } from "@/utils/config";
-import { Chain, getGameManifest } from "@config";
+import { Chain, getGameManifest } from "@contracts";
 import { createDojoConfig } from "@dojoengine/core";
 import { env } from "./env";
 
@@ -14,7 +14,7 @@ const {
   VITE_PUBLIC_CHAIN,
 } = env;
 
-const manifest = await getGameManifest(VITE_PUBLIC_CHAIN! as Chain);
+const manifest = getGameManifest(VITE_PUBLIC_CHAIN! as Chain);
 
 export const dojoConfig = createDojoConfig({
   rpcUrl: VITE_PUBLIC_NODE_URL,
@@ -28,6 +28,6 @@ export const dojoConfig = createDojoConfig({
   manifest,
 });
 
-const config = await ETERNUM_CONFIG();
+const config = ETERNUM_CONFIG();
 console.log("logging eternum configuration json from file");
 console.log({ config });

client/apps/game/src/dojo/debounced-queries.ts

@@ -6,7 +6,6 @@ import {
   getEntitiesFromTorii,
   getMarketFromTorii,
   getOneKeyModelbyRealmEntityIdFromTorii,
-  getTwoKeyModelbyRealmEntityIdFromTorii,
 } from "./queries";
 
 // Queue class to manage requests
@@ -53,19 +52,6 @@ class RequestQueue {
 const subscriptionQueue = new RequestQueue();
 const marketQueue = new RequestQueue();
 
-export const debouncedTwoKeyEntitiesFromTorii = debounce(
-  async <S extends Schema>(
-    client: ToriiClient,
-    components: Component<S, Metadata, undefined>[],
-    entityID: string[],
-    onComplete?: () => void,
-  ) => {
-    await subscriptionQueue.add(() => getTwoKeyModelbyRealmEntityIdFromTorii(client, components, entityID), onComplete);
-  },
-  250,
-  { leading: true },
-);
-
 export const debouncedGetOneKeyEntitiesByRealmEntityIdFromTorii = debounce(
   async <S extends Schema>(
     client: ToriiClient,

client/apps/game/src/dojo/queries.ts

@@ -4,35 +4,6 @@ import { Component, Metadata, Schema } from "@dojoengine/recs";
 import { getEntities } from "@dojoengine/state";
 import { PatternMatching, ToriiClient } from "@dojoengine/torii-client";
 import { LogicalOperator } from "@dojoengine/torii-wasm";
-// on hexception -> fetch below queries based on entityID
-
-export const getTwoKeyModelbyRealmEntityIdFromTorii = async <S extends Schema>(
-  client: ToriiClient,
-  components: Component<S, Metadata, undefined>[],
-  entityID: string[],
-) => {
-  await getEntities(
-    client,
-    {
-      Composite: {
-        operator: "Or",
-        clauses: [
-          ...entityID.map((id) => ({
-            Keys: {
-              keys: [id, undefined],
-              pattern_matching: "VariableLen" as PatternMatching,
-              models: ["s1_eternum-BuildingQuantityv2"],
-            },
-          })),
-        ],
-      },
-    },
-    components,
-    [],
-    ["s1_eternum-BuildingQuantityv2"],
-    20_000,
-  );
-};
 
 export const getOneKeyModelbyRealmEntityIdFromTorii = async <S extends Schema>(
   client: ToriiClient,

client/apps/game/src/hooks/context/policies.ts

@@ -714,5 +714,4 @@ export const policies: ContractPolicies = {
       },
     ],
   },
-
 };

client/apps/game/src/hooks/context/starknet-provider.tsx

@@ -13,7 +13,7 @@ enum StarknetChainId {
   SN_SEPOLIA = "0x534e5f5345504f4c4941",
 }
 
-const resourceAddresses = await getResourceAddresses();
+const resourceAddresses = getResourceAddresses();
 
 const LORDS = resourceAddresses["LORDS"][1].toString();
 const otherResources = Object.entries(resourceAddresses)

client/apps/game/src/hooks/helpers/use-quests.ts

@@ -1,18 +1,12 @@
 import { useUIStore } from "@/hooks/store/use-ui-store";
-import { Prize, QuestType } from "@bibliothecadao/eternum";
+import { Prize, QuestStatus, QuestType } from "@bibliothecadao/eternum";
 import { useDojo } from "@bibliothecadao/react";
 import { useEntityQuery } from "@dojoengine/react";
 import { getComponentValue, HasValue } from "@dojoengine/recs";
 import { getEntityIdFromKeys } from "@dojoengine/utils";
 import { useMemo } from "react";
 import { QUEST_DETAILS } from "./use-starting-tutorial";
 
-export enum QuestStatus {
-  InProgress,
-  Completed,
-  Claimed,
-}
-
 export const useQuests = () => {
   const questStatus = useQuestClaimStatus();
 

client/apps/game/src/three/managers/biome.ts

@@ -6,13 +6,12 @@ import * as THREE from "three";
 const MAP_AMPLITUDE = FixedTrait.fromInt(60n);
 const MOISTURE_OCTAVE = FixedTrait.fromInt(2n);
 const ELEVATION_OCTAVES = [
-  FixedTrait.fromInt(1n),  // 1
-  FixedTrait.fromRatio(1n, 4n),  // 0.25
-  FixedTrait.fromRatio(1n, 10n)  // 0.1
+  FixedTrait.fromInt(1n), // 1
+  FixedTrait.fromRatio(1n, 4n), // 0.25
+  FixedTrait.fromRatio(1n, 10n), // 0.1
 ];
 const ELEVATION_OCTAVES_SUM = ELEVATION_OCTAVES.reduce((a, b) => a.add(b), FixedTrait.ZERO);
 
-
 export enum BiomeType {
   DeepOcean = "DeepOcean",
   Ocean = "Ocean",
@@ -29,7 +28,7 @@ export enum BiomeType {
   TemperateRainForest = "TemperateRainForest",
   SubtropicalDesert = "SubtropicalDesert",
   TropicalSeasonalForest = "TropicalSeasonalForest",
-  TropicalRainForest = "TropicalRainForest"
+  TropicalRainForest = "TropicalRainForest",
 }
 
 export const BIOME_COLORS: Record<BiomeType, THREE.Color> = {
@@ -91,11 +90,13 @@ export class Biome {
     return elevation.div(octavesSum).div(FixedTrait.fromInt(100n));
   }
 
-
   private calculateMoisture(col: number, row: number, mapAmplitude: Fixed, moistureOctave: Fixed): Fixed {
     const moistureX = moistureOctave.mul(FixedTrait.fromInt(BigInt(col))).div(mapAmplitude);
     const moistureZ = moistureOctave.mul(FixedTrait.fromInt(BigInt(row))).div(mapAmplitude);
-    const noise = snoise(Vec3.new(moistureX, FixedTrait.ZERO, moistureZ)).add(FixedTrait.ONE).mul(FixedTrait.fromInt(100n)).div(FixedTrait.fromInt(2n));
+    const noise = snoise(Vec3.new(moistureX, FixedTrait.ZERO, moistureZ))
+      .add(FixedTrait.ONE)
+      .mul(FixedTrait.fromInt(100n))
+      .div(FixedTrait.fromInt(2n));
     return FixedTrait.floor(noise).div(FixedTrait.fromInt(100n));
   }
 

client/apps/game/src/ui/components/worldmap/armies/selected-army.tsx

@@ -17,7 +17,7 @@ export const SelectedArmy = () => {
   return <SelectedArmyContent selectedHex={selectedHex} />;
 };
 
-export const SelectedArmyContent = ({ selectedHex }: { selectedHex: HexPosition }) => {
+const SelectedArmyContent = ({ selectedHex }: { selectedHex: HexPosition }) => {
   const selectedEntityId = useUIStore((state) => state.armyActions.selectedEntityId);
   const updateSelectedEntityId = useUIStore((state) => state.updateSelectedEntityId);
 

client/apps/game/src/ui/modules/onboarding/steps.tsx

@@ -102,7 +102,7 @@ export const SettleRealm = ({ onPrevious }: { onPrevious: () => void }) => {
         owner: account.address,
         frontend: env.VITE_PUBLIC_CLIENT_FEE_RECIPIENT,
         signer: account,
-        season_pass_address: await getSeasonPassAddress(),
+        season_pass_address: getSeasonPassAddress(),
       });
       setSelectedRealms([]);
       onPrevious();

client/apps/game/src/ui/modules/rewards/rewards.tsx

@@ -40,7 +40,7 @@ export const Rewards = () => {
 
   useEffect(() => {
     const init = async () => {
-      const address = await getLordsAddress();
+      const address = getLordsAddress();
       setLordsAddress(address);
     };
     init();
@@ -83,7 +83,7 @@ export const Rewards = () => {
   }, [leaderboardManager]);
 
   const claimRewards = useCallback(async () => {
-    const lordsAddress = await getLordsAddress();
+    const lordsAddress = getLordsAddress();
     setIsLoading(true);
     try {
       await claim_leaderboard_rewards({

client/apps/game/src/utils/addresses.ts

@@ -1,19 +1,15 @@
-import { Chain, getSeasonAddresses } from "@config";
+import { Chain, getSeasonAddresses } from "@contracts";
 import { env } from "../../env";
 
-export const getResourceAddresses = async () => {
-  const addresses = (await getSeasonAddresses(env.VITE_PUBLIC_CHAIN as Chain)).resources;
+export const getResourceAddresses = () => {
+  const addresses = getSeasonAddresses(env.VITE_PUBLIC_CHAIN as Chain).resources;
   return addresses;
 };
 
-export const getSeasonPassAddress = async () => {
-  return (await getSeasonAddresses(env.VITE_PUBLIC_CHAIN as Chain)).seasonPass;
+export const getSeasonPassAddress = () => {
+  return getSeasonAddresses(env.VITE_PUBLIC_CHAIN as Chain).seasonPass;
 };
 
-export const getLordsAddress = async () => {
-  return (await getSeasonAddresses(env.VITE_PUBLIC_CHAIN as Chain)).lords;
-};
-
-export const getRealmsAddress = async () => {
-  return (await getSeasonAddresses(env.VITE_PUBLIC_CHAIN as Chain)).realms;
+export const getLordsAddress = () => {
+  return getSeasonAddresses(env.VITE_PUBLIC_CHAIN as Chain).lords;
 };