Skip to content

Commit 67103ea

Browse files
0oM4R0oM4R
authored
Update configuration and URL management (#4292)
* fix: update environment configuration URLs to use threefold.me domains * feat: update configuration and URL management for network handling - Refactored URL generation in manageURLs.ts to support both grid.tf and threefold.me domains based on the network environment.
1 parent f01fe97 commit 67103ea

File tree

3 files changed

+39
-38
lines changed

3 files changed

+39
-38
lines changed

‎packages/grid_client/src/manageURLs.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,17 @@ function mapResult(result: { [key: string]: string | null }, services: string[])
101101
export async function getAvailableURLs(clientOptions: ClientOptions) {
102102
const { proxyURL, relayURL, substrateURL, graphqlURL, activationURL, network } = clientOptions;
103103
const currentURLs = { proxyURL, relayURL, substrateURL, graphqlURL, activationURL };
104-
const base = network === NetworkEnv.main ? "grid.tf" : `${network}.grid.tf`;
104+
const base_tf = network === NetworkEnv.main ? "grid.tf" : `${network}.grid.tf`;
105+
const base_me = network === NetworkEnv.main ? `grid.threefold.me` : `${network}.threefold.me`;
105106
const URLS = {
106-
relayURL: [`wss://relay.${base}`, `wss://relay.02.${base}`],
107-
proxyURL: [`https://gridproxy.${base}`, `https://gridproxy.02.${base}`],
107+
relayURL: [`wss://relay.${base_tf}`, `wss://relay.${base_me}`],
108+
proxyURL: [`https://gridproxy.${base_tf}`, `https://gridproxy.${base_me}`],
108109
activationURL: [
109-
`https://activation.${base}/activation/activate`,
110-
`https://activation.02.${base}/activation/activate`,
110+
`https://activation.${base_tf}/activation/activate`,
111+
`https://activation.${base_me}/activation/activate`,
111112
],
112-
graphqlURL: [`https://graphql.${base}/graphql`, `https://graphql.02.${base}/graphql`],
113-
substrateURL: [`wss://tfchain.${base}/ws`, `wss://tfchain.02.${base}/ws`],
113+
graphqlURL: [`https://graphql.${base_tf}/graphql`, `https://graphql.${base_me}/graphql`],
114+
substrateURL: [`wss://tfchain.${base_tf}/ws`, `wss://tfchain.${base_me}/ws`],
114115
};
115116
const missingServicesURLS = getServicesWithoutURLs(currentURLs);
116117

‎packages/playground/public/config.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
window.env = {
22
WALLET_KEY: "wallet.v1",
33
NETWORK: "dev",
4-
GRAPHQL_STACKS: ["https://graphql.dev.grid.tf/graphql", "https://graphql.02.dev.grid.tf/graphql"],
5-
GRIDPROXY_STACKS: ["https://gridproxy.dev.grid.tf", "https://gridproxy.02.dev.grid.tf"],
6-
SUBSTRATE_STACKS: ["wss://tfchain.dev.grid.tf/ws", "wss://tfchain.02.dev.grid.tf/ws"],
4+
GRAPHQL_STACKS: ["https://graphql.dev.grid.tf/graphql", "https://graphql.dev.threefold.me/graphql"],
5+
GRIDPROXY_STACKS: ["https://gridproxy.dev.grid.tf", "https://gridproxy.dev.threefold.me"],
6+
SUBSTRATE_STACKS: ["wss://tfchain.dev.grid.tf/ws", "wss://tfchain.dev.threefold.me/ws"],
77
ACTIVATION_SERVICE_STACKS: [
88
"https://activation.dev.grid.tf/activation/activate",
9-
"https://activation.02.dev.grid.tf/activation/activate",
9+
"https://activation.dev.threefold.me/activation/activate",
1010
],
11-
RELAY_STACKS: ["wss://relay.dev.grid.tf", "wss://relay.02.dev.grid.tf"],
11+
RELAY_STACKS: ["wss://relay.dev.grid.tf", "wss://relay.dev.threefold.me"],
1212
BRIDGE_TFT_ADDRESS: "GDHJP6TF3UXYXTNEZ2P36J5FH7W4BJJQ4AYYAXC66I2Q2AH5B6O6BCFG",
1313
STELLAR_NETWORK: "test",
1414
STELLAR_HORIZON_URL: "https://horizon-testnet.stellar.org",
1515
TFT_ASSET_ISSUER: "GA47YZA3PKFUZMPLQ3B5F2E3CJIB57TGGU7SPCQT2WAEYKN766PWIMB3",
1616
MINTING_URL: "https://alpha.minting.tfchain.grid.tf",
1717
KYC_URL: "https://kyc.dev.grid.tf",
18-
STATS_STACKS: ["https://stats.dev.grid.tf", "https://stats.02.dev.grid.tf"],
18+
STATS_STACKS: ["https://stats.dev.grid.tf", "https://stats.dev.threefold.me"],
1919
TIMEOUT: +"10000",
2020
PAGE_SIZE: +"20",
21-
MANUAL_URL: "https://manual.grid.tf",
21+
MANUAL_URL: "https://manual.dev.grid.tf",
2222
SENTRY_DSN: "https://b9af6796f176d1f02837a06f0da3caee@dev.sentry.grid.tf/2",
2323
ENABLE_TELEMETRY: "false",
2424
};

‎packages/playground/scripts/build-env.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,52 +15,52 @@ WALLET_KEY="${WALLET_KEY:=wallet.v1}"
1515

1616
case $MODE in
1717
"dev")
18-
GRAPHQL_URL="${GRAPHQL_URL:-"https://graphql.dev.grid.tf/graphql,https://graphql.02.dev.grid.tf/graphql"}"
19-
GRIDPROXY_URL="${GRIDPROXY_URL:-"https://gridproxy.dev.grid.tf,https://gridproxy.02.dev.grid.tf"}"
20-
SUBSTRATE_URL="${SUBSTRATE_URL:-"wss://tfchain.dev.grid.tf/ws,wss://tfchain.02.dev.grid.tf/ws"}"
21-
ACTIVATION_SERVICE_URL="${ACTIVATION_SERVICE_URL:-"https://activation.dev.grid.tf/activation/activate,https://activation.02.dev.grid.tf/activation/activate"}"
22-
RELAY_DOMAIN="${RELAY_DOMAIN:-"wss://relay.dev.grid.tf,wss://relay.02.dev.grid.tf"}"
18+
GRAPHQL_URL="${GRAPHQL_URL:-"https://graphql.dev.grid.tf/graphql,https://graphql.dev.threefold.me/graphql"}"
19+
GRIDPROXY_URL="${GRIDPROXY_URL:-"https://gridproxy.dev.grid.tf,https://gridproxy.dev.threefold.me"}"
20+
SUBSTRATE_URL="${SUBSTRATE_URL:-"wss://tfchain.dev.grid.tf/ws,wss://tfchain.dev.threefold.me/ws"}"
21+
ACTIVATION_SERVICE_URL="${ACTIVATION_SERVICE_URL:-"https://activation.dev.grid.tf/activation/activate,https://activation.dev.threefold.me/activation/activate"}"
22+
RELAY_DOMAIN="${RELAY_DOMAIN:-"wss://relay.dev.grid.tf,wss://relay.dev.threefold.me"}"
2323
BRIDGE_TFT_ADDRESS="${BRIDGE_TFT_ADDRESS:-GDHJP6TF3UXYXTNEZ2P36J5FH7W4BJJQ4AYYAXC66I2Q2AH5B6O6BCFG}"
24-
STATS_URL="${STATS_URL:-"https://stats.dev.grid.tf,https://stats.02.dev.grid.tf"}"
24+
STATS_URL="${STATS_URL:-"https://stats.dev.grid.tf,https://stats.dev.threefold.me"}"
2525
STELLAR_NETWORK="${STELLAR_NETWORK:-test}"
2626
KYC_URL="${KYC_URL:-https://kyc.dev.grid.tf}"
2727
SENTRY_DSN="https://b9af6796f176d1f02837a06f0da3caee@dev.sentry.grid.tf/2"
2828
MANUAL_URL="${MANUAL_URL:-https://manual.dev.grid.tf}"
2929
;;
3030
"qa")
31-
GRAPHQL_URL="${GRAPHQL_URL:-"https://graphql.qa.grid.tf/graphql,https://graphql.02.qa.grid.tf/graphql"}"
32-
GRIDPROXY_URL="${GRIDPROXY_URL:-"https://gridproxy.qa.grid.tf,https://gridproxy.02.qa.grid.tf"}"
33-
SUBSTRATE_URL="${SUBSTRATE_URL:-"wss://tfchain.qa.grid.tf/ws,wss://tfchain.02.qa.grid.tf/ws"}"
34-
ACTIVATION_SERVICE_URL="${ACTIVATION_SERVICE_URL:-"https://activation.qa.grid.tf/activation/activate,https://activation.02.qa.grid.tf/activation/activate"}"
35-
RELAY_DOMAIN="${RELAY_DOMAIN:-"wss://relay.qa.grid.tf,wss://relay.02.qa.grid.tf"}"
31+
GRAPHQL_URL="${GRAPHQL_URL:-"https://graphql.qa.grid.tf/graphql,https://graphql.qa.threefold.me/graphql"}"
32+
GRIDPROXY_URL="${GRIDPROXY_URL:-"https://gridproxy.qa.grid.tf,https://gridproxy.qa.threefold.me"}"
33+
SUBSTRATE_URL="${SUBSTRATE_URL:-"wss://tfchain.qa.grid.tf/ws,wss://tfchain.qa.threefold.me/ws"}"
34+
ACTIVATION_SERVICE_URL="${ACTIVATION_SERVICE_URL:-"https://activation.qa.grid.tf/activation/activate,https://activation.qa.threefold.me/activation/activate"}"
35+
RELAY_DOMAIN="${RELAY_DOMAIN:-"wss://relay.qa.grid.tf,wss://relay.qa.threefold.me"}"
3636
BRIDGE_TFT_ADDRESS="${BRIDGE_TFT_ADDRESS:-GAQH7XXFBRWXT2SBK6AHPOLXDCLXVFAKFSOJIRMRNCDINWKHGI6UYVKM}"
37-
STATS_URL="${STATS_URL:-"https://stats.qa.grid.tf,https://stats.02.qa.grid.tf"}"
37+
STATS_URL="${STATS_URL:-"https://stats.qa.grid.tf,https://stats.qa.threefold.me"}"
3838
STELLAR_NETWORK="${STELLAR_NETWORK:-test}"
3939
KYC_URL="${KYC_URL:-https://kyc.qa.grid.tf}"
4040
SENTRY_DSN="https://b9af6796f176d1f02837a06f0da3caee@dev.sentry.grid.tf/2"
4141
MANUAL_URL="${MANUAL_URL:-https://manual.grid.tf}"
4242
;;
4343
"test")
44-
GRAPHQL_URL="${GRAPHQL_URL:-"https://graphql.test.grid.tf/graphql,https://graphql.02.test.grid.tf/graphql"}"
45-
GRIDPROXY_URL="${GRIDPROXY_URL:-"https://gridproxy.test.grid.tf,https://gridproxy.02.test.grid.tf"}"
46-
SUBSTRATE_URL="${SUBSTRATE_URL:-"wss://tfchain.test.grid.tf/ws,wss://tfchain.02.test.grid.tf/ws"}"
47-
ACTIVATION_SERVICE_URL="${ACTIVATION_SERVICE_URL:-"https://activation.test.grid.tf/activation/activate,https://activation.02.test.grid.tf/activation/activate"}"
48-
RELAY_DOMAIN="${RELAY_DOMAIN:-"wss://relay.test.grid.tf,wss://relay.02.test.grid.tf"}"
44+
GRAPHQL_URL="${GRAPHQL_URL:-"https://graphql.test.grid.tf/graphql,https://graphql.test.threefold.me/graphql"}"
45+
GRIDPROXY_URL="${GRIDPROXY_URL:-"https://gridproxy.test.grid.tf,https://gridproxy.test.threefold.me"}"
46+
SUBSTRATE_URL="${SUBSTRATE_URL:-"wss://tfchain.test.grid.tf/ws,wss://tfchain.test.threefold.me/ws"}"
47+
ACTIVATION_SERVICE_URL="${ACTIVATION_SERVICE_URL:-"https://activation.test.grid.tf/activation/activate,https://activation.test.threefold.me/activation/activate"}"
48+
RELAY_DOMAIN="${RELAY_DOMAIN:-"wss://relay.test.grid.tf,wss://relay.test.threefold.me"}"
4949
BRIDGE_TFT_ADDRESS="${BRIDGE_TFT_ADDRESS:-GA2CWNBUHX7NZ3B5GR4I23FMU7VY5RPA77IUJTIXTTTGKYSKDSV6LUA4}"
50-
STATS_URL="${STATS_URL:-"https://stats.test.grid.tf,https://stats.02.test.grid.tf"}"
50+
STATS_URL="${STATS_URL:-"https://stats.test.grid.tf,https://stats.test.threefold.me"}"
5151
STELLAR_NETWORK="${STELLAR_NETWORK:-main}"
5252
KYC_URL="${KYC_URL:-https://kyc.test.grid.tf}"
5353
SENTRY_DSN="https://b9af6796f176d1f02837a06f0da3caee@dev.sentry.grid.tf/2"
5454
MANUAL_URL="${MANUAL_URL:-https://manual.grid.tf}"
5555
;;
5656
"main")
57-
GRAPHQL_URL="${GRAPHQL_URL:-"https://graphql.grid.tf/graphql,https://graphql.02.grid.tf/graphql"}"
58-
GRIDPROXY_URL="${GRIDPROXY_URL:-"https://gridproxy.grid.tf,https://gridproxy.02.grid.tf"}"
59-
SUBSTRATE_URL="${SUBSTRATE_URL:-"wss://tfchain.grid.tf/ws,wss://tfchain.02.grid.tf/ws"}"
60-
ACTIVATION_SERVICE_URL="${ACTIVATION_SERVICE_URL:-"https://activation.grid.tf/activation/activate,https://activation.02.grid.tf/activation/activate"}"
61-
RELAY_DOMAIN="${RELAY_DOMAIN:-"wss://relay.grid.tf,wss://relay.02.grid.tf"}"
57+
GRAPHQL_URL="${GRAPHQL_URL:-"https://graphql.grid.tf/graphql,https://graphql.grid.threefold.me/graphql"}"
58+
GRIDPROXY_URL="${GRIDPROXY_URL:-"https://gridproxy.grid.tf,https://gridproxy.grid.threefold.me"}"
59+
SUBSTRATE_URL="${SUBSTRATE_URL:-"wss://tfchain.grid.tf/ws,wss://tfchain.grid.threefold.me/ws"}"
60+
ACTIVATION_SERVICE_URL="${ACTIVATION_SERVICE_URL:-"https://activation.grid.tf/activation/activate,https://activation.grid.threefold.me/activation/activate"}"
61+
RELAY_DOMAIN="${RELAY_DOMAIN:-"wss://relay.grid.tf,wss://relay.grid.threefold.me"}"
6262
BRIDGE_TFT_ADDRESS="${BRIDGE_TFT_ADDRESS:-GBNOTAYUMXVO5QDYWYO2SOCOYIJ3XFIP65GKOQN7H65ZZSO6BK4SLWSC}"
63-
STATS_URL="${STATS_URL:-"https://stats.grid.tf,https://stats.02.grid.tf"}"
63+
STATS_URL="${STATS_URL:-"https://stats.grid.tf,https://stats.grid.threefold.me"}"
6464
STELLAR_NETWORK="${STELLAR_NETWORK:-main}"
6565
KYC_URL="${KYC_URL:-https://kyc.grid.tf}"
6666
SENTRY_DSN="https://598bcc658bd99042ab429166035f8278@sentry.grid.tf/2"

0 commit comments

Comments
 (0)