added #357 transaction service for resolving alias

Author: rg911

src/infrastructure/transaction/CreateTransactionFromDTO.ts

@@ -175,7 +175,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             transactionDTO.version,
             Deadline.createFromDTO(transactionDTO.deadline),
             UInt64.fromNumericString(transactionDTO.maxFee || '0'),
-            new MosaicId(transactionDTO.mosaicId),
+            UnresolvedMapping.toUnresolvedMosaic(transactionDTO.mosaicId),
             transactionDTO.action,
             UInt64.fromNumericString(transactionDTO.delta),
             transactionDTO.signature,

src/model/transaction/AccountAddressRestrictionTransaction.ts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import { Convert, RawAddress } from '../../core/format';
+import { combineLatest, from, of } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
+import { mergeMap, toArray } from 'rxjs/operators';
+import { Convert } from '../../core/format';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AccountAddressRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountAddressRestrictionTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -25,13 +28,13 @@ import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
 import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
 import { UnresolvedAddressDto } from '../../infrastructure/catbuffer/UnresolvedAddressDto';
+import { NamespaceHttp } from '../../infrastructure/NamespaceHttp';
 import { Address } from '../account/Address';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
 import { NamespaceId } from '../namespace/NamespaceId';
 import { AccountRestrictionFlags } from '../restriction/AccountRestrictionType';
 import { UInt64 } from '../UInt64';
-import { AccountRestrictionModification } from './AccountRestrictionModification';
 import { Deadline } from './Deadline';
 import { InnerTransaction } from './InnerTransaction';
 import { Transaction } from './Transaction';
@@ -190,4 +193,41 @@ export class AccountAddressRestrictionTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
+
+    /**
+     * @internal
+     * @param namespaceHttp NamespaceHttp
+     * @returns {AccountAddressRestrictionTransaction}
+     */
+    resolveAliases(namespaceHttp: NamespaceHttp): Observable<AccountAddressRestrictionTransaction> {
+        const restrictionAdditions = from(this.restrictionAdditions).pipe(
+            mergeMap((addition) => addition instanceof NamespaceId ?
+                namespaceHttp.getLinkedAddress(addition) :
+                of(addition),
+            ),
+            toArray(),
+        );
+        const restrictionDeletions = from(this.restrictionDeletions).pipe(
+            mergeMap((deletion) => deletion instanceof NamespaceId ?
+                namespaceHttp.getLinkedAddress(deletion) :
+                of(deletion),
+            ),
+            toArray(),
+        );
+
+        return combineLatest(restrictionAdditions, restrictionDeletions, (additions, deletions) => {
+            return new AccountAddressRestrictionTransaction(
+                this.networkType,
+                this.version,
+                this.deadline,
+                this.maxFee,
+                this.restrictionFlags,
+                additions,
+                deletions,
+                this.signature,
+                this.signer,
+                this.transactionInfo,
+            );
+        });
+    }
 }

src/model/transaction/AccountLinkTransaction.ts

@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
+import { Observable } from 'rxjs/internal/Observable';
+import { of } from 'rxjs/internal/observable/of';
 import { Convert } from '../../core/format';
 import { AccountLinkTransactionBuilder } from '../../infrastructure/catbuffer/AccountLinkTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { EmbeddedAccountLinkTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedAccountLinkTransactionBuilder';
 import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
 import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
+import { NamespaceHttp } from '../../infrastructure/NamespaceHttp';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
 import { UInt64 } from '../UInt64';
@@ -163,4 +166,13 @@ export class AccountLinkTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
+
+    /**
+     * @internal
+     * @param namespaceHttp NamespaceHttp
+     * @returns {AccountLinkTransaction}
+     */
+    resolveAliases(namespaceHttp: NamespaceHttp): Observable<AccountLinkTransaction> {
+        return of(this);
+    }
 }

src/model/transaction/AccountMetadataTransaction.ts

@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
+import { Observable } from 'rxjs/internal/Observable';
+import { of } from 'rxjs/internal/observable/of';
 import { Convert } from '../../core/format';
 import { AccountMetadataTransactionBuilder } from '../../infrastructure/catbuffer/AccountMetadataTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { EmbeddedAccountMetadataTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedAccountMetadataTransactionBuilder';
 import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
 import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
+import { NamespaceHttp } from '../../infrastructure/NamespaceHttp';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
 import { UInt64 } from '../UInt64';
@@ -193,4 +196,13 @@ export class AccountMetadataTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
+
+    /**
+     * @internal
+     * @param namespaceHttp NamespaceHttp
+     * @returns {AccountMetadataTransaction}
+     */
+    resolveAliases(namespaceHttp: NamespaceHttp): Observable<AccountMetadataTransaction> {
+        return of(this);
+    }
 }

src/model/transaction/AccountMosaicRestrictionTransaction.ts

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+import { combineLatest, from, of } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
+import { mergeMap, toArray } from 'rxjs/operators';
 import { Convert } from '../../core/format';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { AccountMosaicRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountMosaicRestrictionTransactionBuilder';
@@ -25,6 +28,7 @@ import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
 import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
 import { UnresolvedMosaicIdDto } from '../../infrastructure/catbuffer/UnresolvedMosaicIdDto';
+import { NamespaceHttp } from '../../infrastructure/NamespaceHttp';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
 import { MosaicId } from '../mosaic/MosaicId';
@@ -189,4 +193,41 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
+
+    /**
+     * @internal
+     * @param namespaceHttp NamespaceHttp
+     * @returns {AccountMosaicRestrictionTransaction}
+     */
+    resolveAliases(namespaceHttp: NamespaceHttp): Observable<AccountMosaicRestrictionTransaction> {
+        const restrictionAdditions = from(this.restrictionAdditions).pipe(
+            mergeMap((addition) => addition instanceof NamespaceId ?
+                namespaceHttp.getLinkedMosaicId(addition) :
+                of(addition),
+            ),
+            toArray(),
+        );
+        const restrictionDeletions = from(this.restrictionDeletions).pipe(
+            mergeMap((deletion) => deletion instanceof NamespaceId ?
+                namespaceHttp.getLinkedMosaicId(deletion) :
+                of(deletion),
+            ),
+            toArray(),
+        );
+
+        return combineLatest(restrictionAdditions, restrictionDeletions, (additions, deletions) => {
+            return new AccountMosaicRestrictionTransaction(
+                this.networkType,
+                this.version,
+                this.deadline,
+                this.maxFee,
+                this.restrictionFlags,
+                additions,
+                deletions,
+                this.signature,
+                this.signer,
+                this.transactionInfo,
+            );
+        });
+    }
 }

src/model/transaction/AccountOperationRestrictionTransaction.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { Observable } from 'rxjs/internal/Observable';
+import { of } from 'rxjs/internal/observable/of';
 import { Convert } from '../../core/format';
 import {
     AccountOperationRestrictionTransactionBuilder,
@@ -25,6 +27,7 @@ import {
 import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
 import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
+import { NamespaceHttp } from '../../infrastructure/NamespaceHttp';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
 import { AccountRestrictionFlags } from '../restriction/AccountRestrictionType';
@@ -174,4 +177,13 @@ export class AccountOperationRestrictionTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
+
+    /**
+     * @internal
+     * @param namespaceHttp NamespaceHttp
+     * @returns {AccountOperationRestrictionTransaction}
+     */
+    resolveAliases(namespaceHttp: NamespaceHttp): Observable<AccountOperationRestrictionTransaction> {
+        return of(this);
+    }
 }

src/model/transaction/AddressAliasTransaction.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { Observable } from 'rxjs/internal/Observable';
+import { of } from 'rxjs/internal/observable/of';
 import { Convert, RawAddress } from '../../core/format';
 import { AddressAliasTransactionBuilder } from '../../infrastructure/catbuffer/AddressAliasTransactionBuilder';
 import { AddressDto } from '../../infrastructure/catbuffer/AddressDto';
@@ -23,6 +25,7 @@ import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
 import { NamespaceIdDto } from '../../infrastructure/catbuffer/NamespaceIdDto';
 import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
+import { NamespaceHttp } from '../../infrastructure/NamespaceHttp';
 import { Address } from '../account/Address';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
@@ -183,4 +186,13 @@ export class AddressAliasTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
+
+    /**
+     * @internal
+     * @param namespaceHttp NamespaceHttp
+     * @returns {AddressAliasTransaction}
+     */
+    resolveAliases(namespaceHttp: NamespaceHttp): Observable<AddressAliasTransaction> {
+        return of(this);
+    }
 }

src/model/transaction/AggregateTransaction.ts

@@ -15,6 +15,7 @@
  */
 
 import { sha3_256 } from 'js-sha3';
+import { Observable } from 'rxjs/internal/Observable';
 import {KeyPair, MerkleHashBuilder, SHA3Hasher, SignSchema} from '../../core/crypto';
 import {Convert, RawArray} from '../../core/format';
 import {AggregateBondedTransactionBuilder} from '../../infrastructure/catbuffer/AggregateBondedTransactionBuilder';
@@ -26,6 +27,7 @@ import { Hash256Dto } from '../../infrastructure/catbuffer/Hash256Dto';
 import {KeyDto} from '../../infrastructure/catbuffer/KeyDto';
 import {SignatureDto} from '../../infrastructure/catbuffer/SignatureDto';
 import {TimestampDto} from '../../infrastructure/catbuffer/TimestampDto';
+import { NamespaceHttp } from '../../infrastructure/NamespaceHttp';
 import {CreateTransactionFromPayload} from '../../infrastructure/transaction/CreateTransactionFromPayload';
 import {Account} from '../account/Account';
 import {PublicAccount} from '../account/PublicAccount';
@@ -400,4 +402,13 @@ export class AggregateTransaction extends Transaction {
     private getInnerTransactionPaddingSize(size: number, alignment: number): number {
         return 0 === size % alignment ? 0 : alignment - (size % alignment);
     }
+
+    /**
+     * @internal
+     * @param namespaceHttp NamespaceHttp
+     * @returns {AggregateTransaction}
+     */
+    resolveAliases(namespaceHttp: NamespaceHttp): Observable<AggregateTransaction> {
+        throw new Error('Not implemented');
+    }
 }

src/model/transaction/LockFundsTransaction.ts

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+import { Observable } from 'rxjs/internal/Observable';
+import { of } from 'rxjs/internal/observable/of';
+import { map } from 'rxjs/internal/operators/map';
+import { mergeMap } from 'rxjs/internal/operators/mergeMap';
 import { Convert } from '../../core/format';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { BlockDurationDto } from '../../infrastructure/catbuffer/BlockDurationDto';
@@ -25,10 +29,12 @@ import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
 import { UnresolvedMosaicBuilder } from '../../infrastructure/catbuffer/UnresolvedMosaicBuilder';
 import { UnresolvedMosaicIdDto } from '../../infrastructure/catbuffer/UnresolvedMosaicIdDto';
+import { NamespaceHttp } from '../../infrastructure/NamespaceHttp';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
 import { Mosaic } from '../mosaic/Mosaic';
 import { MosaicId } from '../mosaic/MosaicId';
+import { NamespaceId } from '../namespace/NamespaceId';
 import { UInt64 } from '../UInt64';
 import { Deadline } from './Deadline';
 import { InnerTransaction } from './InnerTransaction';
@@ -50,6 +56,7 @@ export class LockFundsTransaction extends Transaction {
      * Aggregate bonded hash.
      */
     public readonly hash: string;
+    signedTransaction: SignedTransaction;
 
     /**
      * Create a Lock funds transaction object
@@ -108,6 +115,7 @@ export class LockFundsTransaction extends Transaction {
                 transactionInfo?: TransactionInfo) {
         super(TransactionType.LOCK, networkType, version, deadline, maxFee, signature, signer, transactionInfo);
         this.hash = signedTransaction.hash;
+        this.signedTransaction = signedTransaction;
         if (signedTransaction.type !== TransactionType.AGGREGATE_BONDED) {
             throw new Error('Signed transaction must be Aggregate Bonded Transaction');
         }
@@ -200,4 +208,42 @@ export class LockFundsTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
+
+    /**
+     * @internal
+     * @param namespaceHttp NamespaceHttp
+     * @returns {LockFundsTransaction}
+     */
+    resolveAliases(namespaceHttp: NamespaceHttp): Observable<LockFundsTransaction> {
+        return of(this.mosaic).pipe(
+            mergeMap((mosaic) => mosaic.id instanceof NamespaceId ?
+                namespaceHttp.getLinkedMosaicId(mosaic.id).pipe(
+                    map((mosaicId) => new LockFundsTransaction(
+                        this.networkType,
+                        this.version,
+                        this.deadline,
+                        this.maxFee,
+                        new Mosaic(mosaicId, mosaic.amount),
+                        this.duration,
+                        this.signedTransaction,
+                        this.signature,
+                        this.signer,
+                        this.transactionInfo,
+                    )),
+                ) :
+                of(new LockFundsTransaction(
+                    this.networkType,
+                    this.version,
+                    this.deadline,
+                    this.maxFee,
+                    mosaic,
+                    this.duration,
+                    this.signedTransaction,
+                    this.signature,
+                    this.signer,
+                    this.transactionInfo,
+                )),
+            ),
+        );
+    }
 }