fix: allowing plain base32 addresses in rest payloads

fboucquez · fboucquez · commit f90260cc4722 · 2021-10-01T16:03:55.000-03:00
diff --git a/src/core/utils/DtoMapping.ts b/src/core/utils/DtoMapping.ts
@@ -34,6 +34,7 @@ import { MerkleTreeBranch } from '../../model/state/MerkleTreeBranch';
 import { MerkleTreeBranchLink } from '../../model/state/MerkleTreeBranchLink';
 import { MerkleTreeLeaf } from '../../model/state/MerkleTreeLeaf';
 import { MerkleTreeNodeType } from '../../model/state/MerkleTreeNodeType';
+import { Convert } from '../format';
 
 export class DtoMapping {
     /**
@@ -45,7 +46,7 @@ export class DtoMapping {
         return new AccountRestrictions(
             accountRestrictions.accountRestrictions.version || 1,
             accountRestrictions['id'],
-            Address.createFromEncoded(accountRestrictions.accountRestrictions.address),
+            DtoMapping.toAddress(accountRestrictions.accountRestrictions.address),
             accountRestrictions.accountRestrictions.restrictions.map((prop) => {
                 const restrictionFlags = prop.restrictionFlags as number;
                 switch (restrictionFlags) {
@@ -55,7 +56,7 @@ export class DtoMapping {
                     case AddressRestrictionFlag.BlockOutgoingAddress:
                         return new AccountRestriction(
                             restrictionFlags,
-                            prop.values.map((value) => Address.createFromEncoded(value as string)),
+                            prop.values.map((value) => DtoMapping.toAddress(value as string)),
                         );
                     case MosaicRestrictionFlag.AllowMosaic:
                     case MosaicRestrictionFlag.BlockMosaic:
@@ -76,6 +77,22 @@ export class DtoMapping {
         );
     }
 
+    /**
+     * This method knows how to convert an address payload sent by Rest to Address.
+     *
+     * Currently rest sends hex encoded addresses, it is desired to use base32 encoded addresses.
+     *
+     * This method handles both format, encoded (deprecated) and base32 encoded addresses.
+     *
+     * Clients using this SDK will be able to process both payloads.
+     *
+     * @param value the address in encoded (6823BB7C3C089D996585466380EDBDC19D4959184893E38C) format or decoded/plain format (SB3KUBHATFCPV7UZQLWAQ2EUR6SIHBSBEOEDDDF3)
+     * @return the Address object.
+     */
+    public static toAddress(value: string): Address {
+        return Convert.isHexString(value, 48) ? Address.createFromEncoded(value) : Address.createFromRawAddress(value);
+    }
+
     /**
      * Creates a copy of the first object adding the attributes of the second object.
      * @param object the object to be cloned
diff --git a/src/core/utils/UnresolvedMapping.ts b/src/core/utils/UnresolvedMapping.ts
@@ -21,6 +21,7 @@ import { NamespaceId } from '../../model/namespace/NamespaceId';
 import { NetworkType } from '../../model/network/NetworkType';
 import { Convert } from '../format/Convert';
 import { RawAddress } from '../format/RawAddress';
+import { DtoMapping } from './DtoMapping';
 
 /**
  * @internal
@@ -48,26 +49,40 @@ export class UnresolvedMapping {
     }
 
     /**
-     * Map unresolved address string to Address or NamespaceId
-     * @param {string} address The unresolved address in hex
+     * Map unresolved address string to Address or NamespaceId.
+     *
+     * Input examples:
+     *  - 6826D27E1D0A26CA4E316F901E23E55C8711DB20DF45C536 Hex address (old rest)
+     *  - NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ Base32 address (new reset)
+     *  - 99C2860B73398FD8D3000000000000000000000000000000 Hex namespace id (old rest)
+     *  - THBIMC3THGH5RUYAAAAAAAAAAAAAAAAAAAAAAAA Base32 namespace id (new rest)
+     *
+     * @param {string} unresolvedAddressString The unresolved address in hex (old rest) or base32 address (new rest)
      * @returns {UnresolvedAddress}
      */
-    public static toUnresolvedAddress(address: string): UnresolvedAddress {
-        if (!Convert.isHexString(address)) {
-            throw new Error('Input string is not in valid hexadecimal notation.');
-        }
-        // If bit 0 of byte 0 is not set (like in 0x90), then it is a regular address.
-        // Else (e.g. 0x91) it represents a namespace id which starts at byte 1.
-        const bit0 = Convert.hexToUint8(address.substr(1, 2))[0];
-        if ((bit0 & 16) === 16) {
-            // namespaceId encoded hexadecimal notation provided
-            // only 8 bytes are relevant to resolve the NamespaceId
-            const relevantPart = address.substr(2, 16);
-            return NamespaceId.createFromEncoded(Convert.uint8ToHex(Convert.hexToUint8Reverse(relevantPart)));
-        }
+    public static toUnresolvedAddress(unresolvedAddressString: string): UnresolvedAddress {
+        const fromHexToUnresolvedAddress = (unresolvedAddressStringHex: string) => {
+            // If bit 0 of byte 0 is not set (like in 0x90), then it is a regular address.
+            // Else (e.g. 0x91) it represents a namespace id which starts at byte 1.
+            const bit0 = Convert.hexToUint8(unresolvedAddressStringHex.substr(1, 2))[0];
+            if ((bit0 & 16) === 16) {
+                // namespaceId encoded hexadecimal notation provided
+                // only 8 bytes are relevant to resolve the NamespaceId
+                const relevantPart = unresolvedAddressStringHex.substr(2, 16);
+                return NamespaceId.createFromEncoded(Convert.uint8ToHex(Convert.hexToUint8Reverse(relevantPart)));
+            }
 
-        // read address from encoded hexadecimal notation
-        return Address.createFromEncoded(address);
+            // read address from encoded hexadecimal notation
+            return Address.createFromEncoded(unresolvedAddressStringHex);
+        };
+
+        if (Convert.isHexString(unresolvedAddressString, 48)) {
+            // Old Rest
+            return fromHexToUnresolvedAddress(unresolvedAddressString);
+        } else {
+            // New rest
+            return fromHexToUnresolvedAddress(DtoMapping.toAddress(unresolvedAddressString).encoded());
+        }
     }
 
     /**
diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts
@@ -113,7 +113,7 @@ export class AccountHttp extends Http implements AccountRepository {
         return new AccountInfo(
             dto.account.version || 1,
             dto.id,
-            Address.createFromEncoded(dto.account.address),
+            DtoMapping.toAddress(dto.account.address),
             UInt64.fromNumericString(dto.account.addressHeight),
             dto.account.publicKey,
             UInt64.fromNumericString(dto.account.publicKeyHeight),
diff --git a/src/infrastructure/BlockHttp.ts b/src/infrastructure/BlockHttp.ts
@@ -17,7 +17,6 @@
 import { Observable } from 'rxjs';
 import { BlockInfoDTO, BlockRoutesApi, ImportanceBlockDTO } from 'symbol-openapi-typescript-fetch-client';
 import { DtoMapping } from '../core/utils/DtoMapping';
-import { Address } from '../model/account/Address';
 import { PublicAccount } from '../model/account/PublicAccount';
 import { BlockInfo } from '../model/blockchain/BlockInfo';
 import { BlockType } from '../model/blockchain/BlockType';
@@ -121,7 +120,7 @@ export class BlockHttp extends Http implements BlockRepository {
             dto.block.proofGamma,
             dto.block.proofScalar,
             dto.block.proofVerificationHash,
-            Address.createFromEncoded(dto.block.beneficiaryAddress),
+            DtoMapping.toAddress(dto.block.beneficiaryAddress),
             dto.meta.transactionsCount,
             dto.meta.statementsCount,
         );
diff --git a/src/infrastructure/HashLockHttp.ts b/src/infrastructure/HashLockHttp.ts
@@ -17,7 +17,6 @@
 import { Observable } from 'rxjs';
 import { HashLockInfoDTO, HashLockRoutesApi } from 'symbol-openapi-typescript-fetch-client';
 import { DtoMapping } from '../core/utils/DtoMapping';
-import { Address } from '../model/account/Address';
 import { MerkleStateInfo } from '../model/blockchain/MerkleStateInfo';
 import { HashLockInfo } from '../model/lock/HashLockInfo';
 import { MosaicId } from '../model/mosaic/MosaicId';
@@ -100,7 +99,7 @@ export class HashLockHttp extends Http implements HashLockRepository {
         return new HashLockInfo(
             dto.lock.version || 1,
             dto.id,
-            Address.createFromEncoded(dto.lock.ownerAddress),
+            DtoMapping.toAddress(dto.lock.ownerAddress),
             new MosaicId(dto.lock.mosaicId),
             UInt64.fromNumericString(dto.lock.amount),
             UInt64.fromNumericString(dto.lock.endHeight),
diff --git a/src/infrastructure/Listener.ts b/src/infrastructure/Listener.ts
@@ -19,7 +19,7 @@ import { catchError, distinctUntilChanged, filter, map, mergeMap, share, switchM
 import { BlockInfoDTO } from 'symbol-openapi-typescript-fetch-client';
 import * as WebSocket from 'ws';
 import { parseObjectProperties } from '../core/format/Utilities';
-import { MultisigChildrenTreeObject, MultisigGraphUtils } from '../core/utils';
+import { DtoMapping, MultisigChildrenTreeObject, MultisigGraphUtils } from '../core/utils';
 import { MultisigAccountInfo, UnresolvedAddress } from '../model';
 import { Address } from '../model/account/Address';
 import { PublicAccount } from '../model/account/PublicAccount';
@@ -36,6 +36,7 @@ import { MultisigHttp } from './MultisigHttp';
 import { MultisigRepository } from './MultisigRepository';
 import { NamespaceRepository } from './NamespaceRepository';
 import { CreateTransactionFromDTO } from './transaction/CreateTransactionFromDTO';
+
 export enum ListenerChannelName {
     block = 'block',
     confirmedAdded = 'confirmedAdded',
@@ -579,7 +580,7 @@ export class Listener implements IListener {
             dto.block.proofGamma,
             dto.block.proofScalar,
             dto.block.proofVerificationHash,
-            dto.block.beneficiaryAddress ? Address.createFromEncoded(dto.block.beneficiaryAddress) : undefined,
+            dto.block.beneficiaryAddress ? DtoMapping.toAddress(dto.block.beneficiaryAddress) : undefined,
         );
     }
 
diff --git a/src/infrastructure/MetadataHttp.ts b/src/infrastructure/MetadataHttp.ts
@@ -18,7 +18,6 @@ import { Observable } from 'rxjs';
 import { MetadataInfoDTO, MetadataRoutesApi } from 'symbol-openapi-typescript-fetch-client';
 import { Convert } from '../core/format/Convert';
 import { DtoMapping } from '../core/utils/DtoMapping';
-import { Address } from '../model/account/Address';
 import { MerkleStateInfo } from '../model/blockchain';
 import { Metadata } from '../model/metadata/Metadata';
 import { MetadataEntry } from '../model/metadata/MetadataEntry';
@@ -122,8 +121,8 @@ export class MetadataHttp extends Http implements MetadataRepository {
             new MetadataEntry(
                 metadataEntry.version || 1,
                 metadataEntry.compositeHash,
-                Address.createFromEncoded(metadataEntry.sourceAddress),
-                Address.createFromEncoded(metadataEntry.targetAddress),
+                DtoMapping.toAddress(metadataEntry.sourceAddress),
+                DtoMapping.toAddress(metadataEntry.targetAddress),
                 UInt64.fromHex(metadataEntry.scopedMetadataKey),
                 metadataEntry.metadataType.valueOf(),
                 Convert.decodeHex(metadataEntry.value),
diff --git a/src/infrastructure/MosaicHttp.ts b/src/infrastructure/MosaicHttp.ts
@@ -18,7 +18,6 @@ import { Observable } from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 import { MosaicInfoDTO, MosaicRoutesApi } from 'symbol-openapi-typescript-fetch-client';
 import { DtoMapping } from '../core/utils/DtoMapping';
-import { Address } from '../model/account/Address';
 import { MerkleStateInfo } from '../model/blockchain';
 import { MosaicFlags } from '../model/mosaic/MosaicFlags';
 import { MosaicId } from '../model/mosaic/MosaicId';
@@ -133,7 +132,7 @@ export class MosaicHttp extends Http implements MosaicRepository {
             new MosaicId(mosaicInfo.mosaic.id),
             UInt64.fromNumericString(mosaicInfo.mosaic.supply),
             UInt64.fromNumericString(mosaicInfo.mosaic.startHeight),
-            Address.createFromEncoded(mosaicInfo.mosaic.ownerAddress),
+            DtoMapping.toAddress(mosaicInfo.mosaic.ownerAddress),
             mosaicInfo.mosaic.revision,
             new MosaicFlags(mosaicInfo.mosaic.flags),
             mosaicInfo.mosaic.divisibility,
diff --git a/src/infrastructure/MultisigHttp.ts b/src/infrastructure/MultisigHttp.ts
@@ -92,11 +92,11 @@ export class MultisigHttp extends Http implements MultisigRepository {
     private toMultisigAccountInfo(dto: MultisigAccountInfoDTO): MultisigAccountInfo {
         return new MultisigAccountInfo(
             dto.multisig.version || 1,
-            Address.createFromEncoded(dto.multisig.accountAddress),
+            DtoMapping.toAddress(dto.multisig.accountAddress),
             dto.multisig.minApproval,
             dto.multisig.minRemoval,
-            dto.multisig.cosignatoryAddresses.map((cosigner) => Address.createFromEncoded(cosigner)),
-            dto.multisig.multisigAddresses.map((multisig) => Address.createFromEncoded(multisig)),
+            dto.multisig.cosignatoryAddresses.map((cosigner) => DtoMapping.toAddress(cosigner)),
+            dto.multisig.multisigAddresses.map((multisig) => DtoMapping.toAddress(multisig)),
         );
     }
 }
diff --git a/src/infrastructure/NamespaceHttp.ts b/src/infrastructure/NamespaceHttp.ts
@@ -82,7 +82,7 @@ export class NamespaceHttp extends Http implements NamespaceRepository {
             body.accountNames.map(
                 (accountName) =>
                     new AccountNames(
-                        Address.createFromEncoded(accountName.address),
+                        DtoMapping.toAddress(accountName.address),
                         accountName.names.map((name) => {
                             return new NamespaceName(new NamespaceId(name), name);
                         }),
@@ -255,7 +255,7 @@ export class NamespaceHttp extends Http implements NamespaceRepository {
             dto.namespace.depth,
             NamespaceHttp.extractLevels(dto.namespace),
             NamespaceId.createFromEncoded(dto.namespace.parentId),
-            Address.createFromEncoded(dto.namespace.ownerAddress),
+            DtoMapping.toAddress(dto.namespace.ownerAddress),
             UInt64.fromNumericString(dto.namespace.startHeight),
             UInt64.fromNumericString(dto.namespace.endHeight),
             NamespaceHttp.extractAlias(dto.namespace),
@@ -292,7 +292,7 @@ export class NamespaceHttp extends Http implements NamespaceRepository {
         if (namespace.alias && namespace.alias.type.valueOf() === AliasType.Mosaic) {
             return new MosaicAlias(new MosaicId(namespace.alias.mosaicId!));
         } else if (namespace.alias && namespace.alias.type.valueOf() === AliasType.Address) {
-            return new AddressAlias(Address.createFromEncoded(namespace.alias.address!));
+            return new AddressAlias(DtoMapping.toAddress(namespace.alias.address!));
         }
         return new EmptyAlias();
     }
diff --git a/src/infrastructure/RestrictionMosaicHttp.ts b/src/infrastructure/RestrictionMosaicHttp.ts
@@ -24,7 +24,6 @@ import {
 } from 'symbol-openapi-typescript-fetch-client';
 import { DtoMapping } from '../core/utils';
 import { MerkleStateInfo, UInt64 } from '../model';
-import { Address } from '../model/account';
 import { MosaicId } from '../model/mosaic';
 import {
     MosaicAddressRestriction,
@@ -100,7 +99,7 @@ export class RestrictionMosaicHttp extends Http implements RestrictionMosaicRepo
                 dto.mosaicRestrictionEntry.compositeHash,
                 dto.mosaicRestrictionEntry.entryType.valueOf(),
                 new MosaicId(dto.mosaicRestrictionEntry.mosaicId),
-                Address.createFromEncoded(addressRestrictionDto.mosaicRestrictionEntry.targetAddress),
+                DtoMapping.toAddress(addressRestrictionDto.mosaicRestrictionEntry.targetAddress),
                 addressRestrictionDto.mosaicRestrictionEntry.restrictions.map(RestrictionMosaicHttp.toMosaicAddressRestrictionItem),
             );
         }
diff --git a/src/infrastructure/SecretLockHttp.ts b/src/infrastructure/SecretLockHttp.ts
@@ -18,7 +18,6 @@ import { Observable } from 'rxjs';
 import { SecretLockInfoDTO, SecretLockRoutesApi } from 'symbol-openapi-typescript-fetch-client';
 import { DtoMapping } from '../core/utils';
 import { UInt64 } from '../model';
-import { Address } from '../model/account';
 import { MerkleStateInfo } from '../model/blockchain';
 import { SecretLockInfo } from '../model/lock';
 import { MosaicId } from '../model/mosaic';
@@ -92,14 +91,14 @@ export class SecretLockHttp extends Http implements SecretLockRepository {
         return new SecretLockInfo(
             dto.lock.version || 1,
             dto.id,
-            Address.createFromEncoded(dto.lock.ownerAddress),
+            DtoMapping.toAddress(dto.lock.ownerAddress),
             new MosaicId(dto.lock.mosaicId),
             UInt64.fromNumericString(dto.lock.amount),
             UInt64.fromNumericString(dto.lock.endHeight),
             dto.lock.status.valueOf(),
             dto.lock.hashAlgorithm.valueOf(),
             dto.lock.secret,
-            Address.createFromEncoded(dto.lock.recipientAddress),
+            DtoMapping.toAddress(dto.lock.recipientAddress),
             dto.lock.compositeHash,
         );
     }
diff --git a/src/infrastructure/receipt/CreateReceiptFromDTO.ts b/src/infrastructure/receipt/CreateReceiptFromDTO.ts
@@ -15,6 +15,7 @@
  */
 
 import { ResolutionStatementInfoDTO, TransactionStatementInfoDTO } from 'symbol-openapi-typescript-fetch-client';
+import { DtoMapping } from '../../core/utils';
 import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
 import { Address } from '../../model/account/Address';
 import { UnresolvedAddress } from '../../model/account/UnresolvedAddress';
@@ -85,7 +86,7 @@ export const createAddressResolutionStatement = (statementInfoDTO: ResolutionSta
         extractUnresolvedAddress(statementDTO.unresolved),
         statementDTO.resolutionEntries.map((entry) => {
             return new ResolutionEntry(
-                Address.createFromEncoded(entry.resolved),
+                DtoMapping.toAddress(entry.resolved),
                 new ReceiptSource(entry.source.primaryId, entry.source.secondaryId),
             );
         }),
@@ -100,7 +101,7 @@ export const createAddressResolutionStatement = (statementInfoDTO: ResolutionSta
  */
 const createBalanceChangeReceipt = (receiptDTO): Receipt => {
     return new BalanceChangeReceipt(
-        Address.createFromEncoded(receiptDTO.targetAddress),
+        DtoMapping.toAddress(receiptDTO.targetAddress),
         new MosaicId(receiptDTO.mosaicId),
         UInt64.fromNumericString(receiptDTO.amount),
         receiptDTO.version,
@@ -116,8 +117,8 @@ const createBalanceChangeReceipt = (receiptDTO): Receipt => {
  */
 const createBalanceTransferReceipt = (receiptDTO): Receipt => {
     return new BalanceTransferReceipt(
-        Address.createFromEncoded(receiptDTO.senderAddress),
-        Address.createFromEncoded(receiptDTO.recipientAddress),
+        DtoMapping.toAddress(receiptDTO.senderAddress),
+        DtoMapping.toAddress(receiptDTO.recipientAddress),
         new MosaicId(receiptDTO.mosaicId),
         UInt64.fromNumericString(receiptDTO.amount),
         receiptDTO.version,
diff --git a/src/model/transaction/AddressAliasTransaction.ts b/src/model/transaction/AddressAliasTransaction.ts
@@ -23,6 +23,7 @@ import {
     TransactionBuilder,
 } from 'catbuffer-typescript';
 import { Convert } from '../../core/format';
+import { DtoMapping } from '../../core/utils';
 import { Address } from '../account/Address';
 import { PublicAccount } from '../account/PublicAccount';
 import { AliasAction } from '../namespace/AliasAction';
@@ -131,7 +132,7 @@ export class AddressAliasTransaction extends Transaction {
                 : Deadline.createFromDTO((builder as AddressAliasTransactionBuilder).getDeadline().timestamp),
             builder.getAliasAction().valueOf(),
             new NamespaceId(builder.getNamespaceId().namespaceId),
-            Address.createFromEncoded(Convert.uint8ToHex(builder.getAddress().address)),
+            DtoMapping.toAddress(Convert.uint8ToHex(builder.getAddress().address)),
             networkType,
             isEmbedded ? new UInt64([0, 0]) : new UInt64((builder as AddressAliasTransactionBuilder).fee.amount),
             signature,
diff --git a/test/core/utils/DtoMapping.spec.ts b/test/core/utils/DtoMapping.spec.ts
diff --git a/test/core/utils/UnresolvedMapping.spec.ts b/test/core/utils/UnresolvedMapping.spec.ts
diff --git a/test/infrastructure/receipt/CreateReceiptFromDTO.spec.ts b/test/infrastructure/receipt/CreateReceiptFromDTO.spec.ts
diff --git a/test/model/receipt/Receipt.spec.ts b/test/model/receipt/Receipt.spec.ts
