Skip to content

Commit 7738a18

Browse files
pwltrpwltr
committed
chore: update environment variables
1 parent 2092279 commit 7738a18

File tree

7 files changed

+112
-114
lines changed

7 files changed

+112
-114
lines changed

‎.env.development.template‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,46 @@
1-
# middleware for redux-logger
2-
ENABLE_REDUX_LOGGER=true
3-
4-
# middleware for immutable-state-invariant (disable if things are slow in development)
5-
ENABLE_REDUX_IMMUTABLE_CHECK=true
6-
7-
# i18next debug mode
8-
ENABLE_I18NEXT_DEBUGGER=false
9-
10-
# redux-persist migration debug mode
11-
ENABLE_MIGRATION_DEBUG=false
12-
13-
# react-native-ldk JS logs
14-
ENABLE_LDK_LOGS=true
15-
16-
# Bitkit backend
1+
# Bitkit Backend
172
BACKEND_HOST=https://bitkit.stag0.blocktank.to
183

19-
# LDK backups
4+
# Backup Server
205
BACKUPS_SERVER_HOST=https://bitkit.stag0.blocktank.to/backups-ldk
216
BACKUPS_SERVER_PUBKEY=02c03b8b8c1b5500b622646867d99bf91676fac0f38e2182c91a9ff0d053a21d6d
227

23-
# Slashtags
24-
WEB_RELAY=https://webrelay.slashtags.to
25-
26-
# Blocktank
8+
# LSP API
279
BLOCKTANK_HOST=https://api.stag0.blocktank.to/blocktank/api/v2
2810

29-
# Network
30-
ELECTRUM_BITCOIN_HOST=35.187.18.233
31-
ELECTRUM_BITCOIN_SSL_PORT=8900
32-
ELECTRUM_BITCOIN_TCP_PORT=8911
33-
ELECTRUM_BITCOIN_PROTO=ssl
11+
# bitcoin | bitcoinTestnet | bitcoinRegtest
12+
DEFAULT_BITCOIN_NETWORK=bitcoin
3413

14+
# Default Electrum Peer (Regtest)
3515
ELECTRUM_REGTEST_HOST=34.65.86.104
36-
ELECTRUM_REGTEST_SSL_PORT=18484
3716
ELECTRUM_REGTEST_TCP_PORT=18483
17+
ELECTRUM_REGTEST_SSL_PORT=18484
3818
ELECTRUM_REGTEST_PROTO=tcp
3919

20+
# format: "<pubkey>,<pubkey>,..."
21+
TRUSTED_ZERO_CONF_PEERS="028a8910b0048630d4eb17af25668cdd7ea6f2d8ae20956e7a06e2ae46ebcb69fc,0296b2db342fcf87ea94d981757fdf4d3e545bd5cef4919f58b5d38dfdd73bf5c9,03b9a456fb45d5ac98c02040d39aec77fa3eeb41fd22cf40b862b393bcfc43473a,039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3,03342eac98d8c07ac8a4f303b2ad09a34b3350357730013d534d0537a4d1d8a14d,03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b"
22+
23+
# Default Slashtags Web Relay
24+
WEB_RELAY=https://dht-relay.synonym.to/staging/web-relay
25+
4026
TREASURE_HUNT_HOST=" "
27+
CHATWOOT_API=https://synonym.to/api/chatwoot
4128

42-
# format: "<pubkey>, <pubkey>, ..."
43-
TRUSTED_ZERO_CONF_PEERS="028a8910b0048630d4eb17af25668cdd7ea6f2d8ae20956e7a06e2ae46ebcb69fc,0296b2db342fcf87ea94d981757fdf4d3e545bd5cef4919f58b5d38dfdd73bf5c9,03b9a456fb45d5ac98c02040d39aec77fa3eeb41fd22cf40b862b393bcfc43473a,039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3,03342eac98d8c07ac8a4f303b2ad09a34b3350357730013d534d0537a4d1d8a14d,03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b"
29+
### Debugging
30+
# middleware for redux-logger
31+
ENABLE_REDUX_LOGGER=true
4432

45-
WALLET_DEFAULT_SELECTED_NETWORK=bitcoin
33+
# middleware for immutable-state-invariant (disable if things are slow in development)
34+
ENABLE_REDUX_IMMUTABLE_CHECK=true
4635

47-
E2E=false
36+
# i18next debug mode
37+
ENABLE_I18NEXT_DEBUGGER=false
4838

49-
CHATWOOT_API=https://synonym.to/api/chatwoot
39+
# redux-persist migration debug mode
40+
ENABLE_MIGRATION_DEBUG=false
41+
42+
# react-native-ldk JS logs
43+
ENABLE_LDK_LOGS=true
44+
45+
# Detox E2E Testing
46+
E2E=false

‎.env.production.template‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Bitkit Backend
2+
BACKEND_HOST=https://blocktank.synonym.to
3+
4+
# Backup Server
5+
BACKUPS_SERVER_HOST=https://blocktank.synonym.to/backups-ldk
6+
BACKUPS_SERVER_PUBKEY=0236efd76e37f96cf2dced9d52ff84c97e5b3d4a75e7d494807291971783f38377
7+
8+
# LSP API
9+
BLOCKTANK_HOST=https://api1.blocktank.to/api
10+
11+
# bitcoin | bitcoinTestnet | bitcoinRegtest
12+
DEFAULT_BITCOIN_NETWORK=bitcoin
13+
14+
# Default Electrum Peer (Regtest)
15+
ELECTRUM_REGTEST_HOST=34.65.86.104
16+
ELECTRUM_REGTEST_TCP_PORT=18483
17+
ELECTRUM_REGTEST_SSL_PORT=18484
18+
ELECTRUM_REGTEST_PROTO=tcp
19+
20+
# format: "<pubkey>,<pubkey>,..."
21+
TRUSTED_ZERO_CONF_PEERS="039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3,03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b,02a371038863605300d0b3fc9de0cf5ccb57728b7f8906535709a831b16e311187"
22+
23+
# Default Slashtags Web Relay
24+
WEB_RELAY=https://webrelay.slashtags.to
25+
26+
TREASURE_HUNT_HOST=" "
27+
CHATWOOT_API=https://synonym.to/api/chatwoot
28+
E2E=false

‎.env.test.template‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,46 @@
1-
# middleware for redux-logger
2-
ENABLE_REDUX_LOGGER=false
3-
4-
# middleware for immutable-state-invariant (disable if things are slow in development)
5-
ENABLE_REDUX_IMMUTABLE_CHECK=false
6-
7-
# i18next debug mode
8-
ENABLE_I18NEXT_DEBUGGER=false
9-
10-
# redux-persist migration debug mode
11-
ENABLE_MIGRATION_DEBUG=false
12-
13-
# react-native-ldk JS logs
14-
ENABLE_LDK_LOGS=false
15-
16-
# Bitkit backend
1+
# Bitkit Backend
172
BACKEND_HOST=https://bitkit.stag0.blocktank.to
183

19-
# LDK backups
4+
# Backup Server
205
BACKUPS_SERVER_HOST=http://127.0.0.1:3003
216
BACKUPS_SERVER_PUBKEY=0319c4ff23820afec0c79ce3a42031d7fef1dff78b7bdd69b5560684f3e1827675
227

23-
# Slashtags
24-
WEB_RELAY=https://webrelay.slashtags.to
8+
# LSP API
9+
BLOCKTANK_HOST=https://api.stag0.blocktank.to/blocktank/api/v2
2510

26-
# Blocktank
27-
BLOCKTANK_HOST=https://api.stag.blocktank.to
28-
29-
# Network
30-
ELECTRUM_BITCOIN_HOST=35.187.18.233
31-
ELECTRUM_BITCOIN_SSL_PORT=8900
32-
ELECTRUM_BITCOIN_TCP_PORT=8911
33-
ELECTRUM_BITCOIN_PROTO=tcp
11+
# bitcoin | bitcoinTestnet | bitcoinRegtest
12+
DEFAULT_BITCOIN_NETWORK=bitcoinRegtest
3413

14+
# Default Electrum Peer (Regtest)
3515
ELECTRUM_REGTEST_HOST=127.0.0.1
36-
ELECTRUM_REGTEST_SSL_PORT=60001
3716
ELECTRUM_REGTEST_TCP_PORT=60001
17+
ELECTRUM_REGTEST_SSL_PORT=60002
3818
ELECTRUM_REGTEST_PROTO=tcp
3919

20+
# format: "<pubkey>,<pubkey>,..."
21+
TRUSTED_ZERO_CONF_PEERS=""
22+
23+
# Default Slashtags Web Relay
24+
WEB_RELAY=https://dht-relay.synonym.to/staging/web-relay
25+
4026
TREASURE_HUNT_HOST=" "
27+
CHATWOOT_API=https://synonym.to/api/chatwoot
4128

42-
# format: "<pubkey>, <pubkey>, ..."
43-
TRUSTED_ZERO_CONF_PEERS="03b9a456fb45d5ac98c02040d39aec77fa3eeb41fd22cf40b862b393bcfc43473a"
29+
### Debugging
30+
# middleware for redux-logger
31+
ENABLE_REDUX_LOGGER=false
4432

45-
WALLET_DEFAULT_SELECTED_NETWORK=bitcoinRegtest
33+
# middleware for immutable-state-invariant (disable if things are slow in development)
34+
ENABLE_REDUX_IMMUTABLE_CHECK=false
4635

47-
E2E=true
36+
# i18next debug mode
37+
ENABLE_I18NEXT_DEBUGGER=false
4838

49-
CHATWOOT_API=https://synonym.to/api/chatwoot
39+
# redux-persist migration debug mode
40+
ENABLE_MIGRATION_DEBUG=false
41+
42+
# react-native-ldk JS logs
43+
ENABLE_LDK_LOGS=false
44+
45+
# Detox E2E Testing
46+
E2E=true

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
declare module '@env' {
2-
export const ENABLE_REDUX_LOGGER: string;
3-
export const ENABLE_REDUX_IMMUTABLE_CHECK: string;
4-
export const ENABLE_I18NEXT_DEBUGGER: string;
5-
export const ENABLE_MIGRATION_DEBUG: string;
6-
export const ENABLE_LDK_LOGS: string;
7-
82
export const BACKEND_HOST: string;
93
export const BACKUPS_SERVER_HOST: string;
104
export const BACKUPS_SERVER_PUBKEY: string;
115
export const BLOCKTANK_HOST: string;
126

13-
export const ELECTRUM_BITCOIN_HOST: string;
14-
export const ELECTRUM_BITCOIN_SSL_PORT: number;
15-
export const ELECTRUM_BITCOIN_TCP_PORT: number;
16-
export const ELECTRUM_BITCOIN_PROTO: string;
7+
export const DEFAULT_BITCOIN_NETWORK: string;
8+
179
export const ELECTRUM_REGTEST_HOST: string;
1810
export const ELECTRUM_REGTEST_SSL_PORT: number;
1911
export const ELECTRUM_REGTEST_TCP_PORT: number;
2012
export const ELECTRUM_REGTEST_PROTO: string;
2113

22-
export const TREASURE_HUNT_HOST: string;
23-
2414
export const TRUSTED_ZERO_CONF_PEERS: string;
2515

26-
export const WALLET_DEFAULT_SELECTED_NETWORK: string;
27-
28-
export const E2E: string;
2916
export const WEB_RELAY: string;
17+
export const TREASURE_HUNT_HOST: string;
3018
export const CHATWOOT_API: string;
19+
20+
export const ENABLE_REDUX_LOGGER: string;
21+
export const ENABLE_REDUX_IMMUTABLE_CHECK: string;
22+
export const ENABLE_I18NEXT_DEBUGGER: string;
23+
export const ENABLE_MIGRATION_DEBUG: string;
24+
export const ENABLE_LDK_LOGS: string;
25+
export const E2E: string;
3126
}

‎src/constants/env.ts‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ import {
44
BACKUPS_SERVER_PUBKEY,
55
BLOCKTANK_HOST,
66
CHATWOOT_API,
7+
DEFAULT_BITCOIN_NETWORK,
78
E2E,
8-
ELECTRUM_BITCOIN_HOST,
9-
ELECTRUM_BITCOIN_PROTO,
10-
ELECTRUM_BITCOIN_SSL_PORT,
11-
ELECTRUM_BITCOIN_TCP_PORT,
129
ELECTRUM_REGTEST_HOST,
1310
ELECTRUM_REGTEST_PROTO,
1411
ELECTRUM_REGTEST_SSL_PORT,
@@ -20,20 +17,13 @@ import {
2017
ENABLE_REDUX_LOGGER,
2118
TREASURE_HUNT_HOST,
2219
TRUSTED_ZERO_CONF_PEERS,
23-
WALLET_DEFAULT_SELECTED_NETWORK,
2420
WEB_RELAY,
2521
} from '@env';
2622
import { isProtocol } from '../store/types/settings';
2723
import { isBitcoinNetwork } from '../utils/networks';
2824

29-
if (!isBitcoinNetwork(WALLET_DEFAULT_SELECTED_NETWORK)) {
30-
throw new Error(
31-
`${WALLET_DEFAULT_SELECTED_NETWORK} is not a valid Bitcoin network.`,
32-
);
33-
}
34-
35-
if (!isProtocol(ELECTRUM_BITCOIN_PROTO)) {
36-
throw new Error(`${ELECTRUM_BITCOIN_PROTO} is not a valid protocol.`);
25+
if (!isBitcoinNetwork(DEFAULT_BITCOIN_NETWORK)) {
26+
throw new Error(`${DEFAULT_BITCOIN_NETWORK} is not a valid Bitcoin network.`);
3727
}
3828

3929
if (!isProtocol(ELECTRUM_REGTEST_PROTO)) {
@@ -67,10 +57,6 @@ export const __BACKUPS_SERVER_PUBKEY__ = BACKUPS_SERVER_PUBKEY;
6757

6858
export const __BLOCKTANK_HOST__ = BLOCKTANK_HOST;
6959

70-
export const __ELECTRUM_BITCOIN_HOST__ = ELECTRUM_BITCOIN_HOST;
71-
export const __ELECTRUM_BITCOIN_SSL_PORT__ = ELECTRUM_BITCOIN_SSL_PORT;
72-
export const __ELECTRUM_BITCOIN_TCP_PORT__ = ELECTRUM_BITCOIN_TCP_PORT;
73-
export const __ELECTRUM_BITCOIN_PROTO__ = ELECTRUM_BITCOIN_PROTO;
7460
export const __ELECTRUM_REGTEST_HOST__ = ELECTRUM_REGTEST_HOST;
7561
export const __ELECTRUM_REGTEST_SSL_PORT__ = ELECTRUM_REGTEST_SSL_PORT;
7662
export const __ELECTRUM_REGTEST_TCP_PORT__ = ELECTRUM_REGTEST_TCP_PORT;
@@ -82,8 +68,7 @@ export const __TRUSTED_ZERO_CONF_PEERS__ = TRUSTED_ZERO_CONF_PEERS.split(
8268
',',
8369
).map((nodeId) => nodeId.trim());
8470

85-
export const __WALLET_DEFAULT_SELECTED_NETWORK__ =
86-
WALLET_DEFAULT_SELECTED_NETWORK;
71+
export const __DEFAULT_BITCOIN_NETWORK__ = DEFAULT_BITCOIN_NETWORK;
8772

8873
export const __E2E__ = E2E === 'true';
8974
export const __WEB_RELAY__ = WEB_RELAY;

‎src/store/shapes/settings.ts‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ import { ECoinSelectPreference, EProtocol, TServer } from 'beignet';
22
import cloneDeep from 'lodash/cloneDeep';
33

44
import {
5-
__ELECTRUM_BITCOIN_HOST__,
6-
__ELECTRUM_BITCOIN_PROTO__,
7-
__ELECTRUM_BITCOIN_SSL_PORT__,
8-
__ELECTRUM_BITCOIN_TCP_PORT__,
95
__ELECTRUM_REGTEST_HOST__,
106
__ELECTRUM_REGTEST_PROTO__,
117
__ELECTRUM_REGTEST_SSL_PORT__,
@@ -20,43 +16,43 @@ import { EDenomination, EUnit } from '../types/wallet';
2016
export const defaultElectrumPeer: Record<EAvailableNetwork, TServer[]> = {
2117
bitcoin: [
2218
{
23-
host: __ELECTRUM_BITCOIN_HOST__,
24-
ssl: __ELECTRUM_BITCOIN_SSL_PORT__,
25-
tcp: __ELECTRUM_BITCOIN_TCP_PORT__,
26-
protocol: __ELECTRUM_BITCOIN_PROTO__,
19+
host: '35.187.18.233',
20+
tcp: 8911,
21+
ssl: 8900,
22+
protocol: EProtocol.ssl,
2723
},
2824
],
2925
bitcoinTestnet: [
3026
{
3127
host: 'testnet.hsmiths.com',
32-
ssl: 53012,
3328
tcp: 53012,
29+
ssl: 53012,
3430
protocol: EProtocol.ssl,
3531
},
3632
{
3733
host: 'tn.not.fyi',
38-
ssl: 55002,
3934
tcp: 55002,
35+
ssl: 55002,
4036
protocol: EProtocol.ssl,
4137
},
4238
{
4339
host: 'testnet.aranguren.org',
44-
ssl: 51002,
4540
tcp: 51001,
41+
ssl: 51002,
4642
protocol: EProtocol.ssl,
4743
},
4844
{
4945
host: 'blackie.c3-soft.com',
50-
ssl: 57006,
5146
tcp: 57006,
47+
ssl: 57006,
5248
protocol: EProtocol.ssl,
5349
},
5450
],
5551
bitcoinRegtest: [
5652
{
5753
host: __ELECTRUM_REGTEST_HOST__,
58-
ssl: __ELECTRUM_REGTEST_SSL_PORT__,
5954
tcp: __ELECTRUM_REGTEST_TCP_PORT__,
55+
ssl: __ELECTRUM_REGTEST_SSL_PORT__,
6056
protocol: __ELECTRUM_REGTEST_PROTO__,
6157
},
6258
],

‎src/store/shapes/wallet.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
TGapLimitOptions,
1010
} from 'beignet';
1111
import cloneDeep from 'lodash/cloneDeep';
12-
import { __WALLET_DEFAULT_SELECTED_NETWORK__ } from '../../constants/env';
12+
import { __DEFAULT_BITCOIN_NETWORK__ } from '../../constants/env';
1313
import { EAvailableNetwork } from '../../utils/networks';
1414
import { objectKeys } from '../../utils/objectKeys';
1515
import { IHeader } from '../../utils/types/electrum';
@@ -176,7 +176,7 @@ export const getDefaultGapLimitOptions = (): TGapLimitOptions => {
176176

177177
export const defaultWalletStoreShape: Readonly<IWalletStore> = {
178178
walletExists: false,
179-
selectedNetwork: __WALLET_DEFAULT_SELECTED_NETWORK__,
179+
selectedNetwork: __DEFAULT_BITCOIN_NETWORK__,
180180
selectedWallet: 'wallet0',
181181
exchangeRates: {},
182182
addressTypesToMonitor: [EAddressType.p2wpkh],

0 commit comments

Comments
 (0)