Added: maxFee factory method to be able to use feeMultiplier

Optimised: Transaction.resloveAlias with object assign
Added: unit tests for Transaction.resloveAlias

Author: rg911

src/model/transaction/AccountAddressRestrictionTransaction.ts

@@ -199,19 +199,23 @@ export class AccountAddressRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): AccountAddressRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return new AccountAddressRestrictionTransaction(
-            this.networkType,
-            this.version,
-            this.deadline,
-            this.maxFee,
-            this.restrictionFlags,
-            this.restrictionAdditions.map((addition) => statement.resolveAddress(addition, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)),
-            this.restrictionDeletions.map((deletion) => statement.resolveAddress(deletion, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)),
-            this.signature,
-            this.signer,
-            this.transactionInfo,
-        );
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
+            {
+                restrictionAdditions:
+                    this.restrictionAdditions.map((addition) => statement.resolveAddress(addition, transactionInfo.height.toString(),
+                        transactionInfo.index, aggregateTransactionIndex)),
+                restrictionDeletions:
+                    this.restrictionDeletions.map((deletion) => statement.resolveAddress(deletion, transactionInfo.height.toString(),
+                        transactionInfo.index, aggregateTransactionIndex)),
+            });
+    }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {AccountAddressRestrictionTransaction}
+     */
+    public setMaxFee(multiplier: number): AccountAddressRestrictionTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
     }
 }

src/model/transaction/AccountLinkTransaction.ts

@@ -171,4 +171,13 @@ export class AccountLinkTransaction extends Transaction {
     resolveAliases(): AccountLinkTransaction {
         return this;
     }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {AccountLinkTransaction}
+     */
+    public setMaxFee(multiplier: number): AccountLinkTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
+    }
 }

src/model/transaction/AccountMetadataTransaction.ts

@@ -201,4 +201,13 @@ export class AccountMetadataTransaction extends Transaction {
     resolveAliases(): AccountMetadataTransaction {
         return this;
     }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {AccountMetadataTransaction}
+     */
+    public setMaxFee(multiplier: number): AccountMetadataTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
+    }
 }

src/model/transaction/AccountMosaicRestrictionTransaction.ts

@@ -199,19 +199,23 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): AccountMosaicRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return new AccountMosaicRestrictionTransaction(
-            this.networkType,
-            this.version,
-            this.deadline,
-            this.maxFee,
-            this.restrictionFlags,
-            this.restrictionAdditions.map((addition) => statement.resolveMosaicId(addition, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)),
-            this.restrictionDeletions.map((deletion) => statement.resolveMosaicId(deletion, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)),
-            this.signature,
-            this.signer,
-            this.transactionInfo,
-        );
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
+            {
+                restrictionAdditions:
+                    this.restrictionAdditions.map((addition) => statement.resolveMosaicId(addition, transactionInfo.height.toString(),
+                        transactionInfo.index, aggregateTransactionIndex)),
+                restrictionDeletions:
+                    this.restrictionDeletions.map((deletion) => statement.resolveMosaicId(deletion, transactionInfo.height.toString(),
+                        transactionInfo.index, aggregateTransactionIndex)),
+            });
+    }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {AccountMosaicRestrictionTransaction}
+     */
+    public setMaxFee(multiplier: number): AccountMosaicRestrictionTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
     }
 }

src/model/transaction/AccountOperationRestrictionTransaction.ts

@@ -182,4 +182,13 @@ export class AccountOperationRestrictionTransaction extends Transaction {
     resolveAliases(): AccountOperationRestrictionTransaction {
         return this;
     }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {AccountOperationRestrictionTransaction}
+     */
+    public setMaxFee(multiplier: number): AccountOperationRestrictionTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
+    }
 }

src/model/transaction/AddressAliasTransaction.ts

@@ -194,4 +194,13 @@ export class AddressAliasTransaction extends Transaction {
     resolveAliases(): AddressAliasTransaction {
         return this;
     }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {AddressAliasTransaction}
+     */
+    public setMaxFee(multiplier: number): AddressAliasTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
+    }
 }

src/model/transaction/AggregateTransaction.ts

@@ -407,18 +407,17 @@ export class AggregateTransaction extends Transaction {
      */
     resolveAliases(statement: Statement): AggregateTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return new AggregateTransaction(
-            this.networkType,
-            this.type,
-            this.version,
-            this.deadline,
-            this.maxFee,
-            this.innerTransactions.map((tx) => tx.resolveAliases(statement, transactionInfo.index))
-                .sort((a, b) => a.transactionInfo!.index - b.transactionInfo!.index),
-            this.cosignatures,
-            this.signature,
-            this.signer,
-            this.transactionInfo,
-        );
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
+        {innerTransactions: this.innerTransactions.map((tx) => tx.resolveAliases(statement, transactionInfo.index))
+            .sort((a, b) => a.transactionInfo!.index - b.transactionInfo!.index)});
+    }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {AggregateTransaction}
+     */
+    public setMaxFee(multiplier: number): AggregateTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
     }
 }

src/model/transaction/LockFundsTransaction.ts

@@ -212,18 +212,18 @@ export class LockFundsTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): LockFundsTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return new LockFundsTransaction(
-            this.networkType,
-            this.version,
-            this.deadline,
-            this.maxFee,
-            statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex),
-            this.duration,
-            this.signedTransaction,
-            this.signature,
-            this.signer,
-            this.transactionInfo,
-        );
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
+            {
+                mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
+                transactionInfo.index, aggregateTransactionIndex)});
+    }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {LockFundsTransaction}
+     */
+    public setMaxFee(multiplier: number): LockFundsTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
     }
 }

src/model/transaction/MosaicAddressRestrictionTransaction.ts

@@ -243,21 +243,20 @@ export class MosaicAddressRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicAddressRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return new MosaicAddressRestrictionTransaction(
-            this.networkType,
-            this.version,
-            this.deadline,
-            this.maxFee,
-            statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex),
-            this.restrictionKey,
-            statement.resolveAddress(this.targetAddress,
-                transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex),
-            this.previousRestrictionValue,
-            this.newRestrictionValue,
-            this.signature,
-            this.signer,
-            this.transactionInfo,
-        );
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
+            {
+                mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
+                    transactionInfo.index, aggregateTransactionIndex),
+                    targetAddress: statement.resolveAddress(this.targetAddress,
+                    transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)});
+    }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {MosaicAddressRestrictionTransaction}
+     */
+    public setMaxFee(multiplier: number): MosaicAddressRestrictionTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
     }
 }

src/model/transaction/MosaicAliasTransaction.ts

@@ -186,4 +186,13 @@ export class MosaicAliasTransaction extends Transaction {
     resolveAliases(): MosaicAliasTransaction {
         return this;
     }
+
+    /**
+     * Set transaction maxFee using fee multiplier
+     * @param feeMultiplier The fee multiplier
+     * @returns {MosaicAliasTransaction}
+     */
+    public setMaxFee(multiplier: number): MosaicAliasTransaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * multiplier)});
+    }
 }