Move Extrinsic/Method to generic (#1205)
* Move Extrinsic/Method to generic * Strip Generic* primitives * Move Origin & Method, pass lint/tests
This commit is contained in:
@@ -8,7 +8,7 @@ import extrinsicsFromMeta from '@polkadot/api-metadata/extrinsics/fromMetadata';
|
||||
|
||||
import { createTypeUnsafe } from '../../codec/createType';
|
||||
import Metadata from '../Metadata';
|
||||
import Method from '../../primitive/Method';
|
||||
import Method from '../../primitive/Generic/Method';
|
||||
import { MetadataInterface } from '../types';
|
||||
import { Codec } from '../../types';
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ import { CodecTo } from '../types';
|
||||
import extrinsics from '@polkadot/api-metadata/extrinsics/static';
|
||||
|
||||
import { ClassOf } from '../codec/createType';
|
||||
import Method from '../primitive/Method';
|
||||
import Method from '../primitive/Generic/Method';
|
||||
import Text from '../primitive/Text';
|
||||
import U32 from '../primitive/U32';
|
||||
import Tuple from './Tuple';
|
||||
|
||||
@@ -8,7 +8,7 @@ import { Codec, CodecTo } from '../types';
|
||||
import extrinsics from '@polkadot/api-metadata/extrinsics/static';
|
||||
|
||||
import AccountId from '../primitive/Generic/AccountId';
|
||||
import Method from '../primitive/Method';
|
||||
import Method from '../primitive/Generic/Method';
|
||||
import Text from '../primitive/Text';
|
||||
import { createTypeUnsafe } from './createType';
|
||||
import Vec from './Vec';
|
||||
|
||||
@@ -10,7 +10,7 @@ import { Codec, Constructor } from './types';
|
||||
import * as Classes from './index.types';
|
||||
|
||||
const Types = Classes as Record<string, Constructor>;
|
||||
const UNCONSTRUCTABLE = ['origin', 'usize', 'vote'];
|
||||
const UNCONSTRUCTABLE = ['genericorigin', 'usize'];
|
||||
|
||||
describe('types', (): void => {
|
||||
describe('default creation', (): void => {
|
||||
@@ -29,7 +29,7 @@ describe('types', (): void => {
|
||||
});
|
||||
|
||||
describe('default creation (empty bytes)', (): void => {
|
||||
(Types.Method as any).injectMethods(extrinsics);
|
||||
(Types.GenericMethod as any).injectMethods(extrinsics);
|
||||
|
||||
Object.keys(Types).forEach((name): void => {
|
||||
it(`creates an empty ${name} (from empty bytes)`, (): void => {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// Auto-generated via `yarn build:interfaces`, do not edit
|
||||
|
||||
import { Compact, Option, Vec } from './codec';
|
||||
import { Bytes, Data, Extrinsic, ExtrinsicEra, Fixed64, GenericAccountId, GenericAccountIndex, GenericAddress, GenericBlock, GenericConsensusEngineId, GenericDigest, GenericDigestItem, GenericEvent, GenericVote, H160, H256, H512, ImmortalEra, Method, Moment, MortalEra, Null, Origin, SignaturePayload, StorageHasher, StorageKey, Text, Type, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from './primitive';
|
||||
import { AccountId, AccountIdOf, AccountIndex, Address, Balance, BalanceOf, Block, BlockNumber, Consensus, ConsensusEngineId, Digest, DigestItem, Ed25519Signature, Hash, Header, Index, Justification, KeyTypeId, KeyValue, LockIdentifier, Perbill, Permill, Phantom, PreRuntime, Seal, SealV0, SessionKeys, Signature, SignedBlock, Sr25519Signature, StorageData, ValidatorId, Weight, WeightMultiplier } from './interfaces/runtime';
|
||||
import { Bytes, Data, Fixed64, H160, H256, H512, Moment, Null, StorageHasher, StorageKey, Text, Type, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from './primitive';
|
||||
import { AccountId, AccountIdOf, AccountIndex, Address, Balance, BalanceOf, Block, BlockNumber, Consensus, ConsensusEngineId, Digest, DigestItem, Ed25519Signature, Extrinsic, ExtrinsicEra, ExtrinsicPayload, Hash, Header, ImmortalEra, Index, Justification, KeyTypeId, KeyValue, LockIdentifier, Method, MortalEra, Origin, Perbill, Permill, Phantom, PreRuntime, Seal, SealV0, SessionKeys, Signature, SignedBlock, Sr25519Signature, StorageData, ValidatorId, Weight, WeightMultiplier } from './interfaces/runtime';
|
||||
import { AuthorityId } from './interfaces/consensus';
|
||||
import { Keys, SessionIndex } from './interfaces/session';
|
||||
import { AuthorityWeight, NextAuthority, PendingPause, PendingResume, StoredPendingChange, StoredState } from './interfaces/grandpa';
|
||||
@@ -61,9 +61,6 @@ export interface InterfaceRegistry {
|
||||
i256: i256;
|
||||
'Option<i256>': Option<i256>;
|
||||
'Vec<i256>': Vec<i256>;
|
||||
Method: Method;
|
||||
'Option<Method>': Option<Method>;
|
||||
'Vec<Method>': Vec<Method>;
|
||||
Moment: Moment;
|
||||
'Compact<Moment>': Compact<Moment>;
|
||||
'Option<Moment>': Option<Moment>;
|
||||
@@ -71,9 +68,6 @@ export interface InterfaceRegistry {
|
||||
Null: Null;
|
||||
'Option<Null>': Option<Null>;
|
||||
'Vec<Null>': Vec<Null>;
|
||||
Origin: Origin;
|
||||
'Option<Origin>': Option<Origin>;
|
||||
'Vec<Origin>': Vec<Origin>;
|
||||
StorageHasher: StorageHasher;
|
||||
'Option<StorageHasher>': Option<StorageHasher>;
|
||||
'Vec<StorageHasher>': Vec<StorageHasher>;
|
||||
@@ -114,50 +108,6 @@ export interface InterfaceRegistry {
|
||||
'Compact<usize>': Compact<usize>;
|
||||
'Option<usize>': Option<usize>;
|
||||
'Vec<usize>': Vec<usize>;
|
||||
Extrinsic: Extrinsic;
|
||||
'Option<Extrinsic>': Option<Extrinsic>;
|
||||
'Vec<Extrinsic>': Vec<Extrinsic>;
|
||||
ExtrinsicEra: ExtrinsicEra;
|
||||
'Option<ExtrinsicEra>': Option<ExtrinsicEra>;
|
||||
'Vec<ExtrinsicEra>': Vec<ExtrinsicEra>;
|
||||
MortalEra: MortalEra;
|
||||
'Option<MortalEra>': Option<MortalEra>;
|
||||
'Vec<MortalEra>': Vec<MortalEra>;
|
||||
ImmortalEra: ImmortalEra;
|
||||
'Option<ImmortalEra>': Option<ImmortalEra>;
|
||||
'Vec<ImmortalEra>': Vec<ImmortalEra>;
|
||||
SignaturePayload: SignaturePayload;
|
||||
'Option<SignaturePayload>': Option<SignaturePayload>;
|
||||
'Vec<SignaturePayload>': Vec<SignaturePayload>;
|
||||
GenericAccountId: GenericAccountId;
|
||||
'Option<GenericAccountId>': Option<GenericAccountId>;
|
||||
'Vec<GenericAccountId>': Vec<GenericAccountId>;
|
||||
GenericAccountIndex: GenericAccountIndex;
|
||||
'Compact<GenericAccountIndex>': Compact<GenericAccountIndex>;
|
||||
'Option<GenericAccountIndex>': Option<GenericAccountIndex>;
|
||||
'Vec<GenericAccountIndex>': Vec<GenericAccountIndex>;
|
||||
GenericAddress: GenericAddress;
|
||||
'Option<GenericAddress>': Option<GenericAddress>;
|
||||
'Vec<GenericAddress>': Vec<GenericAddress>;
|
||||
GenericBlock: GenericBlock;
|
||||
'Option<GenericBlock>': Option<GenericBlock>;
|
||||
'Vec<GenericBlock>': Vec<GenericBlock>;
|
||||
GenericConsensusEngineId: GenericConsensusEngineId;
|
||||
'Compact<GenericConsensusEngineId>': Compact<GenericConsensusEngineId>;
|
||||
'Option<GenericConsensusEngineId>': Option<GenericConsensusEngineId>;
|
||||
'Vec<GenericConsensusEngineId>': Vec<GenericConsensusEngineId>;
|
||||
GenericEvent: GenericEvent;
|
||||
'Option<GenericEvent>': Option<GenericEvent>;
|
||||
'Vec<GenericEvent>': Vec<GenericEvent>;
|
||||
GenericDigest: GenericDigest;
|
||||
'Option<GenericDigest>': Option<GenericDigest>;
|
||||
'Vec<GenericDigest>': Vec<GenericDigest>;
|
||||
GenericDigestItem: GenericDigestItem;
|
||||
'Option<GenericDigestItem>': Option<GenericDigestItem>;
|
||||
'Vec<GenericDigestItem>': Vec<GenericDigestItem>;
|
||||
GenericVote: GenericVote;
|
||||
'Option<GenericVote>': Option<GenericVote>;
|
||||
'Vec<GenericVote>': Vec<GenericVote>;
|
||||
AccountId: AccountId;
|
||||
'Option<AccountId>': Option<AccountId>;
|
||||
'Vec<AccountId>': Vec<AccountId>;
|
||||
@@ -269,6 +219,27 @@ export interface InterfaceRegistry {
|
||||
WeightMultiplier: WeightMultiplier;
|
||||
'Option<WeightMultiplier>': Option<WeightMultiplier>;
|
||||
'Vec<WeightMultiplier>': Vec<WeightMultiplier>;
|
||||
Method: Method;
|
||||
'Option<Method>': Option<Method>;
|
||||
'Vec<Method>': Vec<Method>;
|
||||
Origin: Origin;
|
||||
'Option<Origin>': Option<Origin>;
|
||||
'Vec<Origin>': Vec<Origin>;
|
||||
ImmortalEra: ImmortalEra;
|
||||
'Option<ImmortalEra>': Option<ImmortalEra>;
|
||||
'Vec<ImmortalEra>': Vec<ImmortalEra>;
|
||||
MortalEra: MortalEra;
|
||||
'Option<MortalEra>': Option<MortalEra>;
|
||||
'Vec<MortalEra>': Vec<MortalEra>;
|
||||
ExtrinsicEra: ExtrinsicEra;
|
||||
'Option<ExtrinsicEra>': Option<ExtrinsicEra>;
|
||||
'Vec<ExtrinsicEra>': Vec<ExtrinsicEra>;
|
||||
ExtrinsicPayload: ExtrinsicPayload;
|
||||
'Option<ExtrinsicPayload>': Option<ExtrinsicPayload>;
|
||||
'Vec<ExtrinsicPayload>': Vec<ExtrinsicPayload>;
|
||||
Extrinsic: Extrinsic;
|
||||
'Option<Extrinsic>': Option<Extrinsic>;
|
||||
'Vec<Extrinsic>': Vec<Extrinsic>;
|
||||
AuthorityId: AuthorityId;
|
||||
'Option<AuthorityId>': Option<AuthorityId>;
|
||||
'Vec<AuthorityId>': Vec<AuthorityId>;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// Auto-generated via `yarn build:interfaces`, do not edit
|
||||
|
||||
import { Enum, Struct } from '../../codec';
|
||||
import { Method, u32 } from '../../primitive';
|
||||
import { BlockNumber } from '../runtime';
|
||||
import { u32 } from '../../primitive';
|
||||
import { BlockNumber, Method } from '../runtime';
|
||||
import { VoteThreshold } from '../elections';
|
||||
|
||||
/** Enum */
|
||||
|
||||
@@ -7,7 +7,7 @@ import '../../injector';
|
||||
import extrinsics from '@polkadot/api-metadata/extrinsics/static';
|
||||
|
||||
import createType from '../../codec/createType';
|
||||
import Method from '../../primitive/Method';
|
||||
import Method from '../../primitive/Generic/Method';
|
||||
import events from '../../json/SignedBlock.002.json';
|
||||
import immortalTxs from '../../json/SignedBlock.004.immortal.json';
|
||||
import mortalTxs from '../../json/SignedBlock.004.mortal.json';
|
||||
|
||||
@@ -55,6 +55,15 @@ export default {
|
||||
KeyValue: '(StorageKey, StorageData)',
|
||||
ValidatorId: 'AccountId',
|
||||
Weight: 'u32',
|
||||
WeightMultiplier: 'Fixed64'
|
||||
WeightMultiplier: 'Fixed64',
|
||||
|
||||
// extrinsics
|
||||
Method: 'GenericMethod',
|
||||
Origin: 'GenericOrigin',
|
||||
ImmortalEra: 'GenericImmortalEra',
|
||||
MortalEra: 'GenericMortalEra',
|
||||
ExtrinsicEra: 'GenericExtrinsicEra',
|
||||
ExtrinsicPayload: 'GenericExtrinsicPayload',
|
||||
Extrinsic: 'GenericExtrinsic'
|
||||
}
|
||||
};
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import { Codec } from '../../types';
|
||||
import { Compact, Struct, Vec } from '../../codec';
|
||||
import { Bytes, Fixed64, GenericAccountId, GenericAccountIndex, GenericAddress, GenericBlock, GenericConsensusEngineId, GenericDigest, GenericDigestItem, H256, H512, Null, StorageKey, u128, u32, u64, u8 } from '../../primitive';
|
||||
import { Bytes, Fixed64, GenericAccountId, GenericAccountIndex, GenericAddress, GenericBlock, GenericConsensusEngineId, GenericDigest, GenericDigestItem, GenericExtrinsic, GenericExtrinsicEra, GenericExtrinsicPayload, GenericImmortalEra, GenericMethod, GenericMortalEra, GenericOrigin, H256, H512, Null, StorageKey, u128, u32, u64, u8 } from '../../primitive';
|
||||
|
||||
/** GenericAccountId */
|
||||
export type AccountId = GenericAccountId;
|
||||
@@ -43,6 +43,15 @@ export type DigestItem = GenericDigestItem;
|
||||
/** Signature */
|
||||
export type Ed25519Signature = Signature;
|
||||
|
||||
/** GenericExtrinsic */
|
||||
export type Extrinsic = GenericExtrinsic;
|
||||
|
||||
/** GenericExtrinsicEra */
|
||||
export type ExtrinsicEra = GenericExtrinsicEra;
|
||||
|
||||
/** GenericExtrinsicPayload */
|
||||
export type ExtrinsicPayload = GenericExtrinsicPayload;
|
||||
|
||||
/** H256 */
|
||||
export type Hash = H256;
|
||||
|
||||
@@ -60,6 +69,9 @@ export interface Header extends Struct {
|
||||
readonly digest: Digest;
|
||||
}
|
||||
|
||||
/** GenericImmortalEra */
|
||||
export type ImmortalEra = GenericImmortalEra;
|
||||
|
||||
/** u64 */
|
||||
export type Index = u64;
|
||||
|
||||
@@ -75,6 +87,15 @@ export type KeyValue = [StorageKey, StorageData] & Codec;
|
||||
/** Vec<u8> */
|
||||
export type LockIdentifier = Vec<u8>;
|
||||
|
||||
/** GenericMethod */
|
||||
export type Method = GenericMethod;
|
||||
|
||||
/** GenericMortalEra */
|
||||
export type MortalEra = GenericMortalEra;
|
||||
|
||||
/** GenericOrigin */
|
||||
export type Origin = GenericOrigin;
|
||||
|
||||
/** u32 */
|
||||
export type Perbill = u32;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import extrinsics from '@polkadot/api-metadata/extrinsics/static';
|
||||
|
||||
import { hexToU8a } from '@polkadot/util';
|
||||
|
||||
import Method from '../Method';
|
||||
import Method from '../Generic/Method';
|
||||
import Extrinsic from './Extrinsic';
|
||||
|
||||
describe('Extrinsic', (): void => {
|
||||
|
||||
@@ -11,7 +11,7 @@ import Base from '../../codec/Base';
|
||||
import Compact from '../../codec/Compact';
|
||||
import { FunctionMetadata } from '../../Metadata/v7/Calls';
|
||||
import Address from '../Generic/Address';
|
||||
import Method from '../Method';
|
||||
import Method from '../Generic/Method';
|
||||
import ExtrinsicV1, { ExtrinsicValueV1 } from './v1/Extrinsic';
|
||||
import ExtrinsicV2, { ExtrinsicValueV2 } from './v2/Extrinsic';
|
||||
import ExtrinsicEra from './ExtrinsicEra';
|
||||
|
||||
+12
-12
@@ -11,36 +11,36 @@ import createType from '../../codec/createType';
|
||||
import Base from '../../codec/Base';
|
||||
import Compact from '../../codec/Compact';
|
||||
import U8a from '../../codec/U8a';
|
||||
import SignaturePayloadV1, { SignaturePayloadValueV1 } from './v1/SignaturePayload';
|
||||
import SignaturePayloadV2, { SignaturePayloadValueV2 } from './v2/SignaturePayload';
|
||||
import ExtrinsicPayloadV1, { ExtrinsicPayloadValueV1 } from './v1/ExtrinsicPayload';
|
||||
import ExtrinsicPayloadV2, { ExtrinsicPayloadValueV2 } from './v2/ExtrinsicPayload';
|
||||
import ExtrinsicEra from './ExtrinsicEra';
|
||||
import { DEFAULT_VERSION } from './constants';
|
||||
|
||||
interface SignaturePayloadOptions {
|
||||
interface ExtrinsicPayloadOptions {
|
||||
version?: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* @name SignaturePayload
|
||||
* @name ExtrinsicPayload
|
||||
* @description
|
||||
* A signing payload for an [[Extrinsic]]. For the final encoding, it is variable length based
|
||||
* on the contents included
|
||||
*/
|
||||
export default class SignaturePayload extends Base<SignaturePayloadV1 | SignaturePayloadV2> {
|
||||
public constructor (value: SignaturePayloadValueV1 | SignaturePayloadValueV2 | Uint8Array | string | undefined, { version }: SignaturePayloadOptions = {}) {
|
||||
export default class ExtrinsicPayload extends Base<ExtrinsicPayloadV1 | ExtrinsicPayloadV2> {
|
||||
public constructor (value: Partial<ExtrinsicPayloadValueV1> | Partial<ExtrinsicPayloadValueV2> | Uint8Array | string | undefined, { version }: ExtrinsicPayloadOptions = {}) {
|
||||
super(
|
||||
SignaturePayload.decodeSignaturePayload(value, version)
|
||||
ExtrinsicPayload.decodeExtrinsicPayload(value, version)
|
||||
);
|
||||
}
|
||||
|
||||
public static decodeSignaturePayload (value: SignaturePayload | SignaturePayloadValueV1 | SignaturePayloadValueV2 | Uint8Array | string | undefined, version: number = DEFAULT_VERSION): SignaturePayloadV1 | SignaturePayloadV2 {
|
||||
if (value instanceof SignaturePayload) {
|
||||
public static decodeExtrinsicPayload (value: ExtrinsicPayload | Partial<ExtrinsicPayloadValueV1> | Partial<ExtrinsicPayloadValueV2> | Uint8Array | string | undefined, version: number = DEFAULT_VERSION): ExtrinsicPayloadV1 | ExtrinsicPayloadV2 {
|
||||
if (value instanceof ExtrinsicPayload) {
|
||||
return value.raw;
|
||||
}
|
||||
|
||||
switch (version) {
|
||||
case 1: return new SignaturePayloadV1(value as Uint8Array);
|
||||
case 2: return new SignaturePayloadV2(value as Uint8Array);
|
||||
case 1: return new ExtrinsicPayloadV1(value as Uint8Array);
|
||||
case 2: return new ExtrinsicPayloadV2(value as Uint8Array);
|
||||
default: throw new Error(`Unsupported extrinsic version ${version}`);
|
||||
}
|
||||
}
|
||||
@@ -77,7 +77,7 @@ export default class SignaturePayload extends Base<SignaturePayloadV1 | Signatur
|
||||
* @description The [[Balance]]
|
||||
*/
|
||||
public get tip (): Compact<Balance> {
|
||||
return (this.raw as SignaturePayloadV2).tip || createType('Compact<Balance>', 0);
|
||||
return (this.raw as ExtrinsicPayloadV2).tip || createType('Compact<Balance>', 0);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2,6 +2,6 @@
|
||||
// This software may be modified and distributed under the terms
|
||||
// of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
export { default as Extrinsic } from './Extrinsic';
|
||||
export { default as ExtrinsicEra, MortalEra, ImmortalEra } from './ExtrinsicEra';
|
||||
export { default as SignaturePayload } from './SignaturePayload';
|
||||
export { default as GenericExtrinsic } from './Extrinsic';
|
||||
export { default as GenericExtrinsicEra, MortalEra as GenericMortalEra, ImmortalEra as GenericImmortalEra } from './ExtrinsicEra';
|
||||
export { default as GenericExtrinsicPayload } from './ExtrinsicPayload';
|
||||
|
||||
@@ -7,7 +7,7 @@ import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, SignatureOptions }
|
||||
import { isU8a } from '@polkadot/util';
|
||||
|
||||
import Struct from '../../../codec/Struct';
|
||||
import Method from '../../Method';
|
||||
import Method from '../../Generic/Method';
|
||||
import Address from '../../Generic/Address';
|
||||
import ExtrinsicSignature from './ExtrinsicSignature';
|
||||
|
||||
|
||||
+4
-4
@@ -12,7 +12,7 @@ import U8a from '../../../codec/U8a';
|
||||
import ExtrinsicEra from '../ExtrinsicEra';
|
||||
import { sign } from '../util';
|
||||
|
||||
export interface SignaturePayloadValueV1 {
|
||||
export interface ExtrinsicPayloadValueV1 {
|
||||
blockHash: AnyU8a;
|
||||
era: AnyU8a | IExtrinsicEra;
|
||||
method: AnyU8a | IMethod;
|
||||
@@ -20,7 +20,7 @@ export interface SignaturePayloadValueV1 {
|
||||
}
|
||||
|
||||
/**
|
||||
* @name SignaturePayloadV1
|
||||
* @name ExtrinsicPayloadV1
|
||||
* @description
|
||||
* A signing payload for an [[Extrinsic]]. For the final encoding, it is variable length based
|
||||
* on the contents included
|
||||
@@ -30,8 +30,8 @@ export interface SignaturePayloadValueV1 {
|
||||
* 1/2 bytes: The Transaction Era as provided in the transaction itself.
|
||||
* 32 bytes: The hash of the authoring block implied by the Transaction Era and the current block.
|
||||
*/
|
||||
export default class SignaturePayloadV1 extends Struct {
|
||||
public constructor (value?: ExtrinsicPayloadValue | SignaturePayloadValueV1 | Uint8Array | string) {
|
||||
export default class ExtrinsicPayloadV1 extends Struct {
|
||||
public constructor (value?: ExtrinsicPayloadValue | ExtrinsicPayloadValueV1 | Uint8Array | string) {
|
||||
super({
|
||||
nonce: ClassOf('Compact<Index>'),
|
||||
method: U8a,
|
||||
@@ -9,10 +9,10 @@ import createType, { ClassOf } from '../../../codec/createType';
|
||||
import Compact from '../../../codec/Compact';
|
||||
import Struct from '../../../codec/Struct';
|
||||
import Address from '../../Generic/Address';
|
||||
import Method from '../../Method';
|
||||
import Method from '../../Generic/Method';
|
||||
import ExtrinsicEra from '../ExtrinsicEra';
|
||||
import { EMPTY_U8A, IMMORTAL_ERA } from '../constants';
|
||||
import SignaturePayload from './SignaturePayload';
|
||||
import ExtrinsicPayload from './ExtrinsicPayload';
|
||||
|
||||
interface ExtrinsicSignatureV1Options {
|
||||
isSigned?: boolean;
|
||||
@@ -92,7 +92,7 @@ export default class ExtrinsicSignatureV1 extends Struct implements IExtrinsicSi
|
||||
return createType('Compact<Balance>', 0);
|
||||
}
|
||||
|
||||
private injectSignature (signer: Address, signature: Signature, { era, nonce }: SignaturePayload): IExtrinsicSignature {
|
||||
private injectSignature (signer: Address, signature: Signature, { era, nonce }: ExtrinsicPayload): IExtrinsicSignature {
|
||||
this.set('era', era);
|
||||
this.set('nonce', nonce);
|
||||
this.set('signer', signer);
|
||||
@@ -108,7 +108,7 @@ export default class ExtrinsicSignatureV1 extends Struct implements IExtrinsicSi
|
||||
return this.injectSignature(
|
||||
createType('Address', signer),
|
||||
createType('Signature', signature),
|
||||
new SignaturePayload(payload)
|
||||
new ExtrinsicPayload(payload)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ export default class ExtrinsicSignatureV1 extends Struct implements IExtrinsicSi
|
||||
*/
|
||||
public sign (method: Method, account: IKeyringPair, { blockHash, era, nonce }: SignatureOptions): IExtrinsicSignature {
|
||||
const signer = createType('Address', account.publicKey);
|
||||
const payload = new SignaturePayload({
|
||||
const payload = new ExtrinsicPayload({
|
||||
nonce,
|
||||
method: method.toU8a(),
|
||||
era: era || IMMORTAL_ERA,
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import extrinsics from '@polkadot/api-metadata/extrinsics/static';
|
||||
import testingPairs from '@polkadot/keyring/testingPairs';
|
||||
|
||||
import Method from '../../Method';
|
||||
import Method from '../../Generic/Method';
|
||||
import Extrinsic from './Extrinsic';
|
||||
|
||||
const keyring = testingPairs({ type: 'ed25519' }, false);
|
||||
|
||||
@@ -7,7 +7,7 @@ import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, SignatureOptions }
|
||||
import { isU8a } from '@polkadot/util';
|
||||
|
||||
import Struct from '../../../codec/Struct';
|
||||
import Method from '../../Method';
|
||||
import Method from '../../Generic/Method';
|
||||
import Address from '../../Generic/Address';
|
||||
import ExtrinsicSignature from './ExtrinsicSignature';
|
||||
|
||||
|
||||
+4
-4
@@ -12,7 +12,7 @@ import U8a from '../../../codec/U8a';
|
||||
import ExtrinsicEra from '../ExtrinsicEra';
|
||||
import { sign } from '../util';
|
||||
|
||||
export interface SignaturePayloadValueV2 {
|
||||
export interface ExtrinsicPayloadValueV2 {
|
||||
blockHash: AnyU8a;
|
||||
era: AnyU8a | IExtrinsicEra;
|
||||
method: AnyU8a | IMethod;
|
||||
@@ -21,13 +21,13 @@ export interface SignaturePayloadValueV2 {
|
||||
}
|
||||
|
||||
/**
|
||||
* @name SignaturePayloadV2
|
||||
* @name ExtrinsicPayloadV2
|
||||
* @description
|
||||
* A signing payload for an [[Extrinsic]]. For the final encoding, it is variable length based
|
||||
* on the contents included
|
||||
*/
|
||||
export default class SignaturePayloadV2 extends Struct {
|
||||
public constructor (value?: ExtrinsicPayloadValue | SignaturePayloadValueV2 | Uint8Array | string) {
|
||||
export default class ExtrinsicPayloadV2 extends Struct {
|
||||
public constructor (value?: ExtrinsicPayloadValue | ExtrinsicPayloadValueV2 | Uint8Array | string) {
|
||||
super({
|
||||
method: U8a,
|
||||
era: ExtrinsicEra,
|
||||
@@ -9,9 +9,9 @@ import createType, { ClassOf } from '../../../codec/createType';
|
||||
import Compact from '../../../codec/Compact';
|
||||
import Struct from '../../../codec/Struct';
|
||||
import Address from '../../Generic/Address';
|
||||
import Method from '../../Method';
|
||||
import Method from '../../Generic/Method';
|
||||
import ExtrinsicEra from '../ExtrinsicEra';
|
||||
import SignaturePayload from './SignaturePayload';
|
||||
import ExtrinsicPayload from './ExtrinsicPayload';
|
||||
import { EMPTY_U8A, IMMORTAL_ERA } from '../constants';
|
||||
import ExtrinsicExtra from './ExtrinsicExtra';
|
||||
|
||||
@@ -94,7 +94,7 @@ export default class ExtrinsicSignatureV2 extends Struct implements IExtrinsicSi
|
||||
return this.extra.tip;
|
||||
}
|
||||
|
||||
private injectSignature (signer: Address, signature: Signature, { era, nonce, tip }: SignaturePayload): IExtrinsicSignature {
|
||||
private injectSignature (signer: Address, signature: Signature, { era, nonce, tip }: ExtrinsicPayload): IExtrinsicSignature {
|
||||
this.extra.set('era', era);
|
||||
this.extra.set('nonce', nonce);
|
||||
this.extra.set('tip', tip);
|
||||
@@ -112,7 +112,7 @@ export default class ExtrinsicSignatureV2 extends Struct implements IExtrinsicSi
|
||||
return this.injectSignature(
|
||||
createType('Address', signer),
|
||||
createType('Signature', signature),
|
||||
new SignaturePayload(payload)
|
||||
new ExtrinsicPayload(payload)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@ export default class ExtrinsicSignatureV2 extends Struct implements IExtrinsicSi
|
||||
*/
|
||||
public sign (method: Method, account: IKeyringPair, { blockHash, era, nonce, tip }: SignatureOptions): IExtrinsicSignature {
|
||||
const signer = createType('Address', account.publicKey);
|
||||
const payload = new SignaturePayload({
|
||||
const payload = new ExtrinsicPayload({
|
||||
blockHash,
|
||||
era: era || IMMORTAL_ERA,
|
||||
method: method.toU8a(),
|
||||
|
||||
@@ -7,7 +7,7 @@ import '../../injector';
|
||||
import extrinsics from '@polkadot/api-metadata/extrinsics/static';
|
||||
|
||||
import block00300 from '../../json/SignedBlock.003.00.json';
|
||||
import Method from '../Method';
|
||||
import Method from './Method';
|
||||
import Block from './Block';
|
||||
|
||||
describe('Block', (): void => {
|
||||
|
||||
+5
-5
@@ -2,14 +2,14 @@
|
||||
// This software may be modified and distributed under the terms
|
||||
// of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
import { AnyU8a, ArgsDef, Codec, IMethod } from '../types';
|
||||
import { AnyU8a, ArgsDef, Codec, IMethod } from '../../types';
|
||||
|
||||
import { assert, isHex, isObject, isU8a, hexToU8a } from '@polkadot/util';
|
||||
|
||||
import { getTypeDef, getTypeClass } from '../codec/createType';
|
||||
import Struct from '../codec/Struct';
|
||||
import U8aFixed from '../codec/U8aFixed';
|
||||
import { FunctionMetadata as FunctionMetadataV7, FunctionArgumentMetadata } from '../Metadata/v7/Calls';
|
||||
import { getTypeDef, getTypeClass } from '../../codec/createType';
|
||||
import Struct from '../../codec/Struct';
|
||||
import U8aFixed from '../../codec/U8aFixed';
|
||||
import { FunctionMetadata as FunctionMetadataV7, FunctionArgumentMetadata } from '../../Metadata/v7/Calls';
|
||||
|
||||
interface DecodeMethodInput {
|
||||
args: any;
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
// This software may be modified and distributed under the terms
|
||||
// of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
import Null from './Null';
|
||||
import Null from '../Null';
|
||||
|
||||
/**
|
||||
* @name Origin
|
||||
@@ -9,4 +9,6 @@ export { default as GenericBlock } from './Block';
|
||||
export { default as GenericConsensusEngineId } from './ConsensusEngineId';
|
||||
export { default as GenericEvent } from './Event';
|
||||
export { default as GenericDigest, DigestItem as GenericDigestItem } from './Digest';
|
||||
export { default as GenericMethod } from './Method';
|
||||
export { default as GenericOrigin } from './Origin';
|
||||
export { default as GenericVote } from './Vote';
|
||||
|
||||
@@ -25,10 +25,8 @@ export { default as i64 } from './I64';
|
||||
export { default as Fixed64 } from './I64Fixed';
|
||||
export { default as i128 } from './I128';
|
||||
export { default as i256 } from './I256';
|
||||
export { default as Method } from './Method';
|
||||
export { default as Moment } from './Moment';
|
||||
export { default as Null } from './Null';
|
||||
export { default as Origin } from './Origin';
|
||||
export { default as StorageHasher } from './StorageHasher';
|
||||
export { default as StorageKey } from './StorageKey';
|
||||
export { default as Text } from './Text';
|
||||
|
||||
@@ -8,7 +8,7 @@ import fs from 'fs';
|
||||
import { stringCamelCase, stringLowerFirst } from '@polkadot/util';
|
||||
|
||||
import interfaces from '../../../type-jsonrpc/src';
|
||||
import Method from '../primitive/Method';
|
||||
import Method from '../primitive/Generic/Method';
|
||||
import Metadata from '../Metadata';
|
||||
import rpcdata from '../Metadata/static';
|
||||
import MetadataV7, { ModuleMetadataV7 } from '../Metadata/v7';
|
||||
|
||||
@@ -348,14 +348,19 @@ function generateInterfaceRegistry (): void {
|
||||
|
||||
const imports = { codecTypes, localTypes, ownTypes, primitiveTypes, substrateTypes };
|
||||
|
||||
const primitives = Object.keys(primitiveClasses).reduce((accumulator, primitiveName): string => {
|
||||
setImports(imports, [primitiveName]);
|
||||
const primitives = Object
|
||||
.keys(primitiveClasses)
|
||||
.filter((name): boolean =>
|
||||
!!name.indexOf('Generic') && !!name.indexOf('Metadata')
|
||||
)
|
||||
.reduce((accumulator, primitiveName): string => {
|
||||
setImports(imports, [primitiveName]);
|
||||
|
||||
return [
|
||||
accumulator,
|
||||
getDerivedTypes(primitiveName, primitiveName, imports)
|
||||
].join('\n');
|
||||
}, '');
|
||||
return [
|
||||
accumulator,
|
||||
getDerivedTypes(primitiveName, primitiveName, imports)
|
||||
].join('\n');
|
||||
}, '');
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
const srml = Object.entries(definitions).reduce((accumulator, [_defName, { types }]): string => {
|
||||
|
||||
@@ -9,7 +9,7 @@ import BN from 'bn.js';
|
||||
import Compact from './codec/Compact';
|
||||
import U8a from './codec/U8a';
|
||||
import { FunctionMetadata } from './Metadata/v7/Calls';
|
||||
import Method from './primitive/Method';
|
||||
import Method from './primitive/Generic/Method';
|
||||
import Address from './primitive/Generic/Address';
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/interface-name-prefix
|
||||
|
||||
Reference in New Issue
Block a user