Merge pull request #6 from elliotsayes/dev

Fix testnet/devnet contracts, consolidate incentive fetching

src/Root.tsx

@@ -29,37 +29,37 @@ export const Root = () => {
  </span>
  </a>
  {
- network == "devnet" && 
+ network == "mainnet" && 
  <sup className='text-lg text-muted-foreground'>
- &nbsp;dev
  <TooltipProvider>
  <Tooltip>
  <TooltipTrigger>
- <InfoIcon size={12} className="ml-0.5" />
+ <InfoIcon size={12} />
  </TooltipTrigger>
  <TooltipContent align="start" className="z-50 font-normal text-sm">
+ <span>On mainnet</span>
  <a onClick={(e) => {
  e.preventDefault()
- setNetwork('mainnet')
+ setNetwork('testnet')
  window.location.reload()
  }} className="underline cursor-pointer flex flex-row items-baseline">
- <span className="">Switch to mainnet</span><ArrowLeftRightIcon size={12} className='flex ml-0.5' />
+ <span className="">Switch to testnet</span><ArrowLeftRightIcon size={12} className='flex ml-0.5' />
  </a>
  </TooltipContent>
  </Tooltip>
  </TooltipProvider>
  </sup>
  }
  {
- network == "mainnet" && 
+ network == "testnet" && 
  <sup className='text-lg text-muted-foreground'>
+ &nbsp;test
  <TooltipProvider>
  <Tooltip>
  <TooltipTrigger>
- <InfoIcon size={12} />
+ <InfoIcon size={12} className="ml-0.5" />
  </TooltipTrigger>
  <TooltipContent align="start" className="z-50 font-normal text-sm">
- <span>On mainnet</span>
  <a onClick={(e) => {
  e.preventDefault()
  setNetwork('devnet')
@@ -72,6 +72,28 @@ export const Root = () => {
  </TooltipProvider>
  </sup>
  }
+ {
+ network == "devnet" && 
+ <sup className='text-lg text-muted-foreground'>
+ &nbsp;dev
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger>
+ <InfoIcon size={12} className="ml-0.5" />
+ </TooltipTrigger>
+ <TooltipContent align="start" className="z-50 font-normal text-sm">
+ <a onClick={(e) => {
+ e.preventDefault()
+ setNetwork('testnet')
+ window.location.reload()
+ }} className="underline cursor-pointer flex flex-row items-baseline">
+ <span className="">Switch to testnet</span><ArrowLeftRightIcon size={12} className='flex ml-0.5' />
+ </a>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ </sup>
+ }
  </CardTitle>
  {/* <CardDescription>List of all Gateways</CardDescription> */}
  </CardHeader>

src/components/GarTable.stories.ts

@@ -53,12 +53,10 @@ export const MultipleItems: Story = {
  },
 };
 
-import GatewayAddressRegistryCache from "../fixtures/GatewayAddressRegistryCache.json";
+import IncentiveContract from "../fixtures/IncentiveContract.json";
 import { extractGarItems } from "@/lib/convert";
-import { zGatewayAddressRegistryCache } from "@/lib/gar/schema";
-const garCache = zGatewayAddressRegistryCache.parse(
- GatewayAddressRegistryCache
-);
+import { incentiveContractSchema } from "@/lib/incentive/schema";
+const garCache = incentiveContractSchema.parse(IncentiveContract);
 const items = extractGarItems(garCache);
 export const ManyItems: Story = {
  args: {

src/components/GarTable.tsx

@@ -167,18 +167,18 @@ const columns: ColumnDef<z.infer<typeof zGatewayAddressRegistryItem>>[] = [
  },
  {
  id: "Rewards",
- accessorFn: (item) => item.incentiveInfo?.weights.normalizedCompositeWeight ?? 0,
+ accessorFn: (item) => item.weights.normalizedCompositeWeight ?? 0,
  header: "Rewards",
  cell: (cell) => {
- const weight = cell.row.original.incentiveInfo?.weights.normalizedCompositeWeight;
+ const weight = cell.row.original.weights.normalizedCompositeWeight;
  if (weight === undefined) return (
  <div className="max-w-[16rem]"><span className="text-muted-foreground line-clamp-1">
  ---
  </span></div>
  )
 
  return (
- <IncentiveHoverCard incentiveInfo={cell.row.original.incentiveInfo!} />
+ <IncentiveHoverCard incentiveInfo={cell.row.original} />
  )
  }
  },

src/lib/convert.test.ts

@@ -1,16 +1,14 @@
 import { expect, test } from "bun:test";
-import GatewayAddressRegistryCache from "../fixtures/GatewayAddressRegistryCache.json";
+import IncentiveContract from "../fixtures/IncentiveContract.json";
 import { zGatewayAddressRegistryItem } from "../types";
 import { extractGarItems } from "./convert";
 import { z } from "zod";
-import { zGatewayAddressRegistryCache } from "./gar/schema";
+import { incentiveContractEndpointSchema } from "./incentive/schema";
 
 test("convert GatewayAddressRegistryCache fixture", () => {
- const garCache = zGatewayAddressRegistryCache.parse(
- GatewayAddressRegistryCache
- );
- const garItems = extractGarItems(garCache);
- expect(garItems.length).toEqual(Object.keys(garCache.gateways).length);
+ const garCache = incentiveContractEndpointSchema.parse(IncentiveContract);
+ const garItems = extractGarItems(garCache.result);
+ expect(garItems.length).toEqual(Object.keys(garCache.result).length);
 
  const garItemsParsed = z
  .array(zGatewayAddressRegistryItem)

src/lib/convert.ts

@@ -1,17 +1,12 @@
 import { zGatewayAddressRegistryItem } from "@/types";
 import { z } from "zod";
 import { linkFull, linkDisplay } from "./utils";
-import {
- incentiveContractSchema,
- incentiveInfoSchema,
-} from "./incentive/schema";
-import { zGatewayAddressRegistryCache } from "./gar/schema";
+import { incentiveContractSchema } from "./incentive/schema";
 
 const extractGarItems = (
- garCache: z.infer<typeof zGatewayAddressRegistryCache>,
- incentiveContractData?: z.infer<typeof incentiveContractSchema>
+ garCacheWtihIncentiveContractData: z.infer<typeof incentiveContractSchema>
 ): Array<z.infer<typeof zGatewayAddressRegistryItem>> => {
- const gatewayEntries = Object.entries(garCache.gateways);
+ const gatewayEntries = Object.entries(garCacheWtihIncentiveContractData);
  return gatewayEntries.map(([txId, item]) => {
  const fqdnIndex = gatewayEntries
  .filter(([, matchItem]) => matchItem.settings.fqdn == item.settings.fqdn)
@@ -21,16 +16,6 @@ const extractGarItems = (
  ? item.settings.fqdn
  : `${item.settings.fqdn}${`~${fqdnIndex}`}`;
 
- let incentiveInfo: z.infer<typeof incentiveInfoSchema> | undefined;
- // TODO: find a better way to match these up
- const incentiveItem = incentiveContractData?.[txId];
- if (incentiveItem) {
- incentiveInfo = {
- stats: incentiveItem.stats,
- weights: incentiveItem.weights,
- };
- }
-
  return {
  id: txId,
  fqdnKey: fqdnKey,
@@ -48,7 +33,6 @@ const extractGarItems = (
  item.settings.port
  ),
  ...item,
- incentiveInfo,
  };
  });
 };

src/lib/incentive/fetchIncentiveContractData.test.ts

@@ -1,9 +1,11 @@
 import { describe, it, expect } from "bun:test";
-import { fetchIncentiveContractData } from "./fetchIncentiveContractData";
+import { fetchGarCacheWithIncentiveContractData } from "./fetchIncentiveContractData";
 
 describe("fetchIncentiveContractData", () => {
  it("should fetch fetchIncentiveContractData from endpoint", async () => {
- const observerInfo = await fetchIncentiveContractData();
+ const observerInfo = await fetchGarCacheWithIncentiveContractData(
+ "mainnet"
+ );
 
  // console.log(observerInfo);
 

src/lib/incentive/fetchIncentiveContractData.ts

@@ -1,9 +1,11 @@
 import { Network, networkConfigMap } from "../networks";
 import { incentiveContractEndpointSchema } from "./schema";
 
-export const fetchIncentiveContractData = async (network: Network) => {
- const contractTxId = networkConfigMap[network].contractTxIds.incentive;
- const endpoint = networkConfigMap[network].endpoints.incentive;
+export const fetchGarCacheWithIncentiveContractData = async (
+ network: Network
+) => {
+ const contractTxId = networkConfigMap[network].contractTxIds.garCache;
+ const endpoint = networkConfigMap[network].endpoints.garCache;
  const contractEndpointData = await fetch(endpoint)
  .then((res) => res.json())
  .then((json) => incentiveContractEndpointSchema.parse(json));

src/lib/incentive/schema.ts

@@ -33,6 +33,6 @@ export const incentiveContractEndpointSchema = z.object({
  contractTxId: zArweaveTxId,
  result: incentiveContractSchema,
  evaluationOptions: z.object({
- sourceType: z.string(),
+ sourceType: z.string().optional(),
  }),
 });

src/lib/networks.ts

@@ -1,31 +1,31 @@
-export const networks = ["mainnet", "devnet"] as const;
-export const defaultNetwork: Network = "mainnet";
+export const networks = ["mainnet", "testnet", "devnet"] as const;
+export const defaultNetwork: Network = "testnet";
 
 export type Network = (typeof networks)[number];
 
 type ContractTxIdConfig = {
  garCache: string;
- incentive: string;
 };
 
 export const contractTxIdMap: Record<Network, ContractTxIdConfig> = {
  mainnet: {
  garCache: "bLAgYxAdX2Ry-nt6aH2ixgvJXbpsEYm28NgJgyqfs-U",
- incentive: "_NctcA2sRy1-J4OmIQZbYFPM17piNcbdBPH2ncX2RL8",
  },
- devnet: {
+ testnet: {
  garCache: "bLAgYxAdX2Ry-nt6aH2ixgvJXbpsEYm28NgJgyqfs-U",
- incentive: "_NctcA2sRy1-J4OmIQZbYFPM17piNcbdBPH2ncX2RL8",
+ },
+ devnet: {
+ garCache: "_NctcA2sRy1-J4OmIQZbYFPM17piNcbdBPH2ncX2RL8",
  },
 };
 
 type EndpointConfig = {
  garCache: string;
- incentive: string;
 };
 
 const subdomainMap: Record<Network, string> = {
  mainnet: "api",
+ testnet: "api",
  devnet: "dev",
 };
 
@@ -45,10 +45,9 @@ type NetworkConfig = {
 const configBuilder = (network: Network): NetworkConfig => {
  const contractTxIds = contractTxIdMap[network];
  const endpoints = {
- garCache: endpointBuilder(network, contractTxIds.garCache, "/gateways"),
- incentive: endpointBuilder(
+ garCache: endpointBuilder(
  network,
- contractTxIds.incentive,
+ contractTxIds.garCache,
  "/read/gateways"
  ),
  };
@@ -57,5 +56,6 @@ const configBuilder = (network: Network): NetworkConfig => {
 
 export const networkConfigMap: Record<Network, NetworkConfig> = {
  mainnet: configBuilder("mainnet"),
+ testnet: configBuilder("testnet"),
  devnet: configBuilder("devnet"),
 };

src/lib/query.ts

@@ -4,22 +4,19 @@ import {
  downloadReportInfoForTransaction,
  querySingleTransaction,
 } from "./observer/downloadObservation";
-import { fetchIncentiveContractData } from "./incentive/fetchIncentiveContractData";
-import { zGatewayAddressRegistryCache } from "./gar/schema";
-import { Network, networkConfigMap } from "./networks";
+import { fetchGarCacheWithIncentiveContractData } from "./incentive/fetchIncentiveContractData";
+import { Network } from "./networks";
 
 export const queryClient = new QueryClient();
 
 export const garQueryBuilder = (network: Network) =>
  queryOptions({
  queryKey: ["gar", network],
  queryFn: async () => {
- const garCache = await fetch(networkConfigMap[network].endpoints.garCache)
- .then((res) => res.json())
- .then((json) => zGatewayAddressRegistryCache.parse(json));
- const incentiveContractData = await fetchIncentiveContractData(network);
+ const garCacheWtihIncentiveContractData =
+ await fetchGarCacheWithIncentiveContractData(network);
 
- const garItems = extractGarItems(garCache, incentiveContractData);
+ const garItems = extractGarItems(garCacheWtihIncentiveContractData);
  garItems.sort((a, b) => a.fqdnKey.localeCompare(b.fqdnKey));
  return garItems;
  },

src/types.ts

@@ -1,10 +1,6 @@
 import { z } from "zod";
-import { incentiveInfoSchema } from "./lib/incentive/schema";
-import {
- zArioObservation,
- zArweaveTxId,
- zGatewayAddressRegistryItemData,
-} from "./lib/gar/schema";
+import { incentiveContractItemSchema } from "./lib/incentive/schema";
+import { zArioObservation, zArweaveTxId } from "./lib/gar/schema";
 
 export const zGatewayAddressRegistryItem = z.intersection(
  z.object({
@@ -39,9 +35,8 @@ export const zGatewayAddressRegistryItem = z.intersection(
  result: zArioObservation,
  }),
  ]),
- incentiveInfo: incentiveInfoSchema.optional(),
  }),
- zGatewayAddressRegistryItemData
+ incentiveContractItemSchema
 );
 
 export const zGatewayObserverInfo = z.object({