Merge pull request #394 from NEMStudios/task/g393_reapply_catbuffer

Applied catbuffer generator on aggregate

Author: rg911

src/infrastructure/catbuffer/AggregateBondedTransactionBuilder.ts

@@ -21,6 +21,8 @@
 
 import { AggregateTransactionBodyBuilder } from './AggregateTransactionBodyBuilder';
 import { AmountDto } from './AmountDto';
+import { CosignatureBuilder } from './CosignatureBuilder';
+import { EmbeddedTransactionBuilder } from './EmbeddedTransactionBuilder';
 import { EntityTypeDto } from './EntityTypeDto';
 import { GeneratorUtils } from './GeneratorUtils';
 import { Hash256Dto } from './Hash256Dto';
@@ -50,7 +52,7 @@ export class AggregateBondedTransactionBuilder extends TransactionBuilder {
      * @param cosignatures Cosignatures data (fills remaining body space after transactions).
      */
     // tslint:disable-next-line: max-line-length
-    public constructor(signature: SignatureDto,  signerPublicKey: KeyDto,  version: number,  network: NetworkTypeDto,  type: EntityTypeDto,  fee: AmountDto,  deadline: TimestampDto,  transactionsHash: Hash256Dto,  transactions: Uint8Array,  cosignatures: Uint8Array) {
+    public constructor(signature: SignatureDto,  signerPublicKey: KeyDto,  version: number,  network: NetworkTypeDto,  type: EntityTypeDto,  fee: AmountDto,  deadline: TimestampDto,  transactionsHash: Hash256Dto,  transactions: EmbeddedTransactionBuilder[],  cosignatures: CosignatureBuilder[]) {
         super(signature, signerPublicKey, version, network, type, fee, deadline);
         this.aggregateTransactionBody = new AggregateTransactionBodyBuilder(transactionsHash, transactions, cosignatures);
     }
@@ -94,7 +96,7 @@ export class AggregateBondedTransactionBuilder extends TransactionBuilder {
      *
      * @return Sub-transaction data (transactions are variable sized and payload size is in bytes).
      */
-    public getTransactions(): Uint8Array {
+    public getTransactions(): EmbeddedTransactionBuilder[] {
         return this.aggregateTransactionBody.getTransactions();
     }
 
@@ -103,7 +105,7 @@ export class AggregateBondedTransactionBuilder extends TransactionBuilder {
      *
      * @return Cosignatures data (fills remaining body space after transactions).
      */
-    public getCosignatures(): Uint8Array {
+    public getCosignatures(): CosignatureBuilder[] {
         return this.aggregateTransactionBody.getCosignatures();
     }
 

src/infrastructure/catbuffer/AggregateCompleteTransactionBuilder.ts

@@ -21,6 +21,8 @@
 
 import { AggregateTransactionBodyBuilder } from './AggregateTransactionBodyBuilder';
 import { AmountDto } from './AmountDto';
+import { CosignatureBuilder } from './CosignatureBuilder';
+import { EmbeddedTransactionBuilder } from './EmbeddedTransactionBuilder';
 import { EntityTypeDto } from './EntityTypeDto';
 import { GeneratorUtils } from './GeneratorUtils';
 import { Hash256Dto } from './Hash256Dto';
@@ -50,7 +52,7 @@ export class AggregateCompleteTransactionBuilder extends TransactionBuilder {
      * @param cosignatures Cosignatures data (fills remaining body space after transactions).
      */
     // tslint:disable-next-line: max-line-length
-    public constructor(signature: SignatureDto,  signerPublicKey: KeyDto,  version: number,  network: NetworkTypeDto,  type: EntityTypeDto,  fee: AmountDto,  deadline: TimestampDto,  transactionsHash: Hash256Dto,  transactions: Uint8Array,  cosignatures: Uint8Array) {
+    public constructor(signature: SignatureDto,  signerPublicKey: KeyDto,  version: number,  network: NetworkTypeDto,  type: EntityTypeDto,  fee: AmountDto,  deadline: TimestampDto,  transactionsHash: Hash256Dto,  transactions: EmbeddedTransactionBuilder[],  cosignatures: CosignatureBuilder[]) {
         super(signature, signerPublicKey, version, network, type, fee, deadline);
         this.aggregateTransactionBody = new AggregateTransactionBodyBuilder(transactionsHash, transactions, cosignatures);
     }
@@ -94,7 +96,7 @@ export class AggregateCompleteTransactionBuilder extends TransactionBuilder {
      *
      * @return Sub-transaction data (transactions are variable sized and payload size is in bytes).
      */
-    public getTransactions(): Uint8Array {
+    public getTransactions(): EmbeddedTransactionBuilder[] {
         return this.aggregateTransactionBody.getTransactions();
     }
 
@@ -103,7 +105,7 @@ export class AggregateCompleteTransactionBuilder extends TransactionBuilder {
      *
      * @return Cosignatures data (fills remaining body space after transactions).
      */
-    public getCosignatures(): Uint8Array {
+    public getCosignatures(): CosignatureBuilder[] {
         return this.aggregateTransactionBody.getCosignatures();
     }
 

src/infrastructure/catbuffer/AggregateTransactionBodyBuilder.ts

@@ -19,6 +19,9 @@
 *** along with Catapult. If not, see <http://www.gnu.org/licenses/>.
 **/
 
+import { CosignatureBuilder } from './CosignatureBuilder';
+import { EmbeddedTransactionBuilder } from './EmbeddedTransactionBuilder';
+import { EmbeddedTransactionHelper } from './EmbeddedTransactionHelper';
 import { GeneratorUtils } from './GeneratorUtils';
 import { Hash256Dto } from './Hash256Dto';
 
@@ -29,9 +32,9 @@ export class AggregateTransactionBodyBuilder {
     /** Reserved padding to align end of AggregateTransactionHeader on 8-byte boundary. */
     aggregateTransactionHeader_Reserved1: number;
     /** Sub-transaction data (transactions are variable sized and payload size is in bytes). */
-    transactions: Uint8Array;
+    transactions: EmbeddedTransactionBuilder[];
     /** Cosignatures data (fills remaining body space after transactions). */
-    cosignatures: Uint8Array;
+    cosignatures: CosignatureBuilder[];
 
     /**
      * Constructor.
@@ -40,7 +43,8 @@ export class AggregateTransactionBodyBuilder {
      * @param transactions Sub-transaction data (transactions are variable sized and payload size is in bytes).
      * @param cosignatures Cosignatures data (fills remaining body space after transactions).
      */
-    public constructor(transactionsHash: Hash256Dto,  transactions: Uint8Array,  cosignatures: Uint8Array) {
+    // tslint:disable-next-line: max-line-length
+    public constructor(transactionsHash: Hash256Dto,  transactions: EmbeddedTransactionBuilder[],  cosignatures: CosignatureBuilder[]) {
         this.transactionsHash = transactionsHash;
         this.aggregateTransactionHeader_Reserved1 = 0;
         this.transactions = transactions;
@@ -62,9 +66,24 @@ export class AggregateTransactionBodyBuilder {
         // tslint:disable-next-line: max-line-length
         const aggregateTransactionHeader_Reserved1 = GeneratorUtils.bufferToUint(GeneratorUtils.getBytes(Uint8Array.from(byteArray), 4));
         byteArray.splice(0, 4);
-        const transactions = GeneratorUtils.getBytes(Uint8Array.from(byteArray), payloadSize);
-        byteArray.splice(0, payloadSize);
-        const cosignatures = Uint8Array.from(byteArray);
+        let transactionsByteSize = payloadSize;
+        const transactions: EmbeddedTransactionBuilder[] = [];
+        while (transactionsByteSize > 0) {
+            const item = EmbeddedTransactionHelper.loadFromBinary(Uint8Array.from(byteArray));
+            transactions.push(item);
+            const itemSize = item.getSize() + GeneratorUtils.getTransactionPaddingSize(item.getSize(), 8);
+            transactionsByteSize -= itemSize;
+            byteArray.splice(0, itemSize);
+        }
+        let cosignaturesByteSize = byteArray.length;
+        const cosignatures: CosignatureBuilder[] = [];
+        while (cosignaturesByteSize > 0) {
+            const item = CosignatureBuilder.loadFromBinary(Uint8Array.from(byteArray));
+            cosignatures.push(item);
+            const itemSize = item.getSize();
+            cosignaturesByteSize -= itemSize;
+            byteArray.splice(0, itemSize);
+        }
         return new AggregateTransactionBodyBuilder(transactionsHash, transactions, cosignatures);
     }
 
@@ -91,7 +110,7 @@ export class AggregateTransactionBodyBuilder {
      *
      * @return Sub-transaction data (transactions are variable sized and payload size is in bytes).
      */
-    public getTransactions(): Uint8Array {
+    public getTransactions(): EmbeddedTransactionBuilder[] {
         return this.transactions;
     }
 
@@ -100,7 +119,7 @@ export class AggregateTransactionBodyBuilder {
      *
      * @return Cosignatures data (fills remaining body space after transactions).
      */
-    public getCosignatures(): Uint8Array {
+    public getCosignatures(): CosignatureBuilder[] {
         return this.cosignatures;
     }
 
@@ -114,8 +133,8 @@ export class AggregateTransactionBodyBuilder {
         size += this.transactionsHash.getSize();
         size += 4; // payloadSize
         size += 4; // aggregateTransactionHeader_Reserved1
-        size += this.transactions.length;
-        size += this.cosignatures.length;
+        this.transactions.forEach((o) => size += EmbeddedTransactionHelper.serialize(o).length);
+        this.cosignatures.forEach((o) => size += o.getSize());
         return size;
     }
 
@@ -128,13 +147,20 @@ export class AggregateTransactionBodyBuilder {
         let newArray = Uint8Array.from([]);
         const transactionsHashBytes = this.transactionsHash.serialize();
         newArray = GeneratorUtils.concatTypedArrays(newArray, transactionsHashBytes);
-        const payloadSizeBytes = GeneratorUtils.uintToBuffer(this.transactions.length, 4);
+        // tslint:disable-next-line: max-line-length
+        const payloadSizeBytes = GeneratorUtils.uintToBuffer(EmbeddedTransactionHelper.getEmbeddedTransactionSize(this.transactions), 4);
         newArray = GeneratorUtils.concatTypedArrays(newArray, payloadSizeBytes);
         // tslint:disable-next-line: max-line-length
         const aggregateTransactionHeader_Reserved1Bytes = GeneratorUtils.uintToBuffer(this.getAggregateTransactionHeader_Reserved1(), 4);
         newArray = GeneratorUtils.concatTypedArrays(newArray, aggregateTransactionHeader_Reserved1Bytes);
-        newArray = GeneratorUtils.concatTypedArrays(newArray, this.transactions);
-        newArray = GeneratorUtils.concatTypedArrays(newArray, this.cosignatures);
+        this.transactions.forEach((item) => {
+            const transactionsBytes = EmbeddedTransactionHelper.serialize(item);
+            newArray = GeneratorUtils.concatTypedArrays(newArray, transactionsBytes);
+        });
+        this.cosignatures.forEach((item) => {
+            const cosignaturesBytes = item.serialize();
+            newArray = GeneratorUtils.concatTypedArrays(newArray, cosignaturesBytes);
+        });
         return newArray;
     }
 }

src/infrastructure/catbuffer/BalanceChangeReceiptBuilder.ts

@@ -0,0 +1,111 @@
+// tslint:disable: jsdoc-format
+/**
+*** Copyright (c) 2016-present,
+*** Jaguar0625, gimre, BloodyRookie, Tech Bureau, Corp. All rights reserved.
+***
+*** This file is part of Catapult.
+***
+*** Catapult is free software: you can redistribute it and/or modify
+*** it under the terms of the GNU Lesser General Public License as published by
+*** the Free Software Foundation, either version 3 of the License, or
+*** (at your option) any later version.
+***
+*** Catapult is distributed in the hope that it will be useful,
+*** but WITHOUT ANY WARRANTY; without even the implied warranty of
+*** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*** GNU Lesser General Public License for more details.
+***
+*** You should have received a copy of the GNU Lesser General Public License
+*** along with Catapult. If not, see <http://www.gnu.org/licenses/>.
+**/
+
+import { GeneratorUtils } from './GeneratorUtils';
+import { KeyDto } from './KeyDto';
+import { MosaicBuilder } from './MosaicBuilder';
+import { ReceiptBuilder } from './ReceiptBuilder';
+import { ReceiptTypeDto } from './ReceiptTypeDto';
+
+/** Binary layout for a balance change receipt. */
+export class BalanceChangeReceiptBuilder extends ReceiptBuilder {
+    /** Mosaic. */
+    mosaic: MosaicBuilder;
+    /** Account public key. */
+    targetPublicKey: KeyDto;
+
+    /**
+     * Constructor.
+     *
+     * @param version Receipt version.
+     * @param type Receipt type.
+     * @param mosaic Mosaic.
+     * @param targetPublicKey Account public key.
+     */
+    public constructor(version: number,  type: ReceiptTypeDto,  mosaic: MosaicBuilder,  targetPublicKey: KeyDto) {
+        super(version, type);
+        this.mosaic = mosaic;
+        this.targetPublicKey = targetPublicKey;
+    }
+
+    /**
+     * Creates an instance of BalanceChangeReceiptBuilder from binary payload.
+     *
+     * @param payload Byte payload to use to serialize the object.
+     * @return Instance of BalanceChangeReceiptBuilder.
+     */
+    public static loadFromBinary(payload: Uint8Array): BalanceChangeReceiptBuilder {
+        const byteArray = Array.from(payload);
+        const superObject = ReceiptBuilder.loadFromBinary(Uint8Array.from(byteArray));
+        byteArray.splice(0, superObject.getSize());
+        const mosaic = MosaicBuilder.loadFromBinary(Uint8Array.from(byteArray));
+        byteArray.splice(0, mosaic.getSize());
+        const targetPublicKey = KeyDto.loadFromBinary(Uint8Array.from(byteArray));
+        byteArray.splice(0, targetPublicKey.getSize());
+        return new BalanceChangeReceiptBuilder(superObject.version, superObject.type, mosaic, targetPublicKey);
+    }
+
+    /**
+     * Gets mosaic.
+     *
+     * @return Mosaic.
+     */
+    public getMosaic(): MosaicBuilder {
+        return this.mosaic;
+    }
+
+    /**
+     * Gets account public key.
+     *
+     * @return Account public key.
+     */
+    public getTargetPublicKey(): KeyDto {
+        return this.targetPublicKey;
+    }
+
+    /**
+     * Gets the size of the object.
+     *
+     * @return Size in bytes.
+     */
+    public getSize(): number {
+        let size: number = super.getSize();
+        size += this.mosaic.getSize();
+        size += this.targetPublicKey.getSize();
+        return size;
+    }
+
+    /**
+     * Serializes an object to bytes.
+     *
+     * @return Serialized bytes.
+     */
+    public serialize(): Uint8Array {
+        let newArray = Uint8Array.from([]);
+        const superBytes = super.serialize();
+        newArray = GeneratorUtils.concatTypedArrays(newArray, superBytes);
+        const mosaicBytes = this.mosaic.serialize();
+        newArray = GeneratorUtils.concatTypedArrays(newArray, mosaicBytes);
+        const targetPublicKeyBytes = this.targetPublicKey.serialize();
+        newArray = GeneratorUtils.concatTypedArrays(newArray, targetPublicKeyBytes);
+        return newArray;
+    }
+}