Merge branch 'feat-mvp' of github.com:Mississippi-Labs/mississippi in…

…to feat-mvp

packages/client/src/components/Battle/index.tsx

@@ -19,7 +19,7 @@ import btnBg from "@/assets/img/battle/btn-bg.svg";
 import Appearance from '@/components/Appearance';
 import "./styles.scss";
 import { useEntityQuery } from "@latticexyz/react";
-import { Has, getComponentValue, NotValue } from '@latticexyz/recs';
+import { Has, getComponentValue, NotValue, HasValue } from '@latticexyz/recs';
 import { useMUD } from '@/mud/MUDContext';
 import { decodeEntity } from "@latticexyz/store-sync/recs";
 import { getRandomStr } from '@/utils/utils';
@@ -63,8 +63,9 @@ export default function Battle(props) {
       if (!timeout) {
         timeout = setTimeout(async () => {
           let resultBattle:any = await forceEnd(battle.id)
+          console.log(resultBattle)
           if (resultBattle.isEnd && resultBattle.winner) {
-            props.finishBattle(battle.winner, battle.attacker, battle.defender)
+            props.finishBattle(resultBattle.winner, resultBattle.attacker, resultBattle.defender)
             return
           }
         }, 23000)
@@ -85,18 +86,18 @@ export default function Battle(props) {
     // }
   }
 
-  const battles = useEntityQuery([Has(BattleList), NotValue(BattleList, {isEnd: true})]).map((entity) => {
+  const battles = useEntityQuery([Has(BattleList), HasValue(BattleList, {isEnd: false})]).map((entity) => {
     let id = decodeEntity({ battleId: "uint256" }, entity);
     let battle:any = getComponentValue(BattleList, entity)
     battle.id = id.battleId.toString()
     return battle;
   });
-  if (battles.length) {
-    let battleTemp:any = battles.filter((item:any) => (item.attacker.toLocaleLowerCase() == props?.curPlayer?.addr.toLocaleLowerCase() || item.defender.toLocaleLowerCase() == props?.curPlayer?.addr.toLocaleLowerCase()))[0]
-    if (battleTemp) {
-      battle = battleTemp
-      initBattle()
-    }
+  let battleTemp:any = battles?.filter((item:any) => (item.attacker.toLocaleLowerCase() == props?.curPlayer?.addr.toLocaleLowerCase() || item.defender.toLocaleLowerCase() == props?.curPlayer?.addr.toLocaleLowerCase()))[0]
+  if (battleTemp) {
+    battle = battleTemp
+    initBattle()
+  } else {
+    props.finishBattle()
   }
 
   useEffect(() => {

packages/client/src/components/UserAddress/index.tsx

@@ -24,9 +24,6 @@ const UserAddress = (props: IProps) => {
       <CopyToClipboard text={address} onCopy={onCopy}>
         <div className="user-address">{addressTxt}</div>
       </CopyToClipboard>
-      <CopyToClipboard text={address} onCopy={onCopy}>
-        <img src={copyImg} alt="" className="copy-icon"/>
-      </CopyToClipboard>
     </div>
   );
 };

packages/client/src/components/UserAddress/styles.scss

@@ -28,6 +28,7 @@
 
     .user-address {
         padding: 0 20px;
+        cursor: pointer;
     }
 
     .copy-icon {

packages/client/src/components/UserInfo/index.tsx

@@ -17,7 +17,6 @@ const UserInfo = (props: IUserInfo) => {
 
   const { handheld, head, clothes, gem = 0, userUrl, lootUrl, player } = props;
   const lootHasLoaded = (handheld && head && clothes) || (player?.equip?.handheld && player?.equip?.head && player?.equip?.clothes);
-  console.log(handheld, head, clothes, lootHasLoaded);
 
   return (
     <div className={'mi-userinfo-wrapper'}>
@@ -44,7 +43,7 @@ const UserInfo = (props: IUserInfo) => {
           <div className={`user-attr-wrapper ${lootHasLoaded ? 'loaded' : ''}`}>
             <dl>
               <dt>HP</dt>
-              <dd><span className="base-attr">{lootHasLoaded ? player?.maxHp  : 0}</span><span className="extra-attr">{lootHasLoaded ? player?.maxHp?.toString() : ''}</span></dd>
+              <dd><span className="base-attr">{lootHasLoaded ? player?.maxHp.toString()  : 0}</span><span className="extra-attr">{lootHasLoaded ? player?.maxHp?.toString() : ''}</span></dd>
             </dl>
             <dl>
               <dt>Attack</dt>
@@ -71,10 +70,11 @@ const UserInfo = (props: IUserInfo) => {
       </div>
       <div className="right-main-content">
         <UserPackage
-          gem={gem}
+          gem={player?.oreBalance}
           title={'User Package'}
         />
         <UserPackage
+          gem={player?.seasonOreBalance}
           title={'Season Package'}
         />
       </div>

packages/client/src/index.tsx

@@ -18,13 +18,6 @@ setup().then(async (result) => {
     </MUDProvider>
   );
   const { mount: mountDevTools } = await import("@latticexyz/dev-tools");
-  const comp = [];
-  network.world.components.forEach((c) => {
-    if (comp.findIndex((item) => item.id === c.id) === -1) {
-      comp.push(c);
-    }
-  });
-  network.world.components = comp;
   mountDevTools({
     config: mudConfig,
     publicClient: network.publicClient,

packages/client/src/mud/createSystemCalls.ts

@@ -68,6 +68,7 @@ export function createSystemCalls(
       const tx = await worldContract.write.battleInvitation([addr, steps]);
       await waitForTransaction(tx);
       console.log('battleInvitation success', new Date().getTime(), tx);
+      return tx
     } catch (error) {
       console.log('battleInvitation', error);
       message.error(error.cause.reason || error.cause.details);
@@ -239,7 +240,7 @@ export function createSystemCalls(
       return getComponentValue(BattleList, encodeEntity({ battleId: "uint256" }, { battleId:  battleId}))
     } catch (error) {
       console.log('forceEnd', error);
-      message.error(error.cause.reason || error.cause.details);
+      // message.error(error.cause.reason || error.cause.details);
     }
   }
 
@@ -256,6 +257,17 @@ export function createSystemCalls(
     }
   }
 
+  const submitGem = async () => {
+    try {
+      const tx = await worldContract.write.submitGem();
+      await waitForTransaction(tx);
+      return tx
+    } catch (error) {
+      console.log('submitGem', error);
+      message.error(error.cause.reason || error.cause.details);
+    }
+  }
+
   const getBattlePlayerHp = async (battleId: any, addr: any) => {
     const data = await worldContract.read.getBattlePlayerHp([battleId, addr]);
     return data
@@ -280,6 +292,7 @@ export function createSystemCalls(
     initUserInfo,
     selectBothNFT,
     forceEnd,
-    unlockUserLocation
+    unlockUserLocation,
+    submitGem
   };
 }

packages/client/src/mud/getNetworkConfig.ts

@@ -6,8 +6,8 @@ const worlds = worldsJson as Partial<Record<string, { address: string; blockNumb
 
 export async function getNetworkConfig() {
   const params = new URLSearchParams(window.location.search);
-  const chainId = Number(params.get("chainId") || params.get("chainid") || (import.meta.env.DEV ? import.meta.env.TEST_CHAIN_ID : import.meta.env.VITE_CHAIN_ID) || 31337);
-  // const chainId = 46508363;
+  // const chainId = Number(params.get("chainId") || params.get("chainid") || (import.meta.env.DEV ? import.meta.env.TEST_CHAIN_ID : import.meta.env.VITE_CHAIN_ID) || 31337);
+  const chainId = 33784;
   // const chainId = 421613;
   // console.log(supportedChains);
   if (import.meta.env.DEV) {

packages/client/src/mud/supportedChains.ts

@@ -5,5 +5,22 @@ import { sepolia, arbitrumGoerli } from 'viem/chains'
 arbitrumGoerli.rpcUrls.default.http = ['https://arbitrum-goerli.infura.io/v3/5ca372516740427e97512d4dfefd9c47'];
 arbitrumGoerli.rpcUrls.default.webSocket = [ 'wss://arbitrum-goerli.infura.io/ws/v3/5ca372516740427e97512d4dfefd9c47'];
 
+const testnet = {
+    name: "Lidamao Testnet",
+    id: 33784,
+    network: "lidamao-testnet",
+    nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
+    rpcUrls: {
+      default: {
+        http: ["https://rpc.0xmssp.xyz"],
+        webSocket: ["https://rpc.0xmssp.xyz"],
+      },
+      public: {
+        http: ["https://rpc.0xmssp.xyz"],
+        webSocket: ["https://rpc.0xmssp.xyz"],
+      },
+    }
+  }
+
 // If you are deploying to chains other than anvil or Lattice testnet, add them here
-export const supportedChains: MUDChain[] = [mudFoundry, latticeTestnet, sepolia, arbitrumGoerli];
+export const supportedChains: MUDChain[] = [mudFoundry, latticeTestnet, sepolia, arbitrumGoerli, testnet];