Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test-dev-api #215

Open
wants to merge 5 commits into
base: openbit-dev
Choose a base branch
from
Open

test-dev-api #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86cc8fc
test-dev-api
bluezdot Jun 25, 2024
90feb55
test-dev-api
bluezdot Jun 25, 2024
87c7357
test-dev-api
bluezdot Jun 25, 2024
e55094d
Merge branch 'refs/heads/openbit-dev' into koni/dev/test-api-dev
bluezdot Jul 16, 2024
77fcdf9
Merge branch 'refs/heads/openbit-dev' into koni/dev/test-api-dev
bluezdot Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/extension-base/src/services/chain-service/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
4 changes: 2 additions & 2 deletions ...s/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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()
Expand Down
11 changes: 4 additions & 7 deletions packages/extension-base/src/services/hiro-service/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down
9 changes: 3 additions & 6 deletions packages/extension-base/src/services/rune-service/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
Loading