feat: support testnet 4, closes LEA-1406

leather-io · Oct 17, 2024 · eb135a1 · eb135a1
1 parent 1df5138
commit eb135a1
Show file tree

Hide file tree

Showing 8 changed files with 1,236 additions and 1,265 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/bitcoin": "0.14.0",
+    "@leather.io/constants": "0.12.3",
+    "@leather.io/crypto": "1.6.4",
+    "@leather.io/models": "0.18.0",
+    "@leather.io/query": "2.15.0",
+    "@leather.io/stacks": "1.2.1",
     "@leather.io/tokens": "0.9.0",
-    "@leather.io/ui": "1.27.1",
-    "@leather.io/utils": "0.15.0",
+    "@leather.io/ui": "1.29.0",
+    "@leather.io/utils": "0.16.4",
     "@ledgerhq/hw-transport-webusb": "6.27.19",
     "@noble/hashes": "1.5.0",
     "@noble/secp256k1": "2.1.0",
@@ -263,7 +263,7 @@
     "@leather.io/eslint-config": "0.7.0",
     "@leather.io/panda-preset": "0.4.0",
     "@leather.io/prettier-config": "0.6.0",
-    "@leather.io/rpc": "2.1.10",
+    "@leather.io/rpc": "2.1.11",
     "@ls-lint/ls-lint": "2.2.3",
     "@mdx-js/loader": "3.0.0",
     "@pandacss/dev": "0.46.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/features/add-network/network-form-fields.tsx b/src/app/features/add-network/network-form-fields.tsx
@@ -6,7 +6,9 @@ import { HStack, styled } from 'leather-styles/jsx';
 
 import {
   BITCOIN_API_BASE_URL_MAINNET,
-  BITCOIN_API_BASE_URL_TESTNET,
+  BITCOIN_API_BASE_URL_TESTNET3,
+  BITCOIN_API_BASE_URL_TESTNET4,
+  type BitcoinNetwork,
   type BitcoinNetworkModes,
 } from '@leather.io/models';
 import {
@@ -24,15 +26,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 +72,20 @@ export function NetworkFormFields({ isEditNetworkMode }: NetworkFormFieldsProps)
     [setFieldValue]
   );
 
-  function setNetworkUrls(value: BitcoinNetworkModes) {
+  function setNetworkUrls(value: BitcoinNetwork | BitcoinNetworkModes) {
     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 +123,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/store/networks/networks.utils.ts b/src/app/store/networks/networks.utils.ts
@@ -2,7 +2,7 @@ import { ChainID } from '@stacks/transactions';
 
 import {
   BITCOIN_API_BASE_URL_MAINNET,
-  BITCOIN_API_BASE_URL_TESTNET,
+  BITCOIN_API_BASE_URL_TESTNET3,
   type NetworkConfiguration,
 } from '@leather.io/models';
 
@@ -54,7 +54,7 @@ function checkBitcoinNetworkProperties(
       bitcoinUrl:
         network.chainId === ChainID.Mainnet
           ? BITCOIN_API_BASE_URL_MAINNET
-          : BITCOIN_API_BASE_URL_TESTNET,
+          : BITCOIN_API_BASE_URL_TESTNET3,
     };
   } else {
     return network;
@@ -86,7 +86,7 @@ export function transformNetworkStateToMultichainStucture(
               bitcoin: {
                 blockchain: 'bitcoin',
                 bitcoinNetwork: bitcoinNetwork ? bitcoinNetwork : 'testnet',
-                bitcoinUrl: bitcoinUrl ? bitcoinUrl : BITCOIN_API_BASE_URL_TESTNET,
+                bitcoinUrl: bitcoinUrl ? bitcoinUrl : BITCOIN_API_BASE_URL_TESTNET3,
               },
             },
           },

diff --git a/tests/mocks/mock-utxos.ts b/tests/mocks/mock-utxos.ts
@@ -1,6 +1,6 @@
 import type { Page } from '@playwright/test';
 
-import { BITCOIN_API_BASE_URL_TESTNET } from '@leather.io/models';
+import { BITCOIN_API_BASE_URL_TESTNET3 } from '@leather.io/models';
 
 import { TEST_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS } from './constants';
 
@@ -133,7 +133,7 @@ export async function mockMainnetTestAccountBitcoinRequests(page: Page) {
 }
 
 export async function mockTestnetTestAccountEmptyUtxosRequests(page: Page) {
-  await page.route(`${BITCOIN_API_BASE_URL_TESTNET}/address/**/utxo`, route =>
+  await page.route(`${BITCOIN_API_BASE_URL_TESTNET3}/address/**/utxo`, route =>
     route.fulfill({
       json: [],
     })

diff --git a/tests/selectors/network.selectors.ts b/tests/selectors/network.selectors.ts
@@ -16,7 +16,7 @@ export enum NetworkSelectors {
   // add network form
   AddNetworkBtn = 'add-network-btn',
   AddNetworkBitcoinAPISelector = 'add-network-bitcoin-api-selector',
-  BitcoinAPIOptionTestnet = 'bitcoin-api-option-testnet',
+  BitcoinApiOptionTestnet = 'bitcoin-api-option-testnet3',
 
   NetworkMenuBtn = 'network-menu-btn',
   EditNetworkMenuBtn = 'edit-network-menu-btn',

diff --git a/tests/specs/network/add-network.spec.ts b/tests/specs/network/add-network.spec.ts
@@ -1,7 +1,7 @@
 import { NetworkSelectors } from '@tests/selectors/network.selectors';
 import { SettingsSelectors } from '@tests/selectors/settings.selectors';
 
-import { BITCOIN_API_BASE_URL_TESTNET } from '@leather.io/models';
+import { BITCOIN_API_BASE_URL_TESTNET3 } from '@leather.io/models';
 
 import { test } from '../../fixtures/fixtures';
 
@@ -19,11 +19,11 @@ test.describe('Networks tests', () => {
 
   test('that bitcoin api url changes on selecting different network', async ({ page }) => {
     await page.getByTestId(NetworkSelectors.AddNetworkBitcoinAPISelector).click();
-    await page.getByTestId(NetworkSelectors.BitcoinAPIOptionTestnet).click();
+    await page.getByTestId(NetworkSelectors.BitcoinApiOptionTestnet).click();
 
     const bitcoinUrl = page.getByTestId(NetworkSelectors.NetworkBitcoinAddress);
 
-    test.expect(await bitcoinUrl.inputValue()).toEqual(BITCOIN_API_BASE_URL_TESTNET);
+    test.expect(await bitcoinUrl.inputValue()).toEqual(BITCOIN_API_BASE_URL_TESTNET3);
   });
 
   test('validation error when stacks api url is empty', async ({ networkPage }) => {

diff --git a/tests/specs/settings/settings.spec.ts b/tests/specs/settings/settings.spec.ts
@@ -69,7 +69,7 @@ test.describe('Settings menu', () => {
     await page.getByTestId(SettingsSelectors.ChangeNetworkAction).click();
     await page.waitForTimeout(1000);
     const networkListItems = await page.getByTestId(SettingsSelectors.NetworkListItem).all();
-    test.expect(networkListItems).toHaveLength(5);
+    test.expect(networkListItems).toHaveLength(6);
   });
 
   test('that menu item can toggle privacy', async ({ page, homePage }) => {