Migrate fully to PNPM (#5142)

Author: ehegnes

.gitignore

@@ -110,6 +110,7 @@ ts-sdk-evm/docs
 ts-sdk-cosmos/build
 ts-sdk-cosmos/dist
 ts-sdk-cosmos/docs
+sentinel2/build
 docs/src/content/docs/reference/@unionlabs/sdk
 docs/src/content/docs/reference/@unionlabs/sdk-evm
 docs/src/content/docs/reference/@unionlabs/sdk-cosmos

.helix/languages.toml

@@ -17,9 +17,9 @@ command = "biome"
 args    = ["--stdio"]
 command = "emmet-language-server"
 
-[language-server.vscode-solidity-server]
-args    = ["--stdio"]
-command = "./evm/node_modules/vscode-solidity-server/dist/cli/server.js"
+[language-server.solc]
+args    = ["--lsp"]
+command = "solc"
 
 [language-server.tailwindcss-ls]
 args    = ["--stdio"]
@@ -37,7 +37,7 @@ command = "vscode-html-language-server"
 
 [[language]]
 auto-format      = true
-language-servers = [{ name = "vscode-solidity-server" }]
+language-servers = [{ name = "solc" }]
 name             = "solidity"
 
 [[language]]

app2/app2.nix

@@ -40,7 +40,7 @@ _: {
             ../ts-sdk-evm
             ../ts-sdk-cosmos
           ];
-          hash = "sha256-Wc+E99V1tj+tG7VVha9CBB1YVb+H83GgUJpxhvq1gzU=";
+          hash = "sha256-uRmTzZE9pbyW4AIkrViGPzUvLPYARBaDEb35A3TRe/k=";
           buildInputs = deps;
           nativeBuildInputs = buildInputs;
           pnpmWorkspaces = [

app2/src/lib/graphql/error.ts

@@ -1,16 +1,27 @@
-import { Schema as S } from "effect"
-import type { ClientError } from "graphql-request"
+import { Match, pipe, Schema as S } from "effect"
+import { ClientError } from "graphql-request"
 
 export class GraphQLError extends S.TaggedError<GraphQLError>("GraphQLError")("GraphQLError", {
   message: S.String,
   status: S.Number,
   errors: S.optional(S.Any),
   cause: S.Any,
 }) {
-  constructor(error: ClientError) {
-    const query = error.request.query
-    const variables = error.request.variables
-    super({
+  static fromUnknown(error: unknown) {
+    return pipe(
+      Match.value(error),
+      Match.when(Match.instanceOf(ClientError), this.fromClientError),
+      Match.orElse((error) =>
+        this.make({
+          cause: error,
+          message: String(error) ?? "Unknown error",
+          status: -1,
+        })
+      ),
+    )
+  }
+  static fromClientError(error: ClientError) {
+    return this.make({
       message: error.message,
       status: error.response.status,
       errors: error.response.errors,

app2/src/lib/graphql/service.ts

@@ -156,7 +156,7 @@ export class GraphQL extends Effect.Service<GraphQL>()("app/GraphQL", {
               variables,
               signal,
             }),
-          catch: (error) => GraphQLError.make(error as ClientError),
+          catch: (error) => GraphQLError.fromUnknown(error),
         }).pipe(
           Effect.withLogSpan("fetch"),
         )
@@ -260,7 +260,6 @@ export class GraphQL extends Effect.Service<GraphQL>()("app/GraphQL", {
       }),
     } as const
   }),
-  accessors: true,
   dependencies: [
     GraphQLCache.Default,
     Persistence.layerResultKeyValueStore.pipe(

app2/src/lib/layers/live.ts

@@ -3,7 +3,7 @@ import { SupabaseClient } from "$lib/dashboard/client"
 import { GasPriceMap } from "$lib/gasprice"
 import { GraphQL } from "$lib/graphql/service"
 import * as Datadog from "$lib/logging/datadog"
-import { PriceOracleExecutor } from "@unionlabs/sdk/PriceOracle"
+import { PriceOracle } from "@unionlabs/sdk"
 import { Layer, Logger, LogLevel, Match } from "effect"
 
 const minimumLogLevel = Logger.minimumLogLevel(
@@ -18,7 +18,7 @@ const minimumLogLevel = Logger.minimumLogLevel(
 export default Layer.mergeAll(
   GraphQL.Default,
   GasPriceMap.Default,
-  PriceOracleExecutor.Default,
+  PriceOracle.layerExecutor,
   SupabaseClient.Default({ auth: { autoRefreshToken: true } }),
   Logger.replace(
     Logger.defaultLogger,

app2/src/lib/layers/test.ts

@@ -1,12 +1,12 @@
 import { SupabaseClient } from "$lib/dashboard/client"
 import { GasPriceMap } from "$lib/gasprice"
 import { GraphQL } from "$lib/graphql/service"
-import { PriceOracleExecutor } from "@unionlabs/sdk/PriceOracle"
+import { PriceOracle } from "@unionlabs/sdk"
 import { Layer } from "effect"
 
 export default Layer.mergeAll(
   GraphQL.Test,
-  PriceOracleExecutor.Test,
+  PriceOracle.layerTest,
   SupabaseClient.Default(), // TODO: replace with mock
   GasPriceMap.Default, // TODO: replace with mock
 )

app2/src/lib/stores/ui.svelte.ts

@@ -4,7 +4,7 @@ import { GraphQL } from "$lib/graphql/service"
 import * as AppRuntime from "$lib/runtime"
 import { themes } from "$lib/themes"
 import type { Edition, Theme } from "$lib/themes"
-import { Match, Option, pipe, Record as R, String as Str } from "effect"
+import { Effect, Match, Option, pipe, Record as R, String as Str } from "effect"
 
 const projectIds: Record<Edition, string> = {
   app: "f544d5ee6eb61962408fd456c114e9ed",
@@ -79,15 +79,21 @@ class UiStore {
   }
 
   get graphqlEndpoint(): string {
-    return AppRuntime.runSync(GraphQL.getEndpoint)
+    return AppRuntime.runSync(GraphQL.pipe(
+      Effect.andThen((client) => client.getEndpoint),
+    ))
   }
 
   set graphqlEndpoint(s: string) {
-    AppRuntime.runPromise(GraphQL.updateEndpoint(s))
+    AppRuntime.runPromise(GraphQL.pipe(
+      Effect.andThen((client) => client.updateEndpoint(s)),
+    ))
   }
 
   clearGqlCache() {
-    AppRuntime.runSync(GraphQL.resetCache)
+    AppRuntime.runSync(GraphQL.pipe(
+      Effect.andThen((client) => client.resetCache),
+    ))
   }
 
   openWalletModal() {

app2/src/routes/explorer/orbital/charts/TerminalLog.svelte

@@ -311,9 +311,10 @@ $effect(() => {
     const newTransfers = transfers.slice(processedCount)
 
     newTransfers.forEach((transfer) => {
-      const sourceChain = transfer.sourceDisplayName || transfer.source_chain?.display_name
+      const sourceChain = transfer.sourceDisplayName || transfer.source_chain.universal_chain_id
         || "unknown"
-      const destChain = transfer.destinationDisplayName || transfer.destination_chain?.display_name
+      const destChain = transfer.destinationDisplayName
+        || transfer.destination_chain.universal_chain_id
         || "unknown"
 
       addLog(

app2/src/routes/explorer/transfers/[packet_hash]/+page.svelte

@@ -249,7 +249,7 @@ const suggestTokenToWallet = async (chain_id: string, denom: TokenRawDenom) => {
                     class="text-zinc-400"
                   />
                 {:else}
-                  <div>{transfer.source_chain.chain_id}</div>
+                  <div>{transfer.source_chain.universal_chain_id}</div>
                   <div class="font-mono text-sm text-zinc-400">
                     {transfer.sender_canonical}
                   </div>
@@ -279,7 +279,7 @@ const suggestTokenToWallet = async (chain_id: string, denom: TokenRawDenom) => {
                   class="text-zinc-400"
                 />
               {:else}
-                <div>{transfer.destination_chain.chain_id}</div>
+                <div>{transfer.destination_chain.universal_chain_id}</div>
                 <div class="font-mono text-sm text-zinc-400">
                   {transfer.receiver_canonical}
                 </div>