chore: prune PNPM dependency FOD

Signed-off-by: Eric Hegnes <[email protected]>

Author: ehegnes

.npmrc

@@ -0,0 +1,5 @@
+engine-strict=true
+strict-peer-dependencies=true
+auto-install-peers=false
+shared-workspace-lockfile=true
+resolve-peers-from-workspace-root=false

app2/.npmrc

@@ -4,16 +4,13 @@ _: {
       pkgs,
       pkgsUnstable,
       ensureAtRepositoryRoot,
-      lib,
       gitShortRev,
       lastModified,
       lastModifiedDate,
+      buildPnpmPackage,
       ...
     }:
     let
-      buildPnpmPackage = import ../tools/typescript/buildPnpmPackage.nix {
-        inherit pkgs lib;
-      };
       deps = with pkgsUnstable; [
         python3
         stdenv.cc
@@ -35,24 +32,21 @@ _: {
           packageJsonPath = ./package.json;
           extraSrcs = [
             ../app2
-            ../typescript-sdk
             ../ts-sdk
             ../ts-sdk-evm
             ../ts-sdk-cosmos
           ];
-          hash = "sha256-+eBL34sxYBIt2SiiLeSbn93zBN/JqGDJSaKY+3DpSos=";
+          hash = "sha256-dRkGxmO7KS00KZvcdlGxisDu8YttpNUH2NHx6pEtpyA=";
           buildInputs = deps;
           nativeBuildInputs = buildInputs;
           pnpmWorkspaces = [
             "app2"
             "@unionlabs/sdk"
             "@unionlabs/sdk-evm"
             "@unionlabs/sdk-cosmos"
-            "@unionlabs/client"
           ];
           buildPhase = ''
             runHook preBuild
-
             export PUBLIC_DATADOG_CLIENT_TOKEN="${PUBLIC_DATADOG_CLIENT_TOKEN}"
             export PUBLIC_GIT_REV="${PUBLIC_GIT_REV}"
             export PUBLIC_LAST_MODIFIED_DATE="${PUBLIC_LAST_MODIFIED_DATE}"

app2/app2.nix

@@ -17,19 +17,18 @@
     "supabase:generate": "supabase gen types --lang='typescript' --project-id='uorqzpuryrgfnecadajo' > './src/lib/dashboard/database.types.ts'"
   },
   "devDependencies": {
-    "@types/node": "^24.3.1",
-    "@aptos-labs/ts-sdk": "1.38.0",
     "@chain-registry/types": "^0.50.144",
     "@cosmjs/amino": "^0.33.1",
-    "@cosmjs/cosmwasm-stargate": "0.33.1",
-    "@cosmjs/math": "^0.33.1",
-    "@cosmjs/proto-signing": "^0.33.1",
-    "@cosmjs/stargate": "0.33.1",
-    "@cosmjs/tendermint-rpc": "^0.33.1",
+    "@cosmjs/cosmwasm-stargate": "catalog:",
+    "@cosmjs/math": "0.33.1",
+    "@cosmjs/proto-signing": "catalog:",
+    "@cosmjs/stargate": "catalog:",
+    "@cosmjs/tendermint-rpc": "catalog:",
     "@datadog/browser-logs": "^6.6.4",
-    "@effect/experimental": "0.48.6",
-    "@effect/platform": "0.84.6",
-    "@effect/typeclass": "^0.35.5",
+    "@effect/experimental": "catalog:",
+    "@effect/platform": "catalog:",
+    "@effect/typeclass": "catalog:",
+    "@effect/vitest": "catalog:",
     "@eslint/compat": "^1.2.8",
     "@eslint/js": "^9.24.0",
     "@keplr-wallet/types": "^0.12.220",
@@ -39,42 +38,45 @@
     "@safe-global/safe-gateway-typescript-sdk": "^3.23.1",
     "@scure/base": "^1.2.4",
     "@supabase/supabase-js": "^2.49.4",
-    "@sveltejs/adapter-static": "^3.0.8",
-    "@sveltejs/kit": "^2.21.3",
-    "@sveltejs/vite-plugin-svelte": "^5.1.0",
+    "@sveltejs/adapter-static": "catalog:svelte",
+    "@sveltejs/kit": "catalog:svelte",
+    "@sveltejs/vite-plugin-svelte": "catalog:svelte",
     "@tailwindcss/vite": "^4.1.4",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/svelte": "^5.2.4",
-    "@unionlabs/client": "workspace:*",
+    "@testing-library/svelte": "catalog:svelte",
+    "@types/node": "24.6.1",
     "@unionlabs/sdk": "workspace:*",
     "@unionlabs/sdk-cosmos": "workspace:*",
     "@unionlabs/sdk-evm": "workspace:*",
     "@wagmi/connectors": "^5.7.12",
     "@wagmi/core": "^2.16.7",
-    "@web3modal/wagmi": "5.1.11",
     "clsx": "^2.1.1",
-    "effect": "3.16.3",
+    "effect": "catalog:",
     "eslint": "^9.24.0",
-    "eslint-plugin-svelte": "^3.5.1",
+    "eslint-plugin-svelte": "catalog:svelte",
     "globals": "^16.0.0",
     "gql.tada": "^1.8.10",
     "graphql": "^16.10.0",
     "graphql-request": "^7.1.2",
     "happy-dom": "^17.4.4",
     "knip": "^5.63.0",
     "ox": "^0.6.9",
+    "react": "catalog:",
     "rehype-rewrite": "^4.0.2",
     "rehype-stringify": "^10.0.1",
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.2",
-    "svelte": "^5.33.18",
-    "svelte-check": "^4.2.1",
+    "starknet": "catalog:",
+    "svelte": "catalog:svelte",
+    "svelte-check": "catalog:svelte",
     "tailwind-merge": "^3.2.0",
     "tailwindcss": "^4.1.4",
+    "typescript": "catalog:",
     "typescript-eslint": "^8.30.1",
     "unified": "^11.0.5",
     "vfile": "^6.0.3",
-    "viem": "^2.33.3",
-    "vite": "^6.3.1"
+    "viem": "2.33.3",
+    "vite": "catalog:",
+    "vitest": "catalog:"
   }
 }

app2/package.json

@@ -1,19 +1,9 @@
 import type { Window as KeplrWindow } from "@keplr-wallet/types"
 import type { LeapWindow } from "@leapwallet/types"
-import type { AptosBrowserWallet } from "@unionlabs/client"
 
 type FeaturesQuery = ReturnType<typeof enabledFeatures>
 type Features = NonNullable<FeaturesQuery["data"]>["v1_ibc_union_chains"]
 
-interface AptosWindow {
-  aptos: AptosBrowserWallet
-  petra: AptosBrowserWallet
-  martian: AptosBrowserWallet
-  okxwallet: {
-    aptos: AptosBrowserWallet
-  }
-}
-
 declare global {
   namespace App {
     // interface Locals {
@@ -24,7 +14,7 @@ declare global {
     // }
   }
 
-  interface Window extends AptosWindow, KeplrWindow, LeapWindow, Browser {
+  interface Window extends KeplrWindow, LeapWindow, Browser {
     EventEmitter: typeof EventEmitter
 
     /** Guard to ensure GitHub logo proxy patches are applied only once */

app2/src/app.d.ts

@@ -1,7 +1,6 @@
 <script lang="ts">
 import Button from "$lib/components/ui/Button.svelte"
 import type { GraphQLError } from "$lib/graphql/error"
-import { FetchAptosTokenBalanceError } from "$lib/services/aptos/balances"
 import type { QueryBankBalanceError } from "$lib/services/cosmos/balances"
 import type { FetchNativeBalanceError, ReadContractError } from "$lib/services/evm/balances"
 import type { NoViemChainError } from "$lib/services/evm/clients"
@@ -73,7 +72,6 @@ interface Props {
     | CreateWalletClientError
     | CryptoError
     | ExecuteContractError
-    | FetchAptosTokenBalanceError
     | FetchNativeBalanceError
     | FromHexError
     | GasPriceError
@@ -128,7 +126,6 @@ const getUserFriendlyMessage = pipe(
     FromHexError: () => `Failed to decode hex.`,
     GetChainInfoError: (x) => `No info for EVM chain ${x.chainId}.`, // TODO: rename to EVM
     NoCosmosChainInfoError: (x) => `No info for Cosmos chain ${x.chain.display_name}.`,
-    FetchAptosTokenBalanceError: () => `Failed to fetch aptos token balance.`,
     NoRpcError: (error) => `No ${error.type} endpoint available for ${error.chain.display_name}.`,
     NoSuchElementException: () => "An unexpected error occurred.", // TODO: remove me for more explicit errors
     NoViemChain: () => "Chain configuration not found for the selected network.",

app2/src/lib/components/model/ErrorComponent.svelte

@@ -1,17 +1,16 @@
-<script lang="ts">
+<script
+  lang="ts"
+  generics="T extends string"
+>
 import SharpPowerIcon from "$lib/components/icons/SharpPowerIcon.svelte"
-import { dashboard } from "$lib/dashboard/stores/user.svelte"
-import { type AptosWalletId } from "$lib/wallet/aptos"
 import { type CosmosWalletId } from "$lib/wallet/cosmos"
 import { type EvmWalletId } from "$lib/wallet/evm"
 import { RpcType } from "@unionlabs/sdk/schema"
 import type { State } from "@wagmi/core"
 import { Schema } from "effect"
-import { Option } from "effect"
 import Label from "../../Label.svelte"
 import Truncate from "../../Truncate.svelte"
 
-type Chain = Schema.Schema.Type<typeof RpcType>
 type ChainConnectStatus = State["status"]
 type ChainWalletsInformation = ReadonlyArray<{
   id: string
@@ -20,30 +19,32 @@ type ChainWalletsInformation = ReadonlyArray<{
   download: string
 }>
 
+interface Props {
+  chain: T
+  address?: string | undefined
+  connectStatus: ChainConnectStatus
+  chainWalletsInformation: ChainWalletsInformation
+  connectedWalletId?:
+    | (T extends "cosmos" ? CosmosWalletId
+      : T extends "evm" ? EvmWalletId
+      : never)
+    | undefined
+    | null
+  onConnectClick: (walletIdentifier: string) => void | Promise<any>
+  onDisconnectClick: () => void
+  showDivider?: boolean
+}
+
 let {
   chain,
   address,
   connectStatus,
   chainWalletsInformation,
-  connectedWalletId,
+  connectedWalletId = undefined,
   onConnectClick,
   onDisconnectClick,
   showDivider = true,
-} = $props<{
-  chain: Chain
-  address: string | undefined
-  connectStatus: ChainConnectStatus
-  chainWalletsInformation: ChainWalletsInformation
-  connectedWalletId:
-    | (Chain extends "cosmos" ? CosmosWalletId
-      : Chain extends "aptos" ? AptosWalletId
-      : EvmWalletId)
-    | null
-    | undefined
-  onConnectClick: (walletIdentifier: string) => void | Promise<any>
-  onDisconnectClick: () => void
-  showDivider?: boolean
-}>()
+}: Props = $props()
 
 let connectText = $derived(
   connectStatus === "connected" && address && address?.length > 0 ? address : "",
@@ -88,7 +89,7 @@ let connectedWallet = $derived(
     </div>
   {/if}
 
-  {#if connectStatus === "connected" && address?.length > 0}
+  {#if connectStatus === "connected" && connectedWallet && address && address?.length > 0}
     <!-- Wallet Card -->
     <div class="w-full bg-zinc-100 dark:bg-zinc-900 rounded-lg p-4 transition-colors">
       <div class="flex items-center justify-between">

app2/src/lib/components/ui/Wallet/connect/connection.svelte

@@ -1,4 +1,3 @@
-import type { AptosWalletId } from "$lib/wallet/aptos"
 import type { CosmosWalletId } from "$lib/wallet/cosmos"
 import type { EvmWalletId } from "$lib/wallet/evm"
 import type { RpcType } from "@unionlabs/sdk/schema"
@@ -19,11 +18,10 @@ type Props<TChain extends Chain = Chain> = {
   address: string | undefined
   connectStatus: ChainConnectStatus
   chainWalletsInformation: ChainWalletsInformation
-  connectedWalletId:
+  connectedWalletId?:
     | (TChain extends "cosmos" ? CosmosWalletId
-      : TChain extends "aptos" ? AptosWalletId
-      : EvmWalletId)
-    | null
+      : TChain extends "evm" ? EvmWalletId
+      : never)
     | undefined
   onConnectClick: (walletIdentifier: string) => void | Promise<void>
   onDisconnectClick: () => void

app2/src/lib/components/ui/Wallet/connect/index.ts

@@ -1,7 +1,7 @@
 import { chainInfoMap } from "$lib/services/cosmos/chain-info/config"
 import { fallbackTransport } from "$lib/wallet/evm/wagmi-config.svelte"
 import { createViemPublicClient } from "@unionlabs/sdk/evm"
-import { type Chain, NumberFromHexString, UniversalChainId } from "@unionlabs/sdk/schema"
+import { type Chain, UniversalChainId } from "@unionlabs/sdk/schema"
 import {
   Array as A,
   BigDecimal,
@@ -20,7 +20,6 @@ import { GasPriceError } from "./error"
 import * as GasPrice from "./service"
 
 export class GasPriceMap extends LayerMap.Service<GasPriceMap>()("GasPriceByChain", {
-  provides: GasPrice.GasPrice,
   lookup: pipe(
     Match.type<Chain>(),
     Match.when(