fix: updated extrinsics' assetId toHuman (#5879)

polkadot-js · May 15, 2024 · 365fde8 · 365fde8
1 parent b17a6d3
commit 365fde8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/packages/types/src/extrinsic/Extrinsic.ts b/packages/types/src/extrinsic/Extrinsic.ts
@@ -195,7 +195,7 @@ abstract class ExtrinsicBase<A extends AnyTuple> extends AbstractBase<ExtrinsicV
   /**
    * @description Forward compat
    */
-  public get assetId (): IOption<INumber> | IOption<MultiLocation> {
+  public get assetId (): IOption<INumber | MultiLocation> {
     return this.inner.signature.assetId;
   }
 
@@ -324,7 +324,7 @@ export class GenericExtrinsic<A extends AnyTuple = AnyTuple> 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
@@ -113,7 +113,7 @@ export class GenericExtrinsicPayload extends AbstractBase<ExtrinsicPayloadVx> {
   /**
    * @description The (optional) asset id as a [[u32]] or [[MultiLocation]] for this payload
    */
-  public get assetId (): IOption<INumber | IOption<MultiLocation>> {
+  public get assetId (): IOption<INumber | MultiLocation> {
     return this.inner.assetId;
   }
 

diff --git 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<INumber> | IOption<MultiLocation> {
+  get assetId (): IOption<INumber | MultiLocation> {
     return this.getT('assetId');
   }
 

diff --git 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<INumber | IOption<MultiLocation>> {
+  public get assetId (): IOption<INumber | MultiLocation> {
     return this.getT('assetId');
   }
 

diff --git 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<INumber> | IOption<MultiLocation> {
+  public get assetId (): IOption<INumber | MultiLocation> {
     return this.getT('assetId');
   }