Merge pull request #5917 from leather-io/release/urgent-fix

Release/urgent fix
leather-io · Oct 23, 2024 · 4ffdb41 · 4ffdb41
2 parents eb4dc8f + c91f99d
commit 4ffdb41
Show file tree

Hide file tree

Showing 30 changed files with 1,357 additions and 1,604 deletions.
diff --git a/package.json b/package.json
@@ -141,15 +141,15 @@
     "@coinbase/cbpay-js": "2.1.0",
     "@fungible-systems/zone-file": "2.0.0",
     "@hirosystems/token-metadata-api-client": "1.2.0",
-    "@leather.io/bitcoin": "0.13.2",
-    "@leather.io/constants": "0.12.1",
-    "@leather.io/crypto": "1.6.2",
-    "@leather.io/models": "0.17.0",
-    "@leather.io/query": "2.14.1",
-    "@leather.io/stacks": "1.1.5",
-    "@leather.io/tokens": "0.9.0",
-    "@leather.io/ui": "1.27.1",
-    "@leather.io/utils": "0.15.0",
+    "@leather.io/bitcoin": "0.14.2",
+    "@leather.io/constants": "0.12.5",
+    "@leather.io/crypto": "1.6.6",
+    "@leather.io/models": "0.18.2",
+    "@leather.io/query": "2.15.2",
+    "@leather.io/stacks": "1.2.3",
+    "@leather.io/tokens": "0.9.1",
+    "@leather.io/ui": "1.30.0",
+    "@leather.io/utils": "0.16.6",
     "@ledgerhq/hw-transport-webusb": "6.27.19",
     "@noble/hashes": "1.5.0",
     "@noble/secp256k1": "2.1.0",
@@ -261,9 +261,9 @@
     "@btckit/types": "0.0.19",
     "@chromatic-com/storybook": "1.2.23",
     "@leather.io/eslint-config": "0.7.0",
-    "@leather.io/panda-preset": "0.4.0",
+    "@leather.io/panda-preset": "0.4.1",
     "@leather.io/prettier-config": "0.6.0",
-    "@leather.io/rpc": "2.1.10",
+    "@leather.io/rpc": "2.1.13",
     "@ls-lint/ls-lint": "2.2.3",
     "@mdx-js/loader": "3.0.0",
     "@pandacss/dev": "0.46.1",
@@ -366,6 +366,7 @@
     "webpack-shell-plugin": "0.5.0"
   },
   "resolutions": {
+    "http-proxy-middleware": "3.0.3",
     "axios": "1.7.4",
     "body-parser": "1.20.3",
     "braces": "3.0.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/common/persistence.ts b/src/app/common/persistence.ts
@@ -52,11 +52,12 @@ export const queryClient = new QueryClient({
 });
 
 export async function persistAndRenderApp(renderApp: () => void) {
-  if (!IS_TEST_ENV)
+  if (!IS_TEST_ENV) {
     void persistQueryClient({
       queryClient,
       persister: chromeStorageLocalPersister,
       buster: VERSION,
     });
+  }
   renderApp();
 }
diff --git a/src/app/common/utils.ts b/src/app/common/utils.ts
@@ -15,11 +15,6 @@ function kebabCase(str: string) {
   return str.replace(KEBAB_REGEX, match => '-' + match.toLowerCase());
 }
 
-interface MakeBitcoinTxExplorerLinkArgs {
-  txid: string;
-  bitcoin: BitcoinChainConfig;
-}
-
 interface MakeStacksTxExplorerLinkArgs {
   mode: BitcoinNetworkModes;
   searchParams?: URLSearchParams;
@@ -60,20 +55,27 @@ export function makeStacksAddressExplorerLink({
   return `${HIRO_EXPLORER_URL}/address/${address}?${searchParams.toString()}`;
 }
 
+interface MakeBitcoinTxExplorerLinkArgs {
+  txid: string;
+  bitcoin: BitcoinChainConfig;
+}
 export function makeBitcoinTxExplorerLink({
   txid,
   bitcoin: { bitcoinUrl, bitcoinNetwork },
 }: MakeBitcoinTxExplorerLinkArgs) {
+  const mempoolBaseUrl = 'https://mempool.space';
+
   switch (bitcoinNetwork) {
     case 'mainnet':
-    case 'testnet':
-      return `https://mempool.space/${
-        bitcoinNetwork !== 'mainnet' ? bitcoinNetwork + '/' : ''
-      }tx/${txid}`;
+      return `${mempoolBaseUrl}/tx/${txid}`;
+    case 'testnet3':
+      return `${mempoolBaseUrl}/testnet/tx/${txid}`;
+    case 'testnet4':
+      return `${mempoolBaseUrl}/testnet4/tx/${txid}`;
+    case 'signet':
+      return `${mempoolBaseUrl}/signet/tx/${txid}`;
     case 'regtest':
       return `${bitcoinUrl}/tx/${txid}`;
-    default:
-      return '';
   }
 }
 

diff --git a/src/app/components/loaders/bitcoin-account-loader.tsx b/src/app/components/loaders/bitcoin-account-loader.tsx
@@ -45,7 +45,7 @@ export function BitcoinTaprootAccountLoader({ children, ...props }: BtcAccountLo
 
   const properIndex = 'current' in props ? currentAccountIndex : props.index;
 
-  const signer = useTaprootSigner(properIndex, network.chain.bitcoin.bitcoinNetwork);
+  const signer = useTaprootSigner(properIndex, network.chain.bitcoin.mode);
 
   if (!signer || !isBitcoinEnabled) return null;
   return children(signer(0));

diff --git a/src/app/features/add-network/network-form-fields.tsx b/src/app/features/add-network/network-form-fields.tsx
@@ -6,8 +6,9 @@ import { HStack, styled } from 'leather-styles/jsx';
 
 import {
   BITCOIN_API_BASE_URL_MAINNET,
-  BITCOIN_API_BASE_URL_TESTNET,
-  type BitcoinNetworkModes,
+  BITCOIN_API_BASE_URL_TESTNET3,
+  BITCOIN_API_BASE_URL_TESTNET4,
+  type BitcoinNetwork,
 } from '@leather.io/models';
 import {
   CheckmarkIcon,
@@ -24,15 +25,19 @@ import { type AddNetworkFormValues } from './use-add-network';
 
 const networks: {
   label: string;
-  value: BitcoinNetworkModes;
+  value: BitcoinNetwork;
 }[] = [
   {
     label: 'Mainnet',
     value: 'mainnet',
   },
   {
-    label: 'Testnet',
-    value: 'testnet',
+    label: 'Testnet3',
+    value: 'testnet3',
+  },
+  {
+    label: 'Testnet4',
+    value: 'testnet4',
   },
   {
     label: 'Signet',
@@ -66,15 +71,19 @@ export function NetworkFormFields({ isEditNetworkMode }: NetworkFormFieldsProps)
     [setFieldValue]
   );
 
-  function setNetworkUrls(value: BitcoinNetworkModes) {
+  function setNetworkUrls(value: BitcoinNetwork) {
     switch (value) {
       case 'mainnet':
         setStacksUrl('https://api.hiro.so');
         setBitcoinUrl(BITCOIN_API_BASE_URL_MAINNET);
         break;
-      case 'testnet':
+      case 'testnet3':
+        setStacksUrl('https://api.testnet.hiro.so');
+        setBitcoinUrl(BITCOIN_API_BASE_URL_TESTNET3);
+        break;
+      case 'testnet4':
         setStacksUrl('https://api.testnet.hiro.so');
-        setBitcoinUrl(BITCOIN_API_BASE_URL_TESTNET);
+        setBitcoinUrl(BITCOIN_API_BASE_URL_TESTNET4);
         break;
       case 'signet':
         setStacksUrl('https://api.testnet.hiro.so');
@@ -112,7 +121,7 @@ export function NetworkFormFields({ isEditNetworkMode }: NetworkFormFieldsProps)
 
       <Select.Root
         defaultValue={initialValues.bitcoinNetwork || networks[0].value}
-        onValueChange={(value: BitcoinNetworkModes) => {
+        onValueChange={(value: BitcoinNetwork) => {
           setNetworkUrls(value);
           void setFieldValue('bitcoinNetwork', value);
         }}

diff --git a/src/app/features/add-network/use-add-network.tsx b/src/app/features/add-network/use-add-network.tsx
@@ -4,9 +4,10 @@ import { useLocation, useNavigate } from 'react-router-dom';
 import { ChainID } from '@stacks/transactions';
 
 import {
-  type BitcoinNetworkModes,
+  type BitcoinNetwork,
   type DefaultNetworkConfigurations,
   type NetworkConfiguration,
+  bitcoinNetworkToNetworkMode,
   networkConfigurationSchema,
 } from '@leather.io/models';
 
@@ -33,7 +34,7 @@ export interface AddNetworkFormValues {
   name: string;
   stacksUrl: string;
   bitcoinUrl: string;
-  bitcoinNetwork: BitcoinNetworkModes;
+  bitcoinNetwork: BitcoinNetwork;
 }
 
 const initialFormValues: AddNetworkFormValues = {
@@ -72,6 +73,7 @@ function useInitialValues() {
     stacksUrl: network.chain.stacks.url,
     bitcoinUrl: network.chain.bitcoin.bitcoinUrl,
     bitcoinNetwork: network.chain.bitcoin.bitcoinNetwork,
+    mode: network.chain.bitcoin.mode,
   };
 }
 
@@ -169,6 +171,7 @@ export function useAddNetwork() {
           subnetChainId: chainId, // Used for signing transactions (via the network object, not to be confused with the NetworkConfigurations)
           url: stacksPath,
           bitcoinNetwork,
+          mode: bitcoinNetworkToNetworkMode(bitcoinNetwork),
           bitcoinUrl: bitcoinPath,
         });
         navigate(RouteUrls.Home);
@@ -180,6 +183,7 @@ export function useAddNetwork() {
           chainId: chainId,
           url: stacksPath,
           bitcoinNetwork,
+          mode: bitcoinNetworkToNetworkMode(bitcoinNetwork),
           bitcoinUrl: bitcoinPath,
         });
         navigate(RouteUrls.Home);

diff --git a/src/app/features/asset-list/stacks/sip10-token-asset-list/sip10-token-asset-item.tsx b/src/app/features/asset-list/stacks/sip10-token-asset-list/sip10-token-asset-item.tsx
@@ -60,6 +60,7 @@ export function Sip10TokenAssetItem({
         isCheckedByDefault: isTokenEnabled({ tokenId: contractId, preEnabledTokensIds }),
       }}
       itemProps={{
+        contractId,
         availableBalance: balance.availableBalance,
         captionLeft,
         icon,

diff --git a/src/app/features/ledger/flows/bitcoin-tx-signing/ledger-bitcoin-sign-tx-container.tsx b/src/app/features/ledger/flows/bitcoin-tx-signing/ledger-bitcoin-sign-tx-container.tsx
@@ -68,9 +68,9 @@ function LedgerSignBitcoinTxContainer() {
   const { signTransaction, latestDeviceResponse, awaitingDeviceConnection } =
     useLedgerSignTx<BitcoinApp>({
       chain,
-      isAppOpen: isBitcoinAppOpen({ network: network.chain.bitcoin.bitcoinNetwork }),
+      isAppOpen: isBitcoinAppOpen({ network: network.chain.bitcoin.mode }),
       getAppVersion: getBitcoinAppVersion,
-      connectApp: connectLedgerBitcoinApp(network.chain.bitcoin.bitcoinNetwork),
+      connectApp: connectLedgerBitcoinApp(network.chain.bitcoin.mode),
       async signTransactionWithDevice(bitcoinApp) {
         if (!inputsToSign) {
           ledgerNavigate.cancelLedgerAction();

diff --git a/src/app/features/ledger/flows/request-bitcoin-keys/ledger-request-bitcoin-keys.tsx b/src/app/features/ledger/flows/request-bitcoin-keys/ledger-request-bitcoin-keys.tsx
@@ -35,15 +35,15 @@ function LedgerRequestBitcoinKeys() {
   const { requestKeys, latestDeviceResponse, awaitingDeviceConnection } =
     useRequestLedgerKeys<BitcoinApp>({
       chain,
-      connectApp: connectLedgerBitcoinApp(network.chain.bitcoin.bitcoinNetwork),
+      connectApp: connectLedgerBitcoinApp(network.chain.bitcoin.mode),
       getAppVersion: getBitcoinAppVersion,
-      isAppOpen: isBitcoinAppOpen({ network: network.chain.bitcoin.bitcoinNetwork }),
+      isAppOpen: isBitcoinAppOpen({ network: network.chain.bitcoin.mode }),
       onSuccess() {
         navigate('/', { replace: true });
       },
       async pullKeysFromDevice(app) {
         const { keys } = await pullBitcoinKeysFromLedgerDevice(app)({
-          network: bitcoinNetworkModeToCoreNetworkMode(network.chain.bitcoin.bitcoinNetwork),
+          network: bitcoinNetworkModeToCoreNetworkMode(network.chain.bitcoin.mode),
           onRequestKey(index) {
             const keyGroupFinalIndex = defaultNumberOfKeysToPullFromLedgerDevice - 1;
             const isNativeSegwitkey = index <= keyGroupFinalIndex;

diff --git a/src/app/features/psbt-signer/hooks/use-parsed-inputs.tsx b/src/app/features/psbt-signer/hooks/use-parsed-inputs.tsx
@@ -30,7 +30,7 @@ interface UseParsedInputsArgs {
 }
 export function useParsedInputs({ inputs, indexesToSign }: UseParsedInputsArgs) {
   const network = useCurrentNetwork();
-  const bitcoinNetwork = getBtcSignerLibNetworkConfigByMode(network.chain.bitcoin.bitcoinNetwork);
+  const bitcoinNetwork = getBtcSignerLibNetworkConfigByMode(network.chain.bitcoin.mode);
   const bitcoinAddressNativeSegwit = useCurrentAccountNativeSegwitIndexZeroSigner().address;
   const { address: bitcoinAddressTaproot } = useCurrentAccountTaprootIndexZeroSigner();
   const inscriptions = useInscriptionsByOutputs(inputs);

diff --git a/src/app/features/psbt-signer/hooks/use-parsed-outputs.tsx b/src/app/features/psbt-signer/hooks/use-parsed-outputs.tsx
@@ -26,7 +26,7 @@ interface UseParsedOutputsArgs {
 export function useParsedOutputs({ isPsbtMutable, outputs, network }: UseParsedOutputsArgs) {
   const bitcoinAddressNativeSegwit = useCurrentAccountNativeSegwitIndexZeroSigner().address;
   const { address: bitcoinAddressTaproot } = useCurrentAccountTaprootIndexZeroSigner();
-  const bitcoinNetwork = getBtcSignerLibNetworkConfigByMode(network.chain.bitcoin.bitcoinNetwork);
+  const bitcoinNetwork = getBtcSignerLibNetworkConfigByMode(network.chain.bitcoin.mode);
 
   return useMemo(
     () =>

diff --git a/src/app/pages/receive/components/receive-tokens.tsx b/src/app/pages/receive/components/receive-tokens.tsx
@@ -98,7 +98,7 @@ export function ReceiveTokens({
         }}
         title="SRC-20"
       />
-      {(network.chain.bitcoin.bitcoinNetwork === 'testnet' || runesEnabled) && (
+      {(network.chain.bitcoin.mode === 'testnet' || runesEnabled) && (
         <ReceiveItem
           address={btcAddressTaproot}
           icon={<RunesAvatarIcon />}

diff --git a/src/app/pages/rpc-sign-bip322-message/use-sign-bip322-message.ts b/src/app/pages/rpc-sign-bip322-message/use-sign-bip322-message.ts
@@ -88,7 +88,7 @@ function useSignBip322MessageFactory({ address, signPsbt }: SignBip322MessageFac
         message,
         address,
         signPsbt,
-        network: network.chain.bitcoin.bitcoinNetwork,
+        network: network.chain.bitcoin.mode,
       });
 
       await shortPauseBeforeToast();

diff --git a/src/app/pages/send/ordinal-inscription/components/send-inscription-container.tsx b/src/app/pages/send/ordinal-inscription/components/send-inscription-container.tsx
@@ -50,7 +50,7 @@ export function SendInscriptionContainer() {
     setUtxo(
       createUtxoFromInscription({
         inscription: routeState.inscription,
-        network: network.chain.bitcoin.bitcoinNetwork,
+        network: network.chain.bitcoin.mode,
         accountIndex: currentAccountIndex,
         inscriptionAddressIdx: addressesMap[routeState.inscription.address],
       })

diff --git a/src/app/pages/send/ordinal-inscription/hooks/use-send-inscription-form.tsx b/src/app/pages/send/ordinal-inscription/hooks/use-send-inscription-form.tsx
@@ -148,10 +148,10 @@ export function useSendInscriptionForm() {
         .concat(
           complianceValidator(
             btcAddressValidator(),
-            bitcoinNetworkModeToCoreNetworkMode(currentNetwork.chain.bitcoin.bitcoinNetwork)
+            bitcoinNetworkModeToCoreNetworkMode(currentNetwork.chain.bitcoin.mode)
           )
         )
-        .concat(btcAddressNetworkValidator(currentNetwork.chain.bitcoin.bitcoinNetwork)),
+        .concat(btcAddressNetworkValidator(currentNetwork.chain.bitcoin.mode)),
     }),
   };
 }
diff --git a/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx
@@ -102,7 +102,7 @@ export function BtcSendForm() {
                     />
                     <SelectedAssetField icon={<BtcAvatarIcon />} name="Bitcoin" symbol={symbol} />
                     <TransferRecipientField />
-                    {currentNetwork.chain.bitcoin.bitcoinNetwork === 'testnet' && (
+                    {currentNetwork.chain.bitcoin.mode === 'testnet' && (
                       <Callout variant="warning" title="Funds have no value" mt="space.04">
                         This is a Bitcoin testnet transaction.
                         <Link

diff --git a/src/app/pages/send/send-crypto-asset-form/form/btc/use-btc-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/btc/use-btc-send-form.tsx
@@ -74,12 +74,12 @@ export function useBtcSendForm() {
         .string()
         .defined(FormErrorMessages.AddressRequired)
         .concat(btcAddressValidator())
-        .concat(btcAddressNetworkValidator(currentNetwork.chain.bitcoin.bitcoinNetwork))
+        .concat(btcAddressNetworkValidator(currentNetwork.chain.bitcoin.mode))
         .concat(notCurrentAddressValidator(nativeSegwitSigner.address || ''))
         .concat(
           complianceValidator(
             btcAddressValidator(),
-            bitcoinNetworkModeToCoreNetworkMode(currentNetwork.chain.bitcoin.bitcoinNetwork)
+            bitcoinNetworkModeToCoreNetworkMode(currentNetwork.chain.bitcoin.mode)
           )
         ),
     }),

diff --git a/src/app/query/common/compliance-checker/compliance-checker.query.ts b/src/app/query/common/compliance-checker/compliance-checker.query.ts
@@ -1,7 +1,7 @@
 import { type UseQueryOptions, useQueries } from '@tanstack/react-query';
 import axios from 'axios';
 
-import type { BitcoinNetworkModes } from '@leather.io/models';
+import { type BitcoinNetworkModes } from '@leather.io/models';
 import { ensureArray, isEmptyString } from '@leather.io/utils';
 
 import { analytics } from '@shared/utils/analytics';
@@ -69,7 +69,7 @@ function useCheckAddressComplianceQueries(addresses: string[]) {
   return useQueries({
     queries: addresses
       .filter(address => !isEmptyString(address))
-      .map(address => makeComplianceQuery(address, network.chain.bitcoin.bitcoinNetwork)),
+      .map(address => makeComplianceQuery(address, network.chain.bitcoin.mode)),
   });
 }
 

diff --git a/src/app/store/accounts/blockchain/bitcoin/bitcoin-keychain.ts b/src/app/store/accounts/blockchain/bitcoin/bitcoin-keychain.ts
@@ -58,7 +58,7 @@ export function bitcoinAccountBuilderFactory(
 
 export function useBitcoinScureLibNetworkConfig() {
   const network = useCurrentNetwork();
-  return getBtcSignerLibNetworkConfigByMode(network.chain.bitcoin.bitcoinNetwork);
+  return getBtcSignerLibNetworkConfigByMode(network.chain.bitcoin.mode);
 }
 
 export function useBitcoinExtendedPublicKeyVersions(): Versions | undefined {
@@ -72,7 +72,7 @@ export function useBitcoinExtendedPublicKeyVersions(): Versions | undefined {
       return whenWallet({
         software: undefined,
         ledger: getHdKeyVersionsFromNetwork(
-          bitcoinNetworkModeToCoreNetworkMode(network.chain.bitcoin.bitcoinNetwork)
+          bitcoinNetworkModeToCoreNetworkMode(network.chain.bitcoin.mode)
         ),
       });
     } catch (e) {