Merge branch 'master' into task/ws-channel-unsubscription

Author: Grégory Saive

.travis.yml

@@ -13,12 +13,12 @@ script:
 before_deploy:
   - npm install --global typedoc
   - typedoc --out ts-docs src
+  - touch ./ts-docs/.nojekyll
 deploy:
   provider: pages
   skip_cleanup: true
-  keep-history: true
   local_dir: ts-docs
   github_token: $GITHUB_TOKEN
   on:
     branch: master
-  
+

CHANGELOG.md

@@ -1,2 +1,32 @@
 # CHANGELOG
 
+# v0.10.3
+
+- Fixed NetworkCurrencyMosaic, NetworkHarvestMosaic
+- Added exposed UInt64.fromHex and UInt64.toHex
+- Added MosaicId.createFromNonce
+- Added MosaicNonce, MosaicNonce.createRandom
+- Fixed AliasDTO.mosaicId to be UInt64
+- Added nem2-library@v0.9.8 version update (cow compatibility)
+
+# v0.10.2
+
+- Added cow network update *base* compatibility
+- Added AliasTransaction, AddressAliasTransaction, MosaicAliasTransaction
+- Changed MosaicDefinition to hold MosaicNonce
+- Changed SecretLock transaction to work with Sha3_256 instead of Sha3_512
+
+# v0.10.1-beta
+
+- added replyGiven in Transaction model
+- several linter fixes
+
+# v0.10.0-beta
+
+- update rxjs to v6
+- use observableFrom
+
+# v0.9.5
+
+- data signatures
+- nodejs version 10 updates

README.md

@@ -8,6 +8,14 @@
 The official nem2-sdk for TypeScript and JavaScript, available for browsers, mobile applications and NodeJS, to work 
 with the NEM2 (a.k.a Catapult)
 
+## Important Notes
+
+Due to a network upgrade with [catapult-server@cow](https://github.com/nemtech/catapult-server/releases/tag/v0.3.0.1) version, **transactions from Alpaca&Bison are not compatible anymore**.
+
+The upgrade to this SDK's [version v0.10.2](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.10.2) is mandatory for **cow compatibility**.
+
+Other versions like [version v0.10.1-beta](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.10.1-beta) can be used for **bison** network version.
+
 ## Requirements
 
 ### NodeJS
@@ -43,9 +51,17 @@ Please, use the following available resources to get help:
 - [nem2-cli documentation][docs]
 - If you found a bug, [open a new issue][issues]
 
+## Changelog
+
+Important versions listed below. Refer to the [Changelog](CHANGELOG.md) for a full history of the project.
+
+- [0.10.3](CHANGELOG.md#v0103) - **Cow compatible** - TBD
+- [0.10.2](CHANGELOG.md#v0102) - **Cow compatible** - 2019-02-25
+- [0.10.1-beta](CHANGELOG.md#v0101-beta) - **Alpaca compatible**
+
 ## License
 
-Copyright (c) 2018 NEM
+Copyright (c) 2018-2019 NEM
 Licensed under the [Apache License 2.0](LICENSE)
 
 [self]: https://github.com/nemtech/nem2-sdk-typescript-javascript

e2e/infrastructure/MosaicHttp.spec.ts

@@ -53,29 +53,4 @@ describe('MosaicHttp', () => {
                 });
         });
     });
-
-    describe('getMosaicsFromNamespace', () => {
-        it('should return mosaics given namespaceId', (done) => {
-            mosaicHttp.getMosaicsFromNamespace(namespaceId)
-                .subscribe((mosaicInfos) => {
-                    expect(mosaicInfos[0].height.lower).to.be.equal(1);
-                    expect(mosaicInfos[0].height.higher).to.be.equal(0);
-                    expect(mosaicInfos[0].divisibility).to.be.equal(6);
-                    expect(mosaicInfos[0].isSupplyMutable()).to.be.equal(false);
-                    expect(mosaicInfos[0].isTransferable()).to.be.equal(true);
-                    expect(mosaicInfos[0].isLevyMutable()).to.be.equal(false);
-                    done();
-                });
-        });
-    });
-
-    describe('getMosaicsName', () => {
-        it('should return mosaics name given array of mosaicIds', (done) => {
-            mosaicHttp.getMosaicsName([mosaicId])
-                .subscribe((mosaicNames) => {
-                    expect(mosaicNames[0].name).to.be.equal('xem');
-                    done();
-                });
-        });
-    });
 });

e2e/infrastructure/NamespaceHttp.spec.ts

@@ -13,15 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import {deepEqual} from 'assert';
 import {expect} from 'chai';
 import {NamespaceHttp} from '../../src/infrastructure/NamespaceHttp';
 import {PublicAccount} from '../../src/model/account/PublicAccount';
 import {NetworkType} from '../../src/model/blockchain/NetworkType';
+import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
 import {NamespaceId} from '../../src/model/namespace/NamespaceId';
 import {APIUrl} from '../conf/conf.spec';
 
 describe('NamespaceHttp', () => {
-    const namespaceId = new NamespaceId([929036875, 2226345261]);
+    const namespaceId = NetworkCurrencyMosaic.NAMESPACE_ID;
     const publicAccount = PublicAccount.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
         NetworkType.MIJIN_TEST);
     const namespaceHttp = new NamespaceHttp(APIUrl);
@@ -69,4 +71,24 @@ describe('NamespaceHttp', () => {
                 });
         });
     });
+
+    describe('getLinkedMosaicId', () => {
+        it('should return mosaicId given currency namespaceId', (done) => {
+            namespaceHttp.getLinkedMosaicId(namespaceId)
+                .subscribe((mosaicId) => {
+                    expect(mosaicId).to.not.be.null;
+                    done();
+                });
+        });
+    });
+
+    describe('getLinkedAddress', () => {
+        it('should return address given namespaceId', (done) => {
+            namespaceHttp.getLinkedAddress(namespaceId)
+                .subscribe((address) => {
+                    expect(address).to.be.null;
+                    done();
+                });
+        });
+    });
 });