Applied catbuffer on aggregate transaction

rg911 · rg911 · commit 01234ca994ba · 2019-08-14T11:54:25.000+01:00
diff --git a/src/infrastructure/catbuffer/AggregateTransactionBuilder.ts b/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;
     }
diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/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(),
diff --git a/src/model/transaction/AccountLinkTransaction.ts b/src/model/transaction/AccountLinkTransaction.ts
@@ -145,10 +145,8 @@ export class AccountLinkTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedAccountLinkTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.LINK_ACCOUNT.valueOf(),
             new KeyDto(Convert.hexToUint8(this.remoteAccountKey)),
diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/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(),
diff --git a/src/model/transaction/AccountOperationRestrictionTransaction.ts b/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(),
diff --git a/src/model/transaction/AddressAliasTransaction.ts b/src/model/transaction/AddressAliasTransaction.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/AddressAliasTransaction';
 import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction';
 import { AddressAliasTransactionBuilder } from '../../infrastructure/catbuffer/AddressAliasTransactionBuilder';
@@ -163,10 +163,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(),
diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts
@@ -15,8 +15,16 @@
  */
 
 import { SignSchema } from '../../core/crypto';
-import { Builder } from '../../infrastructure/builders/AggregateTransaction';
+import { Convert } from '../../core/format';
 import { AggregateTransaction as AggregatedTransactionCore} from '../../infrastructure/builders/AggregateTransaction';
+import { Builder } from '../../infrastructure/builders/AggregateTransaction';
+import { AggregateTransactionBuilder } from '../../infrastructure/catbuffer/AggregateTransactionBuilder';
+import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
+import { CosignatureBuilder } from '../../infrastructure/catbuffer/CosignatureBuilder';
+import { GeneratorUtils } from '../../infrastructure/catbuffer/GeneratorUtils';
+import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
+import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
+import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
 import { Account } from '../account/Account';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
@@ -209,14 +217,47 @@ export class AggregateTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateBytes(): Uint8Array {
-        throw new Error('Not implemented');
+        const signerBuffer = new Uint8Array(32);
+        const signatureBuffer = new Uint8Array(64);
+
+        let transactions = Uint8Array.from([]);
+        this.innerTransactions.forEach((transaction) => {
+            const transactionByte = transaction.toAggregateTransactionBytes();
+            transactions = GeneratorUtils.concatTypedArrays(transactions, transactionByte);
+        });
+
+        const cosignatures = Uint8Array.from([]);
+        this.cosignatures.forEach((cosignature) => {
+            const signerBytes = Convert.hexToUint8(cosignature.signer.publicKey);
+            const signatureBytes = Convert.hexToUint8(cosignature.signature);
+            const cosignatureBytes = new CosignatureBuilder(
+                new KeyDto(signerBytes),
+                new SignatureDto(signatureBytes),
+            ).serialize();
+            transactions = GeneratorUtils.concatTypedArrays(cosignatures, cosignatureBytes);
+        });
+
+        console.log('cosignatures', Convert.uint8ToHex(cosignatures));
+        console.log('transactions', Convert.uint8ToHex(transactions));
+
+        const transactionBuilder = new AggregateTransactionBuilder(
+            new SignatureDto(signatureBuffer),
+            new KeyDto(signerBuffer),
+            this.versionToDTO(),
+            this.type.valueOf(),
+            new AmountDto(this.maxFee.toDTO()),
+            new TimestampDto(this.deadline.toDTO()),
+            transactions,
+            cosignatures,
+        );
+        return transactionBuilder.serialize();
     }
 
     /**
      * @internal
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        throw new Error('Not implemented');
+        throw new Error('Method not implemented');
     }
 }
diff --git a/src/model/transaction/LockFundsTransaction.ts b/src/model/transaction/LockFundsTransaction.ts
@@ -176,10 +176,8 @@ export class LockFundsTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedHashLockTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.LOCK.valueOf(),
             new UnresolvedMosaicBuilder(new UnresolvedMosaicIdDto(this.mosaic.id.id.toDTO()),
diff --git a/src/model/transaction/ModifyMultisigAccountTransaction.ts b/src/model/transaction/ModifyMultisigAccountTransaction.ts
@@ -172,10 +172,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,
diff --git a/src/model/transaction/MosaicAddressRestrictionTransaction.ts b/src/model/transaction/MosaicAddressRestrictionTransaction.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/MosaicAddressRestrictionTransaction';
 import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -188,10 +188,8 @@ export class MosaicAddressRestrictionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedMosaicAddressRestrictionTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.MOSAIC_ADDRESS_RESTRICTION.valueOf(),
             new UnresolvedMosaicIdDto(this.mosaicId.id.toDTO()),
diff --git a/src/model/transaction/MosaicAliasTransaction.ts b/src/model/transaction/MosaicAliasTransaction.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { Convert } from '../../core/format';
 import { Builder } from '../../infrastructure/builders/MosaicAliasTransaction';
 import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -158,10 +159,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(),
diff --git a/src/model/transaction/MosaicDefinitionTransaction.ts b/src/model/transaction/MosaicDefinitionTransaction.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { Convert } from '../../core/format';
 import { Builder } from '../../infrastructure/builders/MosaicCreationTransaction';
 import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -216,10 +217,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()),
diff --git a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { Convert } from '../../core/format';
 import { Builder } from '../../infrastructure/builders/MosaicGlobalRestrictionTransaction';
 import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -211,10 +212,8 @@ export class MosaicGlobalRestrictionTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedMosaicGlobalRestrictionTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.MOSAIC_GLOBAL_RESTRICTION.valueOf(),
             new UnresolvedMosaicIdDto(this.mosaicId.id.toDTO()),
diff --git a/src/model/transaction/MosaicSupplyChangeTransaction.ts b/src/model/transaction/MosaicSupplyChangeTransaction.ts
@@ -33,6 +33,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,
@@ -159,10 +160,8 @@ export class MosaicSupplyChangeTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedMosaicSupplyChangeTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.MOSAIC_SUPPLY_CHANGE.valueOf(),
             new UnresolvedMosaicIdDto(this.mosaicId.id.toDTO()),
diff --git a/src/model/transaction/RegisterNamespaceTransaction.ts b/src/model/transaction/RegisterNamespaceTransaction.ts
@@ -233,11 +233,10 @@ export class RegisterNamespaceTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
         let transactionBuilder: EmbeddedNamespaceRegistrationTransactionBuilder;
         if (this.namespaceType === NamespaceType.RootNamespace) {
             transactionBuilder = new EmbeddedNamespaceRegistrationTransactionBuilder(
-                new KeyDto(signerBuffer),
+                new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
                 this.versionToDTO(),
                 TransactionType.SECRET_LOCK.valueOf(),
                 new NamespaceIdDto(this.namespaceId.id.toDTO()),
@@ -247,7 +246,7 @@ export class RegisterNamespaceTransaction extends Transaction {
             );
         } else {
             transactionBuilder = new EmbeddedNamespaceRegistrationTransactionBuilder(
-                new KeyDto(signerBuffer),
+                new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
                 this.versionToDTO(),
                 TransactionType.SECRET_LOCK.valueOf(),
                 new NamespaceIdDto(this.namespaceId.id.toDTO()),
diff --git a/src/model/transaction/SecretLockTransaction.ts b/src/model/transaction/SecretLockTransaction.ts
@@ -204,10 +204,8 @@ export class SecretLockTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedSecretLockTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.SECRET_LOCK.valueOf(),
             new UnresolvedMosaicBuilder(new UnresolvedMosaicIdDto(this.mosaic.id.id.toDTO()),
diff --git a/src/model/transaction/SecretProofTransaction.ts b/src/model/transaction/SecretProofTransaction.ts
@@ -185,10 +185,8 @@ export class SecretProofTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
-
         const transactionBuilder = new EmbeddedSecretProofTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.SECRET_PROOF.valueOf(),
             this.hashType.valueOf(),
diff --git a/src/model/transaction/Transaction.ts b/src/model/transaction/Transaction.ts
@@ -186,6 +186,15 @@ export abstract class Transaction {
         return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {signer});
     }
 
+    /**
+     * Takes a transaction and formats bytes to be included in an aggregate transaction.
+     *
+     * @return transaction with signer serialized to be part of an aggregate transaction
+     */
+    public toAggregateTransactionBytes() {
+        return this.generateEmbeddedBytes();
+    }
+
     /**
      * Transaction pending to be included in a block
      * @returns {boolean}
diff --git a/src/model/transaction/TransferTransaction.ts b/src/model/transaction/TransferTransaction.ts
@@ -212,9 +212,8 @@ export class TransferTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     protected generateEmbeddedBytes(): Uint8Array {
-        const signerBuffer = new Uint8Array(32);
         const transactionBuilder = new EmbeddedTransferTransactionBuilder(
-            new KeyDto(signerBuffer),
+            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.TRANSFER.valueOf(),
             new UnresolvedAddressDto(RawAddress.stringToAddress(this.recipientToString())),
diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts
@@ -106,7 +106,7 @@ describe('AggregateTransaction', () => {
             NetworkType.MIJIN_TEST,
             []);
 
-        const signedTransaction = aggregateTransaction.signWith(account, generationHash);
+        const signedTransaction = aggregateTransaction.signWithCatbuffer(account, generationHash);
 
         expect(signedTransaction.payload.substring(0, 8)).to.be.equal('CD000000');
         expect(signedTransaction.payload.substring(240, 256)).to.be.equal('5100000051000000');
