fix: non-aggression was using the wrong epoch

rsproule · Jan 3, 2024 · c5f15b4 · c5f15b4
1 parent da7ed27
commit c5f15b4
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 18 deletions.
diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
@@ -1,8 +1,5 @@
 import Link from "next/link";
-import { EventStream } from "../components/tankGame/EventsStream";
-import { TankGame } from "../components/tankGame/TankGame";
 import { Button } from "../components/ui/button";
-import { Toaster } from "../components/ui/toaster";
 import { Connected } from "../components/wagmi/Connected";
 import Manifesto from "../components/tankGame/Manifesto";
 export default function HomePage() {

diff --git a/frontend/src/app/providers.tsx b/frontend/src/app/providers.tsx
@@ -3,7 +3,6 @@
 import { ConnectKitProvider } from 'connectkit'
 import * as React from 'react'
 import { WagmiConfig } from 'wagmi'
-
 import { config } from '../wagmi'
 
 export function Providers({ children }: { children: React.ReactNode }) {

diff --git a/frontend/src/components/tankGame/EventsStream.tsx b/frontend/src/components/tankGame/EventsStream.tsx
@@ -16,7 +16,6 @@ export async function getTankNameFromJoinIndex(
   }
   let logs = await getLogs(address);
   let joinLogs = logs.filter((log) => log.eventName == "PlayerJoined");
-  console.log({ joinLogs });
   // @ts-ignore
   let name = joinLogs.find((log) => log.args.tankId === tankId);
   // @ts-ignore

diff --git a/frontend/src/components/tankGame/PlayerDropdown.tsx b/frontend/src/components/tankGame/PlayerDropdown.tsx
@@ -16,9 +16,7 @@ export default function PlayerDropdown({
   targetTank: string | undefined;
   gameAddress: Address;
 }) {
-  console.log({ gameAddress })
   const tanks = useTanks(gameAddress);
-  console.log({ tanks });
   return (
     <Select value={targetTank} onValueChange={setTargetTank}>
       <SelectTrigger>
@@ -28,7 +26,7 @@ export default function PlayerDropdown({
         {tanks.map((tank, i) => {
           return (
             <SelectItem key={i} value={(i + 1).toString()}>
-              {tank}
+              {i} - {tank}
             </SelectItem>
           );
         })}

diff --git a/frontend/src/components/treaties/Bounty.tsx b/frontend/src/components/treaties/Bounty.tsx
@@ -31,8 +31,6 @@ export default function Bounty({
   addedHooks: any;
 }) {
   const tankName = useTankNameFromId(gameAddress, tankId);
-  console.log({ tankName });
-  console.log({ tankId });
   const { address } = useAccount();
   const ownerTank = useTankGamePlayers({
     // @ts-ignore
@@ -300,6 +298,5 @@ function TankName({
   gameAddress: Address;
 }) {
   const tankName = useTankNameFromId(gameAddress, tankId);
-  console.log({ tankName });
   return <div>{tankName}</div>;
 }
diff --git a/frontend/src/components/treaties/NonAggression.tsx b/frontend/src/components/treaties/NonAggression.tsx
@@ -5,6 +5,7 @@ import {
   useNonAggressionAccept,
   useGameViewGetEpoch,
   gameViewAddress,
+  useGameViewGetGameEpoch,
 } from "@/src/generated";
 import { useState, useEffect } from "react";
 import { Address, BaseError } from "viem";
@@ -40,7 +41,7 @@ export default function NonAggression({
     enabled: !!address,
   });
   const { chain } = useNetwork();
-  const { data: epoch } = useGameViewGetEpoch({
+  const { data: epoch } = useGameViewGetGameEpoch({
     // @ts-ignore
     address: gameViewAddress[chain?.id as keyof typeof gameViewAddress],
     watch: true,
@@ -66,7 +67,6 @@ export default function NonAggression({
       const acceptedTreaties = allLogs.filter(
         (bounty: any) => bounty.eventName === "AcceptedTreaty"
       );
-
       const filteredProposedTreaties = proposedTreaties
         .filter(
           (proposedTreaty: any) =>
@@ -76,7 +76,7 @@ export default function NonAggression({
                 acceptedTreaty.args.proposee === proposedTreaty.args.proposee &&
                 acceptedTreaty.args.expiry === proposedTreaty.args.expiry &&
                 acceptedTreaty.args.hookProposer ===
-                proposedTreaty.args.proposalHook
+                  proposedTreaty.args.proposalHook
             )
         )
         .filter((treaty: any) => treaty.args.expiry > epoch!);

diff --git a/frontend/src/components/wagmi/Connected.tsx b/frontend/src/components/wagmi/Connected.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import Manifesto from "../tankGame/Manifesto";
-
 export function Connected({ children }: { children: React.ReactNode }) {
   return <>{children}</>;
 }
diff --git a/frontend/src/wagmi.ts b/frontend/src/wagmi.ts
@@ -1,13 +1,13 @@
 import { getDefaultConfig } from "connectkit";
-import { goerli, foundry } from "viem/chains";
+import { foundry, goerli } from "viem/chains";
 import { createConfig } from "wagmi";
 const walletConnectProjectId = process.env.NEXT_PUBLIC_WALLET_CONNECT_APP!;
 const alchemyId = process.env.NEXT_PUBLIC_ALCHEMY_ID!;
 
 export const config = createConfig(
   getDefaultConfig({
     autoConnect: true,
-    appName: "TactV2",
+    appName: "Tact",
     walletConnectProjectId,
     alchemyId: alchemyId,
     chains: [goerli, foundry],