Merge pull request #391 from NEMStudios/task/g390_max_fee

Fixed #390 Spread operator does not assign super class methods

Author: rg911

src/core/utils/DtoMapping.ts

@@ -54,4 +54,15 @@ export class DtoMapping {
                         }
                     })));
     }
+
+    /**
+     * Creates a copy of the first object adding the attributes of the second object.
+     * @param object the object to be cloned
+     * @param attributes the extra attributes to be added to the object.
+     * @returns a copy of the first object with the new attributes added.
+     */
+    public static assign<T>(object: T, attributes: any): T {
+        return Object.assign({__proto__: Object.getPrototypeOf(object)}, object, attributes);
+    }
+
 }

src/model/transaction/AccountAddressRestrictionTransaction.ts

@@ -15,6 +15,7 @@
  */
 
 import { Convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AccountAddressRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountAddressRestrictionTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -199,13 +200,13 @@ export class AccountAddressRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): AccountAddressRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return {...Object.getPrototypeOf(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)),
-            };
+        return DtoMapping.assign(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)),
+        });
     }
 }

src/model/transaction/AccountMosaicRestrictionTransaction.ts

@@ -15,6 +15,7 @@
  */
 
 import { Convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AccountMosaicRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountMosaicRestrictionTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -199,13 +200,13 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): AccountMosaicRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return {...Object.getPrototypeOf(this),
+        return DtoMapping.assign(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)),
-        };
+        });
     }
 }

src/model/transaction/AggregateTransaction.ts

@@ -16,6 +16,7 @@
 
 import {KeyPair, MerkleHashBuilder, SHA3Hasher, SignSchema} from '../../core/crypto';
 import {Convert} from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import {AggregateBondedTransactionBuilder} from '../../infrastructure/catbuffer/AggregateBondedTransactionBuilder';
 import {AggregateCompleteTransactionBuilder} from '../../infrastructure/catbuffer/AggregateCompleteTransactionBuilder';
 import {AmountDto} from '../../infrastructure/catbuffer/AmountDto';
@@ -193,7 +194,7 @@ export class AggregateTransaction extends Transaction {
      */
     public addTransactions(transactions: InnerTransaction[]): AggregateTransaction {
         const innerTransactions = this.innerTransactions.concat(transactions);
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {innerTransactions});
+        return DtoMapping.assign(this, {innerTransactions});
     }
 
     /**
@@ -204,7 +205,7 @@ export class AggregateTransaction extends Transaction {
      */
     public addCosignatures(cosigs: AggregateTransactionCosignature[]): AggregateTransaction {
         const cosignatures = this.cosignatures.concat(cosigs);
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {cosignatures});
+        return DtoMapping.assign(this, {cosignatures});
     }
 
     /**
@@ -407,8 +408,8 @@ export class AggregateTransaction extends Transaction {
      */
     resolveAliases(statement: Statement): AggregateTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-        {innerTransactions: this.innerTransactions.map((tx) => tx.resolveAliases(statement, transactionInfo.index))
+        return DtoMapping.assign(this,
+            {innerTransactions: this.innerTransactions.map((tx) => tx.resolveAliases(statement, transactionInfo.index))
             .sort((a, b) => a.transactionInfo!.index - b.transactionInfo!.index)});
     }
 }

src/model/transaction/LockFundsTransaction.ts

@@ -15,6 +15,7 @@
  */
 
 import { Convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { BlockDurationDto } from '../../infrastructure/catbuffer/BlockDurationDto';
 import { EmbeddedHashLockTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedHashLockTransactionBuilder';
@@ -211,8 +212,8 @@ export class LockFundsTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): LockFundsTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return {...Object.getPrototypeOf(this),
+        return DtoMapping.assign(this, {
             mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
-            transactionInfo.index, aggregateTransactionIndex)};
+            transactionInfo.index, aggregateTransactionIndex)});
     }
 }

src/model/transaction/MosaicAddressRestrictionTransaction.ts

@@ -15,6 +15,7 @@
  */
 
 import { Convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import {
@@ -243,10 +244,10 @@ export class MosaicAddressRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicAddressRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return {...Object.getPrototypeOf(this),
+        return DtoMapping.assign(this, {
             mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
                 transactionInfo.index, aggregateTransactionIndex),
             targetAddress: statement.resolveAddress(this.targetAddress,
-                transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)};
+                transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)});
     }
 }

src/model/transaction/MosaicGlobalRestrictionTransaction.ts

@@ -15,6 +15,7 @@
  */
 
 import { Convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import {
@@ -253,10 +254,10 @@ export class MosaicGlobalRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicGlobalRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return {...Object.getPrototypeOf(this),
+        return DtoMapping.assign(this, {
             mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
                 transactionInfo.index, aggregateTransactionIndex),
             referenceMosaicId: statement.resolveMosaicId(this.referenceMosaicId, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)};
+                transactionInfo.index, aggregateTransactionIndex)});
     }
 }

src/model/transaction/MosaicMetadataTransaction.ts

@@ -15,6 +15,7 @@
  */
 
 import { Convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { EmbeddedMosaicMetadataTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedMosaicMetadataTransactionBuilder';
@@ -219,8 +220,8 @@ export class MosaicMetadataTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicMetadataTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return {...Object.getPrototypeOf(this),
+        return DtoMapping.assign(this, {
             targetMosaicId: statement.resolveMosaicId(this.targetMosaicId, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)};
+                transactionInfo.index, aggregateTransactionIndex)});
     }
 }

src/model/transaction/MosaicSupplyChangeTransaction.ts

@@ -15,6 +15,7 @@
  */
 
 import { Convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { EmbeddedMosaicSupplyChangeTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedMosaicSupplyChangeTransactionBuilder';
@@ -193,8 +194,8 @@ export class MosaicSupplyChangeTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicSupplyChangeTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return {...Object.getPrototypeOf(this),
+        return DtoMapping.assign(this, {
             mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)};
+                transactionInfo.index, aggregateTransactionIndex)});
     }
 }

src/model/transaction/SecretLockTransaction.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { Convert, Convert as convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils/DtoMapping';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { BlockDurationDto } from '../../infrastructure/catbuffer/BlockDurationDto';
@@ -240,10 +241,10 @@ export class SecretLockTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): SecretLockTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return {...Object.getPrototypeOf(this),
+        return DtoMapping.assign(this, {
             recipientAddress: statement.resolveAddress(this.recipientAddress,
                 transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex),
             mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)};
+                transactionInfo.index, aggregateTransactionIndex)});
     }
 }