proposed changes including TODOs

packages/apps-config/src/api/spec/westlake.ts → packages/apps-config/src/api/spec/datahighway-spreehafen-parachain-testnet.ts

@@ -13,6 +13,7 @@ const definitions: OverrideBundleDefinition = {
       minmax: [0, undefined],
       types: {
         Date: 'i64',
+        AccountInfo: "AccountInfoWithDualRefCount",
         Keys: 'SessionKeys2',
         Address: 'MultiAddress',
         LookupSource: 'MultiAddress',

packages/apps-config/src/api/spec/datahighway.ts → packages/apps-config/src/api/spec/datahighway-westlake-chain-mainnet.ts

@@ -12,6 +12,8 @@ const definitions: OverrideBundleDefinition = {
       // on all versions
       minmax: [0, undefined],
       types: {
+        Date: 'i64',
+        AccountInfo: "AccountInfoWithDualRefCount",
         Keys: 'SessionKeys2',
         Address: 'MultiAddress',
         LookupSource: 'MultiAddress',
@@ -37,7 +39,7 @@ const definitions: OverrideBundleDefinition = {
         RoamingAccountingPolicyType: 'Text',
         RoamingAccountingPolicyUplinkFeeFactor: 'u32',
         RoamingAccountingPolicyDownlinkFeeFactor: 'u32',
-        RoamingAccountingPolicyConfig: {
+        RoamingAccountingPolicySetting: {
           policy_type: 'Text',
           subscription_fee: 'Balance',
           uplink_fee_factor: 'u32',
@@ -46,7 +48,7 @@ const definitions: OverrideBundleDefinition = {
         RoamingAgreementPolicy: '[u8; 16]',
         RoamingAgreementPolicyIndex: 'u64',
         RoamingAgreementPolicyActivationType: 'Text',
-        RoamingAgreementPolicyConfig: {
+        RoamingAgreementPolicySetting: {
           policy_activation_type: 'Text',
           policy_expiry_block: 'Moment'
         },
@@ -58,7 +60,7 @@ const definitions: OverrideBundleDefinition = {
         RoamingDeviceProfileDevEUI: 'Text',
         RoamingDeviceProfileJoinEUI: 'Text',
         RoamingDeviceProfileVendorID: 'Text',
-        RoamingDeviceProfileConfig: {
+        RoamingDeviceProfileSetting: {
           device_profile_devaddr: 'Text',
           device_profile_deveui: 'Text',
           device_profile_joineui: 'Text',
@@ -76,13 +78,13 @@ const definitions: OverrideBundleDefinition = {
         },
         RoamingBillingPolicy: '[u8; 16]',
         RoamingBillingPolicyIndex: 'u64',
-        RoamingBillingPolicyConfig: {
+        RoamingBillingPolicySetting: {
           policy_next_billing_at_block: 'Moment',
           policy_frequency_in_blocks: 'Moment'
         },
         RoamingChargingPolicy: '[u8; 16]',
         RoamingChargingPolicyIndex: 'u64',
-        RoamingChargingPolicyConfig: {
+        RoamingChargingPolicySetting: {
           policy_next_charging_at_block: 'Moment',
           policy_delay_after_billing_in_blocks: 'u64'
         },
@@ -107,7 +109,7 @@ const definitions: OverrideBundleDefinition = {
         MiningRatesTokenTokenIOTA: 'u32',
         MiningRatesTokenMaxToken: 'u32',
         MiningRatesTokenMaxLoyalty: 'u32',
-        MiningRatesTokenConfig: {
+        MiningRatesTokenSetting: {
           token_token_mxc: 'u32',
           token_token_iota: 'u32',
           token_token_dot: 'u32',
@@ -122,36 +124,36 @@ const definitions: OverrideBundleDefinition = {
         MiningRatesHardwareCategory1MaxTokenBonusPerGateway: 'u32',
         MiningRatesHardwareCategory2MaxTokenBonusPerGateway: 'u32',
         MiningRatesHardwareCategory3MaxTokenBonusPerGateway: 'u32',
-        MiningRatesHardwareConfig: {
+        MiningRatesHardwareSetting: {
           hardware_hardware_secure: 'u32',
           hardware_hardware_insecure: 'u32',
           hardware_max_hardware: 'u32',
           hardware_category_1_max_token_bonus_per_gateway: 'u32',
           hardware_category_2_max_token_bonus_per_gateway: 'u32',
           hardware_category_3_max_token_bonus_per_gateway: 'u32'
         },
-        MiningConfigToken: '[u8; 16]',
-        MiningConfigTokenIndex: 'u64',
-        MiningConfigTokenType: 'Text',
-        MiningConfigTokenLockAmount: 'u64',
-        MiningConfigTokenConfig: {
+        MiningSettingToken: '[u8; 16]',
+        MiningSettingTokenIndex: 'u64',
+        MiningSettingTokenType: 'Text',
+        MiningSettingTokenLockAmount: 'u64',
+        MiningSettingTokenSetting: {
           token_type: 'Text',
           token_lock_amount: 'u64',
           token_lock_start_block: 'Moment',
           token_lock_interval_blocks: 'Moment'
         },
-        MiningConfigTokenRequirementsConfig: {
+        MiningSettingTokenRequirementsSetting: {
           token_type: 'Text',
           token_lock_min_amount: 'u64',
           token_lock_min_blocks: 'u32'
         },
-        MiningConfigHardware: '[u8; 16]',
-        MiningConfigHardwareIndex: 'u64',
-        MiningConfigHardwareSecure: 'bool',
-        MiningConfigHardwareType: 'Text',
-        MiningConfigHardwareID: 'u64',
-        MiningConfigHardwareDevEUI: 'u64',
-        MiningConfigHardwareConfig: {
+        MiningSettingHardware: '[u8; 16]',
+        MiningSettingHardwareIndex: 'u64',
+        MiningSettingHardwareSecure: 'bool',
+        MiningSettingHardwareType: 'Text',
+        MiningSettingHardwareID: 'u64',
+        MiningSettingHardwareDevEUI: 'u64',
+        MiningSettingHardwareSetting: {
           hardware_secure: 'bool',
           hardware_type: 'Text',
           hardware_id: 'u64',
@@ -162,14 +164,14 @@ const definitions: OverrideBundleDefinition = {
         MiningSamplingToken: '[u8; 16]',
         MiningSamplingTokenIndex: 'u64',
         MiningSamplingTokenSampleLockedAmount: 'u64',
-        MiningSamplingTokenConfig: {
+        MiningSamplingTokenSetting: {
           token_sample_block: 'Moment',
           token_sample_locked_amount: 'u64'
         },
         MiningSamplingHardware: '[u8; 16]',
         MiningSamplingHardwareIndex: 'u64',
         MiningSamplingHardwareSampleHardwareOnline: 'u64',
-        MiningSamplingHardwareConfig: {
+        MiningSamplingHardwareSetting: {
           hardware_sample_block: 'Moment',
           hardware_sample_hardware_online: 'bool'
         },
@@ -195,6 +197,69 @@ const definitions: OverrideBundleDefinition = {
           hardware_block_audited: 'Moment',
           hardware_auditor_account_id: 'u64'
         },
+        MiningEligibilityProxy: '[u8; 16]',
+        MiningEligibilityProxyIndex: 'u64',
+        MiningEligibilityProxyRewardRequest: {
+          proxy_claim_requestor_account_id: 'AccountId',
+          proxy_claim_total_reward_amount: 'Balance',
+          proxy_claim_timestamp_redeemed: 'Moment'
+        },
+        MiningEligibilityProxyClaimRewardeeData: {
+          proxy_claim_rewardee_account_id: 'AccountId',
+          proxy_claim_reward_amount: 'Balance',
+          proxy_claim_start_date: 'Date',
+          proxy_claim_end_date: 'Date'
+        },
+        RewardeeData: {
+          proxy_claim_rewardee_account_id: 'AccountId',
+          proxy_claim_reward_amount: 'Balance',
+          proxy_claim_start_date: 'Date',
+          proxy_claim_end_date: 'Date'
+        },
+        RewardRequestorData: {
+          mining_eligibility_proxy_id: 'MiningEligibilityProxyIndex',
+          total_amt: 'Balance',
+          rewardee_count: 'u64',
+          member_kind: 'u32',
+          requested_date: 'Moment'
+        },
+        RequestorData: {
+          mining_eligibility_proxy_id: 'MiningEligibilityProxyIndex',
+          total_amt: 'Balance',
+          rewardee_count: 'u64',
+          member_kind: 'u32',
+          requested_date: 'Moment'
+        },
+        RewardTransferData: {
+          mining_eligibility_proxy_id: 'MiningEligibilityProxyIndex',
+          is_sent: 'bool',
+          total_amt: 'Balance',
+          rewardee_count: 'u64',
+          member_kind: 'u32',
+          requested_date: 'Moment'
+        },
+        TransferData: {
+          mining_eligibility_proxy_id: 'MiningEligibilityProxyIndex',
+          is_sent: 'bool',
+          total_amt: 'Balance',
+          rewardee_count: 'u64',
+          member_kind: 'u32',
+          requested_date: 'Moment'
+        },
+        RewardDailyData: {
+          mining_eligibility_proxy_id: 'MiningEligibilityProxyIndex',
+          total_amt: 'Balance',
+          proxy_claim_requestor_account_id: 'AccountId',
+          member_kind: 'u32',
+          rewarded_date: 'Date'
+        },
+        DailyData: {
+          mining_eligibility_proxy_id: 'MiningEligibilityProxyIndex',
+          total_amt: 'Balance',
+          proxy_claim_requestor_account_id: 'AccountId',
+          member_kind: 'u32',
+          rewarded_date: 'Date'
+        },
         MiningClaimsToken: '[u8; 16]',
         MiningClaimsTokenIndex: 'u64',
         MiningClaimsTokenClaimAmount: 'u64',
@@ -218,7 +283,7 @@ const definitions: OverrideBundleDefinition = {
           token_execution_ended_block: 'Moment'
         },
         ExchangeRateIndex: 'u64',
-        ExchangeRateConfig: {
+        ExchangeRateSetting: {
           hbtc: 'u64',
           dot: 'u64',
           iota: 'u64',

packages/apps-config/src/api/spec/index.ts

@@ -20,7 +20,8 @@ import crust from './crust';
 import testPara from './cumulus-test-parachain';
 import darwinia from './darwinia';
 import darwiniaParachain from './darwinia-parachain';
-import datahighwayParachain from './datahighway';
+import datahighwayWestlakeChainMainnet from './datahighway-westlake-mainnet';
+import datahighwaySpreehafenParachainTestnet from './datahighway-spreehafen-parachain-testnet';
 import dockPoaMainnet from './dock-poa-mainnet';
 import dockPoaTestnet from './dock-poa-testnet';
 import dotmog from './dotmog';
@@ -85,7 +86,6 @@ import vln from './vln';
 import vlnrococo from './vln-rococo';
 import vodka from './vodka';
 import web3games from './web3games';
-import westlake from './westlake';
 import zeitgeist from './zeitgeist';
 import zenlink from './zenlink';
 import zero from './zero';
@@ -118,9 +118,9 @@ const spec: Record<string, OverrideBundleDefinition> = {
   'crust-parachain': crust,
   'cumulus-subsocial-parachain': subsocial,
   'cumulus-test-parachain': testPara,
-  datahighway: westlake,
-  'datahighway-harbour': westlake,
-  'datahighway-parachain': datahighwayParachain,
+  'datahighway-harbour-chain-testnet': datahighwayWestlakeChainMainnet,
+  'datahighway-westlake-chain-mainnet': datahighwayWestlakeChainMainnet,
+  'datahighway-spreehafen-parachain-testnet': datahighwaySpreehafenParachainTestnet,
   dawn: eave,
   'dev-parachain': zenlink,
   'dock-main-runtime': dockPoaMainnet,

packages/apps-config/src/endpoints/production.ts

@@ -161,8 +161,8 @@ export function createProduction (t: TFunction, firstOnly?: boolean): LinkOption
       }
     },
     {
-      info: 'westlake',
-      text: t('rpc.prod.westlake', 'Westlake', { ns: 'apps-config' }),
+      info: 'datahighway-westlake-chain-mainnet',
+      text: t('rpc.prod.westlake', 'DataHighway Westlake', { ns: 'apps-config' }),
       providers: {
         DataHighway: 'wss://westlake.datahighway.com'
       }

packages/apps-config/src/endpoints/testing.ts

@@ -76,20 +76,12 @@ export function createTesting (t: TFunction, firstOnly?: boolean): LinkOption[]
       }
     },
     {
-      info: 'datahighway-harbour',
-      text: t('rpc.test.datahighway-harbour', 'DataHighway Harbour', { ns: 'apps-config' }),
+      info: 'datahighway-harbour-chain-testnet',
+      text: t('rpc.test.datahighway.harbour', 'DataHighway Harbour', { ns: 'apps-config' }),
       providers: {
         DataHighway: 'wss://testnet-harbour.datahighway.com'
       }
     },
-    {
-      info: 'datahighway',
-      isDisabled: true,
-      text: t('rpc.test.datahighway.spreehafen', 'Spreehafen', { ns: 'apps-config' }),
-      providers: {
-        MXC: 'wss://spreehafen.datahighway.com'
-      }
-    },
     {
       info: 'dock-testnet',
       isDisabled: false,

packages/apps-config/src/endpoints/testingRelayRococo.ts

@@ -156,7 +156,7 @@ export function createRococo (t: TFunction): EndpointOption {
         info: 'rococoDataHighway',
         isDisabled: true, // Rococo reset
         paraId: 2,
-        text: t('rpc.rococo.datahighway', 'DataHighway', { ns: 'apps-config' }),
+        text: t('rpc.rococo.datahighway.spreehafen', 'DataHighway Spreehafen', { ns: 'apps-config' }),
         providers: {
           DataHighway: 'wss://spreehafen.datahighway.com'
         }

packages/apps-config/src/ui/logos/index.ts

@@ -40,7 +40,7 @@ import nodeClover from './nodes/clover.svg';
 import nodeCrab from './nodes/crab.svg';
 import nodeCrust from './nodes/crust.svg';
 import nodeDarwinia from './nodes/darwinia.png';
-import nodeDataHighway from './nodes/datahighway.png';
+import nodeDataHighwayDefault from './nodes/datahighway-default-logo.png';
 import nodeDockMainnet from './nodes/dock-mainnet.png';
 import nodeDockTestnet from './nodes/dock-testnet.png';
 import nodeDotMog from './nodes/dotmog.svg';
@@ -107,7 +107,6 @@ import nodeUnique from './nodes/unique.svg';
 import nodeUnitv from './nodes/unitv.png';
 import nodeVln from './nodes/valiu.png';
 import nodeWeb3games from './nodes/web3games.svg';
-import nodeWestlake from './nodes/westlake.png';
 import nodeWhala from './nodes/whala.svg';
 import nodeZeitgeist from './nodes/zeitgeist.png';
 import nodeZenlink from './nodes/zenlink.svg';
@@ -126,8 +125,12 @@ export const chainLogos: Record<string, unknown> = [
   ['darwinia crab', nodeCrab],
   ['Darwinia Crab PC2', nodeCrab],
   ['Darwinia PC2', nodeDarwinia],
-  ['DataHighway', nodeDataHighway],
-  ['DataHighway Harbour', nodeWestlake],
+  // https://github.com/DataHighway-DHX/node/blob/master/node/src/chain_spec.rs#L478
+  ['DataHighway Harbour Testnet', nodeDataHighwayDefault],
+  // https://github.com/DataHighway-DHX/node/blob/master/node/src/chain_spec.rs#L807
+  ['DataHighway Westlake Mainnet', nodeDataHighwayDefault],
+  // https://github.com/DataHighway-DHX/node/blob/ilya/parachain/node/src/chain_spec.rs#L239
+  ['DataHighway Spreehafen', nodeDataHighwayDefault], // TODO - rename to 'DataHighway Spreehafen' in ilya/parachain branch
   ['Dusty', chainDusty],
   ['EquilibriumTestnet', chainGenshiro],
   ['Equilibrium', chainEquilibrium],
@@ -205,7 +208,6 @@ export const chainLogos: Record<string, unknown> = [
   ['VLN PC', nodeVln],
   ['Vln', nodeVln],
   ['Web3games', nodeWeb3games],
-  ['Westlake', nodeWestlake],
   ['Westmint', nodeStatemine],
   ['Westmint Test', nodeStatemine]
 ].reduce((logos, [chain, logo]): Record<string, unknown> => ({
@@ -239,10 +241,13 @@ export const nodeLogos: Record<string, unknown> = [
   ['darwinia', nodeDarwinia],
   ['darwinia parachain', nodeDarwinia],
   ['Darwinia Runtime Module Library', nodeDarwinia],
-  ['DataHighway', nodeDataHighway],
-  ['DataHighwayChain', nodeWestlake],
-  ['DataHighway Node', nodeDataHighway],
-  ['DataHighway Parachain Collator', nodeDataHighway],
+  ['DataHighway', nodeDataHighwayDefault], // TODO - deprecated?
+  // https://github.com/DataHighway-DHX/node/blob/master/node/src/command.rs#L43
+  ['DataHighwayChain', nodeDataHighwayDefault], // Harbour + Westlake
+  // https://github.com/DataHighway-DHX/node/blob/ilya/parachain/node/src/command.rs#L53
+  ['DataHighway Collator', nodeDataHighwayDefault], // Spreehafen
+  ['DataHighway Node', nodeDataHighwayDefault], // TODO - deprecated?
+  ['DataHighway Parachain Collator', nodeDataHighwayDefault], // TODO - deprecated?
   ['Dock Full Node', nodeDockMainnet],
   ['DOTMog Node', nodeDotMog],
   ['Eave Node', nodeEave],
@@ -328,7 +333,7 @@ export const nodeLogos: Record<string, unknown> = [
   ['Vln', nodeVln],
   ['VLN PC', nodeVln],
   ['Web3games', nodeWeb3games],
-  ['Westlake', nodeWestlake],
+  ['Westlake', nodeDataHighwayDefault],
   ['Westmint Collator', nodeStatemine],
   ['Whala', nodeWhala],
   ['Whala Node', nodeWhala],
@@ -343,6 +348,7 @@ export const nodeLogos: Record<string, unknown> = [
 
 // Alphabetical overrides based on the actual specName
 export const specLogos: Record<string, unknown> = [
+  ['datahighway', nodeStatemine],
   ['shell', nodeShell],
   ['statemine', nodeStatemine],
   ['statemint', nodeStatemine],
@@ -370,8 +376,8 @@ export const namedLogos: Record<string, unknown> = {
   crab_redirect: nodeCrab,
   crust: nodeCrust,
   darwinia: nodeDarwinia,
-  datahighway: nodeDataHighway,
-  'datahighway-harbour': nodeWestlake,
+  'datahighway-harbour-chain-testnet': nodeDataHighwayDefault,
+  'datahighway-westlake-chain-mainnet': nodeDataHighwayDefault,
   'dock-mainnet': nodeDockMainnet,
   'dock-testnet': nodeDockTestnet,
   dotmog: nodeDotMog,
@@ -437,7 +443,7 @@ export const namedLogos: Record<string, unknown> = {
   rococoCrab: nodeCrab,
   rococoCrust: nodeCrust,
   rococoDarwinia: nodeDarwinia,
-  rococoDataHighway: nodeDataHighway,
+  rococoDataHighway: nodeDataHighwayDefault,
   rococoEave: nodeEave,
   rococoEncointer: nodeEncointerNotee,
   rococoGalital: nodeGalital,
@@ -492,7 +498,6 @@ export const namedLogos: Record<string, unknown> = {
   vln: nodeVln,
   web3games: nodeWeb3games,
   westend: nodePolkadot,
-  westlake: nodeWestlake,
   westmint: nodeStatemine,
   whala: nodeWhala,
   zeitgeist: nodeZeitgeist,