Merge branch 'master' into task/g177_ResolutionStatementDTO_copied_to_enumsMap

Author: Grégory Saive

package-lock.json

@@ -45,10 +45,8 @@
     "coveralls": "^3.0.0",
     "gulp": "^4.0.2",
     "gulp-typescript": "^5.0.1",
-    "js-sha256": "^0.9.0",
     "mocha": "^4.0.1",
     "nyc": "^11.3.0",
-    "ripemd160": "^2.0.2",
     "secure-random": "^1.1.1",
     "ts-mockito": "^2.2.7",
     "ts-node": "^5.0.1",
@@ -61,7 +59,9 @@
     "crypto-js": "^3.1.9-1",
     "flatbuffers": "^1.11.0",
     "js-joda": "^1.6.2",
+    "js-sha256": "^0.9.0",
     "js-sha3": "^0.8.0",
+    "ripemd160": "^2.0.2",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
     "rxjs": "^6.2.1",

package.json

@@ -82,8 +82,8 @@ export class MosaicHttp extends Http implements MosaicRepository {
                         PublicAccount.createFromPublicKey(mosaicInfoDTO.mosaic.owner, networkType),
                         mosaicInfoDTO.mosaic.revision,
                         new MosaicProperties(
-                            new UInt64(mosaicFlag),
-                            (new UInt64(divisibility)).compact(),
+                            mosaicFlag ? new UInt64(mosaicFlag) : UInt64.fromUint(0),
+                            (divisibility ? new UInt64(divisibility) : UInt64.fromUint(0)).compact(),
                             duration ? new UInt64(duration) : undefined,
                         ),
                 );
@@ -113,7 +113,7 @@ export class MosaicHttp extends Http implements MosaicRepository {
                         divisibility = mosaicInfoDTO.mosaic.properties[MosaicPropertyType.Divisibility].value;
                     }
                     if (mosaicInfoDTO.mosaic.properties[MosaicPropertyType.Duration].value) {
-                        duration = mosaicInfoDTO.mosaic.properties[MosaicPropertyType.Divisibility].value;
+                        duration = mosaicInfoDTO.mosaic.properties[MosaicPropertyType.Duration].value;
                     }
                     return new MosaicInfo(
                         mosaicInfoDTO.meta.id,
@@ -123,8 +123,8 @@ export class MosaicHttp extends Http implements MosaicRepository {
                         PublicAccount.createFromPublicKey(mosaicInfoDTO.mosaic.owner, networkType),
                         mosaicInfoDTO.mosaic.revision,
                         new MosaicProperties(
-                            new UInt64(mosaicFlag),
-                            (new UInt64(divisibility)).compact(),
+                            mosaicFlag ? new UInt64(mosaicFlag) : UInt64.fromUint(0),
+                            (divisibility ? new UInt64(divisibility) : UInt64.fromUint(0)).compact(),
                             duration ? new UInt64(duration) : undefined,
                         ),
                     );

src/infrastructure/MosaicHttp.ts

@@ -24,8 +24,6 @@ export class MosaicView {
     /**
      * @internal
      * @param mosaicInfo
-     * @param namespaceName
-     * @param mosaicName
      */
     constructor(/**
                  * The mosaic information