Fix counter + client optimisations

client/dojoConfig.ts

@@ -1,6 +1,8 @@
 import { createDojoConfig } from "@dojoengine/core";
 import devManifest from "../contracts/manifest_dev.json";
+import mainnetManifest from "../contracts/manifest_mainnet.json";
 import productionManifest from "../contracts/manifest_prod.json";
+
 import { env } from "./env";
 const {
   VITE_PUBLIC_NODE_URL,
@@ -11,9 +13,12 @@ const {
   VITE_PUBLIC_ACCOUNT_CLASS_HASH,
   VITE_PUBLIC_DEV,
   VITE_PUBLIC_FEE_TOKEN_ADDRESS,
+  VITE_PUBLIC_CHAIN
 } = env;
 
-const manifest = VITE_PUBLIC_DEV === true ? devManifest : productionManifest;
+let manifest = VITE_PUBLIC_DEV === true ? devManifest : productionManifest;
+
+manifest = VITE_PUBLIC_CHAIN === "mainnet" ? mainnetManifest : manifest;
 
 export const dojoConfig = createDojoConfig({
   rpcUrl: VITE_PUBLIC_NODE_URL,

client/env.ts

@@ -10,7 +10,7 @@ const envSchema = z.object({
   VITE_PUBLIC_ACCOUNT_CLASS_HASH: z.string().startsWith("0x"),
   VITE_PUBLIC_FEE_TOKEN_ADDRESS: z.string().startsWith("0x"),
 
-  VITE_CLIENT_FEE_RECIPIENT: z.string().startsWith("0x"),
+  VITE_PUBLIC_CLIENT_FEE_RECIPIENT: z.string().startsWith("0x"),
 
   // External Contracts
   VITE_SEASON_PASS_ADDRESS: z.string().startsWith("0x"),

client/src/dojo/modelManager/ResourceInventoryManager.ts

@@ -6,13 +6,13 @@ import { uuid } from "@latticexyz/utils";
 import { type SetupResult } from "../setup";
 
 export class ResourceInventoryManager {
-  entityId: ID;
+  carrierEntityId: ID;
 
   constructor(
     private readonly setup: SetupResult,
-    entityId: ID,
+    carrierEntityId: ID,
   ) {
-    this.entityId = entityId;
+    this.carrierEntityId = carrierEntityId;
   }
 
   private readonly _optimisticOffloadAll = (
@@ -21,32 +21,35 @@ export class ResourceInventoryManager {
     inventoryResources: Resource[],
   ) => {
     inventoryResources.forEach((resource) => {
-      const entity = getEntityIdFromKeys([BigInt(receiverEntityId), BigInt(resource.resourceId)]);
-      const receiverBalance = getComponentValue(this.setup.components.Resource, entity)?.balance || 0n;
+      const receiveResourceEntity = getEntityIdFromKeys([BigInt(receiverEntityId), BigInt(resource.resourceId)]);
+      const receiverBalance = getComponentValue(this.setup.components.Resource, receiveResourceEntity)?.balance || 0n;
 
       // optimistically update the balance of the receiver
       this.setup.components.Resource.addOverride(overrideId, {
-        entity,
+        entity: receiveResourceEntity,
         value: {
+          entity_id: receiverEntityId,
           resource_type: resource.resourceId,
           balance: receiverBalance + BigInt(resource.amount),
         },
       });
     });
 
-    const entity = getEntityIdFromKeys([BigInt(this.entityId)]);
+    const carrierEntity = getEntityIdFromKeys([BigInt(this.carrierEntityId)]);
 
     this.setup.components.Weight.addOverride(overrideId, {
-      entity,
+      entity: carrierEntity,
       value: {
+        entity_id: this.carrierEntityId,
         value: 0n,
       },
     });
 
     // need to update this for the arrivals list to get updated
     this.setup.components.OwnedResourcesTracker.addOverride(overrideId, {
-      entity,
+      entity: carrierEntity,
       value: {
+        entity_id: this.carrierEntityId,
         resource_types: 0n,
       },
     });
@@ -59,7 +62,7 @@ export class ResourceInventoryManager {
     if (inventoryResources.length > 0) {
       await this.setup.systemCalls
         .send_resources({
-          sender_entity_id: this.entityId,
+          sender_entity_id: this.carrierEntityId,
           recipient_entity_id: receiverEntityId,
           resources: inventoryResources.flatMap((resource) => [resource.resourceId, resource.amount]),
           signer: useAccountStore.getState().account!,