Merge pull request #6 from funDAOmental/next

underware-gg · Jan 19, 2024 · be69353 · be69353
2 parents f61cb10 + 92d48a5
commit be69353
Show file tree

Hide file tree

Showing 46 changed files with 1,094 additions and 479 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,16 +8,8 @@
       "type": "chrome",
       "request": "launch",
       "name": "Launch Chrome against localhost",
-      "url": "http://localhost:5173/",
-      "webRoot": "/Users/roger/Dev/Blockchain/Realms/lootunderworld/client/src/dojo",
-      // "webRoot": "${workspaceFolder}",
-      "sourceMapPathOverrides": {
-        "webpack:/*": "${webRoot}/*",
-        "/./*": "${webRoot}/*",
-        "/src/*": "${webRoot}/*",
-        "/*": "*",
-        "/./~/*": "${webRoot}/node_modules/*"
-      },
+      "url": "http://localhost:3000/",
+      "webRoot": "${workspaceRoot}/client",
     }
   ]
 }
diff --git a/README.md b/README.md
@@ -81,6 +81,7 @@ rustup update
 curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | sh
 
 # other stuff you might need
+cargo install toml-cli
 brew install protobuf
 ```
 

diff --git a/client/.env.dev b/client/.env.dev
@@ -1,5 +1,4 @@
 # pistols
-NEXT_PUBLIC_PROOF_LOST_GAMES=1
 NEXT_PUBLIC_DEBUG=1
 
 # static

diff --git a/client/.env.slot b/client/.env.slot
@@ -1,5 +1,5 @@
 # pistols
-NEXT_PUBLIC_PROOF_LOST_GAMES=0
+NEXT_PUBLIC_DEBUG=1
 
 # static
 NEXT_PUBLIC_ETH_CONTRACT_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
@@ -11,5 +11,5 @@ NEXT_PUBLIC_WORLD_ADDRESS=0x269c58e5fa1e7f6fe3756f1de88ecdfab7d03ba67e79ba0365b4
 NEXT_PUBLIC_NODE_URL=https://api.cartridge.gg/x/pistols/katana
 NEXT_PUBLIC_TORII=https://api.cartridge.gg/x/pistols/torii
 # from katana
-NEXT_PUBLIC_MASTER_ADDRESS=0x35d0cdaf12e6816f4a1a5c074befbddd08abf61bbea87765342289b48b4bc16
-NEXT_PUBLIC_MASTER_PRIVATE_KEY=0x2cbd34ec84e50d1616c3d0b17799a5f2fd7448f2039e4652eb950586f06ad60
+NEXT_PUBLIC_MASTER_ADDRESS=0x2e0e12a0275b03172bb09aafac8e288599678032493fef65adc1af87771bdaa
+NEXT_PUBLIC_MASTER_PRIVATE_KEY=0x3cfcac8524dd04d352479c89b5685b9f3b4e788e226305e1df18712154afd76
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/DojoContext.tsx b/client/src/dojo/DojoContext.tsx
@@ -92,7 +92,7 @@ export const useDojo = () => {
 
 
 //
-// pistols
+// NEW
 //
 
 export const useDojoAccount = () => {

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
@@ -1,9 +1,9 @@
+import { Account, num } from 'starknet'
+import { DojoProvider, } from '@dojoengine/core'
+import * as torii from '@dojoengine/torii-client'
 import { defineContractComponents } from './contractComponents'
 import { world } from './world'
-import { DojoProvider, } from '@dojoengine/core'
-import { Account, num } from 'starknet'
 import manifest from '@/manifest.json'
-import * as torii from '@dojoengine/torii-client'
 
 export type SetupNetworkResult = Awaited<ReturnType<typeof setupNetwork>>
 
@@ -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/src/manifest.json b/client/src/manifest.json
@@ -949,7 +949,7 @@
     {
       "name": "pistols::systems::actions::actions",
       "address": "0x78af18db6887ee0eb2b339f95619e88b65aa47c7025ad42dc81c7be43b631ff",
-      "class_hash": "0x601e133e04612f3e315dd692d926f3e1fc04effea91773fc3b2cf21591eaa7d",
+      "class_hash": "0x6fd66f89f1e1ccde9397313d2cb416fb340f1f98b1e509877ef93593a327637",
       "abi": [
         {
           "type": "impl",

diff --git a/client/src/pistols/components/AppDojo.tsx b/client/src/pistols/components/AppDojo.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { useEffectOnce } from '@/pistols/hooks/useEffectOnce'
 import { DojoProvider } from '@/dojo/DojoContext'
-import { setup } from '@/dojo/setup.ts'
+import { setup } from '@/dojo/setup'
 import { GameplayProvider } from '@/pistols/hooks/GameplayContext'
 import App from '@/pistols/components/App'
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ export const useDojo = () => { @@
     //
-    // pistols
+    // NEW
     //
     export const useDojoAccount = () => {
@@ Expand Down @@