From e73b725a1214da8a8fa3d0c732759673ff906fff Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 08:51:29 +0000 Subject: [PATCH 01/13] v0.16.0 release --- CHANGELOG.md | 10 ++++++++++ README.md | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 675b3cf9ba..f3cf1ab68a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ 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.16.0] - 09-Dec-2019 + +**Milestone**: Fushicho.3 + +- Added epochAdjustment introduced in catapult-server v0.9.1.1 (Fushicho.3) +- Added `setMaxFee` to `Transaction` which calculate max transaction fee using `feeMultiplier * transaction.size`. +- Optimised `resolveAlias` implementation in transaction using object spread operator. +- Fixed couple of bugs in `blockHttp` and unit tests + ## [0.15.1] - 06-Dec-2019 **Milestone**: Fushicho.2 @@ -277,6 +286,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e **Milestone**: Alpaca - Initial code release. +[0.16.0]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.15.1...v0.16.0 [0.15.1]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.15.0...v0.15.1 [0.15.0]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.14.4...v0.15.0 [0.14.4]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.14.3...v0.14.4 diff --git a/README.md b/README.md index 7e6d210d3c..22c8378e32 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ with the NEM2 (a.k.a Catapult) ## Important Notes -### _Fushicho_ Network Compatibility (catapult-server@0.9.0.1) +### _Fushicho_ Network Compatibility (catapult-server@0.9.1.1) -Due to a network upgrade with [catapult-server@Fushicho](https://github.com/nemtech/catapult-server/releases/tag/v0.9.0.1) version, **it is recommended to use this package's 0.15.1 version and upwards to use this package with Fushicho versioned networks**. +Due to a network upgrade with [catapult-server@Fushicho](https://github.com/nemtech/catapult-server/releases/tag/v0.9.1.1) version, **it is recommended to use this package's 0.16.0 version and upwards to use this package with Fushicho versioned networks**. -The upgrade to this package's [version v0.15.1](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.15.1) is mandatory for **fushicho compatibility**. +The upgrade to this package's [version v0.16.0](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.16.0) is mandatory for **fushicho compatibility**. ### _Elephant_ Network Compatibility (catapult-server@0.7.0.1) From ae37184788a1fae900f24b50aeb40cb4035a91fb Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 08:52:26 +0000 Subject: [PATCH 02/13] v0.16.0 Fushicho3 compatibility --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 748f8ed093..b108461788 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nem2-sdk", - "version": "0.15.1", + "version": "0.16.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7c4cbca171..9d1689d015 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nem2-sdk", - "version": "0.15.1", + "version": "0.16.0", "description": "Reactive Nem2 sdk for typescript and javascript", "scripts": { "pretest": "npm run build", From cee72f42ec1f0a29178f16ec1b0b1b1a983c046e Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 09:31:13 +0000 Subject: [PATCH 03/13] Fixed TS2300 build error --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index 4059e92227..fe15ff23ba 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,6 +12,7 @@ "stripInternal": true, "outDir": "dist", "allowJs": false, + "skipLibCheck": true, "lib": [ "es2017", "dom" From 17564dd2884c21ae4c5a460e7cae893e1d2944ba Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 10:04:41 +0000 Subject: [PATCH 04/13] Fixed nyc coverage --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d1689d015..64906f90b7 100644 --- a/package.json +++ b/package.json @@ -77,8 +77,10 @@ "rxjs": "^6.2.1" }, "nyc": { + "exclude-after-remap": false, "exclude": [ - "**/*.spec.js" + "**/*.spec.js", + "gulpfile.js" ] } } From 00e01712912f8cc6aff719a64f30679a4dc0c9fe Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 12:03:48 +0000 Subject: [PATCH 05/13] try commit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f5b1908c2..33c938fe19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ node_js: cache: directories: - "node_modules" -before_script: +script: - npm run build -script: +after_success: - npm run test:coveralls before_deploy: - npm install --global typedoc From 716d850688fa9cc5f09df77dda510e993aac9ad6 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 12:07:34 +0000 Subject: [PATCH 06/13] try remove coveralls --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33c938fe19..d62baf44f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ cache: - "node_modules" script: - npm run build -after_success: - - npm run test:coveralls +# script: +# - npm run test:coveralls before_deploy: - npm install --global typedoc - typedoc --out ts-docs src From cce2bef4ce49e8a65db4171cb29d5995c8cbe702 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 12:09:56 +0000 Subject: [PATCH 07/13] restore changes --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d62baf44f8..4f5b1908c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ node_js: cache: directories: - "node_modules" -script: +before_script: - npm run build -# script: -# - npm run test:coveralls +script: + - npm run test:coveralls before_deploy: - npm install --global typedoc - typedoc --out ts-docs src From eceb87a647696072f14a276b88af82639fc4c0e7 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 12:49:36 +0000 Subject: [PATCH 08/13] try remove nyc excludes --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 64906f90b7..9e4a03765c 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,6 @@ "nyc": { "exclude-after-remap": false, "exclude": [ - "**/*.spec.js", "gulpfile.js" ] } From feed6a47324611aeaab3382932233ea1c9b12f1d Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 12:56:03 +0000 Subject: [PATCH 09/13] restore --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 9e4a03765c..64906f90b7 100644 --- a/package.json +++ b/package.json @@ -79,6 +79,7 @@ "nyc": { "exclude-after-remap": false, "exclude": [ + "**/*.spec.js", "gulpfile.js" ] } From 7478b459e3682333a50597f6a9659ed655c5452a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 12:57:30 +0000 Subject: [PATCH 10/13] try break a unit test --- test/model/transaction/TransferTransaction.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/model/transaction/TransferTransaction.spec.ts b/test/model/transaction/TransferTransaction.spec.ts index 6626d55eaf..c55c2bd3e9 100644 --- a/test/model/transaction/TransferTransaction.spec.ts +++ b/test/model/transaction/TransferTransaction.spec.ts @@ -406,7 +406,7 @@ describe('TransferTransaction', () => { NetworkType.MIJIN_TEST, ).setMaxFee(2); ​ - expect(transferTransaction.maxFee.compact()).to.be.equal(378); + expect(transferTransaction.maxFee.compact()).to.be.equal(0); }); it('Test resolveAlias can resolve', () => { From bc485819caf4e1eba632d126bd6e12f0cef51671 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 13:00:00 +0000 Subject: [PATCH 11/13] restore --- test/model/transaction/TransferTransaction.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/model/transaction/TransferTransaction.spec.ts b/test/model/transaction/TransferTransaction.spec.ts index c55c2bd3e9..6626d55eaf 100644 --- a/test/model/transaction/TransferTransaction.spec.ts +++ b/test/model/transaction/TransferTransaction.spec.ts @@ -406,7 +406,7 @@ describe('TransferTransaction', () => { NetworkType.MIJIN_TEST, ).setMaxFee(2); ​ - expect(transferTransaction.maxFee.compact()).to.be.equal(0); + expect(transferTransaction.maxFee.compact()).to.be.equal(378); }); it('Test resolveAlias can resolve', () => { From 79eb852557d438a683c3d7fb9829d3b29fc7b312 Mon Sep 17 00:00:00 2001 From: Fernando Boucquez Date: Mon, 9 Dec 2019 10:29:12 -0300 Subject: [PATCH 12/13] Splitting test run from coverals report so the failing tests can be shown in travis Running typedoc in branch so docs are tested before merging to master --- .travis.yml | 4 ++-- package.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f5b1908c2..fafd28714d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ cache: before_script: - npm run build script: - - npm run test:coveralls -before_deploy: + - npm run test:cov + - npm run coveralls-report - npm install --global typedoc - typedoc --out ts-docs src - touch ./ts-docs/.nojekyll diff --git a/package.json b/package.json index 64906f90b7..71ec56905b 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "test:all": "mocha --ui bdd --recursive ./dist/ --timeout 90000", "build": "rm -rf dist/ && tsc && npm run e2econfigcopy", "test:cov": "nyc --reporter=lcov --reporter=text-lcov npm t && nyc report --reporter=text-lcov", - "test:coveralls": "npm run test:cov | coveralls" + "test:coveralls": "npm run test:cov | coveralls", + "coveralls-report": "cat ./coverage/lcov.info | coveralls" }, "contributors": [ { From c1ef85cb551aeeed4b94eb065ee956e2e97e9a01 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 9 Dec 2019 14:43:14 +0000 Subject: [PATCH 13/13] optimised the nyc coverage output --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71ec56905b..c5a0cc22b3 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "test:e2e": "npm run build && mocha --ui bdd --recursive ./dist/e2e --timeout 90000", "test:all": "mocha --ui bdd --recursive ./dist/ --timeout 90000", "build": "rm -rf dist/ && tsc && npm run e2econfigcopy", - "test:cov": "nyc --reporter=lcov --reporter=text-lcov npm t && nyc report --reporter=text-lcov", + "test:cov": "nyc --reporter=lcov --reporter=text-summary npm t", "test:coveralls": "npm run test:cov | coveralls", "coveralls-report": "cat ./coverage/lcov.info | coveralls" },