diff --git a/packages/desktop/components/popups/NodeInfoPopup.svelte b/packages/desktop/components/popups/NodeInfoPopup.svelte index ba7171271ef..f16f1f1c511 100644 --- a/packages/desktop/components/popups/NodeInfoPopup.svelte +++ b/packages/desktop/components/popups/NodeInfoPopup.svelte @@ -51,7 +51,6 @@ nodeInfoPath: 'protocolParameters[0].parameters.tokenSupply', }, version: { localeKey: 'protocol.version', nodeInfoPath: 'protocolParameters[0].parameters.version' }, - // minPowScore: { localeKey: 'protocol.minPowScore', nodeInfoPath: 'protocol.minPowScore' }, }, [NodeInfoTab.BaseToken]: { token: { localeKey: 'baseToken.token', nodeInfoPath: 'baseToken.name' }, diff --git a/packages/desktop/features/settings.features.ts b/packages/desktop/features/settings.features.ts index 3762884fe16..a5d31c9652e 100644 --- a/packages/desktop/features/settings.features.ts +++ b/packages/desktop/features/settings.features.ts @@ -70,9 +70,6 @@ const settingsFeatures: ISettingsFeatures = { configureNodeList: { enabled: true, }, - localProofOfWork: { - enabled: true, - }, }, advanced: { enabled: true, diff --git a/packages/desktop/views/dashboard/settings/views/network/LocalProofOfWork.svelte b/packages/desktop/views/dashboard/settings/views/network/LocalProofOfWork.svelte deleted file mode 100644 index 5d77c99357d..00000000000 --- a/packages/desktop/views/dashboard/settings/views/network/LocalProofOfWork.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/packages/desktop/views/dashboard/settings/views/network/index.js b/packages/desktop/views/dashboard/settings/views/network/index.js index e9d301f40d7..a9e522f2673 100644 --- a/packages/desktop/views/dashboard/settings/views/network/index.js +++ b/packages/desktop/views/dashboard/settings/views/network/index.js @@ -1,5 +1,4 @@ export { default as ConfigureNodeList } from './ConfigureNodeList.svelte' -export { default as LocalProofOfWork } from './LocalProofOfWork.svelte' export { default as NetworkInformation } from './NetworkInformation.svelte' export * from './network-settings.constant' diff --git a/packages/desktop/views/dashboard/settings/views/network/network-settings.constant.js b/packages/desktop/views/dashboard/settings/views/network/network-settings.constant.js index 783e50c58f9..401d2883e06 100644 --- a/packages/desktop/views/dashboard/settings/views/network/network-settings.constant.js +++ b/packages/desktop/views/dashboard/settings/views/network/network-settings.constant.js @@ -1,8 +1,7 @@ import { NetworkSettingsRoute } from '@core/router' -import { NetworkInformation, LocalProofOfWork, ConfigureNodeList } from './' +import { NetworkInformation, ConfigureNodeList } from './' export const NETWORK_SETTINGS = [ { component: NetworkInformation, childRoute: NetworkSettingsRoute.NetworkInformation }, { component: ConfigureNodeList, childRoute: NetworkSettingsRoute.ConfigureNodeList }, - { component: LocalProofOfWork, childRoute: NetworkSettingsRoute.LocalProofOfWork }, ] diff --git a/packages/shared/lib/auxiliary/icon/constants/settings-icon-svg.ts b/packages/shared/lib/auxiliary/icon/constants/settings-icon-svg.ts index 2b7d9f3ceb2..c26bd31c52f 100644 --- a/packages/shared/lib/auxiliary/icon/constants/settings-icon-svg.ts +++ b/packages/shared/lib/auxiliary/icon/constants/settings-icon-svg.ts @@ -24,7 +24,6 @@ export const SETTINGS_ICON_SVG = { [CollectiblesSettingsRoute.RefreshNftMedia]: Icon.Refresh, [NetworkSettingsRoute.NetworkInformation]: Icon.Wifi, [NetworkSettingsRoute.ConfigureNodeList]: Icon.Customize, - [NetworkSettingsRoute.LocalProofOfWork]: Icon.Chip, [SecuritySettingsRoute.ExportStronghold]: Icon.Export, [SecuritySettingsRoute.StrongholdPasswordTimeout]: Icon.Timelock, [SecuritySettingsRoute.AppLock]: Icon.Logout, diff --git a/packages/shared/lib/core/network/actions/index.ts b/packages/shared/lib/core/network/actions/index.ts index d71da673cd6..061e6dc7779 100644 --- a/packages/shared/lib/core/network/actions/index.ts +++ b/packages/shared/lib/core/network/actions/index.ts @@ -6,6 +6,5 @@ export * from './network-polling' export * from './removeNodeFromClientOptions' export * from './showNetworkIssueNotification' export * from './toggleDisabledNodeInClientOptions' -export * from './toggleLocalPowInClientOptions' export * from './togglePrimaryNodeInClientOptions' export * from './updateClientOptions' diff --git a/packages/shared/lib/core/network/actions/toggleLocalPowInClientOptions.ts b/packages/shared/lib/core/network/actions/toggleLocalPowInClientOptions.ts deleted file mode 100644 index 3dec91dd1bd..00000000000 --- a/packages/shared/lib/core/network/actions/toggleLocalPowInClientOptions.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { updateClientOptions } from '@core/network' -import { activeProfile } from '@core/profile' -import { get } from 'svelte/store' - -export async function toggleLocalPowInClientOptions(): Promise { - const clientOptions = get(activeProfile)?.clientOptions - await updateClientOptions({ localPow: !clientOptions?.localPow }) -} diff --git a/packages/shared/lib/core/network/constants/default-network-metadata.constant.ts b/packages/shared/lib/core/network/constants/default-network-metadata.constant.ts index 57f85bf488b..fce8457d791 100644 --- a/packages/shared/lib/core/network/constants/default-network-metadata.constant.ts +++ b/packages/shared/lib/core/network/constants/default-network-metadata.constant.ts @@ -12,7 +12,6 @@ export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in NetworkId]?: NetworkMe version: 2, networkName: 'shimmer', bech32Hrp: 'smr', - minPowScore: 1500, belowMaxDepth: 15, rentStructure: { vByteCost: 100, @@ -31,7 +30,6 @@ export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in NetworkId]?: NetworkMe version: 2, networkName: 'testnet', bech32Hrp: 'rms', - minPowScore: 1500, belowMaxDepth: 15, rentStructure: { vByteCost: 100, @@ -50,7 +48,6 @@ export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in NetworkId]?: NetworkMe version: 2, networkName: 'iota', bech32Hrp: 'iota', - minPowScore: 1500, belowMaxDepth: 15, rentStructure: { vByteCost: 250, @@ -69,7 +66,6 @@ export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in NetworkId]?: NetworkMe version: 2, networkName: 'iota-alphanet-2', bech32Hrp: 'atoi', - minPowScore: 1500, belowMaxDepth: 15, rentStructure: { vByteCost: 250, diff --git a/packages/shared/lib/core/network/interfaces/connected-chain.interface.ts b/packages/shared/lib/core/network/interfaces/connected-chain.interface.ts deleted file mode 100644 index 4cedc86073f..00000000000 --- a/packages/shared/lib/core/network/interfaces/connected-chain.interface.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { NetworkHealth } from '../enums' - -export interface IConnectedChain { - name: string - address: string - status: NetworkHealth -} diff --git a/packages/shared/lib/core/network/interfaces/index.ts b/packages/shared/lib/core/network/interfaces/index.ts index d9244a4e24a..ec81e8242ab 100644 --- a/packages/shared/lib/core/network/interfaces/index.ts +++ b/packages/shared/lib/core/network/interfaces/index.ts @@ -1,5 +1,4 @@ export * from './chain-metadata.interface' -export * from './connected-chain.interface' export * from './client-options.interface' export * from './network-status.interface' export * from './node-info-response.interface' diff --git a/packages/shared/lib/core/network/interfaces/protocol.interface.ts b/packages/shared/lib/core/network/interfaces/protocol.interface.ts index 7f593cc214f..bcae7ea5c4e 100644 --- a/packages/shared/lib/core/network/interfaces/protocol.interface.ts +++ b/packages/shared/lib/core/network/interfaces/protocol.interface.ts @@ -4,7 +4,6 @@ export interface IProtocol { version: number networkName: string bech32Hrp: string - // minPowScore: number belowMaxDepth?: number rentStructure: IRentStructure tokenSupply: string diff --git a/packages/shared/lib/core/network/utils/buildChainFromNetwork.ts b/packages/shared/lib/core/network/utils/buildChainFromNetwork.ts deleted file mode 100644 index 54a9f3c2a75..00000000000 --- a/packages/shared/lib/core/network/utils/buildChainFromNetwork.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { IConnectedChain } from '../interfaces' -import { NetworkHealth } from '../enums' - -export function buildChainFromNetwork(name: string, address: string, status: NetworkHealth): IConnectedChain { - return { - name, - address, - status, - } -} diff --git a/packages/shared/lib/core/network/utils/doesNodeHavePlugin.ts b/packages/shared/lib/core/network/utils/doesNodeHavePlugin.ts deleted file mode 100644 index 4e43e665af3..00000000000 --- a/packages/shared/lib/core/network/utils/doesNodeHavePlugin.ts +++ /dev/null @@ -1,9 +0,0 @@ -enum NodePlugin { - Participation = 'Participation', - ProofOfWork = 'PoW', -} - -export function doesNodeHavePlugin(plugin: NodePlugin): boolean { - return Object.keys(NodePlugin).includes(plugin) - // return get(networkStatus).nodePlugins.includes(plugin) -} diff --git a/packages/shared/lib/core/network/utils/index.ts b/packages/shared/lib/core/network/utils/index.ts index 2877b3c490b..6a9c198bca6 100644 --- a/packages/shared/lib/core/network/utils/index.ts +++ b/packages/shared/lib/core/network/utils/index.ts @@ -1,8 +1,6 @@ -export * from './buildChainFromNetwork' export * from './buildPersistedNetworkFromNodeInfoResponse' export * from './checkNetworkId' export * from './checkNodeUrlValidity' -export * from './doesNodeHavePlugin' export * from './getDefaultClientOptions' export * from './getDefaultPersistedNetwork' export * from './getNetworkIdFromNetworkName' diff --git a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts index 6d6d516c46f..2abcc9bf430 100644 --- a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts +++ b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts @@ -96,8 +96,6 @@ export function checkAndMigrateChrysalisProfiles(): boolean { } }) } - migratedProfile.clientOptions.localPow = - chrysalisProfile.settings?.networkConfig?.localPow ?? migratedClientOptions.localPow migrated = true saveProfile(migratedProfile) diff --git a/packages/shared/lib/core/router/enums/settings/network-settings-route.enum.ts b/packages/shared/lib/core/router/enums/settings/network-settings-route.enum.ts index 6f6a3e2b2c2..f7a8324ae04 100644 --- a/packages/shared/lib/core/router/enums/settings/network-settings-route.enum.ts +++ b/packages/shared/lib/core/router/enums/settings/network-settings-route.enum.ts @@ -1,5 +1,4 @@ export enum NetworkSettingsRoute { NetworkInformation = 'networkInformation', ConfigureNodeList = 'configureNodeList', - LocalProofOfWork = 'localProofOfWork', } diff --git a/packages/shared/lib/features/interfaces/settings-features.interface.ts b/packages/shared/lib/features/interfaces/settings-features.interface.ts index c1f6c0da6af..641a70b0d72 100644 --- a/packages/shared/lib/features/interfaces/settings-features.interface.ts +++ b/packages/shared/lib/features/interfaces/settings-features.interface.ts @@ -31,7 +31,6 @@ interface ICollectiblesSettingsFeatures extends IFeatureFlag { interface INetworkSettingsFeatures extends IFeatureFlag { networkInformation: IFeatureFlag configureNodeList: IFeatureFlag - localProofOfWork: IFeatureFlag } interface IAdvancedSettingsFeatures extends IFeatureFlag { diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json index 0131bf6d7cd..8dfd62b799a 100644 --- a/packages/shared/locales/en.json +++ b/packages/shared/locales/en.json @@ -368,10 +368,6 @@ "noNodes": "There are no nodes, unable to connect to the network", "noNodesAuto": "There are no nodes, automatic selection will be used instead" }, - "localProofOfWork": { - "title": "Proof of work", - "description": "Complete proof of work locally on your device or outsource to the node" - }, "errorLog": { "title": "Error log", "description": "View errors to debug an issue" @@ -948,8 +944,7 @@ "network": "Network", "bech32Hrp": "Bech32 HRP", "tokenSupply": "Token supply", - "version": "Version", - "minPowScore": "Min PoW Score" + "version": "Version" }, "baseToken": { "tab": "Base token", @@ -1359,7 +1354,6 @@ "enableDeveloperMode": "Enable developer mode", "enableSystemNotifications": "Enable system notifications", "exportTransactionHistory": "Export transaction history", - "localProofOfWork": "Local proof of work", "unlock": "Unlock", "updateFirefly": "Update Firefly", "restartNow": "Restart now", @@ -1601,7 +1595,6 @@ "transferRemainderAddress": "Generating remainder address", "transferPreparedTransaction": "Preparing transaction", "transferSigning": "Signing the transaction", - "transferPow": "Performing PoW", "transferBroadcasting": "Broadcasting transaction", "transferComplete": "Transfer complete", "generatingReceiveAddress": "Generating receive address", diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index f68866e3e0b..c2b5bd096be 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -7,11 +7,9 @@ // files included below should have no ts-errors "files": [ "lib/core/network/constants/default-seconds-per-slot.constant.ts", - "./lib/core/network/utils/buildChainFromNetwork.ts", "./lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts", "./lib/core/network/utils/checkNetworkId.ts", "./lib/core/network/utils/checkNodeUrlValidity.ts", - "./lib/core/network/utils/doesNodeHavePlugin.ts", "./lib/core/network/utils/getDefaultClientOptions.ts", "./lib/core/network/utils/getDefaultPersistedNetwork.ts", "./lib/core/network/utils/getNetworkIdFromNetworkName.ts", @@ -25,17 +23,14 @@ "./lib/core/utils/constants/default-exchange-rates.constant.ts", "./lib/core/utils/constants/hex.constants.ts", "./lib/core/utils/constants/index.ts", - "./lib/core/utils/constants/iota-unit-map.constant.ts", "./lib/core/utils/constants/max-bytes.constant.ts", "./lib/core/utils/constants/max-number-of-iotas.constant.ts", "./lib/core/utils/constants/pin-length.constant.ts", "./lib/core/utils/constants/time.constants.ts", "./lib/core/utils/enums/exchange-rate.enum.ts", - "./lib/core/utils/enums/iota-unit.enum.ts", "./lib/core/utils/enums/past-time-unit.enum.ts", "./lib/core/utils/interfaces/date-difference.interface.ts", "./lib/core/utils/types/exchange-rates.type.ts", - "./lib/core/utils/types/iota-unit-map.type.ts", "./lib/core/utils/date.ts", "./lib/core/utils/ui.ts" ]