merge to main (#2452)

* Add confirmation step to destroy building * raise limits and remove chat (#2435) * loading page loading itmes (#2436) * loaf-opti * buildings * load * push config * loading * fix for 0 donkey bridge, base manifest on chain env * tiles * merge * do sync * bank * market * bump * queries * reintroduce syncing and fetching * sync and get happening again * working multi bridge out step 2, fix transaction success states * tiles * remove logging * memo * world * set loading state * chunk * coords * as * bunk * bridge styling * update * update dojo version * update dojo sync * Fix hyperstructures * fix * add back chat * a * llint * ✨ Add sub to all player structures * fix(social): get name from address directly * chore: add has not settled realm yet * undefined if no realm found * pretty * fix: trade history crash * 🐛 Fix * config * add realm select border animation * hovered frag mine * hs cost (#2443) * hs cost * fix deposit arrival * update lock * load * Fix/army stamina (#2448) * Fix current tick values in nextBlockTimestamp * lint * Remove quest UI while syncing (#2449) * Remove quest UI while syncing * Add quest load animation * Raschel-dev (#2447) * hs cost * fix deposit arrival * update lock * fix hs crash * building cost config * fix namespace * remove resource cost syncing * added production * fix costs * add upgrade * trigger * remove events * fix tile * fixes * remove loading * fix: transfer view styling bug (#2451) * Fix social tribe crash (#2450) * fix build * fix market --------- Co-authored-by: Bob <[email protected]> Co-authored-by: tedison <[email protected]> Co-authored-by: ponderingdemocritus <[email protected]> Co-authored-by: tedison <[email protected]> Co-authored-by: RedBeardEth <[email protected]> Co-authored-by: Loaf <[email protected]> Co-authored-by: bal7hazar <[email protected]> Co-authored-by: Nasr <[email protected]> Co-authored-by: Larko <[email protected]> Co-authored-by: 0x1337 <[email protected]> Co-authored-by: Bob <[email protected]> Co-authored-by: zabanyat.eth <[email protected]>
BibliothecaDAO · Dec 12, 2024 · bcc3895 · bcc3895
1 parent 3792b90
commit bcc3895
Show file tree

Hide file tree

Showing 56 changed files with 3,908 additions and 4,954 deletions.
diff --git a/client/.env.production b/client/.env.production
@@ -1,5 +1,5 @@
-VITE_PUBLIC_MASTER_ADDRESS=
-VITE_PUBLIC_MASTER_PRIVATE_KEY=
+VITE_PUBLIC_MASTER_ADDRESS=0x5013b17c43a2b664ec2a38aa45f6d891db1188622ec7cf320411321c3248fb5
+VITE_PUBLIC_MASTER_PRIVATE_KEY=0x5013b17c43a2b664ec2a38aa45f6d891db1188622ec7cf320411321c3248fb5
 VITE_PUBLIC_WORLD_ADDRESS="0x5013b17c43a2b664ec2a38aa45f6d891db1188622ec7cf320411321c3248fb5"
 VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
 VITE_PUBLIC_FEE_TOKEN_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7

diff --git a/client/package.json b/client/package.json
@@ -19,13 +19,14 @@
     "@bibliothecadao/eternum": "workspace:^",
     "@cartridge/connector": "0.5.5",
     "@cartridge/controller": "0.5.5",
-    "@dojoengine/core": "1.0.1",
-    "@dojoengine/create-burner": "1.0.1",
-    "@dojoengine/react": "1.0.1",
+    "@dojoengine/core": "1.0.3-alpha.1",
+    "@dojoengine/torii-wasm": "1.0.3-alpha.1",
+    "@dojoengine/create-burner": "1.0.3-alpha.1",
+    "@dojoengine/react": "1.0.3-alpha.1",
     "@dojoengine/recs": "^2.0.13",
-    "@dojoengine/state": "1.0.1",
-    "@dojoengine/torii-client": "1.0.1",
-    "@dojoengine/utils": "1.0.1",
+    "@dojoengine/state": "1.0.3-alpha.1",
+    "@dojoengine/torii-client": "1.0.3-alpha.1",
+    "@dojoengine/utils": "1.0.3-alpha.1",
     "@headlessui/react": "^1.7.18",
     "@latticexyz/utils": "^2.0.0-next.12",
     "@radix-ui/react-collapsible": "^1.1.1",
@@ -104,4 +105,4 @@
     "vitest": "^2.0.5",
     "workbox-window": "^7.3.0"
   }
-}
+}
diff --git a/client/src/dojo/contractComponents.ts b/client/src/dojo/contractComponents.ts
@@ -1902,26 +1902,6 @@ const eventsComponents = (world: World) => {
         );
       })(),
 
-      CancelOrder: (() => {
-        return defineComponent(
-          world,
-          {
-            taker_id: RecsType.Number,
-            maker_id: RecsType.Number,
-            trade_id: RecsType.Number,
-            timestamp: RecsType.BigInt,
-          },
-          {
-            metadata: {
-              namespace: "s0_eternum",
-              name: "CancelOrder",
-              types: ["u32", "u32", "u32", "u64"],
-              customTypes: [],
-            },
-          },
-        );
-      })(),
-
       CreateGuild: (() => {
         return defineComponent(
           world,
@@ -1941,26 +1921,6 @@ const eventsComponents = (world: World) => {
         );
       })(),
 
-      CreateOrder: (() => {
-        return defineComponent(
-          world,
-          {
-            taker_id: RecsType.Number,
-            maker_id: RecsType.Number,
-            trade_id: RecsType.Number,
-            timestamp: RecsType.BigInt,
-          },
-          {
-            metadata: {
-              namespace: "s0_eternum",
-              name: "CreateOrder",
-              types: ["u32", "u32", "u32", "u64"],
-              customTypes: [],
-            },
-          },
-        );
-      })(),
-
       GameEnded: (() => {
         return defineComponent(
           world,
@@ -1979,26 +1939,6 @@ const eventsComponents = (world: World) => {
         );
       })(),
 
-      FragmentMineDiscovered: (() => {
-        return defineComponent(
-          world,
-          {
-            entity_owner_id: RecsType.Number,
-            mine_entity_id: RecsType.Number,
-            production_deadline_tick: RecsType.BigInt,
-            discovered_at: RecsType.BigInt,
-          },
-          {
-            metadata: {
-              namespace: "s0_eternum",
-              name: "FragmentMineDiscovered",
-              types: ["u32", "u32", "u64", "u64"],
-              customTypes: [],
-            },
-          },
-        );
-      })(),
-
       HyperstructureContribution: (() => {
         return defineComponent(
           world,
@@ -2020,45 +1960,6 @@ const eventsComponents = (world: World) => {
         );
       })(),
 
-      HyperstructureCoOwnersChange: (() => {
-        return defineComponent(
-          world,
-          {
-            id: RecsType.Number,
-            hyperstructure_entity_id: RecsType.Number,
-            co_owners: RecsType.StringArray,
-            timestamp: RecsType.Number,
-          },
-          {
-            metadata: {
-              namespace: "s0_eternum",
-              name: "HyperstructureCoOwnersChange",
-              types: ["u32", "u32", "array", "u64"],
-              customTypes: [],
-            },
-          },
-        );
-      })(),
-
-      HyperstructureStarted: (() => {
-        return defineComponent(
-          world,
-          {
-            id: RecsType.Number,
-            hyperstructure_entity_id: RecsType.Number,
-            creator_address_name: RecsType.BigInt,
-            timestamp: RecsType.Number,
-          },
-          {
-            metadata: {
-              namespace: "s0_eternum",
-              name: "HyperstructureStarted",
-              types: ["u32", "u32", "felt252", "u64"],
-              customTypes: [],
-            },
-          },
-        );
-      })(),
       HyperstructureFinished: (() => {
         return defineComponent(
           world,
@@ -2287,6 +2188,25 @@ const eventsComponents = (world: World) => {
           },
         );
       })(),
+      HyperstructureCoOwnersChange: (() => {
+        return defineComponent(
+          world,
+          {
+            id: RecsType.Number,
+            hyperstructure_entity_id: RecsType.Number,
+            co_owners: RecsType.StringArray,
+            timestamp: RecsType.Number,
+          },
+          {
+            metadata: {
+              namespace: "s0_eternum",
+              name: "HyperstructureCoOwnersChange",
+              types: ["u32", "u32", "array", "u64"],
+              customTypes: [],
+            },
+          },
+        );
+      })(),
     },
   };
 };