diff --git a/CHANGELOG.md b/CHANGELOG.md index 547cb00d3d..3eccfba066 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,9 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e **Milestone**: Fushicho.4(RC3 0.9.3.1) Versions | | ---|---|--- -SDK Core| v0.17.0 | https://www.npmjs.com/package/nem2-sdk -Catbuffer Library| v0.0.11 | https://www.npmjs.com/package/catbuffer -Client Library | v0.8.4 | https://www.npmjs.com/package/nem2-sdk-openapi-typescript-node-client +SDK Core| v0.17.0 | https://www.npmjs.com/package/symbol-sdk +catbuffer-typescript Library| v0.0.11 | https://www.npmjs.com/package/catbuffer-typescript +Client Library | v0.8.4 | https://www.npmjs.com/package/symbol-openapi-typescript-node-client - **[BREAKING CHANGE]** Changed hashing algorithm to cope catapult-server changes. All Key derivation and signing are now using `SHA512`. Removed `SignSchema` so `NetworkType` is no longer bonded to the schema anymore (sha3 / keccak). This change will affect all existing keypairs / address (derived from public key) and transaction signatures. - **[BREAKING CHANGE]** Added new `TransactionFilter` parameter to `AccountHttp` which is now support filtering with list of transaction type. @@ -28,9 +28,9 @@ Client Library | v0.8.4 | https://www.npmjs.com/package/nem2-sdk-openapi-typesc **Milestone**: Fushicho.4(RC3) Versions | | ---|---|--- -SDK Core| v0.16.5 | https://www.npmjs.com/package/nem2-sdk -Catbuffer Library| v0.0.11 | https://www.npmjs.com/package/catbuffer -Client Library | v0.7.20-beta.7 | https://www.npmjs.com/package/nem2-sdk-openapi-typescript-node-client +SDK Core| v0.16.5 | https://www.npmjs.com/package/symbol-sdk +catbuffer-typescript Library| v0.0.11 | https://www.npmjs.com/package/catbuffer-typescript +Client Library | v0.7.20-beta.7 | https://www.npmjs.com/package/symbol-openapi-typescript-node-client - Fixed circular reference issue after removed `InnerTransaction` class. @@ -39,15 +39,15 @@ Client Library | v0.7.20-beta.7 | https://www.npmjs.com/package/nem2-sdk-openap **Milestone**: Fushicho.4(RC3) Versions | | ---|---|--- -SDK Core| v0.16.4 | https://www.npmjs.com/package/nem2-sdk -Catbuffer Library| v0.0.11 | https://www.npmjs.com/package/catbuffer -Client Library | v0.7.20-beta.7 | https://www.npmjs.com/package/nem2-sdk-openapi-typescript-node-client +SDK Core| v0.16.4 | https://www.npmjs.com/package/symbol-sdk +catbuffer-typescript Library| v0.0.11 | https://www.npmjs.com/package/catbuffer-typescript +Client Library | v0.7.20-beta.7 | https://www.npmjs.com/package/symbol-openapi-typescript-node-client - Core 0.9.2.1 compatible. Changed hash algorithm for shared key derivation to `HKDF-HMAC-Sha256`. - Removed `senderPrivateKey` in `Persistent Delegation Request Transaction`. Instead, it uses an `ephemeral key pair` and the `EphemeralPublicKey` is now attached in the `PersistentDelegationMessage` payload. - Removed `salt` encryption and decryption functions which uses `HKDF-HMAC-Sha256` instead. This only affects the encrypted payload. - Added missing export in `Infrastructure` classes / interfaces. -- Applied latest `catbuffer` builder codes for `ResolutionStatement`. +- Applied latest `catbuffer-typescript` builder codes for `ResolutionStatement`. - Updated `TransactionType` & `TransactionVersion` enum key name to match `catabuffer` schema definition. - Changed signature type for `Height` from `numeric string` to `UInt64` in `Block` & `Receipt` respostiories - Fixed a few ts lint issues. @@ -57,9 +57,9 @@ Client Library | v0.7.20-beta.7 | https://www.npmjs.com/package/nem2-sdk-openap **Milestone**: Fushicho.3 Versions | | ---|---|--- -SDK Core| v0.16.3 | https://www.npmjs.com/package/nem2-sdk -Catbuffer Library| v0.0.7 | https://www.npmjs.com/package/catbuffer -Client Library | v0.7.20-beta.6 | https://www.npmjs.com/package/nem2-sdk-openapi-typescript-node-client +SDK Core| v0.16.3 | https://www.npmjs.com/package/symbol-sdk +catbuffer-typescript Library| v0.0.7 | https://www.npmjs.com/package/catbuffer-typescript +Client Library | v0.7.20-beta.6 | https://www.npmjs.com/package/symbol-openapi-typescript-node-client - Fixed http client (OpenAPI client package) does not support ES6 issue. @@ -68,11 +68,11 @@ Client Library | v0.7.20-beta.6 | https://www.npmjs.com/package/nem2-sdk-openap **Milestone**: Fushicho.3 Versions | | ---|---|--- -SDK Core| v0.16.2 | https://www.npmjs.com/package/nem2-sdk -Catbuffer Library| v0.0.7 | https://www.npmjs.com/package/catbuffer -Client Library | v0.7.20-alpha.6 | https://www.npmjs.com/package/nem2-sdk-openapi-typescript-node-client +SDK Core| v0.16.2 | https://www.npmjs.com/package/symbol-sdk +catbuffer-typescript Library| v0.0.7 | https://www.npmjs.com/package/catbuffer-typescript +Client Library | v0.7.20-alpha.6 | https://www.npmjs.com/package/symbol-openapi-typescript-node-client -- Refactored to replace generated codes by public library package for both `Catbuffer` and `OpenAPI Http Client`. +- Refactored to replace generated codes by public library package for both `catbuffer-typescript` and `OpenAPI Http Client`. - Added unresolved (mosaicId, address) support in `MosaicRestrictionTransaction`. - Added `toHex()` in `MosaicNonce` class. - Exposed `MultisigAccountGraphInfo` class constructor to public. @@ -92,7 +92,7 @@ Client Library | v0.7.20-alpha.6 | https://www.npmjs.com/package/nem2-sdk-opena - Fixed `TrandactionStatus` not returning correct error code bug. - Fixed `spread operation issue` in `SetMaxFee and ResolveAlias` which results in missing super class properties bug. - Fixed `epochAdjustment` static value not in UTC bug. -- Fixed known issues in `Catbuffer Typescript Generator` over `EntityTypeDto` and `AggregateTransactionBuilder`. Aggregate transaction's `InnerTransactions` and `Cosignatures` are now in array format (`EmbeddedTransactionBuilder` and `CosignatureBuilder`) instead of using `Uint8Array`. +- Fixed known issues in `catbuffer-typescript Typescript Generator` over `EntityTypeDto` and `AggregateTransactionBuilder`. Aggregate transaction's `InnerTransactions` and `Cosignatures` are now in array format (`EmbeddedTransactionBuilder` and `CosignatureBuilder`) instead of using `Uint8Array`. ## [0.16.0] - 09-Dec-2019 @@ -209,7 +209,7 @@ Client Library | v0.7.20-alpha.6 | https://www.npmjs.com/package/nem2-sdk-opena - Added Metadata Transactions (Account, Mosaic and Namespace). - Added new account restriction type to support `Outgoing` addresses and transaction types. -- Catbuffer builder codes fully implemented. Flatbuffer codes removed. +- catbuffer-typescript builder codes fully implemented. Flatbuffer codes removed. - Models and services updated to be compatible with latest server (milestone Elephant: patch-3) schema updates. - Refactored `Uint64` to support `UInt64 to/from: numeric/hex string`. - Refactored `Signature Schema` to support both `NIS1` and `Catapult`. `Network idendifier` is now used to identify `Signature Schema` on model level. PrivateKey reversal has been removed for `NIS1` schema. @@ -377,37 +377,37 @@ Client Library | v0.7.20-alpha.6 | https://www.npmjs.com/package/nem2-sdk-opena **Milestone**: Alpaca - Initial code release. -[0.17.0]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.16.5...v0.17.0 -[0.16.5]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.16.4...v0.16.5 -[0.16.4]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.16.3...v0.16.4 -[0.16.3]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.16.2...v0.16.3 -[0.16.2]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.16.1...v0.16.2 -[0.16.1]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.16.0...v0.16.1 -[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 -[0.14.3]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.14.2...v0.14.3 -[0.14.2]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.14.1...v0.14.2 -[0.14.1]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.14.0...v0.14.1 -[0.14.0]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.13.4...v0.14.0 -[0.13.4]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.13.3...v0.13.4 -[0.13.3]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.13.2...v0.13.3 -[0.13.2]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.13.1...v0.13.2 -[0.13.1]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.13.0...v0.13.1 -[0.13.0]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.4...v0.13.0 -[0.12.4]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.3...v0.12.4 -[0.12.3]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.2...v0.12.3 -[0.12.2]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.1...v0.12.2 -[0.12.1]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.0...v0.12.1 -[0.12.0]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.11.6...v0.12.0 -[0.11.6]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.11.5...v0.11.6 -[0.11.5]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.11.4...v0.11.5 -[0.11.4]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.11.3...v0.11.4 -[0.11.3]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.11.2...v0.11.3 -[0.11.2]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.11.1...v0.11.2 -[0.11.1]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.11.0...v0.11.1 -[0.11]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.10.1-beta...v0.11.0 -[0.10.1-beta]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.9.5...v0.10.1-beta -[0.9.5]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.9.0...v0.9.5 -[0.9.0]: https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.9.0 +[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 +[0.16.4]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.16.3...v0.16.4 +[0.16.3]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.16.2...v0.16.3 +[0.16.2]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.16.1...v0.16.2 +[0.16.1]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.16.0...v0.16.1 +[0.16.0]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.15.1...v0.16.0 +[0.15.1]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.15.0...v0.15.1 +[0.15.0]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.14.4...v0.15.0 +[0.14.4]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.14.3...v0.14.4 +[0.14.3]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.14.2...v0.14.3 +[0.14.2]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.14.1...v0.14.2 +[0.14.1]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.14.0...v0.14.1 +[0.14.0]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.13.4...v0.14.0 +[0.13.4]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.13.3...v0.13.4 +[0.13.3]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.13.2...v0.13.3 +[0.13.2]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.13.1...v0.13.2 +[0.13.1]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.13.0...v0.13.1 +[0.13.0]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.12.4...v0.13.0 +[0.12.4]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.12.3...v0.12.4 +[0.12.3]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.12.2...v0.12.3 +[0.12.2]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.12.1...v0.12.2 +[0.12.1]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.12.0...v0.12.1 +[0.12.0]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.11.6...v0.12.0 +[0.11.6]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.11.5...v0.11.6 +[0.11.5]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.11.4...v0.11.5 +[0.11.4]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.11.3...v0.11.4 +[0.11.3]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.11.2...v0.11.3 +[0.11.2]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.11.1...v0.11.2 +[0.11.1]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.11.0...v0.11.1 +[0.11]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.10.1-beta...v0.11.0 +[0.10.1-beta]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.9.5...v0.10.1-beta +[0.9.5]: https://github.com/nemtech/symbol-sdk-typescript-javascript/compare/v0.9.0...v0.9.5 +[0.9.0]: https://github.com/nemtech/symbol-sdk-typescript-javascript/releases/tag/v0.9.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b2870df7b6..2d3f0d7b88 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,12 @@ -# Contributing to nem2-sdk-typescript-javascript +# Contributing to symbol-sdk-typescript-javascript -First off, thank you for considering contributing to nem2-sdk-typescript-javascript. -It’s people like you that make nem2-sdk-typescript-javascript such a great tool. +First off, thank you for considering contributing to symbol-sdk-typescript-javascript. +It’s people like you that make symbol-sdk-typescript-javascript such a great tool. -nem2-sdk-typescript-javascript is an open source project and we love to receive contributions from +symbol-sdk-typescript-javascript is an open source project and we love to receive contributions from our community — you! There are many ways to contribute, from writing tutorials or blog posts, improving the documentation, submitting bug reports and feature requests or -writing code which can be incorporated into nem2-sdk-typescript-javascript itself. +writing code which can be incorporated into symbol-sdk-typescript-javascript itself. Following these guidelines helps to communicate that you respect the time of the developers managing and developing this open source project. In return, @@ -17,8 +17,8 @@ Please, **don't use the issue tracker for support questions**. ## Bug reports -If you think you have found a bug in nem2-sdk-typescript-javascript, first make sure that you -are testing against the latest version of nem2-sdk-typescript-javascript - your issue may already +If you think you have found a bug in symbol-sdk-typescript-javascript, first make sure that you +are testing against the latest version of symbol-sdk-typescript-javascript - your issue may already have been fixed. If not, search our issues list on GitHub in case a similar issue has already been opened. @@ -42,15 +42,15 @@ Open a new issue [here][github-issues]. ## Feature requests -If you find yourself wishing for a feature that doesn't exist in nem2-sdk-typescript-javascript, +If you find yourself wishing for a feature that doesn't exist in symbol-sdk-typescript-javascript, you are probably not alone. There are bound to be others out there with similar -needs. Many of the features that nem2-sdk-typescript-javascript has today have been added because +needs. Many of the features that symbol-sdk-typescript-javascript has today have been added because our users saw the need. Open an [issue][github-issues] on our issues list on GitHub which describes the feature you would like to see, why you need it, and how it should work. ## Contributing code and documentation changes -If you have a bugfix or new feature that you would like to contribute to nem2-sdk-typescript-javascript, please find or open an issue +If you have a bugfix or new feature that you would like to contribute to symbol-sdk-typescript-javascript, please find or open an issue about it first. Talk about what you would like to do. It may be that somebody is already working on it, or that there are particular issues that you should know about before implementing the change. @@ -65,7 +65,7 @@ Whether or not you state this explicitly, by submitting any copyrighted material ### Fork and clone the repository -You will need to fork the main nem2-sdk-typescript-javascript code or documentation repository and clone +You will need to fork the main symbol-sdk-typescript-javascript code or documentation repository and clone it to your local machine. See [github help page](https://help.github.com/articles/fork-a-repo/) for help. Further instructions for specific projects are given below. @@ -82,9 +82,9 @@ Once your changes and tests are ready to submit for review: Push your local changes to your forked copy of the repository and [submit a pull request](https://help.github.com/articles/about-pull-requests/). In the pull request, choose a title which sums up the changes that you have made, and in the body provide more details about what your changes do. Also mention the number of the issue where discussion has taken place, eg "Closes #123". -Then sit back and wait. There will probably be discussion about the pull request and, if any changes are needed, we would love to work with you to get your pull request merged into nem2-sdk-typescript-javascript. +Then sit back and wait. There will probably be discussion about the pull request and, if any changes are needed, we would love to work with you to get your pull request merged into symbol-sdk-typescript-javascript. *CONTRIBUTING.md is based on [CONTRIBUTING-template.md](https://github.com/nayafia/contributing-template/blob/master/CONTRIBUTING-template.md)* , [elasticsearch/CONTRIBUTING](https://github.com/elastic/elasticsearch/blob/master/CONTRIBUTING.md) and [spark/CONTRIBUTING](https://github.com/apache/spark/blob/master/CONTRIBUTING.md) [pull-request]: https://help.github.com/articles/about-pull-requests/ -[github-issues]: https://github.com/nemtech/nem2-sdk-typescript-javascript/issues +[github-issues]: https://github.com/nemtech/symbol-sdk-typescript-javascript/issues diff --git a/LICENSE b/LICENSE index b4fee5d717..96b0907d16 100644 --- a/LICENSE +++ b/LICENSE @@ -202,9 +202,9 @@ limitations under the License. ======================================================================= -nem2-sdk-typescript-javascript Subcomponents: +symbol-sdk-typescript-javascript Subcomponents: -The nem2-sdk-typescript-javascript contains subcomponents with separate copyright +The symbol-sdk-typescript-javascript contains subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. @@ -216,12 +216,6 @@ For js-joda: See license/LICENSE-js-joda.txt -======================================================================== -For nem2-library-js: -======================================================================== - -See license/LICENSE-nem2-library-js.txt - ======================================================================== For request: ======================================================================== diff --git a/README.md b/README.md index 1960df4dd9..260bb4b8ef 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# nem2-sdk for TypeScript and JavaScript +# Symbol-sdk for TypeScript and JavaScript -[![npm version](https://badge.fury.io/js/nem2-sdk.svg)](https://badge.fury.io/js/nem2-sdk) -[![Build Status](https://api.travis-ci.org/nemtech/nem2-sdk-typescript-javascript.svg?branch=master)](https://travis-ci.org/nemtech/nem2-sdk-typescript-javascript) -[![Coverage Status](https://coveralls.io/repos/github/nemtech/nem2-sdk-typescript-javascript/badge.svg?branch=travis-ci)](https://coveralls.io/github/nemtech/nem2-sdk-typescript-javascript?branch=travis-ci) +[![npm version](https://badge.fury.io/js/symbol-sdk.svg)](https://badge.fury.io/js/symbol-sdk) +[![Build Status](https://api.travis-ci.org/nemtech/symbol-sdk-typescript-javascript.svg?branch=master)](https://travis-ci.org/nemtech/symbol-sdk-typescript-javascript) +[![Coverage Status](https://coveralls.io/repos/github/nemtech/symbol-sdk-typescript-javascript/badge.svg?branch=travis-ci)](https://coveralls.io/github/nemtech/symbol-sdk-typescript-javascript?branch=travis-ci) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -The official nem2-sdk for TypeScript and JavaScript, available for browsers, mobile applications, and NodeJS, to work -with the NEM2 (a.k.a Catapult) +The official symbol-sdk for TypeScript and JavaScript, available for browsers, mobile applications, and NodeJS, to work +with the Symbol (a.k.a Catapult) ## Important Notes @@ -14,29 +14,7 @@ with the NEM2 (a.k.a Catapult) 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.0 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/nem2-sdk-typescript-javascript/releases/tag/v0.17.0) is mandatory for **fushicho compatibility**. - -### _Elephant_ Network Compatibility (catapult-server@0.7.0.1) - -Due to a network upgrade with [catapult-server@elephant3](https://github.com/nemtech/catapult-server/releases/tag/v0.7.0.1) version, **it is recommended to use this package's 0.13.4 version and upwards to use this package with Elephant versioned networks**. - -The upgrade to this package's [version v0.13.3](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.13.3) is mandatory for **elephant compatibility**. - -### _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.4 version and upwards to use this package with Dragon versioned networks**. - -The upgrade to this package's [version v0.12.4](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.12.4) is mandatory for **dragon compatibility**. - -### _Cow_ Network Compatibility (catapult-server@0.3.0.2) - -[version v0.11.6](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.11.6) is the latest locked version for **cow compatibility**. - -Due to a network upgrade with [catapult-server@cow](https://github.com/nemtech/catapult-server/releases/tag/v0.3.0.2) version, **transactions from Alpaca & Bison are not compatible with cow versioned networks**. - -### _Alpaca_ / _Bison_ Network Compatibility (catapult-server@0.1 & 0.2) - -To be able to use this package with _Alpaca_ or _Bison_ versioned network, you must use [version v0.10.1-beta](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.10.1-beta). +The upgrade to this package's [version v0.17.0](https://github.com/nemtech/symbol-sdk-typescript-javascript/releases/tag/v0.17.0) is mandatory for **fushicho compatibility**. You can find the complete changelog [here](CHANGELOG.md). @@ -51,7 +29,7 @@ You can find the complete changelog [here](CHANGELOG.md). ## Installation ```bash -npm install nem2-sdk rxjs +npm install symbol-sdk rxjs ``` ## Usage @@ -59,29 +37,29 @@ npm install nem2-sdk rxjs Surf the [NEM Developer Center][docs] to get started into NEM development. You will find self-paced guides and useful code snippets using the TypeScript/Javascript SDK. To get the full description of the available classes and their functions, check the [SDK reference][sdk-ref]. - + ## Getting help Use the following available resources to get help: -- [nem2-sdk-typescript-javascript documentation][docs] +- [symbol-sdk-typescript-javascript documentation][docs] - If you found a bug, [open a new issue][issues] ## Contributing -This project is developed and maintained by NEM Foundation. Contributions are welcome and appreciated. You can find [nem2-sdk on GitHub][self]. +This project is developed and maintained by NEM Foundation. Contributions are welcome and appreciated. You can find [symbol-sdk on GitHub][self]. Feel free to start an issue or create a pull request. Check [CONTRIBUTING](CONTRIBUTING.md) before start. You can also find useful notes for developers under our documentation [guidelines][guidelines] section. -## License +## License Copyright (c) 2018-2019 NEM Licensed under the [Apache License 2.0](LICENSE) -[self]: https://github.com/nemtech/nem2-sdk-typescript-javascript +[self]: https://github.com/nemtech/symbol-sdk-typescript-javascript [docs]: http://nemtech.github.io/getting-started/setup-workstation.html -[issues]: https://github.com/nemtech/nem2-sdk-typescript-javascript/issues -[sdk-ref]: http://nemtech.github.io/nem2-sdk-typescript-javascript +[issues]: https://github.com/nemtech/symbol-sdk-typescript-javascript/issues +[sdk-ref]: http://nemtech.github.io/symbol-sdk-typescript-javascript [guidelines]: https://nemtech.github.io/contribute/contributing.html#sdk diff --git a/e2e/infrastructure/NodeHttp.spec.ts b/e2e/infrastructure/NodeHttp.spec.ts index 1cbfad5924..17c7196d82 100644 --- a/e2e/infrastructure/NodeHttp.spec.ts +++ b/e2e/infrastructure/NodeHttp.spec.ts @@ -41,6 +41,19 @@ describe('NodeHttp', () => { }); }); + describe('getNodePeers', () => { + it('should return node peers', async () => { + const nodeInfo = await nodeRepository.getNodePeers().toPromise(); + expect(nodeInfo[0].friendlyName).not.to.be.undefined; + expect(nodeInfo[0].host).not.to.be.undefined; + expect(nodeInfo[0].networkIdentifier).not.to.be.undefined; + expect(nodeInfo[0].port).not.to.be.undefined; + expect(nodeInfo[0].publicKey).not.to.be.undefined; + expect(nodeInfo[0].roles).not.to.be.undefined; + expect(nodeInfo[0].version).not.to.be.undefined; + }); + }); + describe('getNodeTime', () => { it('should return node time', async () => { const nodeTime = await nodeRepository.getNodeTime().toPromise(); diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index b0da9ac687..f7c8aabddd 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -1283,7 +1283,7 @@ describe('TransactionHttp', () => { it('Announce cosign signatures given', () => { /** - * @see https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + * @see https://github.com/nemtech/symbol-sdk-typescript-javascript/issues/112 */ // AliceAccount: account // BobAccount: account diff --git a/package-lock.json b/package-lock.json index c0b6d1632e..e04330ce14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "nem2-sdk", + "name": "symbol-sdk", "version": "0.17.0", "lockfileVersion": 1, "requires": true, @@ -966,10 +966,10 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, - "catbuffer": { + "catbuffer-typescript": { "version": "0.0.11", - "resolved": "https://registry.npmjs.org/catbuffer/-/catbuffer-0.0.11.tgz", - "integrity": "sha512-xcv43mcBDeZ1NldCsKwD28gBIs/mj+QBMiu3BI9511Wqeo5VfIsqKULAI9OGTOKaf48G7AYYZHWKKov/EkhcfQ==" + "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.11.tgz", + "integrity": "sha512-KuZefLDiPwS0R4vR80jL2MRYbH5qpVPjSq1iecJCkGdBbVgv3V4xxwvAIOQunZ99Kqz+XA1N3/g8fP7V25egUg==" }, "chai": { "version": "4.1.2", @@ -1552,10 +1552,9 @@ } }, "diff": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", - "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", - "dev": true + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==" }, "duplexify": { "version": "3.7.1", @@ -3791,6 +3790,12 @@ "ms": "2.0.0" } }, + "diff": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", + "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", + "dev": true + }, "supports-color": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", @@ -3832,18 +3837,6 @@ "to-regex": "^3.0.1" } }, - "nem2-sdk-openapi-typescript-node-client": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/nem2-sdk-openapi-typescript-node-client/-/nem2-sdk-openapi-typescript-node-client-0.8.4.tgz", - "integrity": "sha512-53DukFQUCKr0+bH1fm3fLzIT/v10lv5kdMqBHX4h4jDUslQeXnlBpPi/qX/XDmu2hyjwOWZa7hFzLhlt8xqhdQ==", - "requires": { - "@types/bluebird": "*", - "@types/request": "*", - "bluebird": "^3.5.0", - "request": "^2.81.0", - "rewire": "^3.0.2" - } - }, "neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", @@ -5267,6 +5260,18 @@ "es6-symbol": "^3.1.1" } }, + "symbol-openapi-typescript-node-client": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-node-client/-/symbol-openapi-typescript-node-client-0.8.5.tgz", + "integrity": "sha512-1o6qvkabi93xLRHr/C2A+uFhesaXF26EsFIRW6B51DLOGFOrDRPlobnKyahRkieJXEALTOj6MXimUGd/O6jdSw==", + "requires": { + "@types/bluebird": "*", + "@types/request": "*", + "bluebird": "^3.5.0", + "request": "^2.81.0", + "rewire": "^3.0.2" + } + }, "test-exclude": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz", @@ -5530,6 +5535,12 @@ "supports-color": "^5.3.0" } }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", diff --git a/package.json b/package.json index 6e8d757046..bbf3afdff5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "nem2-sdk", + "name": "symbol-sdk", "version": "0.17.0", - "description": "Reactive Nem2 sdk for typescript and javascript", + "description": "Reactive symbol sdk for typescript and javascript", "scripts": { "pretest": "npm run build", "test": "mocha --ui bdd --recursive ./dist/test --timeout 90000", @@ -23,13 +23,13 @@ "email": "guillem@nemeurope.eu" } ], - "bugs": "https://github.com/nemtech/nem2-sdk-typescript-javascript/issues", + "bugs": "https://github.com/nemtech/symbol-sdk-typescript-javascript/issues", "repository": { "type": "git", - "url": "https://github.com/nemtech/nem2-sdk-typescript-javascript.git" + "url": "https://github.com/nemtech/symbol-sdk-typescript-javascript.git" }, "license": "Apache-2.0", - "homepage": "https://github.com/nemtech/nem2-sdk-typescript-javascript#readme", + "homepage": "https://github.com/nemtech/symbol-sdk-typescript-javascript#readme", "main": "dist/index.js", "typings": "dist/index.d.ts", "devDependencies": { @@ -58,8 +58,9 @@ }, "dependencies": { "bluebird": "^3.5.5", - "catbuffer": "0.0.11", + "catbuffer-typescript": "0.0.11", "crypto-js": "^3.1.9-1", + "diff": "^4.0.2", "futoin-hkdf": "^1.3.1", "js-joda": "^1.6.2", "js-sha256": "^0.9.0", @@ -67,12 +68,12 @@ "js-sha512": "^0.8.0", "long": "^4.0.0", "merkletreejs": "^0.1.7", - "nem2-sdk-openapi-typescript-node-client": "0.8.4", "request": "^2.88.0", "request-promise-native": "^1.0.5", "ripemd160": "^2.0.2", "rxjs": "^6.5.3", "rxjs-compat": "^6.5.3", + "symbol-openapi-typescript-node-client": "0.8.5", "tweetnacl": "^1.0.3", "utf8": "^2.1.2", "ws": "^5.2.0" diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts index 2242d63afb..8f918d2261 100644 --- a/src/infrastructure/AccountHttp.ts +++ b/src/infrastructure/AccountHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { AccountInfoDTO, AccountRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { AccountInfoDTO, AccountRoutesApi } from 'symbol-openapi-typescript-node-client'; import { AccountInfo } from '../model/account/AccountInfo'; import { ActivityBucket } from '../model/account/ActivityBucket'; import { Address } from '../model/account/Address'; @@ -39,7 +39,7 @@ import { TransactionFilter } from './TransactionFilter'; export class AccountHttp extends Http implements AccountRepository { /** * @internal - * Nem2 Library account routes api + * Symbol openapi typescript-node client account routes api */ private accountRoutesApi: AccountRoutesApi; diff --git a/src/infrastructure/BlockHttp.ts b/src/infrastructure/BlockHttp.ts index 7877dd3600..96dc39dd7b 100644 --- a/src/infrastructure/BlockHttp.ts +++ b/src/infrastructure/BlockHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { BlockInfoDTO, BlockRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { BlockInfoDTO, BlockRoutesApi } from 'symbol-openapi-typescript-node-client'; import { PublicAccount } from '../model/account/PublicAccount'; import { BlockInfo } from '../model/blockchain/BlockInfo'; import { MerklePathItem } from '../model/blockchain/MerklePathItem'; @@ -36,7 +36,7 @@ import { CreateTransactionFromDTO } from './transaction/CreateTransactionFromDTO export class BlockHttp extends Http implements BlockRepository { /** * @internal - * Nem2 Library block routes api + * Symbol openapi typescript-node client block routes api */ private readonly blockRoutesApi: BlockRoutesApi; diff --git a/src/infrastructure/ChainHttp.ts b/src/infrastructure/ChainHttp.ts index 4ac70cc9ae..afbbffcc1b 100644 --- a/src/infrastructure/ChainHttp.ts +++ b/src/infrastructure/ChainHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { ChainRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { ChainRoutesApi } from 'symbol-openapi-typescript-node-client'; import { BlockchainScore } from '../model/blockchain/BlockchainScore'; import { UInt64 } from '../model/UInt64'; import { ChainRepository } from './ChainRepository'; @@ -30,7 +30,7 @@ import { Http } from './Http'; export class ChainHttp extends Http implements ChainRepository { /** * @internal - * Nem2 Library chain routes api + * Symbol openapi typescript-node client chain routes api */ private chainRoutesApi: ChainRoutesApi; diff --git a/src/infrastructure/Http.ts b/src/infrastructure/Http.ts index 35bcfe8e96..a83c261062 100644 --- a/src/infrastructure/Http.ts +++ b/src/infrastructure/Http.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { NodeRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; +import { NodeRoutesApi } from 'symbol-openapi-typescript-node-client'; // tslint:disable-next-line: ordered-imports import { from as observableFrom, Observable, of as observableOf, throwError } from 'rxjs'; import { catchError, map, shareReplay } from 'rxjs/operators'; diff --git a/src/infrastructure/MetadataHttp.ts b/src/infrastructure/MetadataHttp.ts index 221cfcbe8a..f3b646f0f8 100644 --- a/src/infrastructure/MetadataHttp.ts +++ b/src/infrastructure/MetadataHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { MetadataDTO, MetadataRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { MetadataDTO, MetadataRoutesApi } from 'symbol-openapi-typescript-node-client'; import { Convert } from '../core/format/Convert'; import { Address } from '../model/account/Address'; import { Metadata } from '../model/metadata/Metadata'; @@ -37,7 +37,7 @@ import { QueryParams } from './QueryParams'; export class MetadataHttp extends Http implements MetadataRepository { /** * @internal - * Nem2 Library metadata routes api + * Symbol openapi typescript-node client metadata routes api */ private readonly metadataRoutesApi: MetadataRoutesApi; diff --git a/src/infrastructure/MosaicHttp.ts b/src/infrastructure/MosaicHttp.ts index 78d354067c..2fc2490ebb 100644 --- a/src/infrastructure/MosaicHttp.ts +++ b/src/infrastructure/MosaicHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { MosaicRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map, mergeMap } from 'rxjs/operators'; +import { MosaicRoutesApi } from 'symbol-openapi-typescript-node-client'; import { Address } from '../model/account/Address'; import { PublicAccount } from '../model/account/PublicAccount'; import { NetworkType } from '../model/blockchain/NetworkType'; @@ -35,7 +35,7 @@ import { MosaicRepository } from './MosaicRepository'; export class MosaicHttp extends Http implements MosaicRepository { /** * @internal - * Nem2 Library mosaic routes api + * Symbol openapi typescript-node client mosaic routes api */ private readonly mosaicRoutesApi: MosaicRoutesApi; diff --git a/src/infrastructure/MultisigHttp.ts b/src/infrastructure/MultisigHttp.ts index 110e8189d8..9017022ed6 100644 --- a/src/infrastructure/MultisigHttp.ts +++ b/src/infrastructure/MultisigHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { MultisigRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map, mergeMap } from 'rxjs/operators'; +import { MultisigRoutesApi } from 'symbol-openapi-typescript-node-client'; import { Address } from '../model/account/Address'; import { MultisigAccountGraphInfo } from '../model/account/MultisigAccountGraphInfo'; import { MultisigAccountInfo } from '../model/account/MultisigAccountInfo'; @@ -33,7 +33,7 @@ import { MultisigRepository } from './MultisigRepository'; export class MultisigHttp extends Http implements MultisigRepository { /** * @internal - * Nem2 Library account routes api + * Symbol openapi typescript-node client account routes api */ private readonly multisigRoutesApi: MultisigRoutesApi; /** diff --git a/src/infrastructure/NamespaceHttp.ts b/src/infrastructure/NamespaceHttp.ts index 8471e95d5d..4333724a24 100644 --- a/src/infrastructure/NamespaceHttp.ts +++ b/src/infrastructure/NamespaceHttp.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { NamespaceRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map, mergeMap } from 'rxjs/operators'; +import { NamespaceRoutesApi } from 'symbol-openapi-typescript-node-client'; import { Convert as convert, RawAddress as AddressLibrary } from '../core/format'; import { AccountNames } from '../model/account/AccountNames'; import { Address } from '../model/account/Address'; @@ -44,7 +44,7 @@ import { QueryParams } from './QueryParams'; export class NamespaceHttp extends Http implements NamespaceRepository { /** * @internal - * Nem2 Library namespace routes api + * Symbol openapi typescript-node client namespace routes api */ private namespaceRoutesApi: NamespaceRoutesApi; diff --git a/src/infrastructure/NetworkHttp.ts b/src/infrastructure/NetworkHttp.ts index 027b74e4a6..0420bae20f 100644 --- a/src/infrastructure/NetworkHttp.ts +++ b/src/infrastructure/NetworkHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { NetworkRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { NetworkRoutesApi } from 'symbol-openapi-typescript-node-client'; import { NetworkFees } from '../model/blockchain/NetworkFees'; import { NetworkName } from '../model/blockchain/NetworkName'; import { NetworkType } from '../model/blockchain/NetworkType'; @@ -33,7 +33,7 @@ import { NodeHttp } from './NodeHttp'; export class NetworkHttp extends Http implements NetworkRepository { /** * @internal - * Nem2 Library account routes api + * Symbol openapi typescript-node client account routes api */ private nodeHttp: NodeHttp; private networkRouteApi: NetworkRoutesApi; diff --git a/src/infrastructure/NodeHttp.ts b/src/infrastructure/NodeHttp.ts index ce74c0fe8b..304f57dcf4 100644 --- a/src/infrastructure/NodeHttp.ts +++ b/src/infrastructure/NodeHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { NodeRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { NodeRoutesApi } from 'symbol-openapi-typescript-node-client'; import { StorageInfo } from '../model/blockchain/StorageInfo'; import { NodeHealth } from '../model/node/NodeHealth'; import { NodeInfo } from '../model/node/NodeInfo'; @@ -34,7 +34,7 @@ import { NodeRepository } from './NodeRepository'; export class NodeHttp extends Http implements NodeRepository { /** * @internal - * Nem2 Library account routes api + * Symbol openapi typescript-node client account routes api */ private nodeRoutesApi: NodeRoutesApi; @@ -68,6 +68,27 @@ export class NodeHttp extends Http implements NodeRepository { ); } + /** + * Gets the list of peers visible by the node, + * @summary Gets the list of peers visible by the node + */ + public getNodePeers(): Observable { + return observableFrom(this.nodeRoutesApi.getNodePeers()).pipe( + map(({body}) => body.map((nodeInfo) => + new NodeInfo( + nodeInfo.publicKey, + nodeInfo.networkGenerationHash, + nodeInfo.port, + nodeInfo.networkIdentifier, + nodeInfo.version, + nodeInfo.roles as number, + nodeInfo.host, + nodeInfo.friendlyName, + ))), + catchError((error) => throwError(this.errorHandling(error))), + ); + } + /** * Gets the node time at the moment the reply was sent and received. * @summary Get the node time diff --git a/src/infrastructure/NodeRepository.ts b/src/infrastructure/NodeRepository.ts index ea523d215d..f9b372c09a 100644 --- a/src/infrastructure/NodeRepository.ts +++ b/src/infrastructure/NodeRepository.ts @@ -34,6 +34,12 @@ export interface NodeRepository { */ getNodeInfo(): Observable; + /** + * Gets the list of peers visible by the node, + * @summary Gets the list of peers visible by the node + */ + getNodePeers(): Observable; + /** * Gets the node time at the moment the reply was sent and received. * @summary Get the node time diff --git a/src/infrastructure/QueryParams.ts b/src/infrastructure/QueryParams.ts index 92b918fdda..ffd9620ec4 100644 --- a/src/infrastructure/QueryParams.ts +++ b/src/infrastructure/QueryParams.ts @@ -61,9 +61,9 @@ export class QueryParams { id?: string; }) { if (args) { - if (args.pageSize) this.setPageSize(args.pageSize) - if (args.order) this.order = args.order - if (args.id) this.id = args.id + if (args.pageSize) { this.setPageSize(args.pageSize); } + if (args.order) { this.order = args.order; } + if (args.id) { this.id = args.id; } } } @@ -75,8 +75,8 @@ export class QueryParams { */ private setPageSize(pageSize?: number): void { if (pageSize && pageSize > 100) { - throw new Error('The page size has to be between 10 and 100') + throw new Error('The page size has to be between 10 and 100'); } - this.pageSize = pageSize || 10 + this.pageSize = pageSize || 10; } } diff --git a/src/infrastructure/ReceiptHttp.ts b/src/infrastructure/ReceiptHttp.ts index dad400a03a..bd5ceaecc7 100644 --- a/src/infrastructure/ReceiptHttp.ts +++ b/src/infrastructure/ReceiptHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { ReceiptRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map, mergeMap } from 'rxjs/operators'; +import { ReceiptRoutesApi } from 'symbol-openapi-typescript-node-client'; import { MerklePathItem } from '../model/blockchain/MerklePathItem'; import { MerkleProofInfo } from '../model/blockchain/MerkleProofInfo'; import { NetworkType } from '../model/blockchain/NetworkType'; @@ -34,7 +34,7 @@ import { ReceiptRepository } from './ReceiptRepository'; export class ReceiptHttp extends Http implements ReceiptRepository { /** * @internal - * Nem2 Library receipt routes api + * Symbol openapi typescript-node client receipt routes api */ private readonly receiptRoutesApi: ReceiptRoutesApi; diff --git a/src/infrastructure/RestrictionAccountHttp.ts b/src/infrastructure/RestrictionAccountHttp.ts index 0db5d44055..168f27f41d 100644 --- a/src/infrastructure/RestrictionAccountHttp.ts +++ b/src/infrastructure/RestrictionAccountHttp.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { RestrictionAccountRoutesApi } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { RestrictionAccountRoutesApi } from 'symbol-openapi-typescript-node-client'; import { DtoMapping } from '../core/utils/DtoMapping'; import { Address } from '../model/account/Address'; import { AccountRestriction } from '../model/restriction/AccountRestriction'; diff --git a/src/infrastructure/RestrictionMosaicHttp.ts b/src/infrastructure/RestrictionMosaicHttp.ts index 88e0568bcd..7138c3322c 100644 --- a/src/infrastructure/RestrictionMosaicHttp.ts +++ b/src/infrastructure/RestrictionMosaicHttp.ts @@ -14,13 +14,13 @@ * limitations under the License. */ +import { from as observableFrom, Observable, throwError } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; import { MosaicAddressRestrictionDTO, MosaicGlobalRestrictionDTO, RestrictionMosaicRoutesApi, -} from 'nem2-sdk-openapi-typescript-node-client'; -import { from as observableFrom, Observable, throwError } from 'rxjs'; -import { catchError, map } from 'rxjs/operators'; +} from 'symbol-openapi-typescript-node-client'; import { Address } from '../model/account/Address'; import { MosaicId } from '../model/mosaic/MosaicId'; import { MosaicAddressRestriction } from '../model/restriction/MosaicAddressRestriction'; diff --git a/src/infrastructure/TransactionFilter.ts b/src/infrastructure/TransactionFilter.ts index 2191c15cf2..8bd726e68d 100644 --- a/src/infrastructure/TransactionFilter.ts +++ b/src/infrastructure/TransactionFilter.ts @@ -34,7 +34,7 @@ export class TransactionFilter { constructor(args?: { types?: TransactionType[], }) { - if (args && args.types) this.types = args.types + if (args && args.types) { this.types = args.types; } } /** diff --git a/src/infrastructure/TransactionHttp.ts b/src/infrastructure/TransactionHttp.ts index f7ac26af1f..22dd13e60e 100644 --- a/src/infrastructure/TransactionHttp.ts +++ b/src/infrastructure/TransactionHttp.ts @@ -15,9 +15,9 @@ */ import { ClientResponse } from 'http'; -import { BlockInfoDTO, BlockRoutesApi, TransactionRoutesApi, TransactionStatusDTO } from 'nem2-sdk-openapi-typescript-node-client'; import { from as observableFrom, Observable, throwError } from 'rxjs'; import { catchError, map, mergeMap } from 'rxjs/operators'; +import { BlockInfoDTO, BlockRoutesApi, TransactionRoutesApi, TransactionStatusDTO } from 'symbol-openapi-typescript-node-client'; import { CosignatureSignedTransaction } from '../model/transaction/CosignatureSignedTransaction'; import { Deadline } from '../model/transaction/Deadline'; import { SignedTransaction } from '../model/transaction/SignedTransaction'; @@ -39,13 +39,13 @@ import { TransactionRepository } from './TransactionRepository'; export class TransactionHttp extends Http implements TransactionRepository { /** * @internal - * Nem2 Library transaction routes api + * Symbol openapi typescript-node client transaction routes api */ private transactionRoutesApi: TransactionRoutesApi; /** * @internal - * Nem2 Library blockchain routes api + * Symbol openapi typescript-node client blockchain routes api */ private blockRoutesApi: BlockRoutesApi; diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index cf4f2cdbe3..6efcba07f2 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { EmbeddedTransactionBuilder, TransactionBuilder } from 'catbuffer'; +import { EmbeddedTransactionBuilder, TransactionBuilder } from 'catbuffer-typescript'; import { Convert as convert } from '../../core/format'; import { InnerTransaction } from '../../model/model'; import { AccountAddressRestrictionTransaction } from '../../model/transaction/AccountAddressRestrictionTransaction'; diff --git a/src/model/blockchain/MerklePathItem.ts b/src/model/blockchain/MerklePathItem.ts index d87006889d..9547d8f7e0 100644 --- a/src/model/blockchain/MerklePathItem.ts +++ b/src/model/blockchain/MerklePathItem.ts @@ -1,4 +1,4 @@ -import { PositionEnum } from "nem2-sdk-openapi-typescript-node-client/dist/model/positionEnum"; +import { PositionEnum } from 'symbol-openapi-typescript-node-client/dist/model/positionEnum'; /* * Copyright 2019 NEM diff --git a/src/model/node/NodeHealth.ts b/src/model/node/NodeHealth.ts index fa3cc6018a..85a2dff18e 100644 --- a/src/model/node/NodeHealth.ts +++ b/src/model/node/NodeHealth.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { NodeStatusEnum } from 'nem2-sdk-openapi-typescript-node-client'; +import { NodeStatusEnum } from 'symbol-openapi-typescript-node-client'; /** * The node info structure describes basic information of a node health. diff --git a/src/model/receipt/ArtifactExpiryReceipt.ts b/src/model/receipt/ArtifactExpiryReceipt.ts index ce11165122..41fff14395 100644 --- a/src/model/receipt/ArtifactExpiryReceipt.ts +++ b/src/model/receipt/ArtifactExpiryReceipt.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { MosaicExpiryReceiptBuilder, MosaicIdDto, NamespaceExpiryReceiptBuilder, NamespaceIdDto } from 'catbuffer'; +import { MosaicExpiryReceiptBuilder, MosaicIdDto, NamespaceExpiryReceiptBuilder, NamespaceIdDto } from 'catbuffer-typescript'; import { MosaicId } from '../mosaic/MosaicId'; import { NamespaceId } from '../namespace/NamespaceId'; import { Receipt } from './Receipt'; diff --git a/src/model/receipt/BalanceChangeReceipt.ts b/src/model/receipt/BalanceChangeReceipt.ts index 51e837c916..8d4ab88998 100644 --- a/src/model/receipt/BalanceChangeReceipt.ts +++ b/src/model/receipt/BalanceChangeReceipt.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { AmountDto, BalanceChangeReceiptBuilder, KeyDto, MosaicBuilder, MosaicIdDto } from 'catbuffer'; +import { AmountDto, BalanceChangeReceiptBuilder, KeyDto, MosaicBuilder, MosaicIdDto } from 'catbuffer-typescript'; import { Convert } from '../../core/format/Convert'; import { PublicAccount } from '../account/PublicAccount'; import { MosaicId } from '../mosaic/MosaicId'; diff --git a/src/model/receipt/BalanceTransferReceipt.ts b/src/model/receipt/BalanceTransferReceipt.ts index 7cfdd6a299..93b88da304 100644 --- a/src/model/receipt/BalanceTransferReceipt.ts +++ b/src/model/receipt/BalanceTransferReceipt.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { AddressDto, AmountDto, BalanceTransferReceiptBuilder, KeyDto, MosaicBuilder, MosaicIdDto } from 'catbuffer'; +import { AddressDto, AmountDto, BalanceTransferReceiptBuilder, KeyDto, MosaicBuilder, MosaicIdDto } from 'catbuffer-typescript'; import { Convert } from '../../core/format/Convert'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; import { Address } from '../account/Address'; diff --git a/src/model/receipt/InflationReceipt.ts b/src/model/receipt/InflationReceipt.ts index 54bb8ebc5c..f24b64ab40 100644 --- a/src/model/receipt/InflationReceipt.ts +++ b/src/model/receipt/InflationReceipt.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { AmountDto, InflationReceiptBuilder, MosaicBuilder, MosaicIdDto } from 'catbuffer'; +import { AmountDto, InflationReceiptBuilder, MosaicBuilder, MosaicIdDto } from 'catbuffer-typescript'; import { MosaicId } from '../mosaic/MosaicId'; import { UInt64 } from '../UInt64'; import { Receipt } from './Receipt'; diff --git a/src/model/receipt/ReceiptSource.ts b/src/model/receipt/ReceiptSource.ts index 6e292811f6..3a293cbb62 100644 --- a/src/model/receipt/ReceiptSource.ts +++ b/src/model/receipt/ReceiptSource.ts @@ -1,4 +1,4 @@ -import { GeneratorUtils } from 'catbuffer'; +import { GeneratorUtils } from 'catbuffer-typescript'; /* * Copyright 2019 NEM diff --git a/src/model/receipt/ResolutionEntry.ts b/src/model/receipt/ResolutionEntry.ts index 8b93bbd7d1..7866ff56a1 100644 --- a/src/model/receipt/ResolutionEntry.ts +++ b/src/model/receipt/ResolutionEntry.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { GeneratorUtils } from 'catbuffer'; +import { GeneratorUtils } from 'catbuffer-typescript'; import { RawAddress } from '../../core/format/RawAddress'; import { Address } from '../account/Address'; import { MosaicId } from '../mosaic/MosaicId'; diff --git a/src/model/receipt/ResolutionStatement.ts b/src/model/receipt/ResolutionStatement.ts index e3b08cc047..9884464d4c 100644 --- a/src/model/receipt/ResolutionStatement.ts +++ b/src/model/receipt/ResolutionStatement.ts @@ -21,7 +21,7 @@ import { AddressDto, MosaicResolutionStatementBuilder, ReceiptSourceBuilder, UnresolvedAddressDto, - UnresolvedMosaicIdDto } from 'catbuffer'; + UnresolvedMosaicIdDto } from 'catbuffer-typescript'; import { sha3_256 } from 'js-sha3'; import { RawAddress } from '../../core/format/RawAddress'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/receipt/TransactionStatement.ts b/src/model/receipt/TransactionStatement.ts index 35d7c42ae8..a7c1374c7f 100644 --- a/src/model/receipt/TransactionStatement.ts +++ b/src/model/receipt/TransactionStatement.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { GeneratorUtils } from 'catbuffer'; +import { GeneratorUtils } from 'catbuffer-typescript'; import { sha3_256 } from 'js-sha3'; import { UInt64 } from '../UInt64'; import { Receipt } from './Receipt'; diff --git a/src/model/restriction/AccountRestrictionType.ts b/src/model/restriction/AccountRestrictionType.ts index 09c7e9095a..268c5194ef 100644 --- a/src/model/restriction/AccountRestrictionType.ts +++ b/src/model/restriction/AccountRestrictionType.ts @@ -24,7 +24,7 @@ * 0x80 Account restriction is interpreted as blocking operation. */ - // !!This enum will be deprecated once catbuffer code applied. + // !!This enum will be deprecated once catbuffer-typescript code applied. enum AccountRestrictionTypeEnum { Address = 0x0001, Mosaic = 0x0002, diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts index d90fd53653..293caa4eff 100644 --- a/src/model/transaction/AccountAddressRestrictionTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionTransaction.ts @@ -23,7 +23,7 @@ import { SignatureDto, TimestampDto, UnresolvedAddressDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/transaction/AccountLinkTransaction.ts b/src/model/transaction/AccountLinkTransaction.ts index a1d8639f8d..eb64861a4d 100644 --- a/src/model/transaction/AccountLinkTransaction.ts +++ b/src/model/transaction/AccountLinkTransaction.ts @@ -22,7 +22,7 @@ import { KeyDto, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; diff --git a/src/model/transaction/AccountMetadataTransaction.ts b/src/model/transaction/AccountMetadataTransaction.ts index 047c3fc9ac..327627bda1 100644 --- a/src/model/transaction/AccountMetadataTransaction.ts +++ b/src/model/transaction/AccountMetadataTransaction.ts @@ -22,7 +22,7 @@ import { KeyDto, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts index f34c40c11f..8a07ecaca5 100644 --- a/src/model/transaction/AccountMosaicRestrictionTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionTransaction.ts @@ -23,7 +23,7 @@ import { SignatureDto, TimestampDto, UnresolvedMosaicIdDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/transaction/AccountOperationRestrictionTransaction.ts b/src/model/transaction/AccountOperationRestrictionTransaction.ts index a69dc0aca0..2da59c8fc2 100644 --- a/src/model/transaction/AccountOperationRestrictionTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionTransaction.ts @@ -22,7 +22,7 @@ import { KeyDto, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; diff --git a/src/model/transaction/AddressAliasTransaction.ts b/src/model/transaction/AddressAliasTransaction.ts index 26cebd446b..d5f7593d32 100644 --- a/src/model/transaction/AddressAliasTransaction.ts +++ b/src/model/transaction/AddressAliasTransaction.ts @@ -24,7 +24,7 @@ import { NamespaceIdDto, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert, RawAddress } from '../../core/format'; import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 9d33e75484..60790dd3d6 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -26,7 +26,7 @@ import { KeyDto, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { KeyPair, MerkleHashBuilder, SHA3Hasher } from '../../core/crypto'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; diff --git a/src/model/transaction/LockFundsTransaction.ts b/src/model/transaction/LockFundsTransaction.ts index 2acab775a4..7b9395c3bb 100644 --- a/src/model/transaction/LockFundsTransaction.ts +++ b/src/model/transaction/LockFundsTransaction.ts @@ -26,7 +26,7 @@ import { TimestampDto, UnresolvedMosaicBuilder, UnresolvedMosaicIdDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { PublicAccount } from '../account/PublicAccount'; diff --git a/src/model/transaction/MosaicAddressRestrictionTransaction.ts b/src/model/transaction/MosaicAddressRestrictionTransaction.ts index ee80a02ebb..b9fc59f7fb 100644 --- a/src/model/transaction/MosaicAddressRestrictionTransaction.ts +++ b/src/model/transaction/MosaicAddressRestrictionTransaction.ts @@ -24,7 +24,7 @@ import { TimestampDto, UnresolvedAddressDto, UnresolvedMosaicIdDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/transaction/MosaicAliasTransaction.ts b/src/model/transaction/MosaicAliasTransaction.ts index a773013398..2a29713330 100644 --- a/src/model/transaction/MosaicAliasTransaction.ts +++ b/src/model/transaction/MosaicAliasTransaction.ts @@ -24,7 +24,7 @@ import { NamespaceIdDto, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; diff --git a/src/model/transaction/MosaicDefinitionTransaction.ts b/src/model/transaction/MosaicDefinitionTransaction.ts index 00e009662b..60d79ef13b 100644 --- a/src/model/transaction/MosaicDefinitionTransaction.ts +++ b/src/model/transaction/MosaicDefinitionTransaction.ts @@ -26,7 +26,7 @@ import { MosaicNonceDto, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; diff --git a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts index c34cc1f1ea..eacc12a23c 100644 --- a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts +++ b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts @@ -23,7 +23,7 @@ import { SignatureDto, TimestampDto, UnresolvedMosaicIdDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/transaction/MosaicMetadataTransaction.ts b/src/model/transaction/MosaicMetadataTransaction.ts index f1a835111c..fccf89c2a9 100644 --- a/src/model/transaction/MosaicMetadataTransaction.ts +++ b/src/model/transaction/MosaicMetadataTransaction.ts @@ -23,7 +23,7 @@ import { SignatureDto, TimestampDto, UnresolvedMosaicIdDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/transaction/MosaicSupplyChangeTransaction.ts b/src/model/transaction/MosaicSupplyChangeTransaction.ts index 07212754ed..b742da2266 100644 --- a/src/model/transaction/MosaicSupplyChangeTransaction.ts +++ b/src/model/transaction/MosaicSupplyChangeTransaction.ts @@ -23,7 +23,7 @@ import { SignatureDto, TimestampDto, UnresolvedMosaicIdDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/transaction/MultisigAccountModificationTransaction.ts b/src/model/transaction/MultisigAccountModificationTransaction.ts index 08ea78c472..dfd68c2f5e 100644 --- a/src/model/transaction/MultisigAccountModificationTransaction.ts +++ b/src/model/transaction/MultisigAccountModificationTransaction.ts @@ -22,7 +22,7 @@ import { MultisigAccountModificationTransactionBuilder, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; diff --git a/src/model/transaction/NamespaceMetadataTransaction.ts b/src/model/transaction/NamespaceMetadataTransaction.ts index e673a8ebc7..4bcd502c11 100644 --- a/src/model/transaction/NamespaceMetadataTransaction.ts +++ b/src/model/transaction/NamespaceMetadataTransaction.ts @@ -23,7 +23,7 @@ import { NamespaceMetadataTransactionBuilder, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; diff --git a/src/model/transaction/NamespaceRegistrationTransaction.ts b/src/model/transaction/NamespaceRegistrationTransaction.ts index e3604086b1..3490fe9e08 100644 --- a/src/model/transaction/NamespaceRegistrationTransaction.ts +++ b/src/model/transaction/NamespaceRegistrationTransaction.ts @@ -24,7 +24,7 @@ import { NamespaceRegistrationTransactionBuilder, SignatureDto, TimestampDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert, Convert as convert } from '../../core/format'; import { NamespaceMosaicIdGenerator } from '../../infrastructure/transaction/NamespaceMosaicIdGenerator'; import { PublicAccount } from '../account/PublicAccount'; diff --git a/src/model/transaction/SecretLockTransaction.ts b/src/model/transaction/SecretLockTransaction.ts index bc07ccdd2b..3adeaeb0bd 100644 --- a/src/model/transaction/SecretLockTransaction.ts +++ b/src/model/transaction/SecretLockTransaction.ts @@ -26,7 +26,7 @@ import { UnresolvedAddressDto, UnresolvedMosaicBuilder, UnresolvedMosaicIdDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert, Convert as convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/transaction/SecretProofTransaction.ts b/src/model/transaction/SecretProofTransaction.ts index 64756e0a50..4869ed51e0 100644 --- a/src/model/transaction/SecretProofTransaction.ts +++ b/src/model/transaction/SecretProofTransaction.ts @@ -24,7 +24,7 @@ import { SignatureDto, TimestampDto, UnresolvedAddressDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import { Convert, Convert as convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; diff --git a/src/model/transaction/Transaction.ts b/src/model/transaction/Transaction.ts index 56275d3f4a..725dee952c 100644 --- a/src/model/transaction/Transaction.ts +++ b/src/model/transaction/Transaction.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { EmbeddedTransactionBuilder, EmbeddedTransactionHelper } from 'catbuffer'; +import { EmbeddedTransactionBuilder, EmbeddedTransactionHelper } from 'catbuffer-typescript'; import { KeyPair, SHA3Hasher } from '../../core/crypto'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; diff --git a/src/model/transaction/TransactionStatus.ts b/src/model/transaction/TransactionStatus.ts index 866bb37d45..a286c0ec51 100644 --- a/src/model/transaction/TransactionStatus.ts +++ b/src/model/transaction/TransactionStatus.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { TransactionStateTypeEnum, TransactionStatusTypeEnum } from 'nem2-sdk-openapi-typescript-node-client'; +import { TransactionStateTypeEnum, TransactionStatusTypeEnum } from 'symbol-openapi-typescript-node-client'; import {UInt64} from '../UInt64'; import {Deadline} from './Deadline'; diff --git a/src/model/transaction/TransferTransaction.ts b/src/model/transaction/TransferTransaction.ts index 7ce5059f88..a8f20fa4ed 100644 --- a/src/model/transaction/TransferTransaction.ts +++ b/src/model/transaction/TransferTransaction.ts @@ -26,7 +26,7 @@ import { UnresolvedAddressDto, UnresolvedMosaicBuilder, UnresolvedMosaicIdDto, -} from 'catbuffer'; +} from 'catbuffer-typescript'; import * as Long from 'long'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; diff --git a/src/service/BlockService.ts b/src/service/BlockService.ts index 2e357ccae3..7d49aa8878 100644 --- a/src/service/BlockService.ts +++ b/src/service/BlockService.ts @@ -15,9 +15,9 @@ */ import { sha3_256 } from 'js-sha3'; -import { PositionEnum } from 'nem2-sdk-openapi-typescript-node-client/dist/model/positionEnum'; import { combineLatest, Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { PositionEnum } from 'symbol-openapi-typescript-node-client/dist/model/positionEnum'; import { BlockRepository } from '../infrastructure/BlockRepository'; import { ReceiptRepository } from '../infrastructure/ReceiptRepository'; import { RepositoryFactory } from '../infrastructure/RepositoryFactory'; diff --git a/test/infrastructure/TransactionFilter.spec.ts b/test/infrastructure/TransactionFilter.spec.ts index 5bb962f46e..e18ebcb4f0 100644 --- a/test/infrastructure/TransactionFilter.spec.ts +++ b/test/infrastructure/TransactionFilter.spec.ts @@ -22,7 +22,7 @@ describe('TransactionFilter', () => { it('should return correct query param', () => { const param = new TransactionFilter({ types: [TransactionType.TRANSFER, TransactionType.ACCOUNT_LINK], - }) + }); expect(param.convertCSV(param.types)).to.be.equal('16724,16716'); }); diff --git a/test/infrastructure/TransactionHttp.spec.ts b/test/infrastructure/TransactionHttp.spec.ts index e67758d5c0..1a82929076 100644 --- a/test/infrastructure/TransactionHttp.spec.ts +++ b/test/infrastructure/TransactionHttp.spec.ts @@ -22,7 +22,7 @@ import { TransactionStateTypeEnum, TransactionStatusDTO, TransactionStatusTypeEnum, -} from 'nem2-sdk-openapi-typescript-node-client'; +} from 'symbol-openapi-typescript-node-client'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { TransactionHttp } from '../../src/infrastructure/TransactionHttp'; diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 83fbb051e0..ac4755084e 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -422,7 +422,7 @@ describe('AggregateTransaction', () => { it('Should create signed transaction with cosignatories - Aggregated Complete', () => { /** - * @see https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + * @see https://github.com/nemtech/symbol-sdk-typescript-javascript/issues/112 */ const accountAlice = TestingAccount; const accountBob = CosignatoryAccount; diff --git a/test/model/transaction/Transaction.spec.ts b/test/model/transaction/Transaction.spec.ts index 8260d26872..2c89d2a57f 100644 --- a/test/model/transaction/Transaction.spec.ts +++ b/test/model/transaction/Transaction.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { EmbeddedTransactionBuilder } from 'catbuffer'; +import { EmbeddedTransactionBuilder } from 'catbuffer-typescript'; import { expect } from 'chai'; import { Convert } from '../../../src/core/format/Convert'; import { Account } from '../../../src/model/account/Account'; diff --git a/test/model/transaction/TransactionStatus.spec.ts b/test/model/transaction/TransactionStatus.spec.ts index 163d47cee3..00e45d32fd 100644 --- a/test/model/transaction/TransactionStatus.spec.ts +++ b/test/model/transaction/TransactionStatus.spec.ts @@ -16,8 +16,8 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; -import { TransactionStatusTypeEnum } from 'nem2-sdk-openapi-typescript-node-client'; -import { TransactionStateTypeEnum } from 'nem2-sdk-openapi-typescript-node-client'; +import { TransactionStatusTypeEnum } from 'symbol-openapi-typescript-node-client'; +import { TransactionStateTypeEnum } from 'symbol-openapi-typescript-node-client'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { TransactionStatus } from '../../../src/model/transaction/TransactionStatus'; import { UInt64 } from '../../../src/model/UInt64'; diff --git a/test/model/transaction/TransferTransaction.spec.ts b/test/model/transaction/TransferTransaction.spec.ts index e8f551fda1..d810cc281e 100644 --- a/test/model/transaction/TransferTransaction.spec.ts +++ b/test/model/transaction/TransferTransaction.spec.ts @@ -221,7 +221,7 @@ describe('TransferTransaction', () => { }); }); - it('should create TransferTransaction and sign using catbuffer', () => { + it('should create TransferTransaction and sign using catbuffer-typescript', () => { const transferTransaction = TransferTransaction.create( Deadline.create(), Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'), diff --git a/test/service/AggregateTransactionService.spec.ts b/test/service/AggregateTransactionService.spec.ts index 484fdf9666..e15a57f276 100644 --- a/test/service/AggregateTransactionService.spec.ts +++ b/test/service/AggregateTransactionService.spec.ts @@ -33,7 +33,7 @@ import { TransferTransaction } from '../../src/model/transaction/TransferTransac import { AggregateTransactionService } from '../../src/service/AggregateTransactionService'; /** - * For multi level multisig scenario visit: https://github.com/nemtech/nem2-docs/issues/10 + * For multi level multisig scenario visit: https://github.com/nemtech/symbol-docs/issues/10 */ describe('AggregateTransactionService', () => { let aggregateTransactionService: AggregateTransactionService; diff --git a/test/service/BlockService.spec.ts b/test/service/BlockService.spec.ts index 6145946807..23f8e65be4 100644 --- a/test/service/BlockService.spec.ts +++ b/test/service/BlockService.spec.ts @@ -16,6 +16,7 @@ import { expect } from 'chai'; import { of as observableOf } from 'rxjs'; +import { PositionEnum } from 'symbol-openapi-typescript-node-client'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { BlockRepository } from '../../src/infrastructure/BlockRepository'; import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository'; @@ -28,7 +29,6 @@ import { NetworkType } from '../../src/model/blockchain/NetworkType'; import { UInt64 } from '../../src/model/UInt64'; import { BlockService } from '../../src/service/BlockService'; import { TestingAccount } from '../conf/conf.spec'; -import { PositionEnum } from 'nem2-sdk-openapi-typescript-node-client'; describe('BlockService', () => { diff --git a/test/service/NamespaceService.spec.ts b/test/service/NamespaceService.spec.ts index 7d41fac666..dda67196b7 100644 --- a/test/service/NamespaceService.spec.ts +++ b/test/service/NamespaceService.spec.ts @@ -38,16 +38,16 @@ describe('NamespaceService', () => { when(mockedNamespaceRepository.getNamespace(subnamespace.id)) .thenReturn(observableOf(subnamespace)); when(mockedNamespaceRepository.getNamespacesName(deepEqual([rootNamespace.id]))) - .thenReturn(observableOf([new NamespaceName(new NamespaceId([3316183705, 3829351378]), 'nem2tests')])); + .thenReturn(observableOf([new NamespaceName(new NamespaceId([3316183705, 3829351378]), 'symboltests')])); when(mockedNamespaceRepository.getNamespacesName(deepEqual([rootNamespace.id, subnamespace.id]))) .thenReturn(observableOf([ - new NamespaceName(new NamespaceId([3316183705, 3829351378]), 'nem2tests'), + new NamespaceName(new NamespaceId([3316183705, 3829351378]), 'symboltests'), new NamespaceName(new NamespaceId([1781696705, 4157485863]), 'level2'), ])); const namespaceRepository = instance(mockedNamespaceRepository); const namespaceService = new NamespaceService(namespaceRepository); namespaceService.namespace(rootNamespace.id).subscribe((namespace) => { - expect(namespace.name).to.be.equal('nem2tests'); + expect(namespace.name).to.be.equal('symboltests'); }); }); @@ -60,19 +60,19 @@ describe('NamespaceService', () => { when(mockedNamespaceRepository.getNamespace(subnamespace.id)) .thenReturn(observableOf(subnamespace)); when(mockedNamespaceRepository.getNamespacesName(deepEqual([rootNamespace.id]))) - .thenReturn(observableOf([new NamespaceName(new NamespaceId([3316183705, 3829351378]), 'nem2tests')])); + .thenReturn(observableOf([new NamespaceName(new NamespaceId([3316183705, 3829351378]), 'symboltests')])); when(mockedNamespaceRepository.getNamespacesName(deepEqual([subnamespace.id]))) .thenReturn(observableOf([new NamespaceName(new NamespaceId([1781696705, 4157485863]), 'level2')])); when(mockedNamespaceRepository.getNamespacesName(deepEqual([rootNamespace.id, subnamespace.id]))) .thenReturn(observableOf([ - new NamespaceName(new NamespaceId([3316183705, 3829351378]), 'nem2tests'), + new NamespaceName(new NamespaceId([3316183705, 3829351378]), 'symboltests'), new NamespaceName(new NamespaceId([1781696705, 4157485863]), 'level2'), ])); const namespaceRepository = instance(mockedNamespaceRepository); const namespaceService = new NamespaceService(namespaceRepository); namespaceService.namespace(subnamespace.id).subscribe((namespace) => { - expect(namespace.name).to.be.equal('nem2tests.level2'); + expect(namespace.name).to.be.equal('symboltests.level2'); }); });