From ad19db0764e141a7cdd4798bbc8ace277c01f403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Dethier?= Date: Mon, 11 Jul 2022 19:51:17 +0200 Subject: [PATCH] feat: upgrade logion types. (#7857) --- packages/apps-config/package.json | 2 +- .../src/api/spec/logion-parachain.ts | 91 ++++++++++++++++- packages/apps-config/src/api/spec/logion.ts | 98 ++++++++++++++++++- yarn.lock | 10 +- 4 files changed, 190 insertions(+), 11 deletions(-) diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 6230f6b7ba..592917111e 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -26,7 +26,7 @@ "@interlay/interbtc-types": "1.7.0", "@kiltprotocol/type-definitions": "0.1.23", "@laminar/type-definitions": "0.3.1", - "@logion/node-api": "0.2.1", + "@logion/node-api": "0.3.1", "@mangata-finance/types": "^0.5.0", "@metaverse-network-sdk/type-definitions": "^0.0.1-13", "@parallel-finance/type-definitions": "1.7.7", diff --git a/packages/apps-config/src/api/spec/logion-parachain.ts b/packages/apps-config/src/api/spec/logion-parachain.ts index 0866fd03ac..d5fd1307f2 100644 --- a/packages/apps-config/src/api/spec/logion-parachain.ts +++ b/packages/apps-config/src/api/spec/logion-parachain.ts @@ -3,18 +3,103 @@ import type { OverrideBundleDefinition } from '@polkadot/types/types'; -import logionDefault from '@logion/node-api/dist/interfaces/definitions'; - // structs need to be in order /* eslint-disable sort-keys */ +const logionDefault = { + Address: 'MultiAddress', + LookupSource: 'MultiAddress', + PeerId: '(Vec)', + AccountInfo: 'AccountInfoWithDualRefCount', + TAssetBalance: 'u128', + AssetId: 'u64', + AssetDetails: { + owner: 'AccountId', + issuer: 'AccountId', + admin: 'AccountId', + freezer: 'AccountId', + supply: 'Balance', + deposit: 'DepositBalance', + max_zombies: 'u32', + min_balance: 'Balance', + zombies: 'u32', + accounts: 'u32', + is_frozen: 'bool' + }, + AssetMetadata: { + deposit: 'DepositBalance', + name: 'Vec', + symbol: 'Vec', + decimals: 'u8' + }, + LocId: 'u128', + LegalOfficerCaseOf: { + owner: 'AccountId', + requester: 'Requester', + metadata: 'Vec', + files: 'Vec', + closed: 'bool', + loc_type: 'LocType', + links: 'Vec', + void_info: 'Option>', + replacer_of: 'Option', + collection_last_block_submission: 'Option', + collection_max_size: 'Option' + }, + MetadataItem: { + name: 'Vec', + value: 'Vec', + submitter: 'AccountId' + }, + LocType: { + _enum: [ + 'Transaction', + 'Identity', + 'Collection' + ] + }, + LocLink: { + id: 'LocId', + nature: 'Vec' + }, + File: { + hash: 'Hash', + nature: 'Vec', + submitter: 'AccountId' + }, + LocVoidInfo: { + replacer: 'Option' + }, + StorageVersion: { + _enum: [ + 'V1', + 'V2MakeLocVoid', + 'V3RequesterEnum', + 'V4ItemSubmitter', + 'V5Collection' + ] + }, + Requester: { + _enum: { + None: null, + Account: 'AccountId', + Loc: 'LocId' + } + }, + CollectionSize: 'u32', + CollectionItemId: 'Hash', + CollectionItem: { + description: 'Vec' + } +}; + const definitions: OverrideBundleDefinition = { types: [ { // on all versions minmax: [0, undefined], types: { - ...logionDefault.types + ...logionDefault } } ] diff --git a/packages/apps-config/src/api/spec/logion.ts b/packages/apps-config/src/api/spec/logion.ts index 9d9539bcf0..bef9cfef2c 100644 --- a/packages/apps-config/src/api/spec/logion.ts +++ b/packages/apps-config/src/api/spec/logion.ts @@ -8,11 +8,105 @@ import logionDefault, { session as logionSession } from '@logion/node-api/dist/i // structs need to be in order /* eslint-disable sort-keys */ +const defaultTypesUpTo109 = { + Address: 'MultiAddress', + LookupSource: 'MultiAddress', + PeerId: '(Vec)', + AccountInfo: 'AccountInfoWithDualRefCount', + TAssetBalance: 'u128', + AssetId: 'u64', + AssetDetails: { + owner: 'AccountId', + issuer: 'AccountId', + admin: 'AccountId', + freezer: 'AccountId', + supply: 'Balance', + deposit: 'DepositBalance', + max_zombies: 'u32', + min_balance: 'Balance', + zombies: 'u32', + accounts: 'u32', + is_frozen: 'bool' + }, + AssetMetadata: { + deposit: 'DepositBalance', + name: 'Vec', + symbol: 'Vec', + decimals: 'u8' + }, + LocId: 'u128', + LegalOfficerCaseOf: { + owner: 'AccountId', + requester: 'Requester', + metadata: 'Vec', + files: 'Vec', + closed: 'bool', + loc_type: 'LocType', + links: 'Vec', + void_info: 'Option>', + replacer_of: 'Option', + collection_last_block_submission: 'Option', + collection_max_size: 'Option' + }, + MetadataItem: { + name: 'Vec', + value: 'Vec', + submitter: 'AccountId' + }, + LocType: { + _enum: [ + 'Transaction', + 'Identity', + 'Collection' + ] + }, + LocLink: { + id: 'LocId', + nature: 'Vec' + }, + File: { + hash: 'Hash', + nature: 'Vec', + submitter: 'AccountId' + }, + LocVoidInfo: { + replacer: 'Option' + }, + StorageVersion: { + _enum: [ + 'V1', + 'V2MakeLocVoid', + 'V3RequesterEnum', + 'V4ItemSubmitter', + 'V5Collection' + ] + }, + Requester: { + _enum: { + None: null, + Account: 'AccountId', + Loc: 'LocId' + } + }, + CollectionSize: 'u32', + CollectionItemId: 'Hash', + CollectionItem: { + description: 'Vec' + } +}; + const definitions: OverrideBundleDefinition = { types: [ { - // on all versions - minmax: [0, undefined], + minmax: [0, 109], + types: { + ...defaultTypesUpTo109, + ...logionSession.types + } + }, + { + // Latest + minmax: [110, undefined], types: { ...logionDefault.types, ...logionSession.types diff --git a/yarn.lock b/yarn.lock index 1a15eb9fd2..439fd4b0ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2351,9 +2351,9 @@ __metadata: languageName: node linkType: hard -"@logion/node-api@npm:0.2.1": - version: 0.2.1 - resolution: "@logion/node-api@npm:0.2.1" +"@logion/node-api@npm:0.3.1": + version: 0.3.1 + resolution: "@logion/node-api@npm:0.3.1" dependencies: "@polkadot/api": ^8.8.2 "@polkadot/util": ^9.4.1 @@ -2362,7 +2362,7 @@ __metadata: fast-sha256: ^1.3.0 moment: ^2.29.1 uuid: ^8.3.2 - checksum: c0e30d9a1bfcc28fcfcf6894c0a1f6d4980294b58792f6f4ee34024a4d223ba3645752a5855f6f7ce6302af05ca6d0c717460111aa9cedf74d28677e5dc9a0b5 + checksum: 99d76e8654d5609eb3562c3c58e6a3681227d57e7842184c0abc6467714d8054b66696fdda5fbc77f695ff9b7d5b46f23b04653f1fd5a5077caa094ef4c9f352 languageName: node linkType: hard @@ -3045,7 +3045,7 @@ __metadata: "@interlay/interbtc-types": 1.7.0 "@kiltprotocol/type-definitions": 0.1.23 "@laminar/type-definitions": 0.3.1 - "@logion/node-api": 0.2.1 + "@logion/node-api": 0.3.1 "@mangata-finance/types": ^0.5.0 "@metaverse-network-sdk/type-definitions": ^0.0.1-13 "@parallel-finance/type-definitions": 1.7.7