feat: fix build

backend/src/main.rs

@@ -458,12 +458,12 @@ impl QueryRoot {
         Ok(map_objects)
     }
 
-    async fn leaderboard(
+    async fn leaderboard_players(
         &self,
         ctx: &Context<'_>,
         spacetime_policy_id: String,
-        fuel_policy_id: String,
-        ship_address: String,
+        pellet_policy_id: String,
+        spacetime_address: String,
     ) -> Result<Vec<LeaderboardRecord>, Error> {
         let pool = ctx
             .data::<sqlx::PgPool>()
@@ -486,8 +486,8 @@ impl QueryRoot {
             ORDER BY distance ASC
             ",
             spacetime_policy_id,
-            fuel_policy_id,
-            ship_address,
+            pellet_policy_id,
+            spacetime_address,
         )
         .fetch_all(pool)
         .await
@@ -508,6 +508,56 @@ impl QueryRoot {
 
         Ok(map_objects)
     }
+
+    async fn leaderboard_winners(
+        &self,
+        ctx: &Context<'_>,
+        spacetime_policy_id: String,
+        pellet_policy_id: String,
+        spacetime_address: String,
+    ) -> Result<Vec<LeaderboardRecord>, Error> {
+        let pool = ctx
+            .data::<sqlx::PgPool>()
+            .map_err(|e| Error::new(e.message))?;
+
+        let fetched_objects = sqlx::query!(
+            "
+            SELECT 
+                id,
+                CAST(utxo_subject_amount(era, cbor, decode($2::varchar, 'hex')) AS INTEGER) AS fuel,
+                CAST(utxo_plutus_data(era, cbor) -> 'fields' -> 2 ->> 'bytes' AS TEXT) AS ship_token_name,
+                CAST(utxo_plutus_data(era, cbor) -> 'fields' -> 3 ->> 'bytes' AS TEXT) AS pilot_token_name
+            FROM 
+                utxos
+            WHERE 
+                utxo_address(era, cbor) = from_bech32($3::varchar)
+                AND utxo_has_policy_id(era, cbor, decode($1::varchar, 'hex'))
+                AND ABS(CAST(utxo_plutus_data(era, cbor) -> 'fields' -> 0 ->> 'int' AS INTEGER)) + ABS(CAST(utxo_plutus_data(era, cbor) -> 'fields' -> 1 ->> 'int' AS INTEGER)) = 0
+            order by slot ASC
+            ",
+            spacetime_policy_id,
+            pellet_policy_id,
+            spacetime_address,
+        )
+        .fetch_all(pool)
+        .await
+        .map_err(|e| Error::new(e.to_string()))?;
+
+        let map_objects: Vec<LeaderboardRecord> = fetched_objects
+            .into_iter()
+            .enumerate()
+            .map(|(i, record)| LeaderboardRecord {
+                ranking: i as i32 + 1,
+                address: record.id,
+                ship_name: record.ship_token_name.unwrap_or_default(),
+                pilot_name: record.pilot_token_name.unwrap_or_default(),
+                fuel: record.fuel.unwrap_or(0),
+                distance: 0
+            })
+            .collect();
+
+        Ok(map_objects)
+    }
 }
 
 type AsteriaSchema = Schema<QueryRoot, EmptyMutation, EmptySubscription>;

frontend/src/components/ui/NavBar.tsx

@@ -1,3 +1,5 @@
+"use client";
+
 import Link from 'next/link';
 import Image from 'next/image';
 import { usePathname } from 'next/navigation';

frontend/src/pages/index.tsx

@@ -80,7 +80,7 @@ export default function Landing() {
                   Network | <span className="text-[#F1E9D9] capitalize">{ challenge.network }</span>
                 </p>
                 <p className="mb-2 text-[#6F6F6F] text-base truncate">
-                  Shipyard Policy | <span className="text-[#F1E9D9]">{ challenge.shipyardPolicyId }</span>
+                  Spacetime Policy | <span className="text-[#F1E9D9]">{ challenge.spacetimePolicyId }</span>
                 </p>
                 <p className="mb-4 font-semibold text-white text-2xl truncate">
                   { challenge.label }

frontend/src/pages/leaderboard/index.tsx

@@ -4,9 +4,9 @@ import { useChallengeStore, Challenge } from '@/stores/challenge';
 
 const PAGE_SIZE = 10;
 
-const GET_LEADERBOARD_RECORDS = gql`
-  query Leaderboard($shipyardPolicyId: String, $fuelPolicyId: String, $shipAddress: String) {
-    leaderboard(shipyardPolicyId: $shipyardPolicyId, fuelPolicyId: $fuelPolicyId, shipAddress: $shipAddress) {
+const GET_LEADERBOARD_PLAYERS_RECORDS = gql`
+  query LeaderboardPlayers($spacetimePolicyId: String, $pelletPolicyId: String, $spacetimeAddress: String) {
+    leaderboardPlayers(spacetimePolicyId: $spacetimePolicyId, pelletPolicyId: $pelletPolicyId, spacetimeAddress: $spacetimeAddress) {
       ranking,
       address,
       shipName,
@@ -17,8 +17,21 @@ const GET_LEADERBOARD_RECORDS = gql`
   }
 `;
 
+const GET_LEADERBOARD_WINNERS_RECORDS = gql`
+  query LeaderboardWinners($spacetimePolicyId: String, $pelletPolicyId: String, $spacetimeAddress: String) {
+    leaderboardWinners(spacetimePolicyId: $spacetimePolicyId, pelletPolicyId: $pelletPolicyId, spacetimeAddress: $spacetimeAddress) {
+      ranking,
+      address,
+      shipName,
+      pilotName,
+      fuel
+    }
+  }
+`;
+
 interface LeaderboardQueryResult {
-  leaderboard: LeaderboardRecord[];
+  leaderboardPlayers: LeaderboardRecord[];
+  leaderboardWinners: LeaderboardRecord[];
 }
 
 interface LeaderboardRecord {
@@ -31,6 +44,7 @@ interface LeaderboardRecord {
 }
 
 interface RecordProps {
+  leaderboard: boolean;
   challenge: Challenge;
   record: LeaderboardRecord;
 }
@@ -89,27 +103,35 @@ const LeaderboardRow: React.FunctionComponent<RecordProps> = (props: RecordProps
     <td className="p-4 text-[#D7D7D7] text-left border border-[#333333]">
       {props.record.fuel}
     </td>
-    <td className="p-4 text-left border border-[#333333]">
-      <span className="py-2 px-4 rounded-full bg-[#E7ECEF] text-[#171717]">
-        {`${props.record.distance}km`}
-      </span>
-    </td>
+    {props.leaderboard && (
+      <td className="p-4 text-left border border-[#333333]">
+        <span className="py-2 px-4 rounded-full bg-[#E7ECEF] font-dmsans-regular text-[#171717]">
+          {props.record.distance}
+        </span>
+      </td>
+    )}
   </tr>
 );
 
 export default function Leaderboard() {
+  const [ offset, setOffset ] = useState<number>(0);
+  const [ leaderboard, setLeaderboard ] = useState<boolean>(true);
+
   const { current } = useChallengeStore();
-  const { data } = useQuery<LeaderboardQueryResult>(GET_LEADERBOARD_RECORDS, {
+  const { data } = useQuery<LeaderboardQueryResult>(leaderboard ? GET_LEADERBOARD_PLAYERS_RECORDS : GET_LEADERBOARD_WINNERS_RECORDS, {
     variables: {
-      shipyardPolicyId: current().shipyardPolicyId,
-      fuelPolicyId: current().fuelPolicyId,
-      shipAddress: current().shipAddress,
+      spacetimePolicyId: current().spacetimePolicyId,
+      pelletPolicyId: current().pelletPolicyId,
+      spacetimeAddress: current().spacetimeAddress,
     },
   });
-  const [ offset, setOffset ] = useState<number>(0);
 
   const hasNextPage = () => {
-    return data && data.leaderboard && offset + PAGE_SIZE < data.leaderboard.slice(3).length;
+    if (leaderboard) {
+      return data && data.leaderboardPlayers && offset + PAGE_SIZE < data.leaderboardPlayers.slice(3).length;
+    } else {
+      return data && data.leaderboardWinners && offset + PAGE_SIZE < data.leaderboardWinners.length;
+    }
   }
 
   const nextPage = () => {
@@ -128,17 +150,40 @@ export default function Leaderboard() {
     }
   }
 
+  const getPagination = () => {
+    if (leaderboard) {
+      return `Displaying ${offset+1}-${offset+PAGE_SIZE} of ${data && data.leaderboardPlayers ? data.leaderboardPlayers.length-3 : 0}`;
+    } else {
+      return `Displaying ${offset+1}-${offset+PAGE_SIZE} of ${data && data.leaderboardWinners ? data.leaderboardWinners.length : 0}`;
+    }
+  }
+
   const getPageData = () => {
-    if (!data || !data.leaderboard) return [];
-    return data.leaderboard.slice(3).slice(offset, offset+PAGE_SIZE);
+    if (leaderboard) {
+      if (!data || !data.leaderboardPlayers) return [];
+      return data.leaderboardPlayers.slice(3).slice(offset, offset+PAGE_SIZE);
+    } else {
+      if (!data || !data.leaderboardWinners) return [];
+      return data.leaderboardWinners.slice(offset, offset+PAGE_SIZE);
+    }
+  }
+
+  const getColumns = () => {
+    if (leaderboard) {
+      return ['Ranking', 'Address', 'Ship name', 'Pilot name', 'Fuel', 'Distance'];
+    } else {
+      return ['Ranking', 'Address', 'Ship name', 'Pilot name', 'Fuel'];
+    }
   }
 
   return (
     <div className="container 2xl mx-auto p-8 min-h-[calc(100vh-64px)]">
 
       <div className="flex flex-row items-center mb-12">
         <h1 className="flex-auto mr-6 font-mono text-4xl text-[#FFF75D]">
-          DISTANCE TO ASTERIA
+          <span className="cursor-pointer" onClick={() => setLeaderboard(!leaderboard) }>
+            {`ASTERIA ${ leaderboard ? 'PLAYERS' : 'WINNERS' } >`}
+          </span>
         </h1>
         <input
           type="text"
@@ -150,30 +195,32 @@ export default function Leaderboard() {
         </button>
       </div>
 
-      <div className="flex flex-row justify-center items-center mb-12">
-        {data && data.leaderboard && data.leaderboard.slice(0, 3).map(record =>
-          <LeaderboardChip key={record.address} record={record} challenge={current()} />
-        )}
-      </div>
+      {leaderboard && (
+        <div className="flex flex-row justify-center items-center mb-12">
+          {data && data.leaderboardPlayers && data.leaderboardPlayers.slice(0, 3).map(record =>
+            <LeaderboardChip key={record.address} leaderboard={leaderboard} record={record} challenge={current()} />
+          )}
+        </div>
+      )}
 
       <table className="w-full mb-12 border-collapse border border-[#333333]">
         <thead>
           <tr>
-            {['Ranking', 'Address', 'Ship name', 'Pilot name', 'Fuel', 'Distance'].map(header =>
+            {getColumns().map(header =>
               <th key={header} className="p-4 text-[#FAFAFA] text-left border border-[#333333]">{header}</th>
             )}
           </tr>
         </thead>
         <tbody>
           {getPageData().map(record =>
-            <LeaderboardRow key={record.address} record={record} challenge={current()} />
+            <LeaderboardRow key={record.address} leaderboard={leaderboard} record={record} challenge={current()} />
           )}
         </tbody>
       </table>
 
       <div className="flex flex-row justify-center items-center mb-12">
         <p className="flex-initial text-[#848484] mr-8">
-          {`Displaying ${offset+1}-${offset+PAGE_SIZE} of ${data && data.leaderboard ? data.leaderboard.length-3 : 0}`}
+          {getPagination()}
         </p>
         <button
           className={`flex-initial w-12 h-12 font-mono text-black p-3 rounded-xl text-base mr-4 ${hasPrevPage() ? 'bg-[#07F3E6]' : 'bg-[#AFAFAF]'}`}