Refactor/remove btc kit references

src/app/pages/rpc-get-addresses/use-get-addresses.ts

@@ -1,7 +1,7 @@
-import { BtcAddress } from '@btckit/types';
 import { bytesToHex } from '@stacks/common';
 
 import { ecdsaPublicKeyToSchnorr } from '@leather.io/bitcoin';
+import { BtcAddress } from '@leather.io/rpc';
 
 import { logger } from '@shared/logger';
 import { makeRpcSuccessResponse } from '@shared/rpc/rpc-methods';

src/app/pages/rpc-sign-bip322-message/use-sign-bip322-message.ts

@@ -1,10 +1,10 @@
 import { useMemo, useState } from 'react';
 
-import { PaymentTypes, RpcErrorCode } from '@btckit/types';
 import * as btc from '@scure/btc-signer';
 import * as bitcoin from 'bitcoinjs-lib';
 
 import { signBip322MessageSimple } from '@leather.io/bitcoin';
+import { PaymentTypes, RpcErrorCode } from '@leather.io/rpc';
 
 import { logger } from '@shared/logger';
 import { makeRpcErrorResponse, makeRpcSuccessResponse } from '@shared/rpc/rpc-methods';

src/app/pages/rpc-sign-psbt/use-rpc-sign-psbt.tsx

@@ -1,6 +1,5 @@
 import { useNavigate } from 'react-router-dom';
 
-import { RpcErrorCode } from '@btckit/types';
 import { hexToBytes } from '@noble/hashes/utils';
 import { bytesToHex } from '@stacks/common';
 
@@ -10,6 +9,7 @@ import {
   useCalculateBitcoinFiatValue,
   useCryptoCurrencyMarketDataMeanAverage,
 } from '@leather.io/query';
+import { RpcErrorCode } from '@leather.io/rpc';
 import {
   formatMoney,
   formatMoneyPadded,

src/app/pages/rpc-sign-stacks-message/use-rpc-sign-stacks-message.ts

@@ -1,9 +1,10 @@
 import { useMemo } from 'react';
 
-import { RpcErrorCode } from '@btckit/types';
 import { StacksNetwork } from '@stacks/network';
 import { deserializeCV } from '@stacks/transactions';
 
+import { RpcErrorCode } from '@leather.io/rpc';
+
 import { makeRpcErrorResponse, makeRpcSuccessResponse } from '@shared/rpc/rpc-methods';
 import {
   isSignableMessageType,

src/app/pages/rpc-sign-stacks-transaction/use-rpc-sign-stacks-transaction.ts

@@ -1,9 +1,10 @@
 import { useMemo } from 'react';
 
-import { RpcErrorCode } from '@btckit/types';
 import { bytesToHex } from '@stacks/common';
 import { MultiSigSpendingCondition, deserializeTransaction } from '@stacks/transactions';
 
+import { RpcErrorCode } from '@leather.io/rpc';
+
 import { makeRpcErrorResponse, makeRpcSuccessResponse } from '@shared/rpc/rpc-methods';
 import { closeWindow } from '@shared/utils';
 
@@ -36,6 +37,7 @@ function useRpcSignStacksTransactionParams() {
 export function useRpcSignStacksTransaction() {
   const { origin, requestId, tabId, stacksTransaction, isMultisig, txSender } =
     useRpcSignStacksTransactionParams();
+
   const signStacksTx = useSignStacksTransaction();
   const wasSignedByOtherOwners =
     isMultisig &&

src/app/store/accounts/blockchain/bitcoin/bitcoin.hooks.ts

@@ -1,4 +1,3 @@
-import { PaymentTypes } from '@btckit/types';
 import { bytesToHex } from '@noble/hashes/utils';
 import * as btc from '@scure/btc-signer';
 import { Psbt } from 'bitcoinjs-lib';
@@ -13,6 +12,7 @@ import {
 } from '@leather.io/bitcoin';
 import { extractAddressIndexFromPath } from '@leather.io/crypto';
 import { bitcoinNetworkToNetworkMode } from '@leather.io/models';
+import { PaymentTypes } from '@leather.io/rpc';
 import { isNumber, isUndefined } from '@leather.io/utils';
 
 import {

src/background/messaging/rpc-message-handler.ts

@@ -1,4 +1,4 @@
-import { RpcErrorCode } from '@btckit/types';
+import { RpcErrorCode } from '@leather.io/rpc';
 
 import { WalletRequests, makeRpcErrorResponse } from '@shared/rpc/rpc-methods';
 

src/background/messaging/rpc-methods/get-addresses.ts

@@ -1,4 +1,4 @@
-import { GetAddressesRequest, RpcErrorCode } from '@btckit/types';
+import { GetAddressesRequest, RpcErrorCode } from '@leather.io/rpc';
 
 import { RouteUrls } from '@shared/route-urls';
 import { makeRpcErrorResponse } from '@shared/rpc/rpc-methods';

src/background/messaging/rpc-methods/send-transfer.ts

@@ -1,5 +1,4 @@
-import { RpcErrorCode, type RpcRequest, type SendTransferRequestParams } from '@btckit/types';
-
+import { RpcErrorCode, type RpcRequest, type SendTransferRequestParams } from '@leather.io/rpc';
 import { isUndefined } from '@leather.io/utils';
 
 import { RouteUrls } from '@shared/route-urls';
@@ -42,7 +41,7 @@
 
   // Legacy params support for backward compatibility
   const params = validateRpcSendTransferLegacyParams(message.params)
     ? convertRpcSendTransferLegacyParamsToNew(message.params as RpcSendTransferParamsLegacy)
     : (message.params as RpcSendTransferParams);
 
   if (!validateRpcSendTransferParams(params)) {

src/background/messaging/rpc-methods/sign-message.ts

@@ -1,7 +1,5 @@
-import { PaymentTypes, RpcErrorCode } from '@btckit/types';
-import { SignMessageRequest } from '@btckit/types/dist/types/methods/sign-message';
-
 import { isSupportedMessageSigningPaymentType } from '@leather.io/bitcoin';
+import { PaymentTypes, RpcErrorCode, type SignMessageRequest } from '@leather.io/rpc';
 import { isDefined, isUndefined } from '@leather.io/utils';
 
 import { RouteUrls } from '@shared/route-urls';

src/background/messaging/rpc-methods/sign-psbt.ts

@@ -1,7 +1,7 @@
-import { RpcErrorCode } from '@btckit/types';
 import * as btc from '@scure/btc-signer';
 import { hexToBytes } from '@stacks/common';
 
+import { RpcErrorCode } from '@leather.io/rpc';
 import { ensureArray, isDefined, isUndefined } from '@leather.io/utils';
 
 import { RouteUrls } from '@shared/route-urls';

src/background/messaging/rpc-methods/sign-stacks-message.ts

@@ -1,5 +1,4 @@
-import { RpcErrorCode } from '@btckit/types';
-
+import { RpcErrorCode } from '@leather.io/rpc';
 import { isDefined, isUndefined } from '@leather.io/utils';
 
 import { RouteUrls } from '@shared/route-urls';

src/background/messaging/rpc-methods/sign-stacks-transaction.ts

@@ -1,4 +1,3 @@
-import { RpcErrorCode } from '@btckit/types';
 import { bytesToHex } from '@stacks/common';
 import { TransactionTypes } from '@stacks/connect';
 import {
@@ -17,6 +16,7 @@ import {
 } from '@stacks/transactions';
 import { createUnsecuredToken } from 'jsontokens';
 
+import { RpcErrorCode } from '@leather.io/rpc';
 import { isDefined, isUndefined } from '@leather.io/utils';
 
 import { RouteUrls } from '@shared/route-urls';

src/inpage/inpage.ts

@@ -1,6 +1,7 @@
-import { RpcRequest } from '@btckit/types';
 import type { StacksProvider } from '@stacks/connect';
 
+import { RpcRequest } from '@leather.io/rpc';
+
 import { BRANCH, COMMIT_SHA } from '@shared/environment';
 import {
   AuthenticationRequestEventDetails,
@@ -247,7 +248,7 @@
     params?: Record<string, any>
   ): Promise<WalletMethodMap[T]['response']> {
     const id = crypto.randomUUID();
     const rpcRequest: RpcRequest<T> = {
       jsonrpc: '2.0',
       id,
       method,
@@ -337,6 +338,6 @@
 }
 
 // Legacy product provider objects
-if (typeof window.btc === 'undefined') {
+if (typeof (window as any).btc === 'undefined') {
   (window as any).btc = warnAboutDeprecatedProvider(provider);
 }

src/shared/rpc/methods/open.ts

@@ -1,4 +1,4 @@
-import { DefineRpcMethod, RpcRequest, RpcResponse } from '@btckit/types';
+import { DefineRpcMethod, RpcRequest, RpcResponse } from '@leather.io/rpc';
 
 export type OpenRequest = RpcRequest<'open'>;
 

src/shared/rpc/methods/send-transfer.ts

@@ -1,7 +1,11 @@
 import type { SendTransferRequestParams } from '@btckit/types';
 import { z } from 'zod';
 
-import { type BitcoinNetworkModes, type DefaultNetworkConfigurations } from '@leather.io/models';
+import {
+  type AllowAdditionalProperties,
+  type BitcoinNetworkModes,
+  type DefaultNetworkConfigurations,
+} from '@leather.io/models';
 import { uniqueArray } from '@leather.io/utils';
 
 import { FormErrorMessages } from '@shared/error-messages';
@@ -94,7 +98,7 @@ interface TransferRecipientParam {
   amount: string;
 }
 
-export interface RpcSendTransferParams {
+export interface RpcSendTransferParams extends AllowAdditionalProperties {
   account?: number;
   recipients: TransferRecipientParam[];
   network: string;

src/shared/rpc/methods/sign-message.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import type { PaymentTypes } from '@leather.io/rpc';
+import { PaymentTypes } from '@leather.io/rpc';
 
 import { defaultNetworkIdSchema } from '../rpc-schemas';
 import {

src/shared/rpc/methods/sign-stacks-message.ts

@@ -1,17 +1,16 @@
-import { DefineRpcMethod, RpcRequest, RpcResponse } from '@btckit/types';
 import { StacksNetworks } from '@stacks/network';
 import { z } from 'zod';
 
-import { formatValidationErrors, getRpcParamErrors, validateRpcParams } from './validation.utils';
+import { DefineRpcMethod, RpcRequest, RpcResponse, stxMessageSigningTypes } from '@leather.io/rpc';
 
-const SignedMessageTypeArray = ['utf8', 'structured'] as const;
+import { formatValidationErrors, getRpcParamErrors, validateRpcParams } from './validation.utils';
 
 // TODO: refactor to use .discriminatedUnion
 const rpcSignStacksMessageParamsSchema = z.object({
   network: z.enum(StacksNetworks).optional(),
   message: z.string(),
   domain: z.string().optional(),
-  messageType: z.enum(SignedMessageTypeArray),
+  messageType: z.enum(stxMessageSigningTypes),
 });
 
 export function validateRpcSignStacksMessageParams(obj: unknown) {

src/shared/rpc/methods/sign-stacks-transaction.ts

@@ -1,7 +1,8 @@
-import { DefineRpcMethod, RpcRequest, RpcResponse } from '@btckit/types';
 import { StacksNetworks } from '@stacks/network';
 import { z } from 'zod';
 
+import { DefineRpcMethod, RpcRequest, RpcResponse } from '@leather.io/rpc';
+
 import { formatValidationErrors, getRpcParamErrors, validateRpcParams } from './validation.utils';
 
 const rpcSignStacksTransactionParamsSchema = z.object({

src/shared/rpc/methods/supported-methods.ts

@@ -1,4 +1,4 @@
-import { DefineRpcMethod, RpcRequest, RpcSuccessResponse } from '@btckit/types';
+import { DefineRpcMethod, RpcRequest, RpcSuccessResponse } from '@leather.io/rpc';
 
 export type SupportedMethodsRequest = RpcRequest<'supportedMethods'>;
 

src/shared/rpc/rpc-methods.ts

@@ -1,6 +1,5 @@
-import { BtcKitMethodMap, ExtractErrorResponse, ExtractSuccessResponse } from '@btckit/types';
-
 import type { ValueOf } from '@leather.io/models';
+import { ExtractErrorResponse, ExtractSuccessResponse, LeatherRpcMethodMap } from '@leather.io/rpc';
 
 import { SignStacksTransaction } from '@shared/rpc/methods/sign-stacks-transaction';
 
@@ -9,8 +8,7 @@ import { SignPsbt } from './methods/sign-psbt';
 import { SignStacksMessage } from './methods/sign-stacks-message';
 import { SupportedMethods } from './methods/supported-methods';
 
-// Supports BtcKit methods, as well as custom Leather methods
-export type WalletMethodMap = BtcKitMethodMap &
+export type WalletMethodMap = LeatherRpcMethodMap &
   Open &
   SupportedMethods &
   SignPsbt &

test-app/src/components/debugger.tsx

@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 
-import '@btckit/types';
 import { demoTokenContract } from '@common/contracts';
 import { useSTXAddress } from '@common/use-stx-address';
 import {
@@ -448,8 +447,7 @@ export const Debugger = () => {
             mt={3}
             onClick={() => {
               console.log('requesting');
-              window.btc
-                ?.request('getAddresses')
+              window.LeatherProvider?.request('getAddresses')
                 .then(resp => {
                   console.log({ sucesss: resp });
                 })

tests/specs/rpc-sign-psbt/sign-psbt.spec.ts

@@ -1,7 +1,7 @@
-import { SignPsbtRequestParams } from '@btckit/types';
 import { BrowserContext, Page } from '@playwright/test';
 
 import { WalletDefaultNetworkConfigurationIds } from '@leather.io/models';
+import { SignPsbtRequestParams } from '@leather.io/rpc';
 
 import { test } from '../../fixtures/fixtures';
 
@@ -73,7 +73,7 @@
     context,
   }) => {
     const [result] = await Promise.all([
       initiatePsbtSigning(page)(signAllParams),
       clickActionButton(context)('Confirm'),
     ]);
 
@@ -87,7 +87,7 @@
 
   test('that only requested inputs are signed', async ({ page, context }) => {
     const [result] = await Promise.all([
       initiatePsbtSigning(page)({ ...signAllParams, signAtIndex: 0 }),
       clickActionButton(context)('Confirm'),
     ]);
 
@@ -121,7 +121,7 @@
 
   test('that the request to sign can be canceled', async ({ page, context }) => {
     const [result] = await Promise.all([
       initiatePsbtSigning(page)(signAllParams),
       clickActionButton(context)('Cancel'),
     ]);
 
@@ -141,7 +141,7 @@
     context,
   }) => {
     const [result] = await Promise.all([
       initiatePsbtSigning(page)({ ...signAllParams, signAtIndex: 4 }),
       clickActionButton(context)('Confirm'),
       clickErrorCloseWindowButton(context),
     ]);