diff --git a/e2e/service/StateProofService.spec.ts b/e2e/service/StateProofService.spec.ts index d1d932c56b..aa23ff87cc 100644 --- a/e2e/service/StateProofService.spec.ts +++ b/e2e/service/StateProofService.spec.ts @@ -22,7 +22,7 @@ import { NamespaceRegistrationType } from '../../src/model/namespace'; import { StateMerkleProof } from '../../src/model/state'; import { StateProofService } from '../../src/service'; -const url = 'http://api-01.us-west-2.0.10.0.x.symboldev.network:3000'; +const url = 'http://localhost:3000'; const repositoryFactory = new RepositoryFactoryHttp(url); const service = new StateProofService(repositoryFactory); const stateCounts = 50; @@ -46,7 +46,7 @@ async function test( try { const merkle = await merkleMethod(info).toPromise(); expect(merkle).to.not.undefined; - if (merkle.valid) console.log(stateUrl + ' ' + merkle.valid); + if (merkle.valid) console.log(stateUrl + ' ' + merkle.valid + ' ' + merkle.stateHash); else { console.error(stateUrl + ' ' + merkle.valid); } diff --git a/src/core/utils/DtoMapping.ts b/src/core/utils/DtoMapping.ts index 9010cc91e8..e546f40920 100644 --- a/src/core/utils/DtoMapping.ts +++ b/src/core/utils/DtoMapping.ts @@ -39,7 +39,7 @@ export class DtoMapping { */ public static extractAccountRestrictionFromDto(accountRestrictions: AccountRestrictionsInfoDTO): AccountRestrictions { return new AccountRestrictions( - accountRestrictions.accountRestrictions.version, + accountRestrictions.accountRestrictions.version || 1, accountRestrictions['id'], Address.createFromEncoded(accountRestrictions.accountRestrictions.address), accountRestrictions.accountRestrictions.restrictions.map((prop) => { diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts index fdfa52a28f..1da6661509 100644 --- a/src/infrastructure/AccountHttp.ts +++ b/src/infrastructure/AccountHttp.ts @@ -111,7 +111,7 @@ export class AccountHttp extends Http implements AccountRepository { */ public static toAccountInfo(dto: AccountInfoDTO): AccountInfo { return new AccountInfo( - dto.account.version, + dto.account.version || 1, dto.id, Address.createFromEncoded(dto.account.address), UInt64.fromNumericString(dto.account.addressHeight), diff --git a/src/infrastructure/HashLockHttp.ts b/src/infrastructure/HashLockHttp.ts index f2db60e498..6d97982cf3 100644 --- a/src/infrastructure/HashLockHttp.ts +++ b/src/infrastructure/HashLockHttp.ts @@ -98,7 +98,7 @@ export class HashLockHttp extends Http implements HashLockRepository { */ private toHashLockInfo(dto: HashLockInfoDTO): HashLockInfo { return new HashLockInfo( - dto.lock.version, + dto.lock.version || 1, dto.id, Address.createFromEncoded(dto.lock.ownerAddress), new MosaicId(dto.lock.mosaicId), diff --git a/src/infrastructure/MetadataHttp.ts b/src/infrastructure/MetadataHttp.ts index cfd138de34..3ae4f18cf8 100644 --- a/src/infrastructure/MetadataHttp.ts +++ b/src/infrastructure/MetadataHttp.ts @@ -120,7 +120,7 @@ export class MetadataHttp extends Http implements MetadataRepository { return new Metadata( metadata.id, new MetadataEntry( - metadataEntry.version, + metadataEntry.version || 1, metadataEntry.compositeHash, Address.createFromEncoded(metadataEntry.sourceAddress), Address.createFromEncoded(metadataEntry.targetAddress), diff --git a/src/infrastructure/MosaicHttp.ts b/src/infrastructure/MosaicHttp.ts index 73a705abc1..ba50cdd490 100644 --- a/src/infrastructure/MosaicHttp.ts +++ b/src/infrastructure/MosaicHttp.ts @@ -128,7 +128,7 @@ export class MosaicHttp extends Http implements MosaicRepository { */ public static toMosaicInfo(mosaicInfo: MosaicInfoDTO): MosaicInfo { return new MosaicInfo( - mosaicInfo.mosaic.version, + mosaicInfo.mosaic.version || 1, mosaicInfo.id, new MosaicId(mosaicInfo.mosaic.id), UInt64.fromNumericString(mosaicInfo.mosaic.supply), diff --git a/src/infrastructure/MultisigHttp.ts b/src/infrastructure/MultisigHttp.ts index dfb487dae9..3972d60a1d 100644 --- a/src/infrastructure/MultisigHttp.ts +++ b/src/infrastructure/MultisigHttp.ts @@ -91,7 +91,7 @@ export class MultisigHttp extends Http implements MultisigRepository { */ private toMultisigAccountInfo(dto: MultisigAccountInfoDTO): MultisigAccountInfo { return new MultisigAccountInfo( - dto.multisig.version, + dto.multisig.version || 1, Address.createFromEncoded(dto.multisig.accountAddress), dto.multisig.minApproval, dto.multisig.minRemoval, diff --git a/src/infrastructure/NamespaceHttp.ts b/src/infrastructure/NamespaceHttp.ts index ba940c7d8b..105f41be5d 100644 --- a/src/infrastructure/NamespaceHttp.ts +++ b/src/infrastructure/NamespaceHttp.ts @@ -240,7 +240,7 @@ export class NamespaceHttp extends Http implements NamespaceRepository { */ private toNamespaceInfo(dto: NamespaceInfoDTO): NamespaceInfo { return new NamespaceInfo( - dto.namespace.version, + dto.namespace.version || 1, dto.meta.active, dto.meta.index, dto.id, diff --git a/src/infrastructure/RestrictionMosaicHttp.ts b/src/infrastructure/RestrictionMosaicHttp.ts index ff1316a308..70e26876c4 100644 --- a/src/infrastructure/RestrictionMosaicHttp.ts +++ b/src/infrastructure/RestrictionMosaicHttp.ts @@ -96,7 +96,7 @@ export class RestrictionMosaicHttp extends Http implements RestrictionMosaicRepo if ((dto.mosaicRestrictionEntry as any).targetAddress) { const addressRestrictionDto = dto as MosaicAddressRestrictionDTO; return new MosaicAddressRestriction( - dto.mosaicRestrictionEntry.version, + dto.mosaicRestrictionEntry.version || 1, dto.mosaicRestrictionEntry.compositeHash, dto.mosaicRestrictionEntry.entryType.valueOf(), new MosaicId(dto.mosaicRestrictionEntry.mosaicId), @@ -107,7 +107,7 @@ export class RestrictionMosaicHttp extends Http implements RestrictionMosaicRepo const globalRestrictionDto = dto as MosaicGlobalRestrictionDTO; return new MosaicGlobalRestriction( - dto.mosaicRestrictionEntry.version, + dto.mosaicRestrictionEntry.version || 1, dto.mosaicRestrictionEntry.compositeHash, dto.mosaicRestrictionEntry.entryType.valueOf(), new MosaicId(dto.mosaicRestrictionEntry.mosaicId), diff --git a/src/infrastructure/SecretLockHttp.ts b/src/infrastructure/SecretLockHttp.ts index 681b0ac589..4322ffa592 100644 --- a/src/infrastructure/SecretLockHttp.ts +++ b/src/infrastructure/SecretLockHttp.ts @@ -90,7 +90,7 @@ export class SecretLockHttp extends Http implements SecretLockRepository { */ private toSecretLockInfo(dto: SecretLockInfoDTO): SecretLockInfo { return new SecretLockInfo( - dto.lock.version, + dto.lock.version || 1, dto.id, Address.createFromEncoded(dto.lock.ownerAddress), new MosaicId(dto.lock.mosaicId),