diff --git a/packages/apps-config/src/api/spec/ares-gladios.ts b/packages/apps-config/src/api/spec/ares-gladios.ts index a1c6bb6f32..a6ec3467fb 100644 --- a/packages/apps-config/src/api/spec/ares-gladios.ts +++ b/packages/apps-config/src/api/spec/ares-gladios.ts @@ -3,7 +3,6 @@ import type { OverrideBundleDefinition } from '@polkadot/types/types'; -// structs need to be in order /* eslint-disable sort-keys */ const definitions: OverrideBundleDefinition = { @@ -13,23 +12,134 @@ const definitions: OverrideBundleDefinition = { minmax: [0, undefined], types: { Address: 'MultiAddress', - LookupSource: 'MultiAddress', + AskPeriodNum: 'u64', + AskPointNum: 'u32', + AuthorityAres: 'AccountId', + AccountParticipateEstimates: { + account: 'AccountId', + end: 'BlockNumber', + estimates: 'Option', + range_index: 'Option', + eth_address: 'Option', + multiplier: 'MultiplierOption', + reward: 'u128' + }, + AresPriceData: { + price: 'u64', + account_id: 'AuthorityId', + create_bn: 'BlockNumber', + fraction_len: 'FractionLength', + raw_number: 'JsonNumberValue', + timestamp: 'u64' + }, BalanceOf: 'Balance', + ChooseWinnersPayload: { + block_number: 'BlockNumber', + winners: 'Vec', + public: 'AccountId', + estimates_config: 'Bytes', + symbol: 'Bytes', + price: '(u64, FractionLength)' + }, + EstimatesState: { + _enum: [ + 'InActive', + 'Active', + 'WaitingPayout', + 'Completed' + ] + }, + EstimatesType: { + _enum: [ + 'DEVIATION', 'RANGE' + ] + }, FractionLength: 'u32', - RequestInterval: 'u8', + HttpError: { + _enum: { + IoErr: 'Bytes', + TimeOut: 'Bytes', + StatusErr: '(Bytes,u16)', + ParseErr: 'Bytes' + } + }, + HttpErrTracePayload: { + trace_data: 'HttpErrTraceData', + auth: 'AuthorityId', + public: 'MultiSigner' + }, + HttpErrTraceData: { + block_number: 'BlockNumber', + err_auth: 'AuthorityId', + err_status: 'HttpError', + tip: 'Bytes' + }, JsonNumberValue: { integer: 'u64', fraction: 'u64', fraction_length: 'u32', exponent: 'u32' }, - PricePayloadSubPrice: '(Bytes, u64, FractionLength, JsonNumberValue)', - PricePayloadSubJumpBlock: '(Bytes, RequestInterval)', + Keys: 'SessionKeys3', + LookupSource: 'MultiAddress', + MultiplierOption: { + _enum: [ + 'Base1', 'Base2', 'Base5' + ] + }, + OcwControlData: { + need_verifier_check: 'bool', + open_free_price_reporter: 'bool', + open_paid_price_reporter: 'bool' + }, + OffchainSignature: 'MultiSignature', + PaidValue: { + create_bn: 'BlockNumber', + amount: 'BalanceOf', + is_income: 'bool' + }, + PurchasedId: 'Bytes', + PriceKey: 'Bytes', + PreCheckPayload: { + block_number: 'BlockNumber', + pre_check_stash: 'AccountId', + pre_check_auth: 'AuthorityId', + auth: 'AuthorityId', + public: 'MultiSigner' + }, + PreCheckResultPayload: { + block_number: 'BlockNumber', + pre_check_list: 'Vec', + pre_check_stash: 'AccountId', + pre_check_auth: 'AuthorityId', + public: 'MultiSigner' + }, + PreCheckCompareLog: { + chain_avg_price_list: 'BTreeMap', + validator_up_price_list: 'BTreeMap', + raw_precheck_list: 'Vec' + }, + PreCheckStruct: { + price_key: 'Vec', + number_val: 'JsonNumberValue', + max_offset: 'Percent', + timestamp: 'u64' + }, + PricePayloadSubPrice: '(PriceKey, u64, FractionLength, JsonNumberValue, u64)', + PricePayloadSubJumpBlock: '(PriceKey, RequestInterval)', PricePayload: { block_number: 'BlockNumber', price: 'Vec', jump_block: 'Vec', - public: 'AccountId' + auth: 'AuthorityId', + public: 'MultiSigner' + }, + PreCheckStatus: { + _enum: [ + 'Review', + 'Prohibit', + 'Pass' + ] }, PurchasedRequestData: { account_id: 'AccountId', @@ -43,7 +153,8 @@ const definitions: OverrideBundleDefinition = { block_number: 'BlockNumber', purchase_id: 'Vec', price: 'Vec', - public: 'AccountId' + auth: 'AuthorityId', + public: 'MultiSigner' }, PurchasedAvgPriceData: { create_bn: 'u64', @@ -59,53 +170,26 @@ const definitions: OverrideBundleDefinition = { PurchasedForceCleanPayload: { BlockNumber: 'BlockNumber', purchase_id_list: 'Vec>', - public: 'AccountId' + auth: 'AuthorityId', + public: 'MultiSigner' }, - OcwControlData: { - need_verifier_check: 'bool', - open_free_price_reporter: 'bool', - open_paid_price_reporter: 'bool' - }, - AskPeriodNum: 'u64', PurchaseId: 'Vec', - AskPointNum: 'u32', - PaidValue: { - create_bn: 'BlockNumber', - amount: 'BalanceOf', - is_income: 'bool' - }, - // estimates price + RequestInterval: 'u8', + StatusErr: '(u16)', SymbolEstimatesConfig: { symbol: 'Bytes', + estimates_type: 'EstimatesType', id: 'u64', - price: 'Balance', + ticket_price: 'Balance', + symbol_completed_price: 'u64', + symbol_fraction: 'FractionLength', start: 'BlockNumber', - length: 'BlockNumber', - delay: 'BlockNumber', - deviation: 'Permill', - state: 'EstimatesState', - total_reward: 'Balance' - }, - EstimatesState: { - _enum: [ - 'InActive', - 'Active', - 'WaitingPayout', - 'Completed' - ] - }, - AccountParticipateEstimates: { - account: 'AccountId', - estimates: 'u64', - eth_address: 'Option' - }, - ChooseWinnersPayload: { - block_number: 'BlockNumber', - winners: 'Vec', - public: 'AccountId', - estimates_config: 'Bytes', - symbol: 'Bytes', - price: '(u64, FractionLength)' + end: 'BlockNumber', + distribute: 'BlockNumber', + deviation: 'Option', + range: 'Option>', + total_reward: 'Balance', + state: 'EstimatesState' } } } diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts index 166e963f03..2154dce6ac 100644 --- a/packages/apps-config/src/ui/logos/index.ts +++ b/packages/apps-config/src/ui/logos/index.ts @@ -54,7 +54,7 @@ import externalSubId from './external/subid.svg'; import externalSubscan from './external/subscan.svg'; import externalSubsquare from './external/subsquare.svg'; import nodeApron from './nodes/apron.png'; -import nodeAres from './nodes/ares.svg'; +import nodeAres from './nodes/ares.png'; import nodeAresGladios from './nodes/ares-gladios.svg'; import nodeAresMars from './nodes/ares-mars.png'; import nodeAstar from './nodes/astar.png'; diff --git a/packages/apps-config/src/ui/logos/nodes/ares-gladios.svg b/packages/apps-config/src/ui/logos/nodes/ares-gladios.svg index 1c754d62c3..37ffd5b974 100644 --- a/packages/apps-config/src/ui/logos/nodes/ares-gladios.svg +++ b/packages/apps-config/src/ui/logos/nodes/ares-gladios.svg @@ -1,1191 +1,36 @@ - - - + + + + + + + + + + + + + + diff --git a/packages/apps-config/src/ui/logos/nodes/ares.png b/packages/apps-config/src/ui/logos/nodes/ares.png new file mode 100644 index 0000000000..32fe2b7b78 Binary files /dev/null and b/packages/apps-config/src/ui/logos/nodes/ares.png differ diff --git a/packages/apps-config/src/ui/logos/nodes/ares.svg b/packages/apps-config/src/ui/logos/nodes/ares.svg deleted file mode 100644 index ddb5766c1a..0000000000 --- a/packages/apps-config/src/ui/logos/nodes/ares.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - diff --git a/packages/apps/public/locales/en/apps-config.json b/packages/apps/public/locales/en/apps-config.json index 15f0f468ad..8cbac9024f 100644 --- a/packages/apps/public/locales/en/apps-config.json +++ b/packages/apps/public/locales/en/apps-config.json @@ -245,4 +245,4 @@ "ss58.default": "Default for the connected node", "testnet.kylin-node.co.uk": "Kylin Testnet", "westend.kylin-node.co.uk": "Pichiu" -} \ No newline at end of file +}