Merge branch 'master' into travis-alpha-releases-from-master

Author: fboucquez

CHANGELOG.md

@@ -3,6 +3,21 @@ 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.17.2] - 02-Mar-2020
+
+**Milestone**: Fushicho.4(RC3 0.9.3.1)
+ Versions  |   |
+---|---|---
+SDK Core| v0.17.2 | https://www.npmjs.com/package/symbol-sdk
+Catbuffer | v0.0.11 | https://www.npmjs.com/package/catbuffer-typescript
+Client Library | v0.8.5  | https://www.npmjs.com/package/symbol-openapi-typescript-node-client
+
+- **[BREAKING CHANGE]** Added `s-part` of transaction signature to transaction hash.
+- Added `numStatements` to `blockInfo` model.
+- Fixed `mosaicNonce` issue in `createTransactionFromPayload`.
+- Improved error handling in WS `listener` and `TransactionService`.
+- Improved test coverage.
+
 ## [0.17.1] - 24-Feb-2020
 
 **Milestone**: Fushicho.4(RC3 0.9.3.1)
@@ -392,6 +407,7 @@ Client Library | v0.7.20-alpha.6  | https://www.npmjs.com/package/nem2-sdk-opena
 
 - Initial code release.
 
+[0.17.1]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.17.1...v0.17.2
 [0.17.1]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.17.0...v0.17.1
 [0.17.0]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.16.5...v0.17.0
 [0.16.5]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.16.4...v0.16.5

README.md

@@ -13,9 +13,9 @@ The Symbol SDK for TypeScript / JavaScript allows you to develop web, mobile, an
 
 **!!! Please be noted that the NEM2-SDK is rebranded to SYMBOL-SDK now**.
 
-Due to a network upgrade with [catapult-server@Fushicho](https://github.com/nemtech/catapult-server/releases/tag/v0.9.3.1) version, **it is recommended to use this package's 0.17.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.3.1) version, **it is recommended to use this package's 0.17.2 version and upwards to use this package with Fushicho versioned networks**.
 
-The upgrade to this package's [version v0.17.0](https://github.com/nemtech/symbol-sdk-typescript-javascript/releases/tag/v0.17.1) is mandatory for **fushicho compatibility**.
+The upgrade to this package's [version v0.17.2](https://github.com/nemtech/symbol-sdk-typescript-javascript/releases/tag/v0.17.2) is mandatory for **fushicho compatibility**.
 
 You can find the complete changelog [here](CHANGELOG.md).
 

e2e/infrastructure/IntegrationTestHelper.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { combineLatest } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { IListener } from '../../src/infrastructure/IListener';
 import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory';
 import { RepositoryFactoryHttp } from '../../src/infrastructure/RepositoryFactoryHttp';
@@ -23,6 +23,7 @@ import { NetworkType } from '../../src/model/blockchain/NetworkType';
 import { SignedTransaction } from '../../src/model/transaction/SignedTransaction';
 import { Transaction } from '../../src/model/transaction/Transaction';
 import { UInt64 } from '../../src/model/UInt64';
+import { TransactionService } from '../../src/service/TransactionService';
 
 export class IntegrationTestHelper {
     public readonly yaml = require('js-yaml');
@@ -41,6 +42,7 @@ export class IntegrationTestHelper {
     public listener: IListener;
     public maxFee: UInt64;
     public harvestingAccount: Account;
+    public transactionService: TransactionService;
 
     start(): Promise<IntegrationTestHelper> {
         return new Promise<IntegrationTestHelper>(
@@ -55,6 +57,7 @@ export class IntegrationTestHelper {
                     console.log(`Running tests against: ${json.apiUrl}`);
                     this.apiUrl = json.apiUrl;
                     this.repositoryFactory = new RepositoryFactoryHttp(json.apiUrl);
+                    this.transactionService = new TransactionService(this.repositoryFactory.createTransactionRepository(), this.repositoryFactory.createReceiptRepository());
                     combineLatest(this.repositoryFactory.getGenerationHash(),
                         this.repositoryFactory.getNetworkType()).subscribe(([generationHash, networkType]) => {
                         this.networkType = networkType;
@@ -107,20 +110,10 @@ export class IntegrationTestHelper {
     }
 
     announce(signedTransaction: SignedTransaction): Promise<Transaction> {
-        return new Promise<Transaction>(
-            (resolve, reject) => {
-                const address = signedTransaction.getSignerAddress();
-                console.log(`Announcing transaction: ${signedTransaction.type}`);
-                this.listener.confirmed(address, signedTransaction.hash).subscribe((transaction) => {
-                    console.log(`Transaction ${signedTransaction.type} confirmed`);
-                    resolve(transaction);
-                });
-                this.listener.status(address).pipe(filter((status) => status.hash === signedTransaction.hash)).subscribe((error) => {
-                    console.log(`Error processing transaction ${signedTransaction.type}`, error);
-                    reject(error);
-                });
-                this.repositoryFactory.createTransactionRepository().announce(signedTransaction);
-            },
-        );
+        console.log(`Announcing transaction: ${signedTransaction.type}`);
+        return this.transactionService.announce(signedTransaction, this.listener).pipe(map((t) => {
+            console.log(`Transaction ${signedTransaction.type} confirmed`);
+            return t;
+        })).toPromise();
     }
 }

src/core/crypto/nacl_catapult.ts

@@ -669,28 +669,6 @@ const unpack25519 = (o, n) => {
     o[15] &= 0x7fff;
 };
 
-export const cleanup = (arr) => {
-    for (let i = 0; i < arr.length; i++) {
-        arr[i] = 0;
-    }
-};
-
-export const crypto_shared_key_hash = (shared, pk, sk, hashfunc) => {
-    const d = new Uint8Array(64);
-    const p = [gf(), gf(), gf(), gf()];
-
-    hashfunc(d, sk, 32);
-    d[0] &= 248;
-    d[31] &= 127;
-    d[31] |= 64;
-
-    const q = [gf(), gf(), gf(), gf()];
-    // tslint:disable: no-use-before-declare
-    unpackneg(q, pk);
-    scalarmult(p, q, d);
-    pack(shared, p);
-};
-
 export const crypto_verify_32 = (x, xi, y, yi) => {
     return vn(x, xi, y, yi, 32);
 };
@@ -728,47 +706,6 @@ export const add = (p, q) => {
     M(p[3], e, h);
 };
 
-export const modL = (r, x) => {
-    // tslint:disable-next-line:one-variable-per-declaration
-    let carry, i, j, k;
-    for (i = 63; i >= 32; --i) {
-        carry = 0;
-        for (j = i - 32, k = i - 12; j < k; ++j) {
-            x[j] += carry - 16 * x[i] * L[j - (i - 32)];
-            carry = (x[j] + 128) >> 8;
-            x[j] -= carry * 256;
-        }
-        x[j] += carry;
-        x[i] = 0;
-    }
-    carry = 0;
-    for (j = 0; j < 32; j++) {
-        x[j] += carry - (x[31] >> 4) * L[j];
-        carry = x[j] >> 8;
-        x[j] &= 255;
-    }
-    for (j = 0; j < 32; j++) {
-        x[j] -= carry * L[j];
-    }
-    for (i = 0; i < 32; i++) {
-        x[i + 1] += x[i] >> 8;
-        r[i] = x[i] & 255;
-    }
-};
-
-export const reduce = (r) => {
-    // tslint:disable-next-line:one-variable-per-declaration
-    let x = new Float64Array(64),
-        i;
-    for (i = 0; i < 64; i++) {
-        x[i] = r[i];
-    }
-    for (i = 0; i < 64; i++) {
-        r[i] = 0;
-    }
-    modL(r, x);
-};
-
 export const pack = (r, p) => {
     // tslint:disable-next-line:one-variable-per-declaration
     const tx = gf(),
@@ -797,64 +734,6 @@ export const scalarmult = (p, q, s) => {
     }
 };
 
-export const scalarbase = (p, s) => {
-    const q = [gf(), gf(), gf(), gf()];
-    set25519(q[0], X);
-    set25519(q[1], Y);
-    set25519(q[2], gf1);
-    M(q[3], X, Y);
-    scalarmult(p, q, s);
-};
-
-export const unpackneg = (r, p) => {
-    // tslint:disable-next-line:one-variable-per-declaration
-    const t = gf(),
-        chk = gf(),
-        num = gf(),
-        den = gf(),
-        den2 = gf(),
-        den4 = gf(),
-        den6 = gf();
-
-    set25519(r[2], gf1);
-    unpack25519(r[1], p);
-    S(num, r[1]);
-    M(den, num, D);
-    Z(num, num, r[2]);
-    A(den, r[2], den);
-
-    S(den2, den);
-    S(den4, den2);
-    M(den6, den4, den2);
-    M(t, den6, num);
-    M(t, t, den);
-
-    pow2523(t, t);
-    M(t, t, num);
-    M(t, t, den);
-    M(t, t, den);
-    M(r[0], t, den);
-
-    S(chk, r[0]);
-    M(chk, chk, den);
-    if (neq25519(chk, num)) {
-        M(r[0], r[0], I);
-    }
-
-    S(chk, r[0]);
-    M(chk, chk, den);
-    if (neq25519(chk, num)) {
-        return -1;
-    }
-
-    if (par25519(r[0]) === (p[31] >> 7)) {
-        Z(r[0], gf0, r[0]);
-    }
-
-    M(r[3], r[0], r[1]);
-    return 0;
-};
-
 export const unpack = (r, p) => {
     // tslint:disable-next-line:one-variable-per-declaration
     const t = gf(),

src/infrastructure/Http.ts

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-import { NodeRoutesApi } from 'symbol-openapi-typescript-node-client';
+import * as http from 'http';
 // tslint:disable-next-line: ordered-imports
 import { from as observableFrom, Observable, of as observableOf, throwError } from 'rxjs';
 import { catchError, map, shareReplay } from 'rxjs/operators';
+import { NodeRoutesApi } from 'symbol-openapi-typescript-node-client';
 import { NetworkType } from '../model/blockchain/NetworkType';
 import { QueryParams } from './QueryParams';
 import { TransactionFilter } from './TransactionFilter';
@@ -59,7 +60,7 @@ export abstract class Http {
 
     transactionFilter(filter?: TransactionFilter): any {
         return {
-            type: filter ? filter.convertCSV(filter.types) : undefined,
+            type: filter ? filter.types : undefined,
         };
     }
 
@@ -80,4 +81,16 @@ export abstract class Http {
         }
         return new Error(error);
     }
+
+    /**
+     * This method knows how to call, convert and handle exception when doing remote http operations.
+     * @param remoteCall the remote call
+     * @param mapper the mapper from dto to the model object.
+     */
+    protected call<D, M>(remoteCall: Promise<{ response: http.IncomingMessage; body: D; }>, mapper: (value: D, index: number) => M) {
+        return observableFrom(remoteCall).pipe(
+            map(({body}, index) => mapper(body, index)),
+            catchError((error) => throwError(this.errorHandling(error))),
+        );
+    }
 }

src/infrastructure/NetworkHttp.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { from as observableFrom, Observable, throwError } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { NetworkRoutesApi } from 'symbol-openapi-typescript-node-client';
 import { NetworkFees } from '../model/blockchain/NetworkFees';
 import { NetworkName } from '../model/blockchain/NetworkName';
@@ -35,8 +35,8 @@ export class NetworkHttp extends Http implements NetworkRepository {
      * @internal
      * Symbol openapi typescript-node client account routes api
      */
-    private nodeHttp: NodeHttp;
-    private networkRouteApi: NetworkRoutesApi;
+    private readonly nodeHttp: NodeHttp;
+    private readonly networkRoutesApi: NetworkRoutesApi;
 
     /**
      * Constructor
@@ -45,7 +45,7 @@ export class NetworkHttp extends Http implements NetworkRepository {
     constructor(url: string) {
         super(url);
         this.nodeHttp = new NodeHttp(url);
-        this.networkRouteApi = new NetworkRoutesApi(url);
+        this.networkRoutesApi = new NetworkRoutesApi(url);
 
     }
 
@@ -55,10 +55,7 @@ export class NetworkHttp extends Http implements NetworkRepository {
      * @return network identifier.
      */
     public getNetworkType(): Observable<NetworkType> {
-        return observableFrom(this.nodeHttp.getNodeInfo()).pipe(
-            map(((nodeInfo: NodeInfo) => nodeInfo.networkIdentifier),
-            catchError((error) =>  throwError(this.errorHandling(error)))),
-        );
+        return this.nodeHttp.getNodeInfo().pipe(map((nodeInfo: NodeInfo) => nodeInfo.networkIdentifier));
     }
 
     /**
@@ -67,10 +64,7 @@ export class NetworkHttp extends Http implements NetworkRepository {
      * @return current network type name and description
      */
     public getNetworkName(): Observable<NetworkName> {
-        return observableFrom(this.networkRouteApi.getNetworkType()).pipe(
-            map((({body}) => new NetworkName(body.name, body.description))),
-            catchError((error) =>  throwError(this.errorHandling(error))),
-        );
+        return this.call(this.networkRoutesApi.getNetworkType(), (body) => new NetworkName(body.name, body.description));
     }
 
     /**
@@ -80,10 +74,7 @@ export class NetworkHttp extends Http implements NetworkRepository {
      * @summary Get transaction fees information
      */
     public getNetworkFees(): Observable<NetworkFees> {
-        return observableFrom(this.networkRouteApi.getNetworkFees()).pipe(
-            map((({body}) =>
-                new NetworkFees(body.averageFeeMultiplier, body.medianFeeMultiplier, body.highestFeeMultiplier, body.lowestFeeMultiplier))),
-            catchError((error) =>  throwError(this.errorHandling(error))),
-        );
+        return this.call(this.networkRoutesApi.getNetworkFees(), (body) =>
+            new NetworkFees(body.averageFeeMultiplier, body.medianFeeMultiplier, body.highestFeeMultiplier, body.lowestFeeMultiplier));
     }
 }