Skip to content

Commit ee0c827

Browse files
pwltrpwltr
authored
chore: switch to new staging (#2433)
1 parent 579fc3d commit ee0c827

File tree

6 files changed

+22
-38
lines changed

6 files changed

+22
-38
lines changed

‎.env.development.template‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,34 @@ ENABLE_MIGRATION_DEBUG=false
1313
# react-native-ldk JS logs
1414
ENABLE_LDK_LOGS=true
1515

16+
# Bitkit backend
17+
BACKEND_HOST=https://bitkit.stag0.blocktank.to
18+
1619
# LDK backups
17-
BACKUPS_SERVER_HOST=https://blocktank.synonym.to/staging-backups-ldk
20+
BACKUPS_SERVER_HOST=https://bitkit.stag0.blocktank.to/backups-ldk
1821
BACKUPS_SERVER_PUBKEY=02c03b8b8c1b5500b622646867d99bf91676fac0f38e2182c91a9ff0d053a21d6d
1922

2023
# Slashtags
2124
WEB_RELAY=https://webrelay.slashtags.to
2225

2326
# Blocktank
24-
BLOCKTANK_HOST=https://api1.blocktank.to/api
27+
BLOCKTANK_HOST=https://api.stag0.blocktank.to/blocktank/api/v2
2528

2629
# Network
2730
ELECTRUM_BITCOIN_HOST=35.187.18.233
2831
ELECTRUM_BITCOIN_SSL_PORT=8900
2932
ELECTRUM_BITCOIN_TCP_PORT=8911
3033
ELECTRUM_BITCOIN_PROTO=ssl
3134

32-
ELECTRUM_REGTEST_HOST=35.233.47.252
35+
ELECTRUM_REGTEST_HOST=34.65.86.104
3336
ELECTRUM_REGTEST_SSL_PORT=18484
3437
ELECTRUM_REGTEST_TCP_PORT=18483
3538
ELECTRUM_REGTEST_PROTO=tcp
3639

37-
ELECTRUM_SIGNET_HOST=35.233.47.252
38-
ELECTRUM_SIGNET_SSL_PORT=18484
39-
ELECTRUM_SIGNET_TCP_PORT=18483
40-
ELECTRUM_SIGNET_PROTO=tcp
41-
4240
TREASURE_HUNT_HOST=" "
4341

4442
# format: "<pubkey>, <pubkey>, ..."
45-
TRUSTED_ZERO_CONF_PEERS="0296b2db342fcf87ea94d981757fdf4d3e545bd5cef4919f58b5d38dfdd73bf5c9,03b9a456fb45d5ac98c02040d39aec77fa3eeb41fd22cf40b862b393bcfc43473a,039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3,03342eac98d8c07ac8a4f303b2ad09a34b3350357730013d534d0537a4d1d8a14d,03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b"
43+
TRUSTED_ZERO_CONF_PEERS="028a8910b0048630d4eb17af25668cdd7ea6f2d8ae20956e7a06e2ae46ebcb69fc,0296b2db342fcf87ea94d981757fdf4d3e545bd5cef4919f58b5d38dfdd73bf5c9,03b9a456fb45d5ac98c02040d39aec77fa3eeb41fd22cf40b862b393bcfc43473a,039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3,03342eac98d8c07ac8a4f303b2ad09a34b3350357730013d534d0537a4d1d8a14d,03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b"
4644

4745
WALLET_DEFAULT_SELECTED_NETWORK=bitcoin
4846

‎.env.test.template‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ ENABLE_MIGRATION_DEBUG=false
1313
# react-native-ldk JS logs
1414
ENABLE_LDK_LOGS=false
1515

16+
# Bitkit backend
17+
BACKEND_HOST=https://bitkit.stag0.blocktank.to
18+
1619
# LDK backups
1720
BACKUPS_SERVER_HOST=http://127.0.0.1:3003
1821
BACKUPS_SERVER_PUBKEY=0319c4ff23820afec0c79ce3a42031d7fef1dff78b7bdd69b5560684f3e1827675
@@ -34,11 +37,6 @@ ELECTRUM_REGTEST_SSL_PORT=60001
3437
ELECTRUM_REGTEST_TCP_PORT=60001
3538
ELECTRUM_REGTEST_PROTO=tcp
3639

37-
ELECTRUM_SIGNET_HOST=35.233.47.252
38-
ELECTRUM_SIGNET_SSL_PORT=18484
39-
ELECTRUM_SIGNET_TCP_PORT=18483
40-
ELECTRUM_SIGNET_PROTO=tcp
41-
4240
TREASURE_HUNT_HOST=" "
4341

4442
# format: "<pubkey>, <pubkey>, ..."

‎src/@types/env.d.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ declare module '@env' {
55
export const ENABLE_MIGRATION_DEBUG: string;
66
export const ENABLE_LDK_LOGS: string;
77

8+
export const BACKEND_HOST: string;
89
export const BACKUPS_SERVER_HOST: string;
910
export const BACKUPS_SERVER_PUBKEY: string;
10-
1111
export const BLOCKTANK_HOST: string;
1212

1313
export const ELECTRUM_BITCOIN_HOST: string;
@@ -18,10 +18,6 @@ declare module '@env' {
1818
export const ELECTRUM_REGTEST_SSL_PORT: number;
1919
export const ELECTRUM_REGTEST_TCP_PORT: number;
2020
export const ELECTRUM_REGTEST_PROTO: string;
21-
export const ELECTRUM_SIGNET_HOST: string;
22-
export const ELECTRUM_SIGNET_SSL_PORT: number;
23-
export const ELECTRUM_SIGNET_TCP_PORT: number;
24-
export const ELECTRUM_SIGNET_PROTO: string;
2521

2622
export const TREASURE_HUNT_HOST: string;
2723

‎src/constants/env.ts‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
BACKEND_HOST,
23
BACKUPS_SERVER_HOST,
34
BACKUPS_SERVER_PUBKEY,
45
BLOCKTANK_HOST,
@@ -11,10 +12,6 @@ import {
1112
ELECTRUM_REGTEST_PROTO,
1213
ELECTRUM_REGTEST_SSL_PORT,
1314
ELECTRUM_REGTEST_TCP_PORT,
14-
ELECTRUM_SIGNET_HOST,
15-
ELECTRUM_SIGNET_PROTO,
16-
ELECTRUM_SIGNET_SSL_PORT,
17-
ELECTRUM_SIGNET_TCP_PORT,
1815
ENABLE_I18NEXT_DEBUGGER,
1916
ENABLE_LDK_LOGS,
2017
ENABLE_MIGRATION_DEBUG,
@@ -43,8 +40,8 @@ if (!isProtocol(ELECTRUM_REGTEST_PROTO)) {
4340
throw new Error(`${ELECTRUM_REGTEST_PROTO} is not a valid protocol.`);
4441
}
4542

46-
if (!isProtocol(ELECTRUM_SIGNET_PROTO)) {
47-
throw new Error(`${ELECTRUM_SIGNET_PROTO} is not a valid protocol.`);
43+
if (!BACKEND_HOST) {
44+
throw new Error('BACKEND_HOST is missing.');
4845
}
4946

5047
if (!BACKUPS_SERVER_HOST || !BACKUPS_SERVER_PUBKEY) {
@@ -53,19 +50,18 @@ if (!BACKUPS_SERVER_HOST || !BACKUPS_SERVER_PUBKEY) {
5350

5451
export const __JEST__ = process.env.JEST_WORKER_ID !== undefined;
5552

56-
export const __ENABLE_REDUX_LOGGER__ = ENABLE_REDUX_LOGGER === 'true' ?? true;
57-
export const __ENABLE_MIGRATION_DEBUG__ =
58-
ENABLE_MIGRATION_DEBUG === 'true' ?? false;
53+
export const __ENABLE_REDUX_LOGGER__ = ENABLE_REDUX_LOGGER === 'true';
54+
export const __ENABLE_MIGRATION_DEBUG__ = ENABLE_MIGRATION_DEBUG === 'true';
5955
export const __ENABLE_REDUX_IMMUTABLE_CHECK__ =
6056
__DEV__ && ENABLE_REDUX_IMMUTABLE_CHECK
6157
? ENABLE_REDUX_IMMUTABLE_CHECK === 'true'
6258
: false;
6359

64-
export const __ENABLE_I18NEXT_DEBUGGER__ =
65-
ENABLE_I18NEXT_DEBUGGER === 'true' ?? __DEV__;
60+
export const __ENABLE_I18NEXT_DEBUGGER__ = ENABLE_I18NEXT_DEBUGGER === 'true';
6661

67-
export const __ENABLE_LDK_LOGS__ = ENABLE_LDK_LOGS === 'true' ?? __DEV__;
62+
export const __ENABLE_LDK_LOGS__ = ENABLE_LDK_LOGS === 'true';
6863

64+
export const __BACKEND_HOST__ = BACKEND_HOST;
6965
export const __BACKUPS_SERVER_HOST__ = BACKUPS_SERVER_HOST;
7066
export const __BACKUPS_SERVER_PUBKEY__ = BACKUPS_SERVER_PUBKEY;
7167

@@ -79,10 +75,6 @@ export const __ELECTRUM_REGTEST_HOST__ = ELECTRUM_REGTEST_HOST;
7975
export const __ELECTRUM_REGTEST_SSL_PORT__ = ELECTRUM_REGTEST_SSL_PORT;
8076
export const __ELECTRUM_REGTEST_TCP_PORT__ = ELECTRUM_REGTEST_TCP_PORT;
8177
export const __ELECTRUM_REGTEST_PROTO__ = ELECTRUM_REGTEST_PROTO;
82-
export const __ELECTRUM_SIGNET_HOST__ = ELECTRUM_SIGNET_HOST;
83-
export const __ELECTRUM_SIGNET_SSL_PORT__ = ELECTRUM_SIGNET_SSL_PORT;
84-
export const __ELECTRUM_SIGNET_TCP_PORT__ = ELECTRUM_SIGNET_TCP_PORT;
85-
export const __ELECTRUM_SIGNET_PROTO__ = ELECTRUM_SIGNET_PROTO;
8678

8779
export const __TREASURE_HUNT_HOST__ = TREASURE_HUNT_HOST;
8880

‎src/utils/blocktank/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const setupBlocktank = async (
4545
break;
4646
case EAvailableNetwork.bitcoinRegtest:
4747
dispatch(updateUser({ isGeoBlocked: false }));
48-
bt.baseUrl = 'https://api.stag.blocktank.to/blocktank/api/v2';
48+
bt.baseUrl = 'https://api.stag0.blocktank.to/blocktank/api/v2';
4949
break;
5050
}
5151
if (isGeoBlocked) {

‎src/utils/exchange-rate/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ok, err, Result } from '@synonymdev/result';
33
import i18n from '../i18n';
44
import { timeAgo } from '../helpers';
55
import { getWalletStore } from '../../store/helpers';
6-
import { __BLOCKTANK_HOST__ } from '../../constants/env';
6+
import { __BACKEND_HOST__ } from '../../constants/env';
77
import { showToast } from '../notifications';
88

99
export const mostUsedExchangeTickers = {
@@ -56,7 +56,7 @@ export const getExchangeRates = async (): Promise<Result<IExchangeRates>> => {
5656
const lastUpdatedAt = getWalletStore().exchangeRates.USD?.lastUpdatedAt;
5757

5858
try {
59-
const response = await fetch(`${__BLOCKTANK_HOST__}/fx/rates/btc`);
59+
const response = await fetch(`${__BACKEND_HOST__}/fx/rates/btc`);
6060
const { tickers } = await response.json();
6161

6262
const rates: IExchangeRates = tickers.reduce(

0 commit comments

Comments
 (0)