Refactor Repo to Drift

.changeset/config.json

@@ -6,7 +6,7 @@
     ["@delvtech/hyperdrive-wasm", "hyperdrive-wasm"],
     ["@delvtech/fixed-point-wasm", "fixed-point-wasm"]
   ],
-  "linked": [["@delvtech/hyperdrive-viem", "@delvtech/hyperdrive-js-core"]],
+  "linked": [["@delvtech/hyperdrive-viem", "@delvtech/hyperdrive-js"]],
   "access": "restricted",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",

.changeset/gentle-llamas-glow.md

@@ -0,0 +1,5 @@
+---
+"@delvtech/hyperdrive-js": patch
+---
+
+Initial release of drift based SDK

.changeset/tall-plants-appear.md

@@ -0,0 +1,5 @@
+---
+"@delvtech/hyperdrive-viem": minor
+---
+
+Refactored to drift under the hood

apps/hyperdrive-trading/package.json

@@ -28,9 +28,11 @@
     "gen:walletconnect": "bash ./scripts/generate-walletconnect.sh"
   },
   "dependencies": {
+    "@delvtech/drift": "^0.0.1-beta.11",
+    "@delvtech/drift-viem": "^0.0.1-beta.13",
     "@delvtech/fixed-point-wasm": "^0.0.6",
     "@delvtech/hyperdrive-appconfig": "^0.0.1",
-    "@delvtech/hyperdrive-viem": "^3.0.6",
+    "@delvtech/hyperdrive-js": "^0.0.0",
     "@headlessui/react": "^2.1.5",
     "@heroicons/react": "^2.0.16",
     "@radix-ui/react-tooltip": "^1.1.2",

apps/hyperdrive-trading/src/drift/getDrift.ts

@@ -0,0 +1,23 @@
+import { createLruSimpleCache, Drift, DriftOptions } from "@delvtech/drift";
+import { viemAdapter } from "@delvtech/drift-viem";
+import { getPublicClient, GetPublicClientParameters } from "@wagmi/core";
+import { wagmiConfig } from "src/network/wagmiClient";
+
+// 1 minute TTL to match the queryClient's staleTime
+export const sdkCache = createLruSimpleCache({ max: 500, ttl: 60_000 });
+
+export function getDriftOptions({
+  chainId,
+}: {
+  chainId?: number;
+} = {}): DriftOptions {
+  return {
+    cache: sdkCache,
+    cacheNamespace: chainId,
+  };
+}
+
+export function getDrift(params?: GetPublicClientParameters): Drift {
+  const publicClient = getPublicClient(wagmiConfig as any, params) as any;
+  return new Drift(viemAdapter({ publicClient }), getDriftOptions(params));
+}

apps/hyperdrive-trading/src/hyperdrive/getLpApy.ts

@@ -1,10 +1,11 @@
+import { Block } from "@delvtech/drift";
 import { fixed } from "@delvtech/fixed-point-wasm";
 import {
   appConfig,
   getRewardsFn,
   HyperdriveConfig,
 } from "@delvtech/hyperdrive-appconfig";
-import { Block, ReadHyperdrive } from "@delvtech/hyperdrive-viem";
+import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
 import { getPublicClient } from "@wagmi/core";
 import { convertMillisecondsToDays } from "src/base/convertMillisecondsToDays";
 import { isForkChain } from "src/chains/isForkChain";
@@ -45,7 +46,7 @@
   readHyperdrive: ReadHyperdrive;
   hyperdrive: HyperdriveConfig;
 }): Promise<LpApyResult> {
-  const currentBlock = (await readHyperdrive.network.getBlock()) as Block;
+  const currentBlock = (await readHyperdrive.drift.getBlock()) as Block;
   const currentBlockNumber = currentBlock.blockNumber!;
   // Appconfig tells us how many days to look back for historical rates
   const numBlocksForHistoricalRate = isForkChain(hyperdrive.chainId)
@@ -75,7 +76,7 @@
     });
     lpApy = lpApyResult.lpApy;
     netLpApy = lpApy;
     const publicClient = getPublicClient(wagmiConfig as any, {
       chainId: hyperdrive.chainId,
     }) as PublicClient;
     const rewardsFn = getRewardsFn({

apps/hyperdrive-trading/src/hyperdrive/getYieldSourceRate.ts

@@ -1,11 +1,12 @@
+import { Block } from "@delvtech/drift";
 import { fixed } from "@delvtech/fixed-point-wasm";
 import {
   AppConfig,
   findHyperdriveConfig,
   getRewardsFn,
   HyperdriveConfig,
 } from "@delvtech/hyperdrive-appconfig";
-import { Block, ReadHyperdrive } from "@delvtech/hyperdrive-viem";
+import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
 import { getPublicClient } from "@wagmi/core";
 import { convertMillisecondsToDays } from "src/base/convertMillisecondsToDays";
 import { isForkChain } from "src/chains/isForkChain";
@@ -16,7 +17,7 @@
   readHyperdrive: ReadHyperdrive,
   appConfig: AppConfig,
 ): Promise<{ rate: bigint; ratePeriodDays: number; netRate: bigint }> {
-  const hyperdriveChainId = await readHyperdrive.network.getChainId();
+  const hyperdriveChainId = await readHyperdrive.drift.getChainId();
   const hyperdrive = findHyperdriveConfig({
     hyperdriveChainId,
     hyperdriveAddress: readHyperdrive.address,
@@ -28,7 +29,7 @@
     hyperdrive,
   });
 
-  const currentBlock = (await readHyperdrive.network.getBlock()) as Block;
+  const currentBlock = (await readHyperdrive.drift.getBlock()) as Block;
   const initializationBlock = hyperdrive.initializationBlock;
 
   const isPoolYoungerThanOneRatePeriod =
@@ -84,7 +85,7 @@
     appConfig,
   });
   if (rewardsFn) {
     const publicClient = getPublicClient(wagmiConfig as any, {
       chainId: hyperdrive.chainId,
     }) as PublicClient;
     const rewards = await rewardsFn(publicClient);

apps/hyperdrive-trading/src/registry/data.ts

@@ -1,52 +1,19 @@
-import { Hex } from "viem";
-
-export const statusById = {
-  "1": "active",
-  "2": "sunset",
-} as const;
-
-/**
- * An ID used to represent status in the registry.
- */
-export type StatusId = keyof typeof statusById;
-
 /**
  * The status of an instance or factory in the registry.
  */
-export type Status = (typeof statusById)[StatusId];
-
-/**
- * The decoded data of an instance in the registry.
- */
-export interface InstanceData {
-  status: Status;
-}
-
-/**
- * Decodes the `data` field of an instance in the registry according to the
- * ElementDAO registry schema.
- */
-export function decodeInstanceData(data: Hex): InstanceData {
-  const statusId = BigInt(data).toString() as StatusId;
-  return {
-    status: statusById[statusId],
-  };
-}
-
-/**
- * The decoded data of a factory in the registry.
- */
-export interface FactoryData {
-  status: Status;
-}
+export type Status = "active" | "sunset";
 
 /**
- * Decodes the `data` field of a factory in the registry according to the
- * ElementDAO registry schema.
+ * Returns the status of an instance or factory in the registry according to the
+ * ElementDAO registry data schema.
  */
-export function decodeFactoryData(data: Hex): FactoryData {
-  const statusId = BigInt(data).toString() as StatusId;
-  return {
-    status: statusById[statusId],
-  };
+export function getStatus(statusId: bigint): Status {
+  switch (statusId) {
+    case 1n:
+      return "active";
+    case 2n:
+      return "sunset";
+    default:
+      throw new Error(`Unknown status ID: ${statusId}`);
+  }
 }