fixed a few bugs on account property transaction

Author: Steven Liu

src/model/account/PropertyType.ts

@@ -26,9 +26,9 @@
 export enum PropertyType {
     AllowAddress = 0x01,
     AllowMosaic = 0x02,
-    AllowTransaction = 0x03,
-    Sentinel = 0x04,
+    AllowTransaction = 0x04,
+    Sentinel = 0x05,
     BlockAddress = (0x80 + 0x01),
     BlockMosaic = (0x80 + 0x02),
-    BlockTransaction = (0x80 + 0x03),
+    BlockTransaction = (0x80 + 0x04),
 }

src/model/transaction/AccountPropertyTransaction.ts

@@ -70,10 +70,10 @@ export class AccountPropertyTransaction {
      * @param networkType - The network type.
      * @returns {ModifyAccountPropertyEntityTypeTransaction}
      */
-    public static createEntityTypeProertyModificationransaction(deadline: Deadline,
-                                                                propertyType: PropertyType,
-                                                                modifications: Array<AccountPropertyModification<number>>,
-                                                                networkType: NetworkType): ModifyAccountPropertyEntityTypeTransaction {
+    public static createEntityTypePropertyModificationTransaction(deadline: Deadline,
+                                                                  propertyType: PropertyType,
+                                                                  modifications: Array<AccountPropertyModification<number>>,
+                                                                  networkType: NetworkType): ModifyAccountPropertyEntityTypeTransaction {
         if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) {
             throw new Error ('Property type is not allowed.');
         }

src/model/transaction/ModifyAccountPropertyAddressTransaction.ts

@@ -24,6 +24,7 @@ import { Deadline } from './Deadline';
 import { Transaction } from './Transaction';
 import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
+import { TransactionVersion } from './TransactionVersion';
 
 export class ModifyAccountPropertyAddressTransaction extends Transaction {
 
@@ -40,7 +41,7 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction {
                          modifications: Array<AccountPropertyModification<string>>,
                          networkType: NetworkType): ModifyAccountPropertyAddressTransaction {
         return new ModifyAccountPropertyAddressTransaction(networkType,
-            3,
+            TransactionVersion.ACCOUNT_PROPERTY,
             deadline,
             new UInt64([0, 0]),
             propertyType,

src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts

@@ -25,6 +25,7 @@ import { Deadline } from './Deadline';
 import { Transaction } from './Transaction';
 import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
+import { TransactionVersion } from './TransactionVersion';
 
 export class ModifyAccountPropertyEntityTypeTransaction extends Transaction {
 
@@ -41,7 +42,7 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction {
                          modifications: Array<AccountPropertyModification<number>>,
                          networkType: NetworkType): ModifyAccountPropertyEntityTypeTransaction {
         return new ModifyAccountPropertyEntityTypeTransaction(networkType,
-            3,
+            TransactionVersion.ACCOUNT_PROPERTY,
             deadline,
             new UInt64([0, 0]),
             propertyType,

src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts

@@ -24,6 +24,7 @@ import { Deadline } from './Deadline';
 import { Transaction } from './Transaction';
 import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
+import { TransactionVersion } from './TransactionVersion';
 
 export class ModifyAccountPropertyMosaicTransaction extends Transaction {
 
@@ -40,7 +41,7 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction {
                          modifications: Array<AccountPropertyModification<number[]>>,
                          networkType: NetworkType): ModifyAccountPropertyMosaicTransaction {
         return new ModifyAccountPropertyMosaicTransaction(networkType,
-            3,
+            TransactionVersion.ACCOUNT_PROPERTY,
             deadline,
             new UInt64([0, 0]),
             propertyType,

src/model/transaction/TransactionVersion.ts

@@ -19,10 +19,10 @@
  *
  * Transaction format versions are defined in catapult-server in
  * each transaction's plugin source code.
- * 
+ *
  * In [catapult-server](https://github.com/nemtech/catapult-server), the `DEFINE_TRANSACTION_CONSTANTS` macro
  * is used to define the `TYPE` and `VERSION` of the transaction format.
- * 
+ *
  * @see https://github.com/nemtech/catapult-server/blob/master/plugins/txes/transfer/src/model/TransferTransaction.h#L37
  */
 export class TransactionVersion {
@@ -97,4 +97,10 @@ export class TransactionVersion {
      * @type {number}
      */
     public static readonly MOSAIC_ALIAS = 1;
+
+    /**
+     * Account Property transaction version
+     * @type {number}
+     */
+    public static readonly ACCOUNT_PROPERTY = 1;
 }

test/model/transaction/AccountPropertyTransaction.spec.ts

@@ -163,7 +163,7 @@ describe('AccountPropertyTransaction', () => {
             PropertyModificationType.Add,
             entityType,
         );
-        const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypeProertyModificationransaction(
+        const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction(
             Deadline.create(),
             PropertyType.AllowTransaction,
             [entityTypePropertyFilter],
@@ -175,7 +175,7 @@ describe('AccountPropertyTransaction', () => {
         expect(signedTransaction.payload.substring(
             240,
             signedTransaction.payload.length,
-        )).to.be.equal('0301004E420000');
+        )).to.be.equal('0401004E42');
 
     });
 
@@ -188,7 +188,7 @@ describe('AccountPropertyTransaction', () => {
         );
 
         expect(() => {
-            AccountPropertyTransaction.createEntityTypeProertyModificationransaction(
+            AccountPropertyTransaction.createEntityTypePropertyModificationTransaction(
                 Deadline.create(),
                 PropertyType.Sentinel,
                 [entityTypePropertyFilter],