diff --git a/packages/types/src/extrinsic/Extrinsic.ts b/packages/types/src/extrinsic/Extrinsic.ts index c7c04835bc..d6f089b293 100644 --- a/packages/types/src/extrinsic/Extrinsic.ts +++ b/packages/types/src/extrinsic/Extrinsic.ts @@ -195,7 +195,7 @@ abstract class ExtrinsicBase extends AbstractBase | IOption { + public get assetId (): IOption { return this.inner.signature.assetId; } @@ -324,7 +324,7 @@ export class GenericExtrinsic extends ExtrinsicBa }, this.isSigned ? { - assetId: this.assetId.toHuman(isExpanded, disableAscii), + assetId: this.assetId ? this.assetId.toHuman(isExpanded, disableAscii) : null, era: this.era.toHuman(isExpanded, disableAscii), nonce: this.nonce.toHuman(isExpanded, disableAscii), signature: this.signature.toHex(), diff --git a/packages/types/src/extrinsic/ExtrinsicPayload.ts b/packages/types/src/extrinsic/ExtrinsicPayload.ts index 893bae42e1..5dcba1a8fd 100644 --- a/packages/types/src/extrinsic/ExtrinsicPayload.ts +++ b/packages/types/src/extrinsic/ExtrinsicPayload.ts @@ -113,7 +113,7 @@ export class GenericExtrinsicPayload extends AbstractBase { /** * @description The (optional) asset id as a [[u32]] or [[MultiLocation]] for this payload */ - public get assetId (): IOption> { + public get assetId (): IOption { return this.inner.assetId; } diff --git a/packages/types/src/extrinsic/SignerPayload.ts b/packages/types/src/extrinsic/SignerPayload.ts index 727005a37f..314fb1e82d 100644 --- a/packages/types/src/extrinsic/SignerPayload.ts +++ b/packages/types/src/extrinsic/SignerPayload.ts @@ -104,7 +104,7 @@ export class GenericSignerPayload extends Struct implements ISignerPayload, Sign return this.getT('tip'); } - get assetId (): IOption | IOption { + get assetId (): IOption { return this.getT('assetId'); } diff --git a/packages/types/src/extrinsic/v4/ExtrinsicPayload.ts b/packages/types/src/extrinsic/v4/ExtrinsicPayload.ts index 35fa26684e..18349a41d4 100644 --- a/packages/types/src/extrinsic/v4/ExtrinsicPayload.ts +++ b/packages/types/src/extrinsic/v4/ExtrinsicPayload.ts @@ -105,7 +105,7 @@ export class GenericExtrinsicPayloadV4 extends Struct { /** * @description The (optional) asset id for this signature for chains that support transaction fees in assets */ - public get assetId (): IOption> { + public get assetId (): IOption { return this.getT('assetId'); } diff --git a/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts b/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts index 9b088ace33..96188f62f9 100644 --- a/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts +++ b/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts @@ -122,7 +122,7 @@ export class GenericExtrinsicSignatureV4 extends Struct implements IExtrinsicSig /** * @description The [[u32]] or [[MultiLocation]] assetId */ - public get assetId (): IOption | IOption { + public get assetId (): IOption { return this.getT('assetId'); }