Upgrade to Dojo 0.4.4, Cairo 2.4, dojo.js 0.3.4

underware-gg · Jan 19, 2024 · b7a41b3 · b7a41b3
1 parent 13decd4
commit b7a41b3
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 55 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -12,12 +12,13 @@
     "create-components_local": "script/generateComponents.cjs ../dojo/target/dev/manifest.json src/dojo/contractComponents.ts"
   },
   "dependencies": {
-    "@dojoengine/core": "^0.2.9",
-    "@dojoengine/create-burner": "^0.2.9",
-    "@dojoengine/react": "^0.2.9",
+    "@dojoengine/core": "^0.3.4",
+    "@dojoengine/create-burner": "^0.3.4",
+    "@dojoengine/react": "^0.3.4",
     "@dojoengine/recs": "^0.1.35",
-    "@dojoengine/torii-client": "^0.2.9",
-    "@dojoengine/utils": "^0.2.9",
+    "@dojoengine/state": "^0.3.4",
+    "@dojoengine/torii-client": "^0.3.4",
+    "@dojoengine/utils": "^0.3.4",
     "@tweenjs/tween.js": "^21.0.0",
     "event-emitter": "^0.3.5",
     "next": "^13.5.6",
@@ -30,7 +31,7 @@
     "semantic-ui-react": "^3.0.0-beta.0",
     "starknet": "5.24.3",
     "three": "^0.157.0",
-    "type-fest": "^4.8.3",
+    "type-fest": "^2.14.0",
     "use-local-storage-state": "^19.1.0"
   },
   "devDependencies": {

diff --git a/client/src/dojo/setup.ts b/client/src/dojo/setup.ts
@@ -1,7 +1,7 @@
 import { createClientComponents } from './createClientComponents'
 import { createSystemCalls } from './createSystemCalls'
 import { setupNetwork } from './setupNetwork'
-import { getSyncEntities } from '@dojoengine/react'
+import { getSyncEntities } from '@dojoengine/state'
 
 export type SetupResult = Awaited<ReturnType<typeof setup>>
 

diff --git a/client/src/dojo/setupNetwork.ts b/client/src/dojo/setupNetwork.ts
@@ -14,7 +14,7 @@ export async function setupNetwork() {
   if (!process.env.NEXT_PUBLIC_TORII) throw (`NEXT_PUBLIC_TORII is null`)
 
   // Create a new DojoProvider instance.
-  const provider = new DojoProvider(process.env.NEXT_PUBLIC_WORLD_ADDRESS, manifest, process.env.NEXT_PUBLIC_NODE_URL)
+  const provider = new DojoProvider(manifest, process.env.NEXT_PUBLIC_NODE_URL)
 
   const toriiClient = await torii.createClient([], {
     rpcUrl: process.env.NEXT_PUBLIC_NODE_URL,

diff --git a/client/styles/index.scss b/client/styles/index.scss
@@ -542,20 +542,20 @@ $box-h: calc((100vh - $aspect-h) / 2);
 }
 .StepsIcon {
   font-family: monospace!important;
-  font-size: 16px!important;
+  font-size: 12px!important;
   font-weight: 600!important;
   color: $color-bg;
   text-shadow: 0 0 2px #000;
   margin: -2px 0 0 -2px!important;
 }
 .StepsIcon.small {
-  font-size: 14px!important;
+  font-size: 12px!important;
 }
 .StepsIcon.large {
-  font-size: 20px!important;
+  font-size: 16px!important;
 }
 .StepsIcon.big {
-  font-size: 24px!important;
+  font-size: 20px!important;
 }
 
 .StepsIconRound {

diff --git a/dojo/Scarb.toml b/dojo/Scarb.toml
@@ -7,7 +7,7 @@ website = "https://pistols.lootunder.world"
 socials.x = "https://twitter.com/lootunderworld"
 
 [package]
-cairo-version = "2.3.1"
+cairo-version = "2.4.0"
 name = "pistols"
 version = "0.2.0"
 
@@ -16,7 +16,7 @@ sierra-replace-ids = true
 
 [dependencies]
 # dojo = { git = "https://github.com/dojoengine/dojo.git", rev = "01eab985a3f5056e47cc7b4753ca24f64d3a078a" }
-dojo = { git = "https://github.com/dojoengine/dojo.git", tag = "v0.4.3" }
+dojo = { git = "https://github.com/dojoengine/dojo.git", tag = "v0.4.4" }
 
 
 [[target.dojo]]