From 67d6c5058f3870324dce5c9421386a2eda410e28 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 21 Aug 2019 17:48:02 +0200 Subject: [PATCH] Add ss58Format to ChainProperties interface (#1335) * Add ss58Format to ChainProperties * Make ChaineProperties entries Option --- .../src/interfaces/rpc/ChainProperties.spec.ts | 18 ++++++++++++++---- .../types/src/interfaces/rpc/definitions.ts | 5 +++-- packages/types/src/interfaces/rpc/types.ts | 12 +++++++----- .../Extrinsic/ExtrinsicPayload.spec.ts | 1 + 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/packages/types/src/interfaces/rpc/ChainProperties.spec.ts b/packages/types/src/interfaces/rpc/ChainProperties.spec.ts index 3d237a71bc..0616dccca3 100644 --- a/packages/types/src/interfaces/rpc/ChainProperties.spec.ts +++ b/packages/types/src/interfaces/rpc/ChainProperties.spec.ts @@ -14,12 +14,22 @@ describe('ChainProperties', (): void => { }); it('decodes from an actual object', (): void => { - const { tokenDecimals, tokenSymbol } = createType('ChainProperties', { + const { ss58Format, tokenDecimals, tokenSymbol } = createType('ChainProperties', { + ss58Format: 2, tokenDecimals: 15, - tokenSymbol: 'BBQ' + tokenSymbol: 'KSM' }); - expect(tokenDecimals.eq(15)).toBe(true); - expect(tokenSymbol.eq('BBQ')).toBe(true); + expect(ss58Format.unwrap().eq(2)).toBe(true); + expect(tokenDecimals.unwrap().eq(15)).toBe(true); + expect(tokenSymbol.unwrap().eq('KSM')).toBe(true); + }); + + it('decodes from an object, flagged for non-existent ss58Format', (): void => { + const { ss58Format, tokenDecimals, tokenSymbol } = createType('ChainProperties', { tokenSymbol: 'DEV' }); + + expect(ss58Format.isNone).toBe(true); + expect(tokenDecimals.isNone).toBe(true); + expect(tokenSymbol.isSome).toBe(true); }); }); diff --git a/packages/types/src/interfaces/rpc/definitions.ts b/packages/types/src/interfaces/rpc/definitions.ts index f942f25ed2..c2d07b6a49 100644 --- a/packages/types/src/interfaces/rpc/definitions.ts +++ b/packages/types/src/interfaces/rpc/definitions.ts @@ -6,8 +6,9 @@ export default { types: { ApiId: '[u8; 8]', ChainProperties: { - tokenDecimals: 'u32', - tokenSymbol: 'Text' + ss58Format: 'Option', + tokenDecimals: 'Option', + tokenSymbol: 'Option' }, ExtrinsicOrHash: { _enum: { diff --git a/packages/types/src/interfaces/rpc/types.ts b/packages/types/src/interfaces/rpc/types.ts index 0f63f8b1be..2088c36110 100644 --- a/packages/types/src/interfaces/rpc/types.ts +++ b/packages/types/src/interfaces/rpc/types.ts @@ -3,7 +3,7 @@ import { Codec } from '../../types'; import { Enum, Option, Struct, Vec } from '../../codec'; -import { Bytes, StorageData, StorageKey, Text, bool, u32, u64 } from '../../primitive'; +import { Bytes, StorageData, StorageKey, Text, bool, u32, u64, u8 } from '../../primitive'; import { BlockNumber, Hash } from '../runtime'; /** Uint8Array & Codec */ @@ -11,10 +11,12 @@ export type ApiId = Uint8Array & Codec; /** Struct */ export interface ChainProperties extends Struct { - /** u32 */ - readonly tokenDecimals: u32; - /** Text */ - readonly tokenSymbol: Text; + /** Option */ + readonly ss58Format: Option; + /** Option */ + readonly tokenDecimals: Option; + /** Option */ + readonly tokenSymbol: Option; } /** Enum */ diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts b/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts index d8d807b6e7..cdef5e9042 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts +++ b/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts @@ -14,6 +14,7 @@ describe('ExtrinsicPayload', (): void => { genesisHash: '0xdcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025b', method: '0x0500ffd7568e5f0a7eda67a82691ff379ac4bba4f9c9b859fe779b5d46363b61ad2db9e56c', nonce: '0x00001234', + specVersion: 123, tip: '0x00000000000000000000000000005678' };