Added ts catbuffer codes (without aggregateTx)

Appended new signwithCatbuffer method in Transaction (temp)
Applied catbuffer builders on standalone transaction (builder)
Updated unit tests

Author: rg911

e2e/infrastructure/TransactionHttp.spec.ts

@@ -37,10 +37,10 @@ import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType';
 import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
 import { AliasAction } from '../../src/model/namespace/AliasAction';
 import { NamespaceId } from '../../src/model/namespace/NamespaceId';
-import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction';
+import { AccountAddressRestrictionTransaction } from '../../src/model/transaction/AccountAddressRestrictionTransaction';
 import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
-import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction';
-import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction';
+import { AccountMosaicRestrictionTransaction } from '../../src/model/transaction/AccountMosaicRestrictionTransaction';
+import { AccountOperationRestrictionTransaction } from '../../src/model/transaction/AccountOperationRestrictionTransaction';
 import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification';
 import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction';
 import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
@@ -410,7 +410,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account, generationHash);
 
-            listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionModificationTransaction) => {
+            listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -485,7 +485,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account, generationHash);
 
-            listener.confirmed(account.address).subscribe((transaction: AccountMosaicRestrictionModificationTransaction) => {
+            listener.confirmed(account.address).subscribe((transaction: AccountMosaicRestrictionTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -560,7 +560,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account3, generationHash);
 
-            listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionModificationTransaction) => {
+            listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;

src/infrastructure/QueryParams.ts

@@ -22,7 +22,6 @@ export enum Order {
     DESC = '-id',
 }
 
-
 /**
  * The query params structure describes pagination params for requests.
  *

src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts

@@ -45,7 +45,7 @@ export class Builder {
     modifications: any;
     constructor() {
         this.maxFee = [0, 0];
-        this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS;
+        this.type = TransactionType.ACCOUNT_RESTRICTION_ADDRESS;
     }
 
     addFee(maxFee) {

src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts

@@ -45,7 +45,7 @@ export class Builder {
     modifications: any;
     constructor() {
         this.maxFee = [0, 0];
-        this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION;
+        this.type = TransactionType.ACCOUNT_RESTRICTION_OPERATION;
     }
 
     addFee(maxFee) {

src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts

@@ -45,7 +45,7 @@ export class Builder {
     modifications: any;
     constructor() {
         this.maxFee = [0, 0];
-        this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC;
+        this.type = TransactionType.ACCOUNT_RESTRICTION_MOSAIC;
     }
 
     addFee(maxFee) {

src/infrastructure/catbuffer/AccountAddressRestrictionModificationBuilder.ts

@@ -0,0 +1,91 @@
+// 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 { AccountRestrictionModificationActionDto } from './AccountRestrictionModificationActionDto';
+import { AccountRestrictionModificationBuilder } from './AccountRestrictionModificationBuilder';
+import { GeneratorUtils } from './GeneratorUtils';
+import { UnresolvedAddressDto } from './UnresolvedAddressDto';
+
+/** Account address restriction modification. */
+export class AccountAddressRestrictionModificationBuilder extends AccountRestrictionModificationBuilder {
+    /** Address restriction value. */
+    value: UnresolvedAddressDto;
+
+    /**
+     * Constructor.
+     *
+     * @param modificationAction Modification action.
+     * @param value Address restriction value.
+     */
+    public constructor(modificationAction: AccountRestrictionModificationActionDto,  value: UnresolvedAddressDto) {
+        super(modificationAction);
+        this.value = value;
+    }
+
+    /**
+     * Creates an instance of AccountAddressRestrictionModificationBuilder from binary payload.
+     *
+     * @param payload Byte payload to use to serialize the object.
+     * @return Instance of AccountAddressRestrictionModificationBuilder.
+     */
+    public static loadFromBinary(payload: Uint8Array): AccountAddressRestrictionModificationBuilder {
+        const byteArray = Array.from(payload);
+        const superObject = AccountRestrictionModificationBuilder.loadFromBinary(Uint8Array.from(byteArray));
+        byteArray.splice(0, superObject.getSize());
+        const value = UnresolvedAddressDto.loadFromBinary(Uint8Array.from(byteArray));
+        byteArray.splice(0, value.getSize());
+        return new AccountAddressRestrictionModificationBuilder(superObject.modificationAction, value);
+    }
+
+    /**
+     * Gets address restriction value.
+     *
+     * @return Address restriction value.
+     */
+    public getValue(): UnresolvedAddressDto {
+        return this.value;
+    }
+
+    /**
+     * Gets the size of the object.
+     *
+     * @return Size in bytes.
+     */
+    public getSize(): number {
+        let size: number = super.getSize();
+        size += this.value.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 valueBytes = this.value.serialize();
+        newArray = GeneratorUtils.concatTypedArrays(newArray, valueBytes);
+        return newArray;
+    }
+}

src/infrastructure/catbuffer/AccountAddressRestrictionTransactionBodyBuilder.ts

@@ -0,0 +1,114 @@
+// 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 { AccountAddressRestrictionModificationBuilder } from './AccountAddressRestrictionModificationBuilder';
+import { AccountRestrictionTypeDto } from './AccountRestrictionTypeDto';
+import { GeneratorUtils } from './GeneratorUtils';
+
+/** Binary layout for an account address restriction transaction. */
+export class AccountAddressRestrictionTransactionBodyBuilder {
+    /** Account restriction type. */
+    restrictionType: AccountRestrictionTypeDto;
+    /** Account restriction modifications. */
+    modifications: AccountAddressRestrictionModificationBuilder[];
+
+    /**
+     * Constructor.
+     *
+     * @param restrictionType Account restriction type.
+     * @param modifications Account restriction modifications.
+     */
+    // tslint:disable-next-line: max-line-length
+    public constructor(restrictionType: AccountRestrictionTypeDto,  modifications: AccountAddressRestrictionModificationBuilder[]) {
+        this.restrictionType = restrictionType;
+        this.modifications = modifications;
+    }
+
+    /**
+     * Creates an instance of AccountAddressRestrictionTransactionBodyBuilder from binary payload.
+     *
+     * @param payload Byte payload to use to serialize the object.
+     * @return Instance of AccountAddressRestrictionTransactionBodyBuilder.
+     */
+    public static loadFromBinary(payload: Uint8Array): AccountAddressRestrictionTransactionBodyBuilder {
+        const byteArray = Array.from(payload);
+        const restrictionType = GeneratorUtils.bufferToUint(GeneratorUtils.getBytes(Uint8Array.from(byteArray), 1));
+        byteArray.splice(0, 1);
+        const modificationsCount = GeneratorUtils.bufferToUint(GeneratorUtils.getBytes(Uint8Array.from(byteArray), 1));
+        byteArray.splice(0, 1);
+        const modifications: AccountAddressRestrictionModificationBuilder[] = [];
+        for (let i = 0; i < modificationsCount; i++) {
+            const item = AccountAddressRestrictionModificationBuilder.loadFromBinary(Uint8Array.from(byteArray));
+            modifications.push(item);
+            byteArray.splice(0, item.getSize());
+        }
+        return new AccountAddressRestrictionTransactionBodyBuilder(restrictionType, modifications);
+    }
+
+    /**
+     * Gets account restriction type.
+     *
+     * @return Account restriction type.
+     */
+    public getRestrictionType(): AccountRestrictionTypeDto {
+        return this.restrictionType;
+    }
+
+    /**
+     * Gets account restriction modifications.
+     *
+     * @return Account restriction modifications.
+     */
+    public getModifications(): AccountAddressRestrictionModificationBuilder[] {
+        return this.modifications;
+    }
+
+    /**
+     * Gets the size of the object.
+     *
+     * @return Size in bytes.
+     */
+    public getSize(): number {
+        let size = 0;
+        size += 1; // restrictionType
+        size += 1; // modificationsCount
+        this.modifications.forEach((o) => size += o.getSize());
+        return size;
+    }
+
+    /**
+     * Serializes an object to bytes.
+     *
+     * @return Serialized bytes.
+     */
+    public serialize(): Uint8Array {
+        let newArray = Uint8Array.from([]);
+        const restrictionTypeBytes = GeneratorUtils.uintToBuffer(this.restrictionType, 1);
+        newArray = GeneratorUtils.concatTypedArrays(newArray, restrictionTypeBytes);
+        const modificationsCountBytes = GeneratorUtils.uintToBuffer(this.modifications.length, 1);
+        newArray = GeneratorUtils.concatTypedArrays(newArray, modificationsCountBytes);
+        this.modifications.forEach((item) => {
+            const modificationsBytes = item.serialize();
+            newArray = GeneratorUtils.concatTypedArrays(newArray, modificationsBytes);
+        });
+        return newArray;
+    }
+}

src/infrastructure/catbuffer/AccountAddressRestrictionTransactionBuilder.ts

@@ -0,0 +1,116 @@
+// 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 { AccountAddressRestrictionModificationBuilder } from './AccountAddressRestrictionModificationBuilder';
+import { AccountAddressRestrictionTransactionBodyBuilder } from './AccountAddressRestrictionTransactionBodyBuilder';
+import { AccountRestrictionTypeDto } from './AccountRestrictionTypeDto';
+import { AmountDto } from './AmountDto';
+import { EntityTypeDto } from './EntityTypeDto';
+import { GeneratorUtils } from './GeneratorUtils';
+import { KeyDto } from './KeyDto';
+import { SignatureDto } from './SignatureDto';
+import { TimestampDto } from './TimestampDto';
+import { TransactionBuilder } from './TransactionBuilder';
+
+/** Binary layout for a non-embedded account address restriction transaction. */
+export class AccountAddressRestrictionTransactionBuilder extends TransactionBuilder {
+    /** Account address restriction transaction body. */
+    accountAddressRestrictionTransactionBody: AccountAddressRestrictionTransactionBodyBuilder;
+
+    /**
+     * Constructor.
+     *
+     * @param signature Entity signature.
+     * @param signer Entity signer's public key.
+     * @param version Entity version.
+     * @param type Entity type.
+     * @param fee Transaction fee.
+     * @param deadline Transaction deadline.
+     * @param restrictionType Account restriction type.
+     * @param modifications Account restriction modifications.
+     */
+    // tslint:disable-next-line: max-line-length
+    public constructor(signature: SignatureDto,  signer: KeyDto,  version: number,  type: EntityTypeDto,  fee: AmountDto,  deadline: TimestampDto,  restrictionType: AccountRestrictionTypeDto,  modifications: AccountAddressRestrictionModificationBuilder[]) {
+        super(signature, signer, version, type, fee, deadline);
+        // tslint:disable-next-line: max-line-length
+        this.accountAddressRestrictionTransactionBody = new AccountAddressRestrictionTransactionBodyBuilder(restrictionType, modifications);
+    }
+
+    /**
+     * Creates an instance of AccountAddressRestrictionTransactionBuilder from binary payload.
+     *
+     * @param payload Byte payload to use to serialize the object.
+     * @return Instance of AccountAddressRestrictionTransactionBuilder.
+     */
+    public static loadFromBinary(payload: Uint8Array): AccountAddressRestrictionTransactionBuilder {
+        const byteArray = Array.from(payload);
+        const superObject = TransactionBuilder.loadFromBinary(Uint8Array.from(byteArray));
+        byteArray.splice(0, superObject.getSize());
+        // tslint:disable-next-line: max-line-length
+        const accountAddressRestrictionTransactionBody = AccountAddressRestrictionTransactionBodyBuilder.loadFromBinary(Uint8Array.from(byteArray));
+        byteArray.splice(0, accountAddressRestrictionTransactionBody.getSize());
+        // tslint:disable-next-line: max-line-length
+        return new AccountAddressRestrictionTransactionBuilder(superObject.signature, superObject.signer, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountAddressRestrictionTransactionBody.restrictionType, accountAddressRestrictionTransactionBody.modifications);
+    }
+
+    /**
+     * Gets account restriction type.
+     *
+     * @return Account restriction type.
+     */
+    public getRestrictionType(): AccountRestrictionTypeDto {
+        return this.accountAddressRestrictionTransactionBody.getRestrictionType();
+    }
+
+    /**
+     * Gets account restriction modifications.
+     *
+     * @return Account restriction modifications.
+     */
+    public getModifications(): AccountAddressRestrictionModificationBuilder[] {
+        return this.accountAddressRestrictionTransactionBody.getModifications();
+    }
+
+    /**
+     * Gets the size of the object.
+     *
+     * @return Size in bytes.
+     */
+    public getSize(): number {
+        let size: number = super.getSize();
+        size += this.accountAddressRestrictionTransactionBody.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 accountAddressRestrictionTransactionBodyBytes = this.accountAddressRestrictionTransactionBody.serialize();
+        newArray = GeneratorUtils.concatTypedArrays(newArray, accountAddressRestrictionTransactionBodyBytes);
+        return newArray;
+    }
+}