feat: refactor background service and handlers for Kaspa integration

dadamu · dadamu · commit b67f93ebad1c · 2025-04-14T18:03:33.000+08:00
diff --git a/api/background/background-service.ts b/api/background/background-service.ts
@@ -1,15 +1,15 @@
-import { connectHandler } from "@/api/background/handlers/connect";
-import { getAccountHandler } from "@/api/background/handlers/getAccount";
-import { signAndBroadcastTxHandler } from "@/api/background/handlers/signAndBroadcastTx";
-import { signTxHandler } from "@/api/background/handlers/signTx";
+import { connectHandler } from "@/api/background/handlers/kaspa/connect";
+import { getAccountHandler } from "@/api/background/handlers/kaspa/getAccount";
+import { signAndBroadcastTxHandler } from "@/api/background/handlers/kaspa/signAndBroadcastTx";
+import { signTxHandler } from "@/api/background/handlers/kaspa/signTx";
 import {
   Action,
   ApiRequestWithHostSchema,
   ApiResponseSchema,
 } from "@/api/message";
 import { getNetwork } from "@/api/background/handlers/get-network.ts";
 import { ethereumRequestHandler } from "@/api/background/handlers/ethereum/request";
-import { signMessageHandler } from "@/api/background/handlers/signMessage";
+import { signMessageHandler } from "@/api/background/handlers/kaspa/signMessage";
 
 export class BackgroundService {
   public listen(): void {
diff --git a/api/background/handlers/ethereum/sendTransaction.ts b/api/background/handlers/ethereum/sendTransaction.ts
@@ -3,10 +3,28 @@ import {
   RpcError,
   RPC_ERRORS,
   RpcRequestSchema,
-  ethereumTransactionRequestSchema,
 } from "@/api/message";
 import { ApiUtils } from "@/api/background/utils";
 import { isMatchCurrentAddress, isUserDeniedResponse } from "./utils";
+import { isAddress, isHex } from "viem";
+import { z } from "zod";
+
+export const ethereumTransactionRequestSchema = z.object({
+  from: z.string().refine(isAddress, "Must be a valid Ethereum address"),
+  to: z.string().refine(isAddress, "Must be a valid Ethereum address"),
+  value: z.string().refine(isHex, "Value must be a hex string").optional(),
+  data: z.string().refine(isHex, "Data must be a hex string").optional(),
+  maxFeePerGas: z
+    .string()
+    .refine(isHex, "Max fee per gas must be a hex string")
+    .optional(),
+  maxPriorityFeePerGas: z
+    .string()
+    .refine(isHex, "Max priority fee must be a hex string")
+    .optional(),
+});
+
+// ================================================================================
 
 export const sendTransactionHandler = async (
   tabId: number,
diff --git a/api/background/handlers/kaspa/connect.ts b/api/background/handlers/kaspa/connect.ts
@@ -1,5 +1,15 @@
-import { ApiRequestWithHost, ConnectPayloadSchema } from "@/api/message";
+import { ApiRequestWithHost } from "@/api/message";
 import { ApiUtils, Handler } from "@/api/background/utils";
+import { NetworkType } from "@/contexts/SettingsContext";
+import { z } from "zod";
+
+export const ConnectPayloadSchema = z.object({
+  networkId: z.nativeEnum(NetworkType),
+  name: z.string(),
+  icon: z.string().optional(),
+});
+
+export type ConnectPayload = z.infer<typeof ConnectPayloadSchema>;
 
 /** Connect handler to serve BrowserMessageType.CONNECT message */
 export const connectHandler: Handler = async (
diff --git a/api/background/handlers/kaspa/getAccount.ts b/api/background/handlers/kaspa/getAccount.ts
diff --git a/api/background/handlers/kaspa/signAndBroadcastTx.ts b/api/background/handlers/kaspa/signAndBroadcastTx.ts
@@ -1,6 +1,8 @@
 import { Handler } from "@/api/background/utils";
-import { ApiRequestWithHost, SignTxPayloadSchema } from "@/api/message";
+import { ApiRequestWithHost } from "@/api/message";
 import { ApiUtils } from "@/api/background/utils";
+import { SignTxPayloadSchema } from "./utils";
+
 /** signAndBroadcastTx handler to serve BrowserMessageType.SIGN_AND_BROADCAST_TX message */
 export const signAndBroadcastTxHandler: Handler = async (
   tabId: number,
diff --git a/api/background/handlers/kaspa/signMessage.ts b/api/background/handlers/kaspa/signMessage.ts
@@ -1,10 +1,15 @@
 import { Handler } from "@/api/background/utils";
-import {
-  ApiRequestWithHost,
-  ApiResponse,
-  SignMessagePayloadSchema,
-} from "@/api/message";
+import { ApiRequestWithHost, ApiResponse } from "@/api/message";
 import { ApiUtils } from "@/api/background/utils";
+import { z } from "zod";
+
+export const SignMessagePayloadSchema = z.object({
+  message: z.string(),
+});
+
+export type SignMessagePayload = z.infer<typeof SignMessagePayloadSchema>;
+
+// ================================================================================
 
 /** signMessageHandler to serve BrowserMessageType.SIGN_MESSAGE message */
 export const signMessageHandler: Handler = async (
diff --git a/api/background/handlers/kaspa/signTx.ts b/api/background/handlers/kaspa/signTx.ts
@@ -1,10 +1,7 @@
 import { Handler } from "@/api/background/utils";
-import {
-  ApiRequestWithHost,
-  ApiResponse,
-  SignTxPayloadSchema,
-} from "@/api/message";
+import { ApiRequestWithHost } from "@/api/message";
 import { ApiUtils } from "@/api/background/utils";
+import { SignTxPayloadSchema } from "./utils";
 
 /** signTxHandler to serve BrowserMessageType.SIGN_TX message */
 export const signTxHandler: Handler = async (
diff --git a/api/background/handlers/kaspa/utils.ts b/api/background/handlers/kaspa/utils.ts
@@ -0,0 +1,10 @@
+import { z } from "zod";
+import { ScriptOption } from "@/lib/wallet/wallet-interface.ts";
+
+export const SignTxPayloadSchema = z.object({
+  networkId: z.string(),
+  txJson: z.string(),
+  scripts: z.array(z.custom<ScriptOption>()).optional(),
+});
+
+export type SignTxPayload = z.infer<typeof SignTxPayloadSchema>;
diff --git a/api/browser.ts b/api/browser.ts
@@ -1,15 +1,10 @@
 import { v4 as uuid } from "uuid";
-import {
-  Action,
-  ApiRequest,
-  ApiResponseSchema,
-  ConnectPayloadSchema,
-  SignTxPayloadSchema,
-  SignMessagePayloadSchema,
-} from "@/api/message";
+import { Action, ApiRequest, ApiResponseSchema } from "@/api/message";
 import { ScriptOption } from "@/lib/wallet/wallet-interface.ts";
 import { EthereumBrowserAPI } from "./ethereum";
-import { ApiUtils } from "@/api/background/utils.ts";
+import { ConnectPayloadSchema } from "@/api/background/handlers/kaspa/connect";
+import { SignTxPayloadSchema } from "@/api/background/handlers/kaspa/utils";
+import { SignMessagePayloadSchema } from "@/api/background/handlers/kaspa/signMessage";
 
 function createApiRequest(
   action: Action,
@@ -28,12 +23,7 @@ function createApiRequest(
 export class KastleBrowserAPI {
   public readonly ethereum = new EthereumBrowserAPI();
 
-  constructor() {
-    window.postMessage(
-      ApiUtils.createApiResponse("kastle_installed", []),
-      window.location.origin,
-    );
-  }
+  constructor() {}
 
   async connect(
     networkId: "mainnet" | "testnet-10" = "mainnet",
diff --git a/api/message.ts b/api/message.ts
@@ -1,7 +1,4 @@
-import { ScriptOption } from "@/lib/wallet/wallet-interface.ts";
 import { z } from "zod";
-import { NetworkType } from "@/contexts/SettingsContext.tsx";
-import { isAddress, isHex } from "viem";
 
 export enum Action {
   CONNECT,
@@ -15,31 +12,11 @@ export enum Action {
 
 // ================================================================================================
 
-export const SignMessagePayloadSchema = z.object({
-  message: z.string(),
-});
-
-export type SignMessagePayload = z.infer<typeof SignMessagePayloadSchema>;
-
-// ================================================================================================
-
-export const SignTxPayloadSchema = z.object({
-  networkId: z.string(),
-  txJson: z.string(),
-  scripts: z.array(z.custom<ScriptOption>()).optional(),
-});
-
-export type SignTxPayload = z.infer<typeof SignTxPayloadSchema>;
-
-// ================================================================================================
-
 export const RpcRequestSchema = z.object({
   method: z.string(),
   params: z.array(z.unknown()).optional(),
 });
 
-// ================================================================================================
-
 export type RpcRequest = z.infer<typeof RpcRequestSchema>;
 
 export const RpcErrorSchema = z.object({
@@ -96,31 +73,6 @@ export enum ETHEREUM_METHODS {
   WALLET_SWITCH_ETHEREUM_NETWORK = "wallet_switchEthereumChain",
 }
 
-export const ethereumTransactionRequestSchema = z.object({
-  from: z.string().refine(isAddress, "Must be a valid Ethereum address"),
-  to: z.string().refine(isAddress, "Must be a valid Ethereum address"),
-  value: z.string().refine(isHex, "Value must be a hex string").optional(),
-  data: z.string().refine(isHex, "Data must be a hex string").optional(),
-  maxFeePerGas: z
-    .string()
-    .refine(isHex, "Max fee per gas must be a hex string")
-    .optional(),
-  maxPriorityFeePerGas: z
-    .string()
-    .refine(isHex, "Max priority fee must be a hex string")
-    .optional(),
-});
-
-// ================================================================================================
-
-export const ConnectPayloadSchema = z.object({
-  networkId: z.nativeEnum(NetworkType),
-  name: z.string(),
-  icon: z.string().optional(),
-});
-
-export type ConnectPayload = z.infer<typeof ConnectPayloadSchema>;
-
 // ================================================================================================
 
 export const ApiRequestSchema = z.object({
diff --git a/components/screens/browser-api/ConnectConfirm.tsx b/components/screens/browser-api/ConnectConfirm.tsx
@@ -1,6 +1,5 @@
 import { ApiExtensionUtils } from "@/api/extension";
 import { useSettings } from "@/hooks/useSettings";
-import { useEffect } from "react";
 import { NetworkType } from "@/contexts/SettingsContext.tsx";
 import Header from "@/components/GeneralHeader";
 import Link from "@/assets/images/link.svg";
@@ -23,7 +22,7 @@ export default function ConnectConfirm() {
   const urlSearchParams = new URLSearchParams(window.location.search);
   const requestId = urlSearchParams.get("requestId") ?? "";
   const host = urlSearchParams.get("host") ?? "";
-  const network = urlSearchParams.get("network") ?? "";
+  const network = urlSearchParams.get("network") ?? settings?.networkId;
   const tabName = urlSearchParams.get("name") ?? "Unknown";
   const icon = urlSearchParams.get("icon") ?? undefined;
 
@@ -47,7 +46,9 @@ export default function ConnectConfirm() {
       }
 
       const walletConnections = settings.walletConnections ?? {};
-      const targetNetwork = (network as NetworkType) ?? settings.networkId;
+      const targetNetwork = (network ?? settings.networkId) as NetworkType;
+      console.log(targetNetwork, settings.networkId);
+
       const connections =
         walletConnections[selectedWalletId]?.[selectedAccountIndex]?.[
           targetNetwork
@@ -84,7 +85,6 @@ export default function ConnectConfirm() {
         ),
       );
     } finally {
-      window.close();
     }
   };
 
@@ -110,6 +110,7 @@ export default function ConnectConfirm() {
       background: "bg-yellow-800",
     },
   ];
+
   const selectedNetwork = networks.find(
     (n) => n.id === (network ?? settings?.networkId),
   );
diff --git a/components/screens/browser-api/SignAndBroadcastTxConfirm.tsx b/components/screens/browser-api/SignAndBroadcastTxConfirm.tsx
@@ -1,4 +1,4 @@
-import { SignTxPayloadSchema } from "@/api/message";
+import { SignTxPayloadSchema } from "@/api/background/handlers/kaspa/utils";
 import HotWalletSignAndBroadcast from "@/components/screens/browser-api/sign-and-broadcast/HotWalletSignAndBroadcast";
 import LedgerSignAndBroadcast from "@/components/screens/browser-api/sign-and-broadcast/LedgerSignAndBroadcast";
 import useWalletManager from "@/hooks/useWalletManager.ts";
diff --git a/components/screens/browser-api/SignMessageConfirm.tsx b/components/screens/browser-api/SignMessageConfirm.tsx
@@ -1,10 +1,7 @@
-import { SignMessagePayload } from "@/api/message";
+import { SignMessagePayloadSchema } from "@/api/background/handlers/kaspa/signMessage";
 import HotWalletSignMessage from "@/components/screens/browser-api/sign-message/HotWalletSignMessage";
 import LedgerSignMessage from "@/components/screens/browser-api/sign-message/LedgerSignMessage";
 import useWalletManager from "@/hooks/useWalletManager.ts";
-import { useEffect } from "react";
-import { ApiExtensionUtils } from "@/api/extension";
-import { ApiResponse } from "@/api/message";
 import Splash from "@/components/screens/Splash";
 
 export default function SignMessageConfirm() {
@@ -19,16 +16,26 @@ export default function SignMessageConfirm() {
     ? JSON.parse(decodeURIComponent(encodedPayload))
     : null;
 
-  const loading = !wallet || !requestId || !payload;
+  const parsedPayload = payload
+    ? SignMessagePayloadSchema.parse(payload)
+    : null;
+
+  const loading = !wallet || !requestId || !parsedPayload;
 
   return (
     <div className="h-screen p-4">
       {loading && <Splash />}
       {!loading && wallet.type !== "ledger" && (
-        <HotWalletSignMessage requestId={requestId} payload={payload} />
+        <HotWalletSignMessage
+          requestId={requestId}
+          payload={SignMessagePayloadSchema.parse(parsedPayload)}
+        />
       )}
       {!loading && wallet.type === "ledger" && (
-        <LedgerSignMessage requestId={requestId} payload={payload} />
+        <LedgerSignMessage
+          requestId={requestId}
+          payload={SignMessagePayloadSchema.parse(parsedPayload)}
+        />
       )}
     </div>
   );
diff --git a/components/screens/browser-api/SignTxConfirm.tsx b/components/screens/browser-api/SignTxConfirm.tsx
@@ -1,4 +1,4 @@
-import { SignTxPayloadSchema } from "@/api/message";
+import { SignTxPayloadSchema } from "@/api/background/handlers/kaspa/utils";
 import HotWalletSignTx from "@/components/screens/browser-api/sign-tx/HotWalletSignTx";
 import LedgerSignTx from "@/components/screens/browser-api/sign-tx/LedgerSignTx";
 import useWalletManager from "@/hooks/useWalletManager.ts";
diff --git a/components/screens/browser-api/ethereum/EthereumSignMessageConfirm.tsx b/components/screens/browser-api/ethereum/EthereumSignMessageConfirm.tsx
@@ -1,10 +1,6 @@
 import HotWalletSignMessage from "@/components/screens/browser-api/ethereum/sign-message/HotWalletSignMessage";
 import useWalletManager from "@/hooks/useWalletManager.ts";
-import { useEffect } from "react";
-import { ApiExtensionUtils } from "@/api/extension";
-import { RPC_ERRORS } from "@/api/message";
 import Splash from "@/components/screens/Splash";
-import { ApiUtils } from "@/api/background/utils";
 
 export default function EthereumSignMessageConfirm() {
   const { wallet } = useWalletManager();
diff --git a/components/screens/browser-api/ethereum/send-transaction/SendTransaction.tsx b/components/screens/browser-api/ethereum/send-transaction/SendTransaction.tsx
@@ -6,7 +6,7 @@ import Header from "@/components/GeneralHeader";
 import { useBoolean } from "usehooks-ts";
 import { ApiExtensionUtils } from "@/api/extension";
 import { ApiUtils } from "@/api/background/utils";
-import { RPC_ERRORS, ethereumTransactionRequestSchema } from "@/api/message";
+import { RPC_ERRORS } from "@/api/message";
 import {
   TransactionSerializable,
   hexToBigInt,
@@ -15,6 +15,7 @@ import {
 } from "viem";
 import { kairos } from "viem/chains";
 import { estimateFeesPerGas } from "viem/actions";
+import { ethereumTransactionRequestSchema } from "@/api/background/handlers/ethereum/sendTransaction";
 
 type SignTransactionProps = {
   walletSigner: IWallet;
diff --git a/components/screens/browser-api/sign-and-broadcast/HotWalletSignAndBroadcast.tsx b/components/screens/browser-api/sign-and-broadcast/HotWalletSignAndBroadcast.tsx
@@ -1,4 +1,4 @@
-import { SignTxPayload } from "@/api/message";
+import { SignTxPayload } from "@/api/background/handlers/kaspa/utils";
 import SignAndBroadcast from "@/components/screens/browser-api/sign-and-broadcast/SignAndBroadcast";
 import { IWallet } from "@/lib/wallet/wallet-interface.ts";
 import { AccountFactory } from "@/lib/wallet/wallet-factory";
diff --git a/components/screens/browser-api/sign-and-broadcast/LedgerSignAndBroadcast.tsx b/components/screens/browser-api/sign-and-broadcast/LedgerSignAndBroadcast.tsx
@@ -1,4 +1,4 @@
-import { SignTxPayload } from "@/api/message";
+import { SignTxPayload } from "@/api/background/handlers/kaspa/utils";
 import LedgerNotSupported from "@/components/screens/browser-api/sign/LedgerNotSupported";
 import SignAndBroadcast from "@/components/screens/browser-api/sign-and-broadcast/SignAndBroadcast";
 import { AccountFactory } from "@/lib/wallet/wallet-factory";
diff --git a/components/screens/browser-api/sign-and-broadcast/SignAndBroadcast.tsx b/components/screens/browser-api/sign-and-broadcast/SignAndBroadcast.tsx
@@ -1,4 +1,4 @@
-import { SignTxPayload } from "@/api/message";
+import { SignTxPayload } from "@/api/background/handlers/kaspa/utils";
 import { ApiExtensionUtils } from "@/api/extension";
 import { IWallet } from "@/lib/wallet/wallet-interface.ts";
 import useWalletManager from "@/hooks/useWalletManager";
diff --git a/components/screens/browser-api/sign-message/HotWalletSignMessage.tsx b/components/screens/browser-api/sign-message/HotWalletSignMessage.tsx
@@ -1,4 +1,4 @@
-import { SignMessagePayload } from "@/api/message";
+import { SignMessagePayload } from "@/api/background/handlers/kaspa/signMessage";
 import SignMessage from "@/components/screens/browser-api/sign-message/SignMessage";
 import { IWallet } from "@/lib/wallet/wallet-interface.ts";
 import { AccountFactory } from "@/lib/wallet/wallet-factory";
diff --git a/components/screens/browser-api/sign-message/LedgerSignMessage.tsx b/components/screens/browser-api/sign-message/LedgerSignMessage.tsx
@@ -1,4 +1,4 @@
-import { SignMessagePayload } from "@/api/message";
+import { SignMessagePayload } from "@/api/background/handlers/kaspa/signMessage";
 import { AccountFactory } from "@/lib/wallet/wallet-factory";
 import useRpcClientStateful from "@/hooks/useRpcClientStateful";
 import { NetworkType } from "@/contexts/SettingsContext";
diff --git a/components/screens/browser-api/sign-tx/HotWalletSignTx.tsx b/components/screens/browser-api/sign-tx/HotWalletSignTx.tsx
@@ -1,4 +1,4 @@
-import { SignTxPayload } from "@/api/message";
+import { SignTxPayload } from "@/api/background/handlers/kaspa/utils";
 import SignTx from "@/components/screens/browser-api/sign-tx/SignTx";
 import { IWallet } from "@/lib/wallet/wallet-interface.ts";
 import { AccountFactory } from "@/lib/wallet/wallet-factory";
diff --git a/components/screens/browser-api/sign-tx/LedgerSignTx.tsx b/components/screens/browser-api/sign-tx/LedgerSignTx.tsx
@@ -1,4 +1,4 @@
-import { SignTxPayload } from "@/api/message";
+import { SignTxPayload } from "@/api/background/handlers/kaspa/utils";
 import LedgerNotSupported from "@/components/screens/browser-api/sign/LedgerNotSupported";
 import SignTx from "@/components/screens/browser-api/sign-tx/SignTx";
 import { AccountFactory } from "@/lib/wallet/wallet-factory";
diff --git a/components/screens/browser-api/sign-tx/SignTx.tsx b/components/screens/browser-api/sign-tx/SignTx.tsx
diff --git a/components/screens/browser-api/sign/DetailsSelector.tsx b/components/screens/browser-api/sign/DetailsSelector.tsx
diff --git a/components/screens/browser-api/sign/SignConfirm.tsx b/components/screens/browser-api/sign/SignConfirm.tsx
diff --git a/entrypoints/content.ts b/entrypoints/content.ts
