- Fixed primary source id as confirmed by Jag

rg911 · rg911 · commit 4f497aedd8c4 · 2019-12-02T14:55:53.000Z
- Updated aggregate transaction handler with secondary source id
diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts
@@ -199,9 +199,10 @@ export class AccountAddressRestrictionTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<AccountAddressRestrictionTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<AccountAddressRestrictionTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<AccountAddressRestrictionTransaction> {
         const hasUnresolved = this.restrictionAdditions.find((address) => address instanceof NamespaceId) !== undefined ||
             this.restrictionDeletions.find((address) => address instanceof NamespaceId) !== undefined;
 
@@ -217,7 +218,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
                 return this.restrictionAdditions.map((addition) => {
                     return addition instanceof NamespaceId ?
                     TransactionService.getResolvedFromReceipt(ResolutionType.Address, addition as NamespaceId,
-                        statement, transactionInfo.index, transactionInfo.height.toString()) as Address :
+                        statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as Address :
                     addition;
                 });
             }),
@@ -228,7 +229,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
                 return this.restrictionDeletions.map((deletion) => {
                     return deletion instanceof NamespaceId ?
                     TransactionService.getResolvedFromReceipt(ResolutionType.Address, deletion as NamespaceId,
-                        statement, transactionInfo.index, transactionInfo.height.toString()) as Address :
+                        statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as Address :
                         deletion;
                 });
             }),
diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts
@@ -199,9 +199,10 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<AccountMosaicRestrictionTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<AccountMosaicRestrictionTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<AccountMosaicRestrictionTransaction> {
         const hasUnresolved = this.restrictionAdditions.find((mosaicId) => mosaicId instanceof NamespaceId) !== undefined ||
             this.restrictionDeletions.find((mosaicId) => mosaicId instanceof NamespaceId) !== undefined;
 
@@ -217,7 +218,7 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
                 return this.restrictionAdditions.map((addition) => {
                     return addition instanceof NamespaceId ?
                     TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, addition as NamespaceId,
-                        statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId :
+                        statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as MosaicId :
                     addition;
                 });
             }),
@@ -228,7 +229,7 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
                 return this.restrictionDeletions.map((deletion) => {
                     return deletion instanceof NamespaceId ?
                     TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, deletion as NamespaceId,
-                        statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId :
+                        statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as MosaicId :
                         deletion;
                 });
             }),
diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+import { from, of } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
+import { map, mergeMap, toArray } from 'rxjs/operators';
 import {KeyPair, MerkleHashBuilder, SHA3Hasher, SignSchema} from '../../core/crypto';
 import {Convert} from '../../core/format';
 import {AggregateBondedTransactionBuilder} from '../../infrastructure/catbuffer/AggregateBondedTransactionBuilder';
@@ -41,8 +43,6 @@ import {Transaction} from './Transaction';
 import {TransactionInfo} from './TransactionInfo';
 import {TransactionType} from './TransactionType';
 import {TransactionVersion} from './TransactionVersion';
-import { of, from } from 'rxjs';
-import { map, mergeMap, toArray } from 'rxjs/operators';
 
 /**
  * Aggregate innerTransactions contain multiple innerTransactions that can be initiated by different accounts.
@@ -410,8 +410,9 @@ export class AggregateTransaction extends Transaction {
      * @returns {Observable<AggregateTransaction>}
      */
     resolveAliases(receiptHttp: ReceiptHttp): Observable<AggregateTransaction> {
+        const transactionInfo = this.checkTransactionHeightAndIndex();
         return from(this.innerTransactions).pipe(
-            mergeMap((transaction) => transaction.resolveAliases(receiptHttp)),
+            mergeMap((transaction) => transaction.resolveAliases(receiptHttp, transactionInfo.index)),
             map((transaction) => transaction as InnerTransaction),
             toArray(),
         ).pipe(
diff --git a/src/model/transaction/LockFundsTransaction.ts b/src/model/transaction/LockFundsTransaction.ts
@@ -213,9 +213,10 @@ export class LockFundsTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<LockFundsTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<LockFundsTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<LockFundsTransaction> {
         const hasUnresolved = this.mosaic.id instanceof NamespaceId;
 
         if (!hasUnresolved) {
@@ -232,7 +233,8 @@ export class LockFundsTransaction extends Transaction {
                         this.deadline,
                         this.maxFee,
                         new Mosaic(TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, this.mosaic.id as NamespaceId,
-                            statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId, this.mosaic.amount),
+                            statement, transactionInfo.index, transactionInfo.height.toString(),
+                            aggregateTransactionIndex) as MosaicId, this.mosaic.amount),
                         this.duration,
                         this.signedTransaction,
                         this.signature,
diff --git a/src/model/transaction/MosaicAddressRestrictionTransaction.ts b/src/model/transaction/MosaicAddressRestrictionTransaction.ts
@@ -244,9 +244,10 @@ export class MosaicAddressRestrictionTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<MosaicAddressRestrictionTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<MosaicAddressRestrictionTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<MosaicAddressRestrictionTransaction> {
         const hasUnresolved = this.targetAddress instanceof NamespaceId ||
             this.mosaicId instanceof NamespaceId;
 
@@ -261,15 +262,15 @@ export class MosaicAddressRestrictionTransaction extends Transaction {
         const resolvedAddress = statementObservable.pipe(
             map((statement) => this.targetAddress instanceof NamespaceId ?
                 TransactionService.getResolvedFromReceipt(ResolutionType.Address, this.targetAddress as NamespaceId,
-                    statement, transactionInfo.index, transactionInfo.height.toString()) as Address :
+                    statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as Address :
                 this.targetAddress,
             ),
         );
 
         const resolvedMosaicId = statementObservable.pipe(
             map((statement) => this.mosaicId instanceof NamespaceId ?
                 TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, this.mosaicId as NamespaceId,
-                    statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId :
+                    statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as MosaicId :
                 this.mosaicId,
             ),
         );
diff --git a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts
@@ -253,9 +253,10 @@ export class MosaicGlobalRestrictionTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<MosaicGlobalRestrictionTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<MosaicGlobalRestrictionTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<MosaicGlobalRestrictionTransaction> {
         const hasUnresolved = this.mosaicId instanceof NamespaceId ||
             this.referenceMosaicId instanceof NamespaceId;
 
@@ -270,15 +271,15 @@ export class MosaicGlobalRestrictionTransaction extends Transaction {
         const resolvedMosaicId = statementObservable.pipe(
             map((statement) => this.mosaicId instanceof NamespaceId ?
                 TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, this.mosaicId as NamespaceId,
-                    statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId :
+                    statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as MosaicId :
                 this.mosaicId,
             ),
         );
 
         const resolvedRefMosaicId = statementObservable.pipe(
             map((statement) => this.referenceMosaicId instanceof NamespaceId ?
                 TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, this.referenceMosaicId as NamespaceId,
-                    statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId :
+                    statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as MosaicId :
                 this.referenceMosaicId,
             ),
         );
diff --git a/src/model/transaction/MosaicMetadataTransaction.ts b/src/model/transaction/MosaicMetadataTransaction.ts
@@ -219,9 +219,10 @@ export class MosaicMetadataTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<MosaicMetadataTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<MosaicMetadataTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<MosaicMetadataTransaction> {
         const hasUnresolved = this.targetMosaicId instanceof NamespaceId;
 
         if (!hasUnresolved) {
@@ -241,7 +242,7 @@ export class MosaicMetadataTransaction extends Transaction {
                         this.targetPublicKey,
                         this.scopedMetadataKey,
                         TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, this.targetMosaicId as NamespaceId,
-                            statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId,
+                            statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as MosaicId,
                         this.valueSizeDelta,
                         this.value,
                         this.signature,
diff --git a/src/model/transaction/MosaicSupplyChangeTransaction.ts b/src/model/transaction/MosaicSupplyChangeTransaction.ts
@@ -193,9 +193,10 @@ export class MosaicSupplyChangeTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<MosaicSupplyChangeTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<MosaicSupplyChangeTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<MosaicSupplyChangeTransaction> {
         const hasUnresolved = this.mosaicId instanceof NamespaceId;
 
         if (!hasUnresolved) {
@@ -214,7 +215,7 @@ export class MosaicSupplyChangeTransaction extends Transaction {
                         this.deadline,
                         this.maxFee,
                         TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, this.mosaicId as NamespaceId,
-                            statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId,
+                            statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as MosaicId,
                         this.action,
                         this.delta,
                         this.signature,
diff --git a/src/model/transaction/MultisigAccountModificationTransaction.ts b/src/model/transaction/MultisigAccountModificationTransaction.ts
@@ -220,7 +220,7 @@ export class MultisigAccountModificationTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
-     * @returns {Observable<MultisigAccountModificationTransaction>
+     * @returns {Observable<MultisigAccountModificationTransaction>}
      */
     resolveAliases(receiptHttp: ReceiptHttp): Observable<MultisigAccountModificationTransaction> {
         return of(this);
diff --git a/src/model/transaction/SecretLockTransaction.ts b/src/model/transaction/SecretLockTransaction.ts
@@ -241,9 +241,10 @@ export class SecretLockTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<SecretLockTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<SecretLockTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<SecretLockTransaction> {
         const hasUnresolved = this.recipientAddress instanceof NamespaceId ||
             this.mosaic.id instanceof NamespaceId;
 
@@ -258,15 +259,16 @@ export class SecretLockTransaction extends Transaction {
         const resolvedRecipient = statementObservable.pipe(
             map((statement) => this.recipientAddress instanceof NamespaceId ?
                 TransactionService.getResolvedFromReceipt(ResolutionType.Address, this.recipientAddress as NamespaceId,
-                    statement, transactionInfo.index, transactionInfo.height.toString()) as Address :
+                    statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as Address :
                 this.recipientAddress,
             ),
         );
 
         const resolvedMosaic = statementObservable.pipe(
             map((statement) => this.mosaic.id instanceof NamespaceId ?
                 new Mosaic(TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, this.recipientAddress as NamespaceId,
-                    statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId, this.mosaic.amount) :
+                    statement, transactionInfo.index, transactionInfo.height.toString(),
+                    aggregateTransactionIndex) as MosaicId, this.mosaic.amount) :
                 this.mosaic,
             ),
         );
diff --git a/src/model/transaction/SecretProofTransaction.ts b/src/model/transaction/SecretProofTransaction.ts
@@ -217,9 +217,10 @@ export class SecretProofTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<SecretProofTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<SecretProofTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<SecretProofTransaction> {
         const hasUnresolved = this.recipientAddress instanceof NamespaceId;
 
         if (!hasUnresolved) {
@@ -239,7 +240,7 @@ export class SecretProofTransaction extends Transaction {
                     this.hashType,
                     this.secret,
                     TransactionService.getResolvedFromReceipt(ResolutionType.Address, this.recipientAddress as NamespaceId,
-                        statement, transactionInfo.index, transactionInfo.height.toString()) as Address,
+                        statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as Address,
                     this.proof,
                     this.signature,
                     this.signer,
diff --git a/src/model/transaction/Transaction.ts b/src/model/transaction/Transaction.ts
@@ -191,9 +191,10 @@ export abstract class Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param AggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<Transaction>}
      */
-    abstract resolveAliases(receiptHttp: ReceiptHttp): Observable<Transaction>;
+    abstract resolveAliases(receiptHttp: ReceiptHttp, AggregateTransactionIndex?: number): Observable<Transaction>;
 
     /**
      * @internal
diff --git a/src/model/transaction/TransferTransaction.ts b/src/model/transaction/TransferTransaction.ts
@@ -282,9 +282,10 @@ export class TransferTransaction extends Transaction {
     /**
      * @internal
      * @param receiptHttp ReceiptHttp
+     * @param aggregateTransactionIndex Transaction index for aggregated transaction
      * @returns {Observable<TransferTransaction>}
      */
-    resolveAliases(receiptHttp: ReceiptHttp): Observable<TransferTransaction> {
+    resolveAliases(receiptHttp: ReceiptHttp, aggregateTransactionIndex?: number): Observable<TransferTransaction> {
         const hasUnresolved = this.recipientAddress instanceof NamespaceId ||
             this.mosaics.find((mosaic) => mosaic.id instanceof NamespaceId) !== undefined;
 
@@ -299,7 +300,7 @@ export class TransferTransaction extends Transaction {
         const resolvedRecipient = statementObservable.pipe(
             map((statement) => this.recipientAddress instanceof NamespaceId ?
                 TransactionService.getResolvedFromReceipt(ResolutionType.Address, this.recipientAddress as NamespaceId,
-                    statement, transactionInfo.index, transactionInfo.height.toString()) as Address :
+                    statement, transactionInfo.index, transactionInfo.height.toString(), aggregateTransactionIndex) as Address :
                 this.recipientAddress,
             ),
         );
@@ -309,7 +310,8 @@ export class TransferTransaction extends Transaction {
                 this.mosaics.map((mosaic) =>
                     mosaic.id instanceof NamespaceId ?
                         new Mosaic(TransactionService.getResolvedFromReceipt(ResolutionType.Mosaic, mosaic.id as NamespaceId,
-                        statement, transactionInfo.index, transactionInfo.height.toString()) as MosaicId, mosaic.amount) :
+                        statement, transactionInfo.index, transactionInfo.height.toString(),
+                        aggregateTransactionIndex) as MosaicId, mosaic.amount) :
                         mosaic,
                 ),
             ),
diff --git a/src/service/TransactionService.ts b/src/service/TransactionService.ts
diff --git a/test/model/transaction/Transaction.spec.ts b/test/model/transaction/Transaction.spec.ts
diff --git a/test/service/TransactionService.spec.ts b/test/service/TransactionService.spec.ts
