bump latest budokan

Author: Await-0x

client/manifest_mainnet.json

@@ -1532,7 +1532,7 @@
         }
       ],
       "init_calldata": [],
-      "tag": "ds_v1_2_0-battle_systems",
+      "tag": "ds_v1_2_1-battle_systems",
       "selector": "0x76b546602bfd66e91f744f1b841949ecc5df451537918678873b327d2aa7255",
       "systems": [
         "battle_actions",
@@ -2178,7 +2178,7 @@
         }
       ],
       "init_calldata": [],
-      "tag": "ds_v1_2_0-config_systems",
+      "tag": "ds_v1_2_1-config_systems",
       "selector": "0x39c10fec712357fc9947f12b4b3ec88e2a69623267c0558898940bcd980d7f3",
       "systems": [
         "add_settings",
@@ -3442,7 +3442,7 @@
       "init_calldata": [
         "0x065d2AB17338b5AffdEbAF95E2D79834B5f30Bac596fF55563c62C3c98700150"
       ],
-      "tag": "ds_v1_2_0-game_systems",
+      "tag": "ds_v1_2_1-game_systems",
       "selector": "0x35bcd7b3c47338b5483ebad7aedd81f697cbbc89c0ade18e06668b90174d709",
       "systems": [
         "dojo_init",
@@ -3468,135 +3468,135 @@
     {
       "members": [],
       "class_hash": "0x59b0c8d986b06e8d848b1b527d1104314065f6beb79c5dfaef735e4cf3379ff",
-      "tag": "ds_v1_2_0-Battle",
+      "tag": "ds_v1_2_1-Battle",
       "selector": "0x291c625aa877649d6e00fe736031bd96a98ca41337c91cd828eca2176b3c72e"
     },
     {
       "members": [],
       "class_hash": "0x72b6cd41fb4cd54849ce04278d6ab24468145f4c5b65ea3c87aa04fc9c0c024",
-      "tag": "ds_v1_2_0-BattleResources",
+      "tag": "ds_v1_2_1-BattleResources",
       "selector": "0x62eabd0b2825cba91cbe1e9ae4df89049b33d2a8766615326a1eaafc670c244"
     },
     {
       "members": [],
       "class_hash": "0x681cbb66370f3980d0fbcb0e233053277d4f229dd5c8dbc584b17d1d9d7dd01",
-      "tag": "ds_v1_2_0-Card",
+      "tag": "ds_v1_2_1-Card",
       "selector": "0x3563b64c9849ebf240d13129a73401f121733afe85f32d2eb7ded1c192240a7"
     },
     {
       "members": [],
       "class_hash": "0x3b148e016adec7160043c471937c17c9dc3bdd39b9f8717f9b505930ecb1c9e",
-      "tag": "ds_v1_2_0-CardsCounter",
+      "tag": "ds_v1_2_1-CardsCounter",
       "selector": "0x3bb6ee0b48f7f07baa9bf9a47efdc32722366b9579e98cfb36a12605a0ddc7"
     },
     {
       "members": [],
       "class_hash": "0xd4f640a50756169259a15daf7a36a8f45298c2aef16dd374cb51221e7bdf1c",
-      "tag": "ds_v1_2_0-CreatureCard",
+      "tag": "ds_v1_2_1-CreatureCard",
       "selector": "0x1f6960b539a2d74a0e8d07261aea0e2bff6f89cd47a26243df33497582fbb9d"
     },
     {
       "members": [],
       "class_hash": "0x3803be3eadf86c4d229269c64e162097e061535fb3482b00672f2077f2069b2",
-      "tag": "ds_v1_2_0-Draft",
+      "tag": "ds_v1_2_1-Draft",
       "selector": "0x24ddbb3b98b29eaf34a5ce80e669fe197cfda5b1b834fe55a374d891ef8b704"
     },
     {
       "members": [],
       "class_hash": "0x4b723939b9a3963d79a6ac5567f69375b75a8390d20bf63f6152c05475b3016",
-      "tag": "ds_v1_2_0-Game",
+      "tag": "ds_v1_2_1-Game",
       "selector": "0x5204599c7da123e9a99a67c195ce63807a9f65ac046b3c9e398aade9f25b034"
     },
     {
       "members": [],
       "class_hash": "0xdc2e5bb9a031c39c331e7452da6001f874a496eedab97472fa7f5c911a8ec2",
-      "tag": "ds_v1_2_0-GameCounter",
+      "tag": "ds_v1_2_1-GameCounter",
       "selector": "0x5818a2af252a8723457437e02adf79d8988ca2ff5998bc12db94da226632674"
     },
     {
       "members": [],
       "class_hash": "0x35d37c838aec0d1456a75508561f744ae2fff299af4734b53b35b6bb122b0c9",
-      "tag": "ds_v1_2_0-GameEffects",
+      "tag": "ds_v1_2_1-GameEffects",
       "selector": "0x21ab79e9ecdaed6b16ff5c92763c14eb3bdd38916e67752662e376695a3156d"
     },
     {
       "members": [],
       "class_hash": "0x32268509eabc1bd319688f1fca9d8151159dbb09b9cf26734dc23e0afffafe4",
-      "tag": "ds_v1_2_0-GameMetadata",
+      "tag": "ds_v1_2_1-GameMetadata",
       "selector": "0x15f4fdc5b14db949ce35e985c4224b83e7d0e479720cd4b197bf27b3380156e"
     },
     {
       "members": [],
       "class_hash": "0x640aa8745685ebcae9755aca97bf7e42da3dc0432aeb20b2eca00e84df9a5ad",
-      "tag": "ds_v1_2_0-GameSettings",
+      "tag": "ds_v1_2_1-GameSettings",
       "selector": "0x40f76893af52af25c2dda8662449d83f52ad15151e90c7645bed03144f7b154"
     },
     {
       "members": [],
       "class_hash": "0x1256bcd0259b1d09e4edb0cf9fe8c1a2ae188c4d9c42620dfdecb0550b8b375",
-      "tag": "ds_v1_2_0-GameSettingsMetadata",
+      "tag": "ds_v1_2_1-GameSettingsMetadata",
       "selector": "0x3c1e4c37dd780e19648d4999be5897db259efd01a1a75112ecf7a1d76f7e627"
     },
     {
       "members": [],
       "class_hash": "0x4246a8f9d608c989bdb3d09cb49b7f91aa91a20a374377ff57e0a16707ccf19",
-      "tag": "ds_v1_2_0-Map",
+      "tag": "ds_v1_2_1-Map",
       "selector": "0x1960d24475531c7a7b2e9821ec6093352216d8d772f9d0b358a941fd3293a34"
     },
     {
       "members": [],
       "class_hash": "0x18fc1c720db350bed92a902bee4a63a7df92b49569eabfcf5d46fc6bb73628a",
-      "tag": "ds_v1_2_0-Score",
+      "tag": "ds_v1_2_1-Score",
       "selector": "0x764867485c827fd7fb0a1ef25f0ce0f735739497ce8cd91824e068332adefbc"
     },
     {
       "members": [],
       "class_hash": "0xfe76028a63cb7cb179e39108da14dfc7a2a0b86ee2d32363dd9cf796d81fe7",
-      "tag": "ds_v1_2_0-Settings",
+      "tag": "ds_v1_2_1-Settings",
       "selector": "0x40fe855844a37570fcd8b6125d48396bee123249a0068053436474bb503e46e"
     },
     {
       "members": [],
       "class_hash": "0x1540d593f7b6d0ec355e68e7d066ad39cbb99c32c96a46d572c758c70f40c02",
-      "tag": "ds_v1_2_0-SettingsCounter",
+      "tag": "ds_v1_2_1-SettingsCounter",
       "selector": "0x5b23c4031b676804c0cc3474dfb6f3f18794efde96149b5ecda2307222c7dac"
     },
     {
       "members": [],
       "class_hash": "0x7289d1d56a6e92ff99925fdfac1f70d7829a991211281fdda7e6f4bb15b4453",
-      "tag": "ds_v1_2_0-SettingsDetails",
+      "tag": "ds_v1_2_1-SettingsDetails",
       "selector": "0x127c1783c9a292361dc99114c80a3ee2df645829dd6f3ac9f9575ad3abd8ac2"
     },
     {
       "members": [],
       "class_hash": "0x1108c66facaec53cd93ae2c20ae10a22ae681a26a5423f51772c1cf29cb5fc0",
-      "tag": "ds_v1_2_0-SpellCard",
+      "tag": "ds_v1_2_1-SpellCard",
       "selector": "0x185b767087fffd938907d9790de909248fd7ced185ad1f02347968c0f94d696"
     },
     {
       "members": [],
       "class_hash": "0x33d1fab3b617046a970045ee9e236a70a7585a8938b9c54eddd2b1ef9979b9a",
-      "tag": "ds_v1_2_0-TokenMetadata",
+      "tag": "ds_v1_2_1-TokenMetadata",
       "selector": "0x57d581ad570550f0a6cc3c14d220021eb69741f2aaaeaab21e3a7d7a80dd85a"
     }
   ],
   "events": [
     {
       "members": [],
       "class_hash": "0x69b6b21085d523bb6e7751453ac064b88947b4cf929386c65f82660001f0e1a",
-      "tag": "ds_v1_2_0-GameActionEvent",
+      "tag": "ds_v1_2_1-GameActionEvent",
       "selector": "0x46cbaf9ca08bbe09c6040d3bd8d3690ebbeb9b8782fab1ada0c1617fc7716c0"
     },
     {
       "members": [],
       "class_hash": "0x5139e06eeffddd491a7563f9e4c10799f98fddfd6f26047e94413e374a19fcf",
-      "tag": "ds_v1_2_0-TrophyCreation",
+      "tag": "ds_v1_2_1-TrophyCreation",
       "selector": "0x737933c4161511c7809ddc147c6278cb88d696d4e2f64d942528e0b1e2d54f"
     },
     {
       "members": [],
       "class_hash": "0x95f31367acd360680f16e74f712470bd3faf98aede3393644dad7d6d9c12cb",
-      "tag": "ds_v1_2_0-TrophyProgression",
+      "tag": "ds_v1_2_1-TrophyProgression",
       "selector": "0x620cf10a34caaf302accd82358cb9b55b9efa1345f8e09a6afbc7feb4a9a9b0"
     }
   ],

client/manifest_sepolia.json

@@ -10,12 +10,12 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@cartridge/connector": "^0.10.1",
-    "@cartridge/controller": "^0.10.1",
+    "@cartridge/connector": "^0.10.7",
+    "@cartridge/controller": "^0.10.7",
     "@dojoengine/core": "^1.7.6",
     "@dojoengine/sdk": "^1.7.6",
-    "@dojoengine/utils": "^1.7.6",
     "@dojoengine/torii-client": "^1.7.6",
+    "@dojoengine/utils": "^1.7.6",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
     "@fontsource/roboto": "^4.5.8",

client/package.json

@@ -1,23 +1,25 @@
+import { getContractByName } from '@dojoengine/core';
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
 import ArrowDropUpIcon from '@mui/icons-material/ArrowDropUp';
 import BookmarkIcon from '@mui/icons-material/Bookmark';
 import CloseIcon from '@mui/icons-material/Close';
+import EditIcon from '@mui/icons-material/Edit';
 import FavoriteIcon from '@mui/icons-material/Favorite';
+import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 import { LoadingButton } from '@mui/lab';
 import { Box, Button, CircularProgress, Dialog, Input, TextField, Typography } from '@mui/material';
+import { useAccount, useConnect } from '@starknet-react/core';
 import { useSnackbar } from 'notistack';
 import { useContext, useEffect, useState } from 'react';
 import { isMobile } from 'react-device-detect';
 import { byteArray } from "starknet";
 import { useIndexer } from '../../api/indexer';
 import sword from '../../assets/images/sword.png';
 import { DojoContext } from '../../contexts/dojoContext';
+import { GameContext } from '../../contexts/gameContext';
+import { useDynamicConnector } from '../../contexts/starknet';
 import { tierColors } from '../../helpers/cards';
 import DeckBuilder from './deckBuilder';
-import { GameContext } from '../../contexts/gameContext';
-import { useAccount, useConnect } from '@starknet-react/core';
-import PlayArrowIcon from '@mui/icons-material/PlayArrow';
-import EditIcon from '@mui/icons-material/Edit';
 
 const DEFAULT_SETTINGS = {
   name: '',
@@ -52,13 +54,14 @@ const DEFAULT_SETTINGS = {
 function GameSettings(props) {
   const { view, settingsId, closeList, inGame } = props
 
+  const { currentNetworkConfig } = useDynamicConnector();
   const dojo = useContext(DojoContext)
   const { enqueueSnackbar } = useSnackbar()
   const gameContext = useContext(GameContext)
   const { account } = useAccount()
   const { connect, connectors } = useConnect()
   const { getSettings } = useIndexer()
-  
+
   const [gameSettings, setGameSettings] = useState(DEFAULT_SETTINGS)
   const [loading, setLoading] = useState(view)
   const [creating, setCreating] = useState(false)
@@ -103,7 +106,7 @@ function GameSettings(props) {
 
     try {
       const res = await dojo.executeTx([{
-        contractName: "config_systems",
+        contractAddress: getContractByName(currentNetworkConfig.manifest, currentNetworkConfig.namespace, "config_systems")?.address,
         entrypoint: "add_settings",
         calldata: [
           name,

client/pnpm-lock.yaml

@@ -26,6 +26,7 @@ function GameTokens(props) {
   const [gameSettings, openGameSettings] = useState(false)
 
   const { games: gamesData, loading: gamesLoading } = useGameTokens({
+    gameAddresses: ["0x3451230bc1bbec7bb1f337f22c9f6699d238429638ac357dba53af193674c70"],
     owner: address,
     limit: 1000,
   });
@@ -37,10 +38,14 @@ function GameTokens(props) {
       let games = await populateGameTokens(gamesData)
       let settingsMetadata = await getSettingsMetadata(games.map(game => game.settingsId))
 
-      games = await Promise.all(games.map(async (game) => ({
+      if (!active) {
+        games = games.filter(game => !game.active)
+      }
+
+      games = games.map((game) => ({
         ...game,
         settingsMetadata: settingsMetadata.find(metadata => metadata.settings_id === game.settingsId),
-      })))
+      }))
 
       setSelectedGame()
       setGames(games ?? [])
@@ -50,7 +55,7 @@ function GameTokens(props) {
     if (gamesData) {
       fetchGames()
     }
-  }, [gamesData, address, active])
+  }, [gamesData, address])
 
   const handleResumeGame = () => {
     gameContext.actions.loadGameDetails(selectedGame)
@@ -122,7 +127,7 @@ function GameTokens(props) {
       </Box>
 
       <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'flex-end' }}>
-        {active && game.available_at !== 0 && <Box sx={{ display: 'flex', alignItems: 'center', gap: 3 }}>
+        {active && (game.available_at > 0 || game.expires_at > 0) && <Box sx={{ display: 'flex', alignItems: 'center', gap: 3 }}>
           {game.available_at < Date.now() ? <Box sx={{ display: 'flex', alignItems: 'center' }}>
             <AccessTimeIcon color='primary' sx={{ fontSize: '16px', mr: '3px' }} />
             {renderTimeRemaining(game.expires_at)}

client/src/components/dialogs/gameSettings.jsx

@@ -8,18 +8,20 @@ import { BrowserView, MobileView, isMobile } from 'react-device-detect';
 import BlockRevealAnimation from '../components/animations/blockRevealAnimation';
 import HeroStats from '../components/draft/heroStats';
 import Overview from '../components/draft/overview';
-import Structure from '../components/map/structure';
 import QuestComplete from '../components/map/questComplete';
+import Structure from '../components/map/structure';
 import { BattleContext } from '../contexts/battleContext';
 import { DojoContext } from '../contexts/dojoContext';
 import { GameContext } from '../contexts/gameContext';
+import { useDynamicConnector } from '../contexts/starknet';
 import { fadeVariant } from "../helpers/variants";
+import { getContractByName } from '@dojoengine/core';
 
 function MapContainer() {
+  const { currentNetworkConfig } = useDynamicConnector();
   const dojo = useContext(DojoContext)
   const game = useContext(GameContext)
   const battle = useContext(BattleContext)
-
   const [cardOverview, setCardOverview] = useState(false)
   const [selectingNode, setSelectingNode] = useState(false)
 
@@ -47,7 +49,11 @@ function MapContainer() {
     }
 
     setSelectingNode(true)
-    const res = await dojo.executeTx([{ contractName: "game_systems", entrypoint: "select_node", calldata: [game.values.gameId, nodeId] }], true)
+    const res = await dojo.executeTx([{
+      contractAddress: getContractByName(currentNetworkConfig.manifest, currentNetworkConfig.namespace, "game_systems")?.address,
+      entrypoint: "select_node",
+      calldata: [game.values.gameId, nodeId]
+    }], true)
 
     if (res) {
       const gameValues = res.find(e => e.componentName === 'Game')

client/src/components/dialogs/gameTokens.jsx

@@ -12,14 +12,17 @@ import { delay } from "../helpers/utilities";
 import { AnimationContext } from "./animationHandler";
 import { DojoContext } from "./dojoContext";
 import { GameContext } from "./gameContext";
+import { useDynamicConnector } from "./starknet";
+import { getContractByName } from "@dojoengine/core";
 
 export const BattleContext = createContext()
 
 export const BattleProvider = ({ children }) => {
+  const { currentNetworkConfig } = useDynamicConnector();
   const dojo = useContext(DojoContext)
   const game = useContext(GameContext)
   const { getBattleState } = useIndexer()
-  
+
   const { gameEffects } = game.getState
   const animationHandler = useContext(AnimationContext)
 
@@ -133,7 +136,11 @@ export const BattleProvider = ({ children }) => {
 
     setPendingTx(true)
 
-    const res = await dojo.executeTx([{ contractName: "battle_systems", entrypoint: "battle_actions", calldata: [game.values.gameId, values.battleId, [...actions, [1]]] }], true)
+    const res = await dojo.executeTx([{
+      contractAddress: getContractByName(currentNetworkConfig.manifest, currentNetworkConfig.namespace, "battle_systems")?.address,
+      entrypoint: "battle_actions",
+      calldata: [game.values.gameId, values.battleId, [...actions, [1]]]
+    }], true)
 
     if (!res) {
       return;