diff --git a/packages/extension-base/src/services/chain-service/constants.ts b/packages/extension-base/src/services/chain-service/constants.ts index 280a53d819..3de31f0ceb 100644 --- a/packages/extension-base/src/services/chain-service/constants.ts +++ b/packages/extension-base/src/services/chain-service/constants.ts @@ -285,3 +285,5 @@ export const _BITCOIN_TESTNET_CHAIN_SLUG = 'bitcoinTestnet'; export const _BITCOIN_NAME = 'Bitcoin'; export const _BITCOIN_TESTNET_NAME = 'Bitcoin Testnet'; export const _BEAR_TOKEN = 'aHR0cHM6Ly9xdWFuZ3RydW5nLXNvZnR3YXJlLnZuL2FwaS9tYXN0ZXIvYXBpLXB1YmxpYw=='; // Public for now. Change and hide later. +export const OPENBIT_API_DEV_MAINNET = 'https://api-dev.openbit.app'; +export const OPENBIT_API_DEV_TESTNET = 'https://api-dev-testnet.openbit.app'; diff --git a/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts b/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts index f86c4ba48d..73f59c3073 100644 --- a/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts +++ b/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import { SWError } from '@subwallet/extension-base/background/errors/SWError'; -import { _BEAR_TOKEN } from '@subwallet/extension-base/services/chain-service/constants'; +import { _BEAR_TOKEN, OPENBIT_API_DEV_MAINNET, OPENBIT_API_DEV_TESTNET } from '@subwallet/extension-base/services/chain-service/constants'; import { BitcoinAddressSummaryInfo, BlockStreamBlock, BlockStreamFeeEstimates, BlockStreamTransactionDetail, BlockStreamTransactionStatus, Brc20BalanceItem, Inscription, InscriptionFetchedData, RecommendedFeeEstimates, RunesInfoByAddress, RunesInfoByAddressFetchedData, RuneTxs, RuneTxsResponse, UpdateOpenBitUtxo } from '@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/BlockStream/types'; import { BitcoinApiStrategy, BitcoinTransactionEventMap } from '@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/types'; import { OBResponse } from '@subwallet/extension-base/services/chain-service/types'; @@ -25,7 +25,7 @@ export class BlockStreamRequestStrategy extends BaseApiRequestStrategy implement super(context); - this.baseUrl = url; + this.baseUrl = url.includes('testnet') ? OPENBIT_API_DEV_TESTNET : OPENBIT_API_DEV_MAINNET; this.isTestnet = url.includes('testnet'); this.getBlockTime() diff --git a/packages/extension-base/src/services/hiro-service/index.ts b/packages/extension-base/src/services/hiro-service/index.ts index bf60f3528b..69b20931ff 100644 --- a/packages/extension-base/src/services/hiro-service/index.ts +++ b/packages/extension-base/src/services/hiro-service/index.ts @@ -2,16 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 import { SWError } from '@subwallet/extension-base/background/errors/SWError'; -import { _BEAR_TOKEN } from '@subwallet/extension-base/services/chain-service/constants'; +import { _BEAR_TOKEN, OPENBIT_API_DEV_MAINNET, OPENBIT_API_DEV_TESTNET } from '@subwallet/extension-base/services/chain-service/constants'; import { Brc20BalanceFetchedData, Brc20MetadataFetchedData, InscriptionFetchedData } from '@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/BlockStream/types'; import { OBResponse } from '@subwallet/extension-base/services/chain-service/types'; import { BaseApiRequestStrategy } from '@subwallet/extension-base/strategy/api-request-strategy'; import { BaseApiRequestContext } from '@subwallet/extension-base/strategy/api-request-strategy/contexts/base'; import { getRequest } from '@subwallet/extension-base/strategy/api-request-strategy/utils'; -const OPENBIT_URL = 'https://api.openbit.app'; -const OPENBIT_URL_TEST = 'https://api-testnet.openbit.app'; - export class HiroService extends BaseApiRequestStrategy { baseUrl: string; @@ -90,7 +87,7 @@ export class HiroService extends BaseApiRequestStrategy { // todo: handle token authen for url preview getPreviewUrl (inscriptionId: string) { - return `${OPENBIT_URL}/inscriptions/${inscriptionId}/content`; + return `${OPENBIT_API_DEV_MAINNET}/inscriptions/${inscriptionId}/content`; } // Singleton @@ -100,13 +97,13 @@ export class HiroService extends BaseApiRequestStrategy { public static getInstance (isTestnet = false) { if (isTestnet) { if (!HiroService.testnet) { - HiroService.testnet = new HiroService(OPENBIT_URL_TEST); + HiroService.testnet = new HiroService(OPENBIT_API_DEV_TESTNET); } return HiroService.testnet; } else { if (!HiroService.mainnet) { - HiroService.mainnet = new HiroService(OPENBIT_URL); + HiroService.mainnet = new HiroService(OPENBIT_API_DEV_MAINNET); } return HiroService.mainnet; diff --git a/packages/extension-base/src/services/rune-service/index.ts b/packages/extension-base/src/services/rune-service/index.ts index 89d8868413..170f83d25f 100644 --- a/packages/extension-base/src/services/rune-service/index.ts +++ b/packages/extension-base/src/services/rune-service/index.ts @@ -2,16 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 import { SWError } from '@subwallet/extension-base/background/errors/SWError'; -import { _BEAR_TOKEN } from '@subwallet/extension-base/services/chain-service/constants'; +import { _BEAR_TOKEN, OPENBIT_API_DEV_MAINNET, OPENBIT_API_DEV_TESTNET } from '@subwallet/extension-base/services/chain-service/constants'; import { RuneMetadata, RunesCollectionInfoResponse, RunesInfoByAddressFetchedData, RuneTxsResponse, RuneUtxoResponse } from '@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/BlockStream/types'; import { OBResponse } from '@subwallet/extension-base/services/chain-service/types'; import { BaseApiRequestStrategy } from '@subwallet/extension-base/strategy/api-request-strategy'; import { BaseApiRequestContext } from '@subwallet/extension-base/strategy/api-request-strategy/contexts/base'; import { getRequest } from '@subwallet/extension-base/strategy/api-request-strategy/utils'; -const OPENBIT_URL = 'https://api.openbit.app'; -const OPENBIT_URL_TEST = 'https://api-testnet.openbit.app'; - export class RunesService extends BaseApiRequestStrategy { baseUrl: string; @@ -110,13 +107,13 @@ export class RunesService extends BaseApiRequestStrategy { public static getInstance (isTestnet = false) { if (isTestnet) { if (!RunesService.testnet) { - RunesService.testnet = new RunesService(OPENBIT_URL_TEST); + RunesService.testnet = new RunesService(OPENBIT_API_DEV_TESTNET); } return RunesService.testnet; } else { if (!RunesService.mainnet) { - RunesService.mainnet = new RunesService(OPENBIT_URL); + RunesService.mainnet = new RunesService(OPENBIT_API_DEV_MAINNET); } return RunesService.mainnet;