Applied catbuffer on aggregate transaction

Author: rg911

src/infrastructure/catbuffer/AggregateTransactionBuilder.ts

@@ -19,14 +19,10 @@
 *** along with Catapult. If not, see <http://www.gnu.org/licenses/>.
 **/
 
-import { AddressAliasTransactionBodyBuilder } from './AddressAliasTransactionBodyBuilder';
-import { AddressDto } from './AddressDto';
-import { AliasActionDto } from './AliasActionDto';
 import { AmountDto } from './AmountDto';
 import { EntityTypeDto } from './EntityTypeDto';
 import { GeneratorUtils } from './GeneratorUtils';
 import { KeyDto } from './KeyDto';
-import { NamespaceIdDto } from './NamespaceIdDto';
 import { SignatureDto } from './SignatureDto';
 import { TimestampDto } from './TimestampDto';
 import { TransactionBuilder } from './TransactionBuilder';
@@ -129,7 +125,7 @@ export class AggregateTransactionBuilder extends TransactionBuilder {
         newArray = GeneratorUtils.concatTypedArrays(newArray, payloadSizeBytes);
         const transactionBytes = this.transactions;
         newArray = GeneratorUtils.concatTypedArrays(newArray, transactionBytes);
-        const cosignaturesBytes = this.transactions;
+        const cosignaturesBytes = this.cosignatures;
         newArray = GeneratorUtils.concatTypedArrays(newArray, cosignaturesBytes);
         return newArray;
     }

src/model/transaction/AccountAddressRestrictionTransaction.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { RawAddress } from '../../core/format';
+import { Convert, RawAddress } from '../../core/format';
 import { Builder } from '../../infrastructure/builders/AccountRestrictionsAddressTransaction';
 import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AccountAddressRestrictionModificationBuilder } from '../../infrastructure/catbuffer/AccountAddressRestrictionModificationBuilder';
@@ -151,10 +151,8 @@ export class AccountAddressRestrictionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedAccountAddressRestrictionTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.ACCOUNT_RESTRICTION_ADDRESS.valueOf(),
             this.restrictionType.valueOf(),

src/model/transaction/AccountMosaicRestrictionTransaction.ts

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+import { Convert } from '../../core/format';
 import { Builder } from '../../infrastructure/builders/AccountRestrictionsMosaicTransaction';
 import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AccountMosaicRestrictionModificationBuilder } from '../../infrastructure/catbuffer/AccountMosaicRestrictionModificationBuilder';
 import { AccountMosaicRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountMosaicRestrictionTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { EmbeddedAccountMosaicRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedAccountMosaicRestrictionTransactionBuilder';
-import { EntityTypeDto } from '../../infrastructure/catbuffer/EntityTypeDto';
 import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
 import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
@@ -150,10 +150,8 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedAccountMosaicRestrictionTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.ACCOUNT_RESTRICTION_MOSAIC.valueOf(),
             this.restrictionType.valueOf(),

src/model/transaction/AccountOperationRestrictionTransaction.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { Convert } from '../../core/format';
 import { Builder } from '../../infrastructure/builders/AccountRestrictionsEntityTypeTransaction';
 import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AccountOperationRestrictionModificationBuilder } from '../../infrastructure/catbuffer/AccountOperationRestrictionModificationBuilder';
@@ -148,10 +149,8 @@ export class AccountOperationRestrictionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedAccountOperationRestrictionTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.ACCOUNT_RESTRICTION_OPERATION.valueOf(),
             this.restrictionType.valueOf(),

src/model/transaction/AddressAliasTransaction.ts

@@ -189,10 +189,8 @@ export class AddressAliasTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedAddressAliasTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.ADDRESS_ALIAS.valueOf(),
             this.actionType.valueOf(),

src/model/transaction/AggregateTransaction.ts

@@ -340,6 +340,6 @@ export class AggregateTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        throw new Error('Not implemented');
+        throw new Error('Method not implemented');
     }
 }

src/model/transaction/ModifyMultisigAccountTransaction.ts

@@ -213,10 +213,8 @@ export class ModifyMultisigAccountTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedMultisigAccountModificationTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.MODIFY_MULTISIG_ACCOUNT.valueOf(),
             this.minRemovalDelta,

src/model/transaction/MosaicAliasTransaction.ts

@@ -185,10 +185,8 @@ export class MosaicAliasTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedMosaicAliasTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.MOSAIC_ALIAS.valueOf(),
             this.actionType.valueOf(),

src/model/transaction/MosaicDefinitionTransaction.ts

@@ -239,10 +239,8 @@ export class MosaicDefinitionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedMosaicDefinitionTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.MOSAIC_DEFINITION.valueOf(),
             new MosaicNonceDto(this.getMosaicNonceIntValue()),

src/model/transaction/MosaicSupplyChangeTransaction.ts

@@ -34,6 +34,7 @@ import { Transaction } from './Transaction';
 import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
 import { TransactionVersion } from './TransactionVersion';
+import { Convert } from '../../core/format';
 
 /**
  * In case a mosaic has the flag 'supplyMutable' set to true, the creator of the mosaic can change the supply,