From 6adb427e6b55d13ad9261374d579113c0412ab4b Mon Sep 17 00:00:00 2001 From: kyranjamie Date: Fri, 17 Jan 2025 11:40:56 +0000 Subject: [PATCH] fix: possible issue introduced with testnet4 --- src/app/store/networks/networks.utils.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/store/networks/networks.utils.ts b/src/app/store/networks/networks.utils.ts index adcac066f1..4174d3c74e 100644 --- a/src/app/store/networks/networks.utils.ts +++ b/src/app/store/networks/networks.utils.ts @@ -3,8 +3,10 @@ import { ChainID } from '@stacks/transactions'; import { BITCOIN_API_BASE_URL_MAINNET, BITCOIN_API_BASE_URL_TESTNET3, + type BitcoinNetwork, type NetworkConfiguration, bitcoinNetworkToNetworkMode, + bitcoinNetworks, } from '@leather.io/models'; import { PersistedNetworkConfiguration } from './networks.slice'; @@ -64,6 +66,10 @@ function checkBitcoinNetworkProperties( } } +function isValidBitcoinNetwork(network: string): network is BitcoinNetwork { + return bitcoinNetworks.includes(network as BitcoinNetwork); +} + export function transformNetworkStateToMultichainStucture( state: Record ) { @@ -82,14 +88,16 @@ export function transformNetworkStateToMultichainStucture( chain: { stacks: { blockchain: 'stacks', - url: url, + url, chainId, subnetChainId, }, bitcoin: { blockchain: 'bitcoin', - bitcoinNetwork: bitcoinNetwork ?? 'testnet', - mode: bitcoinNetworkToNetworkMode(bitcoinNetwork ?? 'testnet'), + bitcoinNetwork: isValidBitcoinNetwork(bitcoinNetwork) ? bitcoinNetwork : 'testnet4', + mode: isValidBitcoinNetwork(bitcoinNetwork) + ? bitcoinNetworkToNetworkMode(bitcoinNetwork) + : 'testnet', bitcoinUrl: bitcoinUrl ?? BITCOIN_API_BASE_URL_TESTNET3, }, },