diff --git a/apps/provider-console/env/.env b/apps/provider-console/env/.env index d2958ea27..0739fafee 100644 --- a/apps/provider-console/env/.env +++ b/apps/provider-console/env/.env @@ -1 +1,15 @@ -NEXT_PUBLIC_SENTRY_DSN=https://0c68b41d2867082e6fb77c3eb08bf8fe@sentry.praetorapp.com/2 \ No newline at end of file +NEXT_PUBLIC_SENTRY_DSN=https://0c68b41d2867082e6fb77c3eb08bf8fe@sentry.praetorapp.com/2 + + +# Network Configurations +NEXT_PUBLIC_SELECTED_NETWORK=mainnet +NEXT_PUBLIC_NETWORK_TITLE=Mainnet +NEXT_PUBLIC_CHAIN_ID=akashnet-2 +NEXT_PUBLIC_CHAIN_REGISTRY_NAME=akash +NEXT_PUBLIC_NETWORK_TYPE=mainnet +NEXT_PUBLIC_RPC_ENDPOINT=https://rpc.cosmos.directory/akash +NEXT_PUBLIC_API_ENDPOINT=https://rest.cosmos.directory/akash +NEXT_PUBLIC_CONSOLE_API_URL=https://console-api.akash.network +NEXT_PUBLIC_SECURITY_URL=https://provider-console-security.akash.network +NEXT_PUBLIC_API_BASE_URL=https://provider-console-api.akash.network +NEXT_PUBLIC_URL=https://provider-console.akash.network \ No newline at end of file diff --git a/apps/provider-console/env/.env.production b/apps/provider-console/env/.env.production index e504d5016..e69de29bb 100644 --- a/apps/provider-console/env/.env.production +++ b/apps/provider-console/env/.env.production @@ -1,16 +0,0 @@ - - -# Network Configurations -NEXT_PUBLIC_SELECTED_NETWORK=mainnet -NEXT_PUBLIC_NETWORK_TITLE=Mainnet -NEXT_PUBLIC_CHAIN_ID=akashnet-2 -NEXT_PUBLIC_CHAIN_REGISTRY_NAME=akash -NEXT_PUBLIC_NETWORK_TYPE=mainnet -NEXT_PUBLIC_RPC_ENDPOINT=https://rpc.cosmos.directory/akash -NEXT_PUBLIC_API_ENDPOINT=https://rest.cosmos.directory/akash -NEXT_PUBLIC_NETWORK_VERSION=v1beta3 -NEXT_PUBLIC_NETWORK_VERSION_MARKET=v1beta4 -NEXT_PUBLIC_CONSOLE_API_URL=https://console-api.akash.network -NEXT_PUBLIC_SECURITY_URL=https://provider-console-security.akash.network -NEXT_PUBLIC_API_BASE_URL=https://provider-console-api.akash.network -NEXT_PUBLIC_URL=https://provider-console.akash.network \ No newline at end of file diff --git a/apps/provider-console/env/.env.sandbox b/apps/provider-console/env/.env.sandbox index a719540ac..caf39adbb 100644 --- a/apps/provider-console/env/.env.sandbox +++ b/apps/provider-console/env/.env.sandbox @@ -8,8 +8,6 @@ NEXT_PUBLIC_CHAIN_REGISTRY_NAME=akash-sandbox NEXT_PUBLIC_NETWORK_TYPE=devnet NEXT_PUBLIC_RPC_ENDPOINT=https://rpc.sandbox-01.aksh.pw:443 NEXT_PUBLIC_API_ENDPOINT=https://api.sandbox-01.aksh.pw:443 -NEXT_PUBLIC_NETWORK_VERSION=v1beta3 -NEXT_PUBLIC_NETWORK_VERSION_MARKET=v1beta4 NEXT_PUBLIC_CONSOLE_API_URL=https://console-api.akash.network diff --git a/apps/provider-console/env/.env.staging b/apps/provider-console/env/.env.staging index c330caa78..045449954 100644 --- a/apps/provider-console/env/.env.staging +++ b/apps/provider-console/env/.env.staging @@ -8,8 +8,6 @@ NEXT_PUBLIC_CHAIN_REGISTRY_NAME=akash NEXT_PUBLIC_NETWORK_TYPE=mainnet NEXT_PUBLIC_RPC_ENDPOINT=https://rpc.cosmos.directory/akash NEXT_PUBLIC_API_ENDPOINT=https://rest.cosmos.directory/akash -NEXT_PUBLIC_NETWORK_VERSION=v1beta3 -NEXT_PUBLIC_NETWORK_VERSION_MARKET=v1beta4 NEXT_PUBLIC_CONSOLE_API_URL=https://console-api.akash.network NEXT_PUBLIC_SECURITY_URL=https://provider-console-security-beta.akash.network NEXT_PUBLIC_API_BASE_URL=https://provider-console-api-beta.akash.network diff --git a/apps/provider-console/package.json b/apps/provider-console/package.json index 42a1d6586..272c3c8cf 100644 --- a/apps/provider-console/package.json +++ b/apps/provider-console/package.json @@ -15,8 +15,6 @@ "type-check": "tsc" }, "dependencies": { - "@akashnetwork/akash-api": "^1.3.0", - "@akashnetwork/akashjs": "^0.11.1", "@akashnetwork/env-loader": "*", "@akashnetwork/ui": "*", "@chain-registry/types": "^0.50.1", diff --git a/apps/provider-console/src/config/browser-env.config.ts b/apps/provider-console/src/config/browser-env.config.ts index 77d92cd1f..e332a1e47 100644 --- a/apps/provider-console/src/config/browser-env.config.ts +++ b/apps/provider-console/src/config/browser-env.config.ts @@ -14,8 +14,6 @@ export const browserEnvConfig = validateStaticEnvVars({ NEXT_PUBLIC_NETWORK_TYPE: process.env.NEXT_PUBLIC_NETWORK_TYPE, NEXT_PUBLIC_RPC_ENDPOINT: process.env.NEXT_PUBLIC_RPC_ENDPOINT, NEXT_PUBLIC_API_ENDPOINT: process.env.NEXT_PUBLIC_API_ENDPOINT, - NEXT_PUBLIC_NETWORK_VERSION: process.env.NEXT_PUBLIC_NETWORK_VERSION, - NEXT_PUBLIC_NETWORK_VERSION_MARKET: process.env.NEXT_PUBLIC_NETWORK_VERSION_MARKET, NEXT_PUBLIC_CONSOLE_API_URL: process.env.NEXT_PUBLIC_CONSOLE_API_URL, NEXT_PUBLIC_SECURITY_URL: process.env.NEXT_PUBLIC_SECURITY_URL, NEXT_PUBLIC_API_BASE_URL: process.env.NEXT_PUBLIC_API_BASE_URL, diff --git a/apps/provider-console/src/config/env-config.schema.ts b/apps/provider-console/src/config/env-config.schema.ts index 7d09b3550..af97ca4e7 100644 --- a/apps/provider-console/src/config/env-config.schema.ts +++ b/apps/provider-console/src/config/env-config.schema.ts @@ -16,8 +16,6 @@ export const browserEnvSchema = z.object({ NEXT_PUBLIC_NETWORK_TYPE: z.string(), NEXT_PUBLIC_RPC_ENDPOINT: z.string().url(), NEXT_PUBLIC_API_ENDPOINT: z.string().url(), - NEXT_PUBLIC_NETWORK_VERSION: z.string().optional(), - NEXT_PUBLIC_NETWORK_VERSION_MARKET: z.string().optional(), NEXT_PUBLIC_CONSOLE_API_URL: z.string().url(), NEXT_PUBLIC_SECURITY_URL: z.string().url(), NEXT_PUBLIC_API_BASE_URL: z.string().url(), diff --git a/apps/provider-console/src/config/network.config.ts b/apps/provider-console/src/config/network.config.ts index 869f1ebc9..15dda47fc 100644 --- a/apps/provider-console/src/config/network.config.ts +++ b/apps/provider-console/src/config/network.config.ts @@ -21,7 +21,7 @@ export function getCurrentNetworkConfig(): Network { chainId: config.chainId, chainRegistryName: config.chainRegistryName, enabled: true, - version: config.version || null, + version: null, rpcEndpoint: config.rpcEndpoint, nodesUrl: config.apiEndpoint, versionUrl: config.apiEndpoint @@ -40,8 +40,6 @@ function getNetworkConfig() { networkType: browserEnvConfig.NEXT_PUBLIC_NETWORK_TYPE, rpcEndpoint: browserEnvConfig.NEXT_PUBLIC_RPC_ENDPOINT, apiEndpoint: browserEnvConfig.NEXT_PUBLIC_API_ENDPOINT, - version: browserEnvConfig.NEXT_PUBLIC_NETWORK_VERSION, - versionMarket: browserEnvConfig.NEXT_PUBLIC_NETWORK_VERSION_MARKET, consoleApiUrl: browserEnvConfig.NEXT_PUBLIC_CONSOLE_API_URL, securityUrl: browserEnvConfig.NEXT_PUBLIC_SECURITY_URL, apiBaseUrl: browserEnvConfig.NEXT_PUBLIC_API_BASE_URL @@ -75,11 +73,8 @@ export function createDynamicChain(): Chain { */ export function getNetworkVersionInfo() { const selectedNetwork = browserEnvConfig.NEXT_PUBLIC_SELECTED_NETWORK ?? "mainnet"; - const config = getNetworkConfig(); return { - networkVersion: (config.version || "v1beta3") as "v1beta2" | "v1beta3" | "v1beta4", - networkVersionMarket: (config.versionMarket || "v1beta4") as "v1beta2" | "v1beta3" | "v1beta4", selectedNetworkId: selectedNetwork }; } diff --git a/apps/provider-console/src/types/network.ts b/apps/provider-console/src/types/network.ts index 88f846acc..aa0da29e9 100644 --- a/apps/provider-console/src/types/network.ts +++ b/apps/provider-console/src/types/network.ts @@ -1,7 +1,5 @@ -import type { NetworkId } from "@akashnetwork/akashjs/build/types/network"; - export type Network = { - id: NetworkId; + id: string; title: string; description: string; nodesUrl: string; diff --git a/apps/provider-console/src/utils/constants.ts b/apps/provider-console/src/utils/constants.ts index 3c14d40a1..85c2a0ff4 100644 --- a/apps/provider-console/src/utils/constants.ts +++ b/apps/provider-console/src/utils/constants.ts @@ -46,8 +46,6 @@ export const defaultInitialDeposit = 500000; // Get network info based on selected network - no if/else conditions const networkVersionInfo = getNetworkVersionInfo(); export const selectedNetworkId = networkVersionInfo.selectedNetworkId; -export const networkVersion = networkVersionInfo.networkVersion; -export const networkVersionMarket = networkVersionInfo.networkVersionMarket; export function setNetworkVersion() { // This function is kept for backward compatibility but now uses environment-driven config diff --git a/apps/provider-console/src/utils/init.ts b/apps/provider-console/src/utils/init.ts index 2f18b4b3a..e43e43803 100644 --- a/apps/provider-console/src/utils/init.ts +++ b/apps/provider-console/src/utils/init.ts @@ -1,7 +1,5 @@ import { setNetworkVersion } from "./constants"; -import { initProtoTypes } from "./proto"; export const initAppTypes = () => { setNetworkVersion(); - initProtoTypes(); }; diff --git a/apps/provider-console/src/utils/proto/grant.ts b/apps/provider-console/src/utils/proto/grant.ts deleted file mode 100644 index f5424a577..000000000 --- a/apps/provider-console/src/utils/proto/grant.ts +++ /dev/null @@ -1,3 +0,0 @@ -export { MsgGrantAllowance, MsgRevokeAllowance } from "cosmjs-types/cosmos/feegrant/v1beta1/tx"; -export { BasicAllowance, PeriodicAllowance, AllowedMsgAllowance } from "cosmjs-types/cosmos/feegrant/v1beta1/feegrant"; -export { MsgGrant, MsgRevoke } from "cosmjs-types/cosmos/authz/v1beta1/tx"; diff --git a/apps/provider-console/src/utils/proto/index.ts b/apps/provider-console/src/utils/proto/index.ts deleted file mode 100644 index 0bec51a1c..000000000 --- a/apps/provider-console/src/utils/proto/index.ts +++ /dev/null @@ -1,30 +0,0 @@ -import * as v1beta3 from "@akashnetwork/akash-api/v1beta3"; -import * as v1beta4 from "@akashnetwork/akash-api/v1beta4"; - -import { browserEnvConfig } from "@src/config/browser-env.config"; -import { mainnetId, sandboxId, testnetId } from "../constants"; - -const commonTypes = { ...v1beta3, ...v1beta4 }; -const mainnetTypes = commonTypes; -const sandboxTypes = commonTypes; - -export let protoTypes; - -export function initProtoTypes() { - const selectedNetworkId = browserEnvConfig.NEXT_PUBLIC_CHAIN_ID ?? mainnetId; - - switch (selectedNetworkId) { - case mainnetId: - case testnetId: - protoTypes = mainnetTypes; - break; - - case sandboxId: - protoTypes = sandboxTypes; - break; - - default: - protoTypes = mainnetTypes; - break; - } -} diff --git a/package-lock.json b/package-lock.json index e60222029..a6f654cdc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4837,7 +4837,6 @@ "version": "1.28.1", "dependencies": { "@akashnetwork/akash-api": "^1.3.0", - "@akashnetwork/akashjs": "^0.11.1", "@akashnetwork/env-loader": "*", "@akashnetwork/ui": "*", "@chain-registry/types": "^0.50.1",