Merge branch 'master' into task/g112_sign_with_cosignatories

Author: Grégory Saive

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.12.3] - 20-Jun-2019
+
+- Fixed null mosaic property in MosaicHttp
+- Added NodeHttp
+- Fixed Uint8 conversions (control char added)
+- Fixed ResolutionStatementDTO in exports
+
 ## [0.12.2] - 17-Jun-2019
 
 - Removed nem2-library dependency

README.md

@@ -12,9 +12,9 @@ with the NEM2 (a.k.a Catapult)
 
 ### _Dragon_ Network Compatibility (catapult-server@0.4.0.1)
 
-Due to a network upgrade with [catapult-server@dragon](https://github.com/nemtech/catapult-server/releases/tag/v0.4.0.1) version, **it is recommended to use this package's 0.12.2 version and upwards to use this package with Dragon versioned networks**.
+Due to a network upgrade with [catapult-server@dragon](https://github.com/nemtech/catapult-server/releases/tag/v0.4.0.1) version, **it is recommended to use this package's 0.12.3 version and upwards to use this package with Dragon versioned networks**.
 
-The upgrade to this package's [version v0.12.2](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.12.2) is mandatory for **dragon compatibility**.
+The upgrade to this package's [version v0.12.3](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.12.3) is mandatory for **dragon compatibility**.
 
 ### _Cow_ Network Compatibility (catapult-server@0.3.0.2)
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nem2-sdk",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "Reactive Nem2 sdk for typescript and javascript",
   "scripts": {
     "pretest": "npm run build",
@@ -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

@@ -161,7 +161,6 @@ let primitives = [
 let enumsMap: {[index: string]: any} = {
     "AccountPropertyTypeEnum": AccountPropertyTypeEnum,
     "AliasTypeEnum": AliasTypeEnum,
-    "ResolutionStatementDTO": ResolutionStatementDTO,
     "MosaicPropertyIdEnum": MosaicPropertyIdEnum,
     "MultisigModificationTypeEnum": MultisigModificationTypeEnum,
     "NamespaceTypeEnum": NamespaceTypeEnum,
@@ -209,6 +208,7 @@ let typeMap: {[index: string]: any} = {
     "NodeInfoDTO": NodeInfoDTO,
     "NodeTimeDTO": NodeTimeDTO,
     "ResolutionEntryDTO": ResolutionEntryDTO,
+    "ResolutionStatementDTO": ResolutionStatementDTO,
     "ServerDTO": ServerDTO,
     "ServerInfoDTO": ServerInfoDTO,
     "SourceDTO": SourceDTO,

src/infrastructure/model/models.ts

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