BibliothecaDAO · ponderingdemocritus · Dec 11, 2024 · Dec 8, 2024 · Dec 10, 2024 · Dec 10, 2024
diff --git a/.github/workflows/test-contracts.yml b/.github/workflows/test-contracts.yml
@@ -51,7 +51,7 @@ jobs:
     steps:
       - name: Download Dojo release artifact
         run: |
-          curl -L -o dojo-linux-x86_64.tar.gz https://github.com/dojoengine/dojo/releases/download/v1.0.3/dojo_v1.0.3_linux_amd64.tar.gz
+          curl -L -o dojo-linux-x86_64.tar.gz https://github.com/dojoengine/dojo/releases/download/v1.0.5/dojo_v1.0.5_linux_amd64.tar.gz
           tar -xzf dojo-linux-x86_64.tar.gz
           sudo mv sozo /usr/local/bin/
       - name: Checkout repository

diff --git a/.knip.json b/.knip.json
@@ -12,6 +12,8 @@
 
     "sdk/packages/eternum/global.d.ts",
     "config/bank/index.ts",
+    "config/speed.ts",
+
     "**/**__test__**/**",
     "**/**__tests__**/**",
 
@@ -24,6 +26,10 @@
     "landing/**",
     "client/pwa-assets.config.ts",
 
+    "docs/components/**",
+    "docs/utils/**",
+    "vocs.config.ts",
+
     "client/src/ui/modules/chat/types.tsx",
     "client/src/ui/modules/chat/constants.tsx",
     "client/src/ui/modules/chat/ChatTab.tsx",

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 scarb 2.8.4
-dojo 1.0.3
+dojo 1.0.5
diff --git a/client/.env.preview b/client/.env.preview
@@ -3,19 +3,19 @@ VITE_PUBLIC_MASTER_PRIVATE_KEY=0x075362a844768f31c8058ce31aec3dd7751686440b4f220
 VITE_PUBLIC_WORLD_ADDRESS="0x00fd85ef42eaed3b90d02d2cdc7417d6cae189ff4ba876aa5608551afbf1fb47"
 VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
 VITE_PUBLIC_FEE_TOKEN_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
-VITE_PUBLIC_TORII=https://api.cartridge.gg/x/sepolia-rc-16/torii
+VITE_PUBLIC_TORII=https://api.cartridge.gg/x/sepolia-rc-17/torii
 VITE_PUBLIC_NODE_URL=https://api.cartridge.gg/x/starknet/sepolia
 VITE_PUBLIC_DEV=false
 VITE_PUBLIC_GAME_VERSION="v1.0.0-rc7"
 VITE_PUBLIC_SHOW_FPS=false
 VITE_PUBLIC_GRAPHICS_DEV=false
-VITE_PUBLIC_TORII_RELAY=/dns4/api.cartridge.gg/tcp/443/x-parity-wss/%2Fx%2Fsepolia-rc-16%2Ftorii%2Fwss
+VITE_PUBLIC_TORII_RELAY=/dns4/api.cartridge.gg/tcp/443/x-parity-wss/%2Fx%2Fsepolia-rc-17%2Ftorii%2Fwss
 VITE_SEASON_PASS_ADDRESS=0x23cc88996a5f9c7bcb559fdcffc257c0f75abe60f2a7e5d5cd343f8a95967f7
 VITE_REALMS_ADDRESS=0x3205f47bd6f0b5e9cd5c79fcae19e12523a024709776d0a9e8b375adf63468d
 VITE_LORDS_ADDRESS=0x0342ad5cc14002c005a5cedcfce2bd3af98d5e7fb79e9bf949b3a91cf145d72e
 
 VITE_PUBLIC_CHAIN=sepolia
-VITE_PUBLIC_SLOT=sepolia-rc-16
+VITE_PUBLIC_SLOT=sepolia-rc-17
 
 VITE_PUBLIC_CONSTRUCTION_FLAG=false
 VITE_PUBLIC_HIDE_THREEJS_MENU=false

diff --git a/client/.env.production b/client/.env.production
@@ -28,4 +28,4 @@ VITE_PUBLIC_IMAGE_PROXY_URL=https://abc.com
 VITE_PUBLIC_IPFS_GATEWAY=https://abc.com
 
 VITE_VRF_PROVIDER_ADDRESS="0x051fea4450da9d6aee758bdeba88b2f665bcbf549d2c61421aa724e9ac0ced8f"
-VITE_CLIENT_FEE_RECIPIENT=0x045c587318c9ebcf2fbe21febf288ee2e3597a21cd48676005a5770a50d433c5
+VITE_PUBLIC_CLIENT_FEE_RECIPIENT=0x045c587318c9ebcf2fbe21febf288ee2e3597a21cd48676005a5770a50d433c5
diff --git a/client/index.html b/client/index.html
@@ -96,7 +96,6 @@
 
     <meta name="twitter:card" content="summary_large_image" />
     <meta name="twitter:image" content="https://eternum.realms.world/images/og-image.png" />
-
   </head>
   <body>
     <div id="root"></div>

diff --git a/client/public/images/Eternum-Mark-Black.png b/client/public/images/Eternum-Mark-Black.png
diff --git a/client/public/images/apple-touch-icon-180x180.png b/client/public/images/apple-touch-icon-180x180.png
diff --git a/client/public/images/favicon.ico b/client/public/images/favicon.ico
diff --git a/client/public/images/maskable-icon-512x512.png b/client/public/images/maskable-icon-512x512.png
diff --git a/client/public/images/pwa-192x192.png b/client/public/images/pwa-192x192.png
diff --git a/client/public/images/pwa-512x512.png b/client/public/images/pwa-512x512.png
diff --git a/client/public/images/pwa-64x64.png b/client/public/images/pwa-64x64.png
diff --git a/client/public/models/buildings-opt/wonder.glb b/client/public/models/buildings-opt/wonder.glb
diff --git a/client/public/models/buildings-opt/wonder2.glb b/client/public/models/buildings-opt/wonder2.glb
diff --git a/client/pwa-assets.config.ts b/client/pwa-assets.config.ts
@@ -2,5 +2,5 @@ import { defineConfig, minimal2023Preset } from "@vite-pwa/assets-generator/conf
 
 export default defineConfig({
   preset: minimal2023Preset,
-  images: ["public/images/oroborus.png"],
+  images: ["public/images/Eternum-Mark-Black.png"],
 });
diff --git a/client/src/dojo/createClientComponents.ts b/client/src/dojo/createClientComponents.ts
@@ -13,8 +13,10 @@ export function createClientComponents({ contractComponents }: SetupNetworkResul
     Population: overridableComponent(contractComponents.Population),
     Resource: overridableComponent(contractComponents.Resource),
     Weight: overridableComponent(contractComponents.Weight),
+    OwnedResourcesTracker: overridableComponent(contractComponents.OwnedResourcesTracker),
     Army: overridableComponent(contractComponents.Army),
     BuildingQuantityv2: overridableComponent(contractComponents.BuildingQuantityv2),
     Structure: overridableComponent(contractComponents.Structure),
+    ArrivalTime: overridableComponent(contractComponents.ArrivalTime),
   };
 }
diff --git a/client/src/dojo/modelManager/ArmyMovementManager.ts b/client/src/dojo/modelManager/ArmyMovementManager.ts
@@ -1,4 +1,5 @@
 import { useAccountStore } from "@/hooks/context/accountStore";
+import useUIStore from "@/hooks/store/useUIStore";
 import { type HexPosition } from "@/types";
 import { FELT_CENTER } from "@/ui/config";
 import {
@@ -263,12 +264,23 @@ export class ArmyMovementManager {
     });
   };
 
+  private readonly _optimisticArrivalTimeUpdate = (overrideId: string) => {
+    this.setup.components.ArrivalTime.addOverride(overrideId, {
+      entity: this.entity,
+      value: {
+        entity_id: this.entityId,
+        arrives_at: BigInt(useUIStore.getState().nextBlockTimestamp || 0),
+      },
+    });
+  };
+
   private readonly _optimisticExplore = (col: number, row: number, currentArmiesTick: number) => {
     const overrideId = uuid();
 
     this._optimisticStaminaUpdate(overrideId, configManager.getExploreStaminaCost(), currentArmiesTick);
     this._optimisticTileUpdate(overrideId, col, row);
     this._optimisticPositionUpdate(overrideId, col, row);
+    this._optimisticArrivalTimeUpdate(overrideId);
     this._optimisticCapacityUpdate(
       overrideId,
       // all resources you can find have the same weight as wood
@@ -315,6 +327,7 @@ export class ArmyMovementManager {
 
     this._optimisticStaminaUpdate(overrideId, configManager.getTravelStaminaCost() * pathLength, currentArmiesTick);
     this._optimisticFoodCosts(overrideId, TravelTypes.Travel);
+    this._optimisticArrivalTimeUpdate(overrideId);
 
     this.setup.components.Position.addOverride(overrideId, {
       entity: this.entity,
@@ -338,6 +351,7 @@ export class ArmyMovementManager {
     this.setup.components.Stamina.removeOverride(overrideId);
     this.setup.components.Resource.removeOverride(overrideId);
     this.setup.components.Weight.removeOverride(overrideId);
+    this.setup.components.ArrivalTime.removeOverride(overrideId);
   };
 
   private readonly _optimisticFoodCosts = (overrideId: string, travelType: TravelTypes) => {

diff --git a/client/src/dojo/modelManager/LeaderboardManager.ts b/client/src/dojo/modelManager/LeaderboardManager.ts
@@ -9,7 +9,7 @@ import {
   TickIds,
   WORLD_CONFIG_ID,
 } from "@bibliothecadao/eternum";
-import { Entity, getComponentValue, HasValue, runQuery } from "@dojoengine/recs";
+import { Entity, HasValue, getComponentValue, runQuery } from "@dojoengine/recs";
 import { getEntityIdFromKeys } from "@dojoengine/utils";
 import { configManager } from "../setup";
 import { ClientConfigManager } from "./ConfigManager";
@@ -33,15 +33,16 @@ export class LeaderboardManager {
     );
     if (!hyperstructure) return;
 
+    const epochIndex = hyperstructure.current_epoch - 1 >= 0 ? hyperstructure.current_epoch - 1 : 0;
     const currentEpoch = getComponentValue(
       this.dojoResult.setup.components.Epoch,
-      getEntityIdFromKeys([BigInt(hyperstructureEntityId), BigInt(hyperstructure.current_epoch)]),
+      getEntityIdFromKeys([BigInt(hyperstructureEntityId), BigInt(epochIndex)]),
     );
     if (!currentEpoch) return;
 
     const coOwners = (currentEpoch.owners as any).map((owner: any) => {
       let [owner_address, percentage] = owner.value.map((value: any) => value.value);
-      return { address: owner_address, percentage: Number(percentage) / 10_000 };
+      return { address: ContractAddress(owner_address), percentage: Number(percentage) };
     });
 
     return { coOwners, timestamp: Number(currentEpoch.start_timestamp) };

diff --git a/client/src/dojo/modelManager/ResourceInventoryManager.ts b/client/src/dojo/modelManager/ResourceInventoryManager.ts
@@ -42,6 +42,14 @@ export class ResourceInventoryManager {
         value: 0n,
       },
     });
+
+    // need to update this for the arrivals list to get updated
+    this.setup.components.OwnedResourcesTracker.addOverride(overrideId, {
+      entity,
+      value: {
+        resource_types: 0n,
+      },
+    });
   };
 
   public onOffloadAll = async (receiverEntityId: ID, inventoryResources: Resource[]) => {
@@ -59,61 +67,8 @@ export class ResourceInventoryManager {
         .finally(() => {
           this.setup.components.Resource.removeOverride(overrideId);
           this.setup.components.Weight.removeOverride(overrideId);
+          this.setup.components.OwnedResourcesTracker.removeOverride(overrideId);
         });
     }
   };
-
-  public onOffloadAllMultiple = async (
-    transfers: {
-      senderEntityId: ID;
-      recipientEntityId: ID;
-      resources: Resource[];
-    }[],
-  ) => {
-    const overrideId = uuid();
-
-    // Apply optimistic updates for each transfer
-    transfers.forEach((transfer) => {
-      transfer.resources.forEach((resource) => {
-        const recipientEntity = getEntityIdFromKeys([BigInt(transfer.recipientEntityId), BigInt(resource.resourceId)]);
-        const recipientBalance = getComponentValue(this.setup.components.Resource, recipientEntity)?.balance || 0n;
-
-        this.setup.components.Resource.addOverride(overrideId, {
-          entity: recipientEntity,
-          value: {
-            resource_type: resource.resourceId,
-            balance: recipientBalance + BigInt(resource.amount),
-          },
-        });
-      });
-
-      // Reset weight for sender
-      const senderEntity = getEntityIdFromKeys([BigInt(transfer.senderEntityId)]);
-      this.setup.components.Weight.addOverride(overrideId, {
-        entity: senderEntity,
-        value: {
-          value: 0n,
-        },
-      });
-    });
-
-    try {
-      await this.setup.systemCalls.send_resources_multiple({
-        calls: transfers.map((transfer) => ({
-          sender_entity_id: transfer.senderEntityId,
-          recipient_entity_id: transfer.recipientEntityId,
-          resources: transformResources(transfer.resources),
-        })),
-        signer: useAccountStore.getState().account!,
-      });
-    } finally {
-      // Clean up overrides
-      this.setup.components.Resource.removeOverride(overrideId);
-      this.setup.components.Weight.removeOverride(overrideId);
-    }
-  };
 }
-
-const transformResources = (resources: Resource[]) => {
-  return resources.flatMap((resource) => [resource.resourceId, resource.amount]);
-};
diff --git a/client/src/dojo/modelManager/ResourceManager.ts b/client/src/dojo/modelManager/ResourceManager.ts
@@ -197,13 +197,11 @@ export class ResourceManager {
     if (!production) return [false, 0];
 
     let consumptionRate = Number(production.consumption_rate);
-  
+
     // Check if this is a Wonder producing Lords
-    const isWonder = getComponentValue(
-      this.setup.components.Realm,
-      getEntityIdFromKeys([BigInt(this.entityId)])
-    )?.has_wonder || false;
-
+    const isWonder =
+      getComponentValue(this.setup.components.Realm, getEntityIdFromKeys([BigInt(this.entityId)]))?.has_wonder || false;
+
     if (isWonder && resourceId === ResourcesIds.Lords) {
       consumptionRate = consumptionRate * 0.1; // 10% of normal production rate for Wonders
     }

diff --git a/client/src/dojo/modelManager/TileManager.ts b/client/src/dojo/modelManager/TileManager.ts
@@ -61,6 +61,12 @@ export class TileManager {
     return (realm?.level || RealmLevels.Settlement) as RealmLevels;
   };
 
+  getWonder = () => {
+    const realmEntityId = useUIStore.getState().structureEntityId;
+    const realm = getComponentValue(this.setup.components.Realm, getEntityIdFromKeys([BigInt(realmEntityId)]));
+    return realm?.has_wonder || false;
+  };
+
   existingBuildings = () => {
     const builtBuildings = Array.from(
       runQuery([
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,7 +96,6 @@ @@
         <meta name="twitter:card" content="summary_large_image" />
         <meta name="twitter:image" content="https://eternum.realms.world/images/og-image.png" />
       </head>
       <body>
         <div id="root"></div>
@@ Expand Down @@