Removed static version number

added versionDtoToHex()

Author: rg911

src/infrastructure/builders/AccountLinkTransaction.ts

@@ -18,15 +18,12 @@
  * @module transactions/AccountLinkTransaction
  */
 import { Convert as convert } from '../../core/format';
+import { TransactionType } from '../../model/transaction/TransactionType';
 import AccountLinkTransactionBufferPackage from '../buffers/AccountLinkTransactionBuffer';
 import AccountLinkTransactionSchema from '../schemas/AccountLinkTransactionSchema';
-import {
-    VerifiableTransaction,
-} from './VerifiableTransaction';
+import {VerifiableTransaction} from './VerifiableTransaction';
 
-const {
-    flatbuffers,
-} = require('flatbuffers');
+import {flatbuffers} from 'flatbuffers';
 
 const {
     AccountLinkTransactionBuffer,
@@ -40,20 +37,19 @@ export class AccountLinkTransaction extends VerifiableTransaction {
 
 // tslint:disable-next-line:max-classes-per-file
 export class Builder {
-    fee: any;
+    maxFee: any;
     version: any;
     type: any;
     deadline: any;
     remoteAccountKey: any;
     linkAction: any;
     constructor() {
-        this.fee = [0, 0];
-        this.version = 36865;
-        this.type = 0x414C;
+        this.maxFee = [0, 0];
+        this.type = TransactionType.LINK_ACCOUNT;
     }
 
-    addFee(fee) {
-        this.fee = fee;
+    addFee(maxFee) {
+        this.maxFee = maxFee;
         return this;
     }
 
@@ -89,7 +85,7 @@ export class Builder {
             .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0));
         const signerVector = AccountLinkTransactionBuffer.createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0));
         const deadlineVector = AccountLinkTransactionBuffer.createDeadlineVector(builder, this.deadline);
-        const feeVector = AccountLinkTransactionBuffer.createFeeVector(builder, this.fee);
+        const feeVector = AccountLinkTransactionBuffer.createFeeVector(builder, this.maxFee);
         const remoteAccountKeyVector = AccountLinkTransactionBuffer.createRemoteAccountKeyVector(builder, this.remoteAccountKey);
 
         AccountLinkTransactionBuffer.startAccountLinkTransactionBuffer(builder);

src/infrastructure/builders/AccountPropertiesAddressTransaction.ts

@@ -18,6 +18,7 @@
  * @module transactions/AccountPropertiesAddressTransaction
  */
 import { RawAddress as address } from '../../core/format';
+import { TransactionType } from '../../model/transaction/TransactionType';
 import AccountPropertiesAddressTransactionBufferPackage from '../buffers/AccountPropertiesAddressTransactionBuffer';
 import AccountPropertiesAddressModificationTransactionSchema from '../schemas/AccountPropertiesAddressModificationTransactionSchema';
 import { VerifiableTransaction } from './VerifiableTransaction';
@@ -26,9 +27,7 @@ const {
     PropertyAddressModificationBuffer,
 } = AccountPropertiesAddressTransactionBufferPackage.Buffers;
 
-const {
-    flatbuffers
-} = require('flatbuffers');
+import {flatbuffers} from 'flatbuffers';
 
 export default class AccountPropertiesAddressTransaction extends VerifiableTransaction {
     constructor(bytes) {
@@ -38,20 +37,19 @@ export default class AccountPropertiesAddressTransaction extends VerifiableTrans
 
 // tslint:disable-next-line:max-classes-per-file
 export class Builder {
-    fee: any;
+    maxFee: any;
     version: any;
     type: any;
     deadline: any;
     propertyType: any;
     modifications: any;
     constructor() {
-        this.fee = [0, 0];
-        this.version = 36865;
-        this.type = 0x4150;
+        this.maxFee = [0, 0];
+        this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS;
     }
 
-    addFee(fee) {
-        this.fee = fee;
+    addFee(maxFee) {
+        this.maxFee = maxFee;
         return this;
     }
 
@@ -85,7 +83,7 @@ export class Builder {
 
         // Create modifications
         const modificationsArray: any = [];
-        this.modifications.forEach(modification => {
+        this.modifications.forEach((modification) => {
             const addressModificationVector = PropertyAddressModificationBuffer
                 .createValueVector(builder, address.stringToAddress(modification.value));
             PropertyAddressModificationBuffer.startPropertyAddressModificationBuffer(builder);
@@ -102,7 +100,7 @@ export class Builder {
         const deadlineVector = AccountPropertiesAddressTransactionBuffer
             .createDeadlineVector(builder, this.deadline);
         const feeVector = AccountPropertiesAddressTransactionBuffer
-            .createFeeVector(builder, this.fee);
+            .createFeeVector(builder, this.maxFee);
         const modificationVector = AccountPropertiesAddressTransactionBuffer
             .createModificationsVector(builder, modificationsArray);
 

src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts

@@ -17,6 +17,7 @@
 /**
  * @module transactions/AccountPropertiesEntityTypeTransaction
  */
+import { TransactionType } from '../../model/transaction/TransactionType';
 import AccountPropertiesEntityTypeTransactionBufferPackage from '../buffers/AccountPropertiesEntityTypeTransactionBuffer';
 import AccountPropertiesEntityTypeModificationTransactionSchema from '../schemas/AccountPropertiesEntityTypeModificationTransactionSchema';
 import { VerifiableTransaction } from './VerifiableTransaction';
@@ -26,9 +27,7 @@ const {
     PropertyEntityTypeModificationBuffer,
 } = AccountPropertiesEntityTypeTransactionBufferPackage.Buffers;
 
-const {
-    flatbuffers
-} = require('flatbuffers');
+import {flatbuffers} from 'flatbuffers';
 
 export default class AccountPropertiesEntityTypeTransaction extends VerifiableTransaction {
     constructor(bytes) {
@@ -38,20 +37,19 @@ export default class AccountPropertiesEntityTypeTransaction extends VerifiableTr
 
 // tslint:disable-next-line:max-classes-per-file
 export class Builder {
-    fee: any;
+    maxFee: any;
     version: any;
     type: any;
     deadline: any;
     propertyType: any;
     modifications: any;
     constructor() {
-        this.fee = [0, 0];
-        this.version = 36865;
-        this.type = 0x4350;
+        this.maxFee = [0, 0];
+        this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE;
     }
 
-    addFee(fee) {
-        this.fee = fee;
+    addFee(maxFee) {
+        this.maxFee = maxFee;
         return this;
     }
 
@@ -85,7 +83,7 @@ export class Builder {
 
         // Create modifications
         const modificationsArray: any = [];
-        this.modifications.forEach(modification => {
+        this.modifications.forEach((modification) => {
             PropertyEntityTypeModificationBuffer.startPropertyEntityTypeModificationBuffer(builder);
             PropertyEntityTypeModificationBuffer.addModificationType(builder, modification.type);
             PropertyEntityTypeModificationBuffer.addValue(builder, modification.value);
@@ -100,7 +98,7 @@ export class Builder {
         const deadlineVector = AccountPropertiesEntityTypeTransactionBuffer
             .createDeadlineVector(builder, this.deadline);
         const feeVector = AccountPropertiesEntityTypeTransactionBuffer
-            .createFeeVector(builder, this.fee);
+            .createFeeVector(builder, this.maxFee);
         const modificationVector = AccountPropertiesEntityTypeTransactionBuffer
             .createModificationsVector(builder, modificationsArray);
 

src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts

@@ -17,6 +17,7 @@
 /**
  * @module transactions/AccountPropertiesMosaicTransaction
  */
+import { TransactionType } from '../../model/transaction/TransactionType';
 import AccountPropertiesMosaicTransactionBufferPackage from '../buffers/AccountPropertiesMosaicTransactionBuffer';
 import AccountPropertiesMosaicModificationTransactionSchema from '../schemas/AccountPropertiesMosaicModificationTransactionSchema';
 import { VerifiableTransaction } from './VerifiableTransaction';
@@ -26,9 +27,7 @@ const {
     PropertyMosaicModificationBuffer,
 } = AccountPropertiesMosaicTransactionBufferPackage.Buffers;
 
-const {
-    flatbuffers,
-} = require('flatbuffers');
+import {flatbuffers} from 'flatbuffers';
 
 export default class AccountPropertiesMosaicTransaction extends VerifiableTransaction {
     constructor(bytes) {
@@ -38,20 +37,19 @@ export default class AccountPropertiesMosaicTransaction extends VerifiableTransa
 
 // tslint:disable-next-line:max-classes-per-file
 export class Builder {
-    fee: any;
+    maxFee: any;
     version: any;
     type: any;
     deadline: any;
     propertyType: any;
     modifications: any;
     constructor() {
-        this.fee = [0, 0];
-        this.version = 36865;
-        this.type = 0x4250;
+        this.maxFee = [0, 0];
+        this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC;
     }
 
-    addFee(fee) {
-        this.fee = fee;
+    addFee(maxFee) {
+        this.maxFee = maxFee;
         return this;
     }
 
@@ -85,7 +83,7 @@ export class Builder {
 
         // Create modifications
         const modificationsArray: any = [];
-        this.modifications.forEach(modification => {
+        this.modifications.forEach((modification) => {
             const addressModificationVector = PropertyMosaicModificationBuffer
                 .createValueVector(builder, modification.value);
             PropertyMosaicModificationBuffer.startPropertyMosaicModificationBuffer(builder);
@@ -102,7 +100,7 @@ export class Builder {
         const deadlineVector = AccountPropertiesMosaicTransactionBuffer
             .createDeadlineVector(builder, this.deadline);
         const feeVector = AccountPropertiesMosaicTransactionBuffer
-            .createFeeVector(builder, this.fee);
+            .createFeeVector(builder, this.maxFee);
         const modificationVector = AccountPropertiesMosaicTransactionBuffer
             .createModificationsVector(builder, modificationsArray);
 

src/infrastructure/builders/AddressAliasTransaction.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { RawAddress as addressLibrary } from '../../core/format';
+import { TransactionType } from '../../model/transaction/TransactionType';
 import AddressAliasTransactionBufferPackage from '../buffers/AddressAliasTransactionBuffer';
 import AddressAliasTransactionSchema from '../schemas/AddressAliasTransactionSchema';
 import { VerifiableTransaction } from './VerifiableTransaction';
@@ -22,9 +23,7 @@ const {
     AddressAliasTransactionBuffer,
 } = AddressAliasTransactionBufferPackage.Buffers;
 
-const {
-    flatbuffers,
-} = require('flatbuffers');
+import {flatbuffers} from 'flatbuffers';
 
 /**
  * @module transactions/AddressAliasTransaction
@@ -36,21 +35,20 @@ export class AddressAliasTransaction extends VerifiableTransaction {
 }
 // tslint:disable-next-line:max-classes-per-file
 export class Builder {
-    fee: any;
+    maxFee: any;
     version: any;
     type: any;
     deadline: any;
     address: any;
     namespaceId: any;
     actionType: any;
     constructor() {
-        this.fee = [0, 0];
-        this.version = 36865;
-        this.type = 0x424E;
+        this.maxFee = [0, 0];
+        this.type = TransactionType.ADDRESS_ALIAS;
     }
 
-    addFee(fee) {
-        this.fee = fee;
+    addFee(maxFee) {
+        this.maxFee = maxFee;
         return this;
     }
 
@@ -95,7 +93,7 @@ export class Builder {
         const deadlineVector = AddressAliasTransactionBuffer
             .createDeadlineVector(builder, this.deadline);
         const feeVector = AddressAliasTransactionBuffer
-            .createFeeVector(builder, this.fee);
+            .createFeeVector(builder, this.maxFee);
         const namespaceIdVector = AddressAliasTransactionBuffer
             .createNamespaceIdVector(builder, this.namespaceId);
         const addressVector = AddressAliasTransactionBuffer

src/infrastructure/builders/AggregateTransaction.ts

@@ -17,14 +17,13 @@
 /**
  * @module transactions/AggregateTransaction
  */
+import { TransactionType } from '../../model/transaction/TransactionType';
 import AggregateTransactionBufferPackage from '../buffers/AggregateTransactionBuffer';
 import AggregateTransactionSchema from '../schemas/AggregateTransactionSchema';
 import { CosignatureTransaction} from './CosignatureTransaction';
 import { VerifiableTransaction } from './VerifiableTransaction';
 
-const {
-    flatbuffers,
-} = require('flatbuffers');
+import {flatbuffers} from 'flatbuffers';
 
 const {
     AggregateTransactionBuffer,
@@ -76,19 +75,18 @@ export class AggregateTransaction extends VerifiableTransaction {
 }
 // tslint:disable-next-line:max-classes-per-file
 export class Builder {
-    fee: any;
+    maxFee: any;
     version: any;
     type: any;
     deadline: any;
     transactions: any;
     constructor() {
-        this.fee = [0, 0];
-        this.version = 36865;
-        this.type = 0x4141;
+        this.maxFee = [0, 0];
+        this.type = TransactionType.AGGREGATE_COMPLETE;
     }
 
-    addFee(fee) {
-        this.fee = fee;
+    addFee(maxFee) {
+        this.maxFee = maxFee;
         return this;
     }
 
@@ -128,7 +126,7 @@ export class Builder {
             .createSignerVector(builder, Array(...Array(32))
                 .map(Number.prototype.valueOf, 0));
         const deadlineVector = AggregateTransactionBuffer.createDeadlineVector(builder, this.deadline);
-        const feeVector = AggregateTransactionBuffer.createFeeVector(builder, this.fee);
+        const feeVector = AggregateTransactionBuffer.createFeeVector(builder, this.maxFee);
         const modificationsVector = AggregateTransactionBuffer.createTransactionsVector(builder, this.transactions);
 
         AggregateTransactionBuffer.startAggregateTransactionBuffer(builder);

src/infrastructure/builders/HashLockTransaction.ts

@@ -21,10 +21,9 @@ import { Convert as convert } from '../../core/format';
 import * as HashLockTransactionBufferPackage from '../buffers/HashLockTransactionBuffer';
 import HashLockTransactionSchema from '../schemas/HashLockTransactionSchema';
 import { VerifiableTransaction } from './VerifiableTransaction';
+import { TransactionType } from '../../model/transaction/TransactionType';
 
-const {
-    flatbuffers,
-} = require('flatbuffers');
+import {flatbuffers} from 'flatbuffers';
 
 const {
     HashLockTransactionBuffer,
@@ -38,7 +37,7 @@ export default class HashLockTransaction extends VerifiableTransaction {
 
 // tslint:disable-next-line:max-classes-per-file
 export class Builder {
-    fee: any;
+    maxFee: any;
     version: any;
     type: any;
     deadline: any;
@@ -47,13 +46,12 @@ export class Builder {
     duration: any;
     hash: any;
     constructor() {
-        this.fee = [0, 0];
-        this.version = 36865;
-        this.type = 0x414C;
+        this.maxFee = [0, 0];
+        this.type = TransactionType.LOCK;
     }
 
-    addFee(fee) {
-        this.fee = fee;
+    addFee(maxFee) {
+        this.maxFee = maxFee;
         return this;
     }
 
@@ -100,7 +98,7 @@ export class Builder {
             .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0));
         const signerVector = HashLockTransactionBuffer.createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0));
         const deadlineVector = HashLockTransactionBuffer.createDeadlineVector(builder, this.deadline);
-        const feeVector = HashLockTransactionBuffer.createFeeVector(builder, this.fee);
+        const feeVector = HashLockTransactionBuffer.createFeeVector(builder, this.maxFee);
         const mosaicIdVector = HashLockTransactionBuffer.createMosaicIdVector(builder, this.mosaicId);
         const mosaicAmountVector = HashLockTransactionBuffer.createMosaicAmountVector(builder, this.mosaicAmount);
         const durationVector = HashLockTransactionBuffer.createDurationVector(builder, this.duration);