symbol · rg911 · May 19, 2020 · May 19, 2020
diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts
@@ -50,6 +50,8 @@ export class AccountAddressRestrictionTransaction extends Transaction {
      * @param restrictionDeletions - Account restriction deletions.
      * @param networkType - The network type.
      * @param maxFee - (Optional) Max fee defined by the sender
+     * @param signature - (Optional) Transaction signature
+     * @param signer - (Optional) Signer public account
      * @returns {AccountAddressRestrictionTransaction}
      */
     public static create(
@@ -59,6 +61,8 @@ export class AccountAddressRestrictionTransaction extends Transaction {
         restrictionDeletions: (Address | NamespaceId)[],
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
+        signature?: string,
+        signer?: PublicAccount,
     ): AccountAddressRestrictionTransaction {
         return new AccountAddressRestrictionTransaction(
             networkType,
@@ -68,6 +72,8 @@ export class AccountAddressRestrictionTransaction extends Transaction {
             restrictionFlags,
             restrictionAdditions,
             restrictionDeletions,
+            signature,
+            signer,
         );
     }
 
@@ -110,6 +116,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
             : AccountAddressRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
         const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
         const networkType = builder.getNetwork().valueOf();
+        const signature = payload.substring(16, 144);
         const transaction = AccountAddressRestrictionTransaction.create(
             isEmbedded
                 ? Deadline.create()
@@ -123,6 +130,8 @@ export class AccountAddressRestrictionTransaction extends Transaction {
             }),
             networkType,
             isEmbedded ? new UInt64([0, 0]) : new UInt64((builder as AccountAddressRestrictionTransactionBuilder).fee.amount),
+            isEmbedded || signature.match(`^[0]+$`) ? undefined : signature,
+            signerPublicKey.match(`^[0]+$`) ? undefined : PublicAccount.createFromPublicKey(signerPublicKey, networkType),
         );
         return isEmbedded ? transaction.toAggregate(PublicAccount.createFromPublicKey(signerPublicKey, networkType)) : transaction;
     }
@@ -160,8 +169,8 @@ export class AccountAddressRestrictionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-        const signatureBuffer = new Uint8Array(64);
+        const signerBuffer = this.signer !== undefined ? Convert.hexToUint8(this.signer.publicKey) : new Uint8Array(32);
+        const signatureBuffer = this.signature !== undefined ? Convert.hexToUint8(this.signature) : new Uint8Array(64);
 
         const transactionBuilder = new AccountAddressRestrictionTransactionBuilder(
             new SignatureDto(signatureBuffer),

diff --git a/src/model/transaction/AccountKeyLinkTransaction.ts b/src/model/transaction/AccountKeyLinkTransaction.ts
@@ -46,6 +46,8 @@ export class AccountKeyLinkTransaction extends Transaction {
      * @param remotePublicKey - The public key of the remote account.
      * @param linkAction - The account link action.
      * @param maxFee - (Optional) Max fee defined by the sender
+     * @param signature - (Optional) Transaction signature
+     * @param signer - (Optional) Signer public account
      * @returns {AccountLinkTransaction}
      */
     public static create(
@@ -54,6 +56,8 @@ export class AccountKeyLinkTransaction extends Transaction {
         linkAction: LinkAction,
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
+        signature?: string,
+        signer?: PublicAccount,
     ): AccountKeyLinkTransaction {
         return new AccountKeyLinkTransaction(
             networkType,
@@ -62,6 +66,8 @@ export class AccountKeyLinkTransaction extends Transaction {
             maxFee,
             remotePublicKey,
             linkAction,
+            signature,
+            signer,
         );
     }
 
@@ -108,12 +114,15 @@ export class AccountKeyLinkTransaction extends Transaction {
             : AccountKeyLinkTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
         const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
         const networkType = builder.getNetwork().valueOf();
+        const signature = payload.substring(16, 144);
         const transaction = AccountKeyLinkTransaction.create(
             isEmbedded ? Deadline.create() : Deadline.createFromDTO((builder as AccountKeyLinkTransactionBuilder).getDeadline().timestamp),
             Convert.uint8ToHex(builder.getRemotePublicKey().key),
             builder.getLinkAction().valueOf(),
             networkType,
             isEmbedded ? new UInt64([0, 0]) : new UInt64((builder as AccountKeyLinkTransactionBuilder).fee.amount),
+            isEmbedded || signature.match(`^[0]+$`) ? undefined : signature,
+            signerPublicKey.match(`^[0]+$`) ? undefined : PublicAccount.createFromPublicKey(signerPublicKey, networkType),
         );
         return isEmbedded ? transaction.toAggregate(PublicAccount.createFromPublicKey(signerPublicKey, networkType)) : transaction;
     }
@@ -139,8 +148,8 @@ export class AccountKeyLinkTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-        const signatureBuffer = new Uint8Array(64);
+        const signerBuffer = this.signer !== undefined ? Convert.hexToUint8(this.signer.publicKey) : new Uint8Array(32);
+        const signatureBuffer = this.signature !== undefined ? Convert.hexToUint8(this.signature) : new Uint8Array(64);
 
         const transactionBuilder = new AccountKeyLinkTransactionBuilder(
             new SignatureDto(signatureBuffer),

diff --git a/src/model/transaction/AccountMetadataTransaction.ts b/src/model/transaction/AccountMetadataTransaction.ts
@@ -49,6 +49,8 @@ export class AccountMetadataTransaction extends Transaction {
      *                You can calculate value as xor(previous-value, new-value).
      *                If there is no previous value, use directly the new value.
      * @param maxFee - (Optional) Max fee defined by the sender
+     * @param signature - (Optional) Transaction signature
+     * @param signer - (Optional) Signer public account
      * @returns {AccountMetadataTransaction}
      */
     public static create(
@@ -59,6 +61,8 @@ export class AccountMetadataTransaction extends Transaction {
         value: string,
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
+        signature?: string,
+        signer?: PublicAccount,
     ): AccountMetadataTransaction {
         return new AccountMetadataTransaction(
             networkType,
@@ -69,6 +73,8 @@ export class AccountMetadataTransaction extends Transaction {
             scopedMetadataKey,
             valueSizeDelta,
             value,
+            signature,
+            signer,
         );
     }
 
@@ -126,6 +132,7 @@ export class AccountMetadataTransaction extends Transaction {
             : AccountMetadataTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
         const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
         const networkType = builder.getNetwork().valueOf();
+        const signature = payload.substring(16, 144);
         const transaction = AccountMetadataTransaction.create(
             isEmbedded ? Deadline.create() : Deadline.createFromDTO((builder as AccountMetadataTransactionBuilder).getDeadline().timestamp),
             Convert.uint8ToHex(builder.getTargetPublicKey().key),
@@ -134,6 +141,8 @@ export class AccountMetadataTransaction extends Transaction {
             Convert.uint8ToUtf8(builder.getValue()),
             networkType,
             isEmbedded ? new UInt64([0, 0]) : new UInt64((builder as AccountMetadataTransactionBuilder).fee.amount),
+            isEmbedded || signature.match(`^[0]+$`) ? undefined : signature,
+            signerPublicKey.match(`^[0]+$`) ? undefined : PublicAccount.createFromPublicKey(signerPublicKey, networkType),
         );
         return isEmbedded ? transaction.toAggregate(PublicAccount.createFromPublicKey(signerPublicKey, networkType)) : transaction;
     }
@@ -161,8 +170,8 @@ export class AccountMetadataTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-        const signatureBuffer = new Uint8Array(64);
+        const signerBuffer = this.signer !== undefined ? Convert.hexToUint8(this.signer.publicKey) : new Uint8Array(32);
+        const signatureBuffer = this.signature !== undefined ? Convert.hexToUint8(this.signature) : new Uint8Array(64);
 
         const transactionBuilder = new AccountMetadataTransactionBuilder(
             new SignatureDto(signatureBuffer),

diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts
@@ -50,6 +50,8 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
      * @param restrictionDeletions - Account restriction deletions.
      * @param networkType - The network type.
      * @param maxFee - (Optional) Max fee defined by the sender
+     * @param signature - (Optional) Transaction signature
+     * @param signer - (Optional) Signer public account
      * @returns {AccountAddressRestrictionTransaction}
      */
     public static create(
@@ -59,6 +61,8 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
         restrictionDeletions: (MosaicId | NamespaceId)[],
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
+        signature?: string,
+        signer?: PublicAccount,
     ): AccountMosaicRestrictionTransaction {
         return new AccountMosaicRestrictionTransaction(
             networkType,
@@ -68,6 +72,8 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
             restrictionFlags,
             restrictionAdditions,
             restrictionDeletions,
+            signature,
+            signer,
         );
     }
 
@@ -110,6 +116,7 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
             : AccountMosaicRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
         const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
         const networkType = builder.getNetwork().valueOf();
+        const signature = payload.substring(16, 144);
         const transaction = AccountMosaicRestrictionTransaction.create(
             isEmbedded
                 ? Deadline.create()
@@ -123,6 +130,8 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
             }),
             networkType,
             isEmbedded ? new UInt64([0, 0]) : new UInt64((builder as AccountMosaicRestrictionTransactionBuilder).fee.amount),
+            isEmbedded || signature.match(`^[0]+$`) ? undefined : signature,
+            signerPublicKey.match(`^[0]+$`) ? undefined : PublicAccount.createFromPublicKey(signerPublicKey, networkType),
         );
         return isEmbedded ? transaction.toAggregate(PublicAccount.createFromPublicKey(signerPublicKey, networkType)) : transaction;
     }
@@ -160,8 +169,8 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-        const signatureBuffer = new Uint8Array(64);
+        const signerBuffer = this.signer !== undefined ? Convert.hexToUint8(this.signer.publicKey) : new Uint8Array(32);
+        const signatureBuffer = this.signature !== undefined ? Convert.hexToUint8(this.signature) : new Uint8Array(64);
 
         const transactionBuilder = new AccountMosaicRestrictionTransactionBuilder(
             new SignatureDto(signatureBuffer),

diff --git a/src/model/transaction/AccountOperationRestrictionTransaction.ts b/src/model/transaction/AccountOperationRestrictionTransaction.ts
@@ -44,6 +44,8 @@ export class AccountOperationRestrictionTransaction extends Transaction {
      * @param restrictionDeletions - Account restriction deletions.
      * @param networkType - The network type.
      * @param maxFee - (Optional) Max fee defined by the sender
+     * @param signature - (Optional) Transaction signature
+     * @param signer - (Optional) Signer public account
      * @returns {AccountOperationRestrictionTransaction}
      */
     public static create(
@@ -53,6 +55,8 @@ export class AccountOperationRestrictionTransaction extends Transaction {
         restrictionDeletions: TransactionType[],
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
+        signature?: string,
+        signer?: PublicAccount,
     ): AccountOperationRestrictionTransaction {
         return new AccountOperationRestrictionTransaction(
             networkType,
@@ -62,6 +66,8 @@ export class AccountOperationRestrictionTransaction extends Transaction {
             restrictionFlags,
             restrictionAdditions,
             restrictionDeletions,
+            signature,
+            signer,
         );
     }
 
@@ -104,6 +110,7 @@ export class AccountOperationRestrictionTransaction extends Transaction {
             : AccountOperationRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
         const signer = Convert.uint8ToHex(builder.getSignerPublicKey().key);
         const networkType = builder.getNetwork().valueOf();
+        const signature = payload.substring(16, 144);
         const transaction = AccountOperationRestrictionTransaction.create(
             isEmbedded
                 ? Deadline.create()
@@ -113,6 +120,8 @@ export class AccountOperationRestrictionTransaction extends Transaction {
             builder.getRestrictionDeletions(),
             networkType,
             isEmbedded ? new UInt64([0, 0]) : new UInt64((builder as AccountOperationRestrictionTransactionBuilder).fee.amount),
+            isEmbedded || signature.match(`^[0]+$`) ? undefined : signature,
+            signer.match(`^[0]+$`) ? undefined : PublicAccount.createFromPublicKey(signer, networkType),
         );
         return isEmbedded ? transaction.toAggregate(PublicAccount.createFromPublicKey(signer, networkType)) : transaction;
     }
@@ -150,8 +159,8 @@ export class AccountOperationRestrictionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-        const signatureBuffer = new Uint8Array(64);
+        const signerBuffer = this.signer !== undefined ? Convert.hexToUint8(this.signer.publicKey) : new Uint8Array(32);
+        const signatureBuffer = this.signature !== undefined ? Convert.hexToUint8(this.signature) : new Uint8Array(64);
 
         const transactionBuilder = new AccountOperationRestrictionTransactionBuilder(
             new SignatureDto(signatureBuffer),

diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts
@@ -25,6 +25,7 @@ import { AccountMosaicRestrictionTransaction } from './AccountMosaicRestrictionT
 import { AccountOperationRestrictionTransaction } from './AccountOperationRestrictionTransaction';
 import { Deadline } from './Deadline';
 import { TransactionType } from './TransactionType';
+import { PublicAccount } from '../account/PublicAccount';
 
 export class AccountRestrictionTransaction {
     /**
@@ -35,6 +36,8 @@ export class AccountRestrictionTransaction {
      * @param restrictionDeletions - Account restriction deletions.
      * @param networkType - The network type.
      * @param maxFee - (Optional) Max fee defined by the sender
+     * @param signature - (Optional) Transaction signature
+     * @param signer - (Optional) Signer public account
      * @returns {AccountAddressRestrictionTransaction}
      */
     public static createAddressRestrictionModificationTransaction(
@@ -44,6 +47,8 @@ export class AccountRestrictionTransaction {
         restrictionDeletions: (Address | NamespaceId)[],
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
+        signature?: string,
+        signer?: PublicAccount,
     ): AccountAddressRestrictionTransaction {
         if (
             ![
@@ -62,6 +67,8 @@ export class AccountRestrictionTransaction {
             restrictionDeletions,
             networkType,
             maxFee,
+            signature,
+            signer,
         );
     }
 
@@ -73,6 +80,8 @@ export class AccountRestrictionTransaction {
      * @param restrictionDeletions - Account restriction deletions.
      * @param networkType - The network type.
      * @param maxFee - (Optional) Max fee defined by the sender
+     * @param signature - (Optional) Transaction signature
+     * @param signer - (Optional) Signer public account
      * @returns {AccountMosaicRestrictionTransaction}
      */
     public static createMosaicRestrictionModificationTransaction(
@@ -82,6 +91,8 @@ export class AccountRestrictionTransaction {
         restrictionDeletions: (MosaicId | NamespaceId)[],
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
+        signature?: string,
+        signer?: PublicAccount,
     ): AccountMosaicRestrictionTransaction {
         if (![AccountRestrictionFlags.AllowMosaic, AccountRestrictionFlags.BlockMosaic].includes(restrictionFlags)) {
             throw new Error('Restriction type is not allowed.');
@@ -93,6 +104,8 @@ export class AccountRestrictionTransaction {
             restrictionDeletions,
             networkType,
             maxFee,
+            signature,
+            signer,
         );
     }
 
@@ -104,6 +117,8 @@ export class AccountRestrictionTransaction {
      * @param restrictionDeletions - Account restriction deletions.
      * @param networkType - The network type.
      * @param maxFee - (Optional) Max fee defined by the sender
+     * @param signature - (Optional) Transaction signature
+     * @param signer - (Optional) Signer public account
      * @returns {AccountOperationRestrictionTransaction}
      */
     public static createOperationRestrictionModificationTransaction(
@@ -113,6 +128,8 @@ export class AccountRestrictionTransaction {
         restrictionDeletions: TransactionType[],
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
+        signature?: string,
+        signer?: PublicAccount,
     ): AccountOperationRestrictionTransaction {
         if (
             ![AccountRestrictionFlags.AllowOutgoingTransactionType, AccountRestrictionFlags.BlockOutgoingTransactionType].includes(
@@ -128,6 +145,8 @@ export class AccountRestrictionTransaction {
             restrictionDeletions,
             networkType,
             maxFee,
+            signature,
+            signer,
         );
     }
 }