Applied catbuffer on receipt

Author: rg911

src/infrastructure/catbuffer/ReceiptBuilder.ts

@@ -97,8 +97,6 @@ export class ReceiptBuilder {
      */
     public serialize(): Uint8Array {
         let newArray = Uint8Array.from([]);
-        const sizeBytes = GeneratorUtils.uintToBuffer(this.getSize(), 4);
-        newArray = GeneratorUtils.concatTypedArrays(newArray, sizeBytes);
         const versionBytes = GeneratorUtils.uintToBuffer(this.getVersion(), 2);
         newArray = GeneratorUtils.concatTypedArrays(newArray, versionBytes);
         const typeBytes = GeneratorUtils.uintToBuffer(this.type, 2);

src/model/receipt/ArtifactExpiryReceipt.ts

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import { Convert } from '../../core/format/Convert';
-import { GeneratorUtils } from '../../infrastructure/catbuffer/GeneratorUtils';
+import { MosaicExpiryReceiptBuilder } from '../../infrastructure/catbuffer/MosaicExpiryReceiptBuilder';
+import { MosaicIdDto } from '../../infrastructure/catbuffer/MosaicIdDto';
+import { NamespaceExpiryReceiptBuilder } from '../../infrastructure/catbuffer/NamespaceExpiryReceiptBuilder';
+import { NamespaceIdDto } from '../../infrastructure/catbuffer/NamespaceIdDto';
 import { MosaicId } from '../mosaic/MosaicId';
 import { NamespaceId } from '../namespace/NamespaceId';
-import { UInt64 } from '../UInt64';
 import { Receipt } from './Receipt';
 import { ReceiptType } from './ReceiptType';
 import { ReceiptVersion } from './ReceiptVersion';
@@ -48,10 +49,11 @@ export class ArtifactExpiryReceipt extends Receipt {
      * @return {Uint8Array}
      */
     public serialize(): Uint8Array {
-        const buffer = new Uint8Array(12);
-        buffer.set(GeneratorUtils.uintToBuffer(ReceiptVersion.ARTIFACT_EXPIRY, 2));
-        buffer.set(GeneratorUtils.uintToBuffer(this.type, 2), 2);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.artifactId.toHex()).toDTO()), 4);
-        return buffer;
+        if (this.artifactId instanceof MosaicId) {
+            return new MosaicExpiryReceiptBuilder(ReceiptVersion.ARTIFACT_EXPIRY, this.type.valueOf(),
+                new MosaicIdDto(this.artifactId.toDTO())).serialize();
+        }
+        return new NamespaceExpiryReceiptBuilder(ReceiptVersion.ARTIFACT_EXPIRY, this.type.valueOf(),
+            new NamespaceIdDto(this.artifactId.id.toDTO())).serialize();
     }
 }

src/model/receipt/BalanceChangeReceipt.ts

@@ -15,7 +15,11 @@
  */
 
 import { Convert } from '../../core/format/Convert';
-import { GeneratorUtils } from '../../infrastructure/catbuffer/GeneratorUtils';
+import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
+import { BalanceChangeReceiptBuilder } from '../../infrastructure/catbuffer/BalanceChangeReceiptBuilder';
+import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
+import { MosaicBuilder } from '../../infrastructure/catbuffer/MosaicBuilder';
+import { MosaicIdDto } from '../../infrastructure/catbuffer/MosaicIdDto';
 import { PublicAccount } from '../account/PublicAccount';
 import { MosaicId } from '../mosaic/MosaicId';
 import { UInt64 } from '../UInt64';
@@ -62,12 +66,9 @@ export class BalanceChangeReceipt extends Receipt {
      * @return {Uint8Array}
      */
     public serialize(): Uint8Array {
-        const buffer = new Uint8Array(52);
-        buffer.set(GeneratorUtils.uintToBuffer(ReceiptVersion.BALANCE_CHANGE, 2));
-        buffer.set(GeneratorUtils.uintToBuffer(this.type, 2), 2);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.mosaicId.toHex()).toDTO()), 4);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.amount.toHex()).toDTO()), 12);
-        buffer.set(Convert.hexToUint8(this.targetPublicAccount.publicKey), 20);
-        return buffer;
+        return new BalanceChangeReceiptBuilder(ReceiptVersion.BALANCE_CHANGE, this.type.valueOf(),
+            new MosaicBuilder(new MosaicIdDto(this.mosaicId.toDTO()), new AmountDto(this.amount.toDTO())),
+            new KeyDto(Convert.hexToUint8(this.targetPublicAccount.publicKey)),
+        ).serialize();
     }
 }

src/model/receipt/BalanceTransferReceipt.ts

@@ -15,8 +15,13 @@
  */
 
 import { Convert } from '../../core/format/Convert';
-import { UnresolvedMapping } from "../../core/utils/UnresolvedMapping";
-import { GeneratorUtils } from '../../infrastructure/catbuffer/GeneratorUtils';
+import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
+import { AddressDto } from '../../infrastructure/catbuffer/AddressDto';
+import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
+import { BalanceTransferReceiptBuilder } from '../../infrastructure/catbuffer/BalanceTransferReceiptBuilder';
+import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
+import { MosaicBuilder } from '../../infrastructure/catbuffer/MosaicBuilder';
+import { MosaicIdDto } from '../../infrastructure/catbuffer/MosaicIdDto';
 import { Address } from '../account/Address';
 import { PublicAccount } from '../account/PublicAccount';
 import { MosaicId } from '../mosaic/MosaicId';
@@ -70,15 +75,11 @@ export class BalanceTransferReceipt extends Receipt {
      * @return {Uint8Array}
      */
     public serialize(): Uint8Array {
-        const recipient = this.getRecipientBytes();
-        const buffer = new Uint8Array(52 + recipient.length);
-        buffer.set(GeneratorUtils.uintToBuffer(ReceiptVersion.BALANCE_TRANSFER, 2));
-        buffer.set(GeneratorUtils.uintToBuffer(this.type, 2), 2);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.mosaicId.toHex()).toDTO()), 4);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.amount.toHex()).toDTO()), 12);
-        buffer.set(Convert.hexToUint8(this.sender.publicKey), 20);
-        buffer.set(recipient, 52);
-        return buffer;
+        return new BalanceTransferReceiptBuilder(ReceiptVersion.BALANCE_TRANSFER, this.type.valueOf(),
+            new MosaicBuilder(new MosaicIdDto(this.mosaicId.toDTO()), new AmountDto(this.amount.toDTO())),
+            new KeyDto(Convert.hexToUint8(this.sender.publicKey)),
+            new AddressDto(this.getRecipientBytes()),
+        ).serialize();
     }
 
     /**

src/model/receipt/InflationReceipt.ts

@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-import { Convert } from '../../core/format/Convert';
-import { GeneratorUtils } from '../../infrastructure/catbuffer/GeneratorUtils';
+import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
+import { InflationReceiptBuilder } from '../../infrastructure/catbuffer/InflationReceiptBuilder';
+import { MosaicBuilder } from '../../infrastructure/catbuffer/MosaicBuilder';
+import { MosaicIdDto } from '../../infrastructure/catbuffer/MosaicIdDto';
 import { MosaicId } from '../mosaic/MosaicId';
 import { UInt64 } from '../UInt64';
 import { Receipt } from './Receipt';
@@ -56,11 +58,9 @@ export class InflationReceipt extends Receipt {
      * @return {Uint8Array}
      */
     public serialize(): Uint8Array {
-        const buffer = new Uint8Array(20);
-        buffer.set(GeneratorUtils.uintToBuffer(ReceiptVersion.INFLATION_RECEIPT, 2));
-        buffer.set(GeneratorUtils.uintToBuffer(this.type, 2), 2);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.mosaicId.toHex()).toDTO()), 4);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.amount.toHex()).toDTO()), 12);
-        return buffer;
+       return new InflationReceiptBuilder(
+            ReceiptVersion.INFLATION_RECEIPT, this.type.valueOf(),
+            new MosaicBuilder(new MosaicIdDto(this.mosaicId.toDTO()), new AmountDto(this.amount.toDTO())),
+        ).serialize();
     }
 }