feat: address monitor and btc ntx notifications

package.json

@@ -360,6 +360,7 @@
     "ts-node": "10.9.2",
     "ts-unused-exports": "10.0.1",
     "tsconfig-paths-webpack-plugin": "4.1.0",
+    "type-fest": "4.30.2",
     "typescript": "5.4.5",
     "vitest": "2.0.5",
     "vm-browserify": "1.1.2",
@@ -370,8 +371,7 @@
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",
     "webpack-hot-middleware": "2.26.1",
-    "webpack-shell-plugin": "0.5.0",
-    "type-fest": "4.30.2"
+    "webpack-shell-plugin": "0.5.0"
   },
   "resolutions": {
     "cross-spawn": "7.0.5",

scripts/generate-manifest.js

@@ -69,7 +69,7 @@ const manifest = {
   manifest_version: 3,
   author: 'Leather Wallet, LLC',
   description: 'Leather Bitcoin Wallet - Your Bitcoin Wallet for DeFi, NFTs, Ordinals, and dApps',
-  permissions: ['contextMenus', 'storage', 'unlimitedStorage', 'alarms', 'notifications'],
+  permissions: ['contextMenus', 'storage', 'unlimitedStorage', 'notifications'],
   commands: {
     _execute_browser_action: {
       suggested_key: {

src/app/features/address-monitor/use-monitorable-addresses.ts

@@ -0,0 +1,78 @@
+import { useMemo } from 'react';
+
+import type { HDKey } from '@scure/bip32';
+import type { P2Ret } from '@scure/btc-signer/payment';
+
+import {
+  type SupportedPaymentType,
+  deriveAddressIndexZeroFromAccount,
+  getNativeSegwitPaymentFromAddressIndex,
+  getTaprootPaymentFromAddressIndex,
+} from '@leather.io/bitcoin';
+import type { BitcoinNetworkModes } from '@leather.io/models';
+import { createNullArrayOfLength, isDefined } from '@leather.io/utils';
+
+import { useCurrentAccountIndex } from '@app/store/accounts/account';
+import { useGenerateNativeSegwitAccount } from '@app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks';
+import { useGenerateTaprootAccount } from '@app/store/accounts/blockchain/bitcoin/taproot-account.hooks';
+import { useStacksAccounts } from '@app/store/accounts/blockchain/stacks/stacks-account.hooks';
+import { useCurrentNetworkId } from '@app/store/networks/networks.selectors';
+import type { MonitoredAddress } from '@background/monitors/address-monitor';
+
+const paymentFnMap: Record<
+  SupportedPaymentType,
+  (keychain: HDKey, network: BitcoinNetworkModes) => P2Ret
+> = {
+  p2tr: getTaprootPaymentFromAddressIndex,
+  p2wpkh: getNativeSegwitPaymentFromAddressIndex,
+};
+
+export function useMonitorableAddresses() {
+  const currentAccountIndex = useCurrentAccountIndex();
+  const currentNetworkId = useCurrentNetworkId();
+  const createNativeSegwitAccount = useGenerateNativeSegwitAccount();
+  const createTaprootAccount = useGenerateTaprootAccount();
+
+  const stacksAccounts = useStacksAccounts();
+
+  return useMemo(() => {
+    if (!stacksAccounts || !currentNetworkId) return;
+
+    const stacksAddresses = stacksAccounts.map(
+      account =>
+        ({
+          accountIndex: account.index,
+          address: account.address,
+          chain: 'stacks',
+          isCurrent: account.index === currentAccountIndex,
+        }) as MonitoredAddress
+    );
+    const btcAddresses = createNullArrayOfLength(stacksAccounts.length).flatMap((_, index) =>
+      [createNativeSegwitAccount(index), createTaprootAccount(index)]
+        .filter(isDefined)
+        .map(account => {
+          const addressIndexKeychain = deriveAddressIndexZeroFromAccount(account.keychain);
+          if (account.type !== 'p2tr' && account.type !== 'p2wpkh') return undefined;
+          const payment = paymentFnMap[account.type](addressIndexKeychain, 'mainnet');
+          return {
+            accountIndex: index,
+            address: payment.address,
+            chain: 'bitcoin',
+            isCurrent: index === currentAccountIndex,
+          } as MonitoredAddress;
+        })
+        .filter(isDefined)
+    );
+    // if one address array is empty and the other not, we're in an intermediate state
+    return (stacksAddresses.length === 0 && btcAddresses.length > 0) ||
+      (btcAddresses.length === 0 && stacksAddresses.length > 0)
+      ? undefined
+      : [...stacksAddresses, ...btcAddresses];
+  }, [
+    createNativeSegwitAccount,
+    createTaprootAccount,
+    stacksAccounts,
+    currentNetworkId,
+    currentAccountIndex,
+  ]);
+}

src/app/features/address-monitor/use-sync-address-monitor.ts

@@ -0,0 +1,29 @@
+import { useEffect, useRef } from 'react';
+
+import isEqual from 'lodash.isequal';
+
+import { logger } from '@shared/logger';
+import { InternalMethods } from '@shared/message-types';
+import { sendMessage } from '@shared/messages';
+
+import { useMonitorableAddresses } from '@app/features/address-monitor/use-monitorable-addresses';
+import type { MonitoredAddress } from '@background/monitors/address-monitor';
+
+export function useSyncAddressMonitor() {
+  const addresses = useMonitorableAddresses();
+  const prevAddresses = useRef<MonitoredAddress[]>([]);
+
+  useEffect(() => {
+    if (addresses && !isEqual(addresses, prevAddresses.current)) {
+      prevAddresses.current = addresses;
+
+      logger.debug('Syncing Monitored Addresses: ', addresses);
+      sendMessage({
+        method: InternalMethods.AddressMonitorUpdated,
+        payload: {
+          addresses,
+        },
+      });
+    }
+  }, [addresses]);
+}

src/app/features/container/container.tsx

@@ -19,6 +19,7 @@ import { useOnWalletLock } from '@app/routes/hooks/use-on-wallet-lock';
 import { useAppDispatch, useHasStateRehydrated } from '@app/store';
 import { stxChainSlice } from '@app/store/chains/stx-chain.slice';
 
+import { useSyncAddressMonitor } from '../address-monitor/use-sync-address-monitor';
 import { useRestoreFormState } from '../popup-send-form-restoration/use-restore-form-state';
 
 export function Container() {
@@ -28,7 +29,7 @@ export function Container() {
   const dispatch = useAppDispatch();
 
   const hasStateRehydrated = useHasStateRehydrated();
-
+  useSyncAddressMonitor();
   useOnWalletLock(() => closeWindow());
   useOnSignOut(() => closeWindow());
   useRestoreFormState();

src/app/pages/unlock.tsx

@@ -4,6 +4,8 @@ import { Content } from '@app/components/layout';
 import { RequestPassword } from '@app/components/request-password';
 import { UnlockHeader } from '@app/features/container/headers/unlock.header';
 
+import { useGetAddresses } from './rpc-get-addresses/use-get-addresses';
+
 export function Unlock() {
   const navigate = useNavigate();
   // Here we want to return to the previous route. The user could land on any

src/app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks.ts

@@ -45,7 +45,7 @@ const selectCurrentNetworkNativeSegwitAccountBuilder = createSelector(
     nativeSegwitKeychains[bitcoinNetworkToNetworkMode(network.chain.bitcoin.bitcoinNetwork)]
 );
 
-function useNativeSegwitAccountBuilder() {
+export function useGenerateNativeSegwitAccount() {
   return useSelector(selectCurrentNetworkNativeSegwitAccountBuilder);
 }
 
@@ -72,7 +72,7 @@ export function useNativeSegwitNetworkSigners() {
 }
 
 export function useNativeSegwitSigner(accountIndex: number) {
-  const account = useNativeSegwitAccountBuilder()(accountIndex);
+  const account = useGenerateNativeSegwitAccount()(accountIndex);
   const extendedPublicKeyVersions = useBitcoinExtendedPublicKeyVersions();
 
   return useMemo(() => {

src/app/store/accounts/blockchain/bitcoin/taproot-account.hooks.ts

@@ -45,6 +45,11 @@ const selectCurrentTaprootAccount = createSelector(
   (taprootKeychain, accountIndex) => taprootKeychain(accountIndex)
 );
 
+export function useGenerateTaprootAccount() {
+  const generateTaprootAccount = useSelector(selectCurrentNetworkTaprootAccountBuilder);
+  return useMemo(() => generateTaprootAccount, [generateTaprootAccount]);
+}
+
 export function useTaprootAccount(accountIndex: number) {
   const generateTaprootAccount = useSelector(selectCurrentNetworkTaprootAccountBuilder);
   return useMemo(

src/app/store/chains/stx-chain.selectors.ts

@@ -1,3 +1,9 @@
+import { useSelector } from 'react-redux';
+
 import { RootState } from '@app/store';
 
 export const selectStacksChain = (state: RootState) => state.chains.stx;
+
+export function useStacksChain() {
+  return useSelector(selectStacksChain);
+}

src/background/background.ts

@@ -6,17 +6,14 @@ import { CONTENT_SCRIPT_PORT, type LegacyMessageFromContentScript } from '@share
 import { WalletRequests } from '@shared/rpc/rpc-methods';
 import { warnUsersAboutDevToolsDangers } from '@shared/utils/dev-tools-warning-log';
 
-import {
-  monitorPendingConfirmations,
-  pendingConfirmationsAlarm,
-} from './alarms/transaction-monitor';
 import { initContextMenuActions } from './init-context-menus';
 import { internalBackgroundMessageHandler } from './messaging/internal-methods/message-handler';
 import {
   handleLegacyExternalMethodFormat,
   isLegacyMessage,
 } from './messaging/legacy/legacy-external-message-handler';
 import { rpcMessageHandler } from './messaging/rpc-message-handler';
+import { initAddressMonitor } from './monitors/address-monitor';
 
 initContextMenuActions();
 warnUsersAboutDevToolsDangers();
@@ -64,13 +61,6 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
   return true;
 });
 
-console.log('hello from background');
-
-monitorPendingConfirmations()
-  .then(() => {
-    console.log('confirmation called');
-  })
-  .catch(() => {
-    // eslint-disable-next-line no-console
-    console.error('whoops!');
-  });
+initAddressMonitor().catch(e => {
+  logger.error('Unable to Initialise Address Monitor: ', e);
+});

src/background/messaging/internal-methods/message-handler.ts

@@ -1,6 +1,9 @@
 import { logger } from '@shared/logger';
+import { InternalMethods } from '@shared/message-types';
 import { BackgroundMessages } from '@shared/messages';
 
+import { syncAddressMonitor } from '@background/monitors/address-monitor';
+
 function validateMessagesAreFromExtension(sender: chrome.runtime.MessageSender) {
   // Only respond to internal messages from our UI, not content scripts in other applications
   return sender.url?.startsWith(chrome.runtime.getURL(''));
@@ -28,5 +31,16 @@ export async function internalBackgroundMessageHandler(
     return;
   }
   logger.debug('Internal message', message);
+
+  switch (message.method) {
+    case InternalMethods.AddressMonitorUpdated:
+      await syncAddressMonitor(message.payload.addresses);
+      break;
+  }
+
+  if (message.method.includes('bitcoinKeys/signOut')) {
+    await syncAddressMonitor([]);
+  }
+
   sendResponse();
 }

src/background/monitors/address-monitor.ts

@@ -0,0 +1,54 @@
+/* eslint-disable no-console */
+import { z } from 'zod';
+
+import { BitcoinTransactionMonitor } from './address-monitors/bitcoin-transaction-monitor';
+
+export const monitoredAddressSchema = z.object({
+  chain: z.enum(['bitcoin', 'stacks']),
+  accountIndex: z.number(),
+  isCurrent: z.boolean(),
+  address: z.string(),
+});
+
+export type MonitoredAddress = z.infer<typeof monitoredAddressSchema>;
+
+export interface AddressMonitor {
+  syncAddresses(addresses: MonitoredAddress[]): void;
+}
+
+export class AddressMonitorContainer {
+  private _monitors: AddressMonitor[] = [];
+
+  init(addresses: MonitoredAddress[]) {
+    this._monitors = [new BitcoinTransactionMonitor(addresses)];
+  }
+  sync(addresses: MonitoredAddress[]) {
+    this._monitors.forEach(monitor => monitor.syncAddresses(addresses));
+  }
+}
+
+const monitorContainer = new AddressMonitorContainer();
+
+export async function initAddressMonitor() {
+  const addresses = await readMonitoredAddressStore();
+  monitorContainer.init(addresses);
+}
+
+export async function syncAddressMonitor(addresses: MonitoredAddress[]) {
+  await writeMonitoredAddressStore(addresses);
+  monitorContainer.sync(addresses);
+}
+
+const ADDRESS_MONITOR_STORE = 'addressMonitorStore';
+
+export async function readMonitoredAddressStore() {
+  const result = await chrome.storage.local.get(ADDRESS_MONITOR_STORE);
+  const addresses = result[ADDRESS_MONITOR_STORE] || [];
+  return addresses;
+}
+
+export async function writeMonitoredAddressStore(addresses: MonitoredAddress[]) {
+  await chrome.storage.local.set({
+    [ADDRESS_MONITOR_STORE]: addresses,
+  });
+}