Merge branch 'master' into add/EncryptedMessage

Author: Grégory Saive

CHANGELOG.md

@@ -1,20 +1,20 @@
 # CHANGELOG
 
-# v0.10.3
+# v0.11
 
 - Fixed NetworkCurrencyMosaic, NetworkHarvestMosaic
 - Added exposed UInt64.fromHex and UInt64.toHex
 - Added MosaicId.createFromNonce
 - Added MosaicNonce, MosaicNonce.createRandom
 - Fixed AliasDTO.mosaicId to be UInt64
 - Added nem2-library@v0.9.8 version update (cow compatibility)
-
-# v0.10.2
-
 - Added cow network update *base* compatibility
 - Added AliasTransaction, AddressAliasTransaction, MosaicAliasTransaction
 - Changed MosaicDefinition to hold MosaicNonce
 - Changed SecretLock transaction to work with Sha3_256 instead of Sha3_512
+- Added delegated harvesting
+- Fixed #38: error message for aggregate as inner tx
+- Added TransferTransaction.recipient NamespaceId argument type
 
 # v0.10.1-beta
 

README.md

@@ -10,9 +10,9 @@ with the NEM2 (a.k.a Catapult)
 
 ## Important Notes
 
-Due to a network upgrade with [catapult-server@cow](https://github.com/nemtech/catapult-server/releases/tag/v0.3.0.1) version, **transactions from Alpaca&Bison are not compatible anymore**.
+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 anymore**.
 
-The upgrade to this SDK's [version v0.10.2](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.10.2) is mandatory for **cow compatibility**.
+The upgrade to this SDK's [version v0.11](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.11) is mandatory for **cow compatibility**.
 
 Other versions like [version v0.10.1-beta](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.10.1-beta) can be used for **bison** network version.
 
@@ -55,9 +55,8 @@ Please, use the following available resources to get help:
 
 Important versions listed below. Refer to the [Changelog](CHANGELOG.md) for a full history of the project.
 
-- [0.10.3](CHANGELOG.md#v0103) - **Cow compatible** - TBD
-- [0.10.2](CHANGELOG.md#v0102) - **Cow compatible** - 2019-02-25
-- [0.10.1-beta](CHANGELOG.md#v0101-beta) - **Alpaca compatible**
+- [0.11](CHANGELOG.md#v011) - **Cow compatible** - 14.03.2019
+- [0.10.1-beta](CHANGELOG.md#v0101-beta) - **Alpaca compatible** 07.2018
 
 ## License
 

e2e/infrastructure/Listener.spec.ts

@@ -154,4 +154,16 @@ describe('Listener', () => {
             TransactionUtils.createAndAnnounceWithInsufficientBalance();
         }, 1000);
     });
+
+    it('multisigAccountAdded', (done) => {
+        listener.multisigAccountAdded(account.address)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
+
+        setTimeout(() => {
+            TransactionUtils.createModifyMultisigAccountTransaction(account);
+        }, 1000);
+    });
 });

e2e/infrastructure/TransactionUtils.ts

@@ -17,11 +17,15 @@ import {ChronoUnit} from 'js-joda';
 import {TransactionHttp} from '../../src/infrastructure/TransactionHttp';
 import {Account} from '../../src/model/account/Account';
 import {Address} from '../../src/model/account/Address';
+import { PublicAccount } from '../../src/model/account/PublicAccount';
 import {NetworkType} from '../../src/model/blockchain/NetworkType';
 import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
 import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction';
 import {CosignatureTransaction} from '../../src/model/transaction/CosignatureTransaction';
 import {Deadline} from '../../src/model/transaction/Deadline';
+import { ModifyMultisigAccountTransaction } from '../../src/model/transaction/ModifyMultisigAccountTransaction';
+import { MultisigCosignatoryModification } from '../../src/model/transaction/MultisigCosignatoryModification';
+import { MultisigCosignatoryModificationType } from '../../src/model/transaction/MultisigCosignatoryModificationType';
 import {PlainMessage} from '../../src/model/transaction/PlainMessage';
 import {TransferTransaction} from '../../src/model/transaction/TransferTransaction';
 import {CosignatoryAccount, MultisigAccount, NIS2_URL, TestingAccount} from '../../test/conf/conf.spec';
@@ -82,4 +86,20 @@ export class TransactionUtils {
         const cosignatureSignedTransaction = account.signCosignatureTransaction(cosignatureTransaction);
         transactionHttp.announceAggregateBondedCosignature(cosignatureSignedTransaction);
     }
+
+    public static createModifyMultisigAccountTransaction( account: Account,
+                                                          transactionHttp: TransactionHttp = new TransactionHttp(NIS2_URL)) {
+        const modifyMultisig = ModifyMultisigAccountTransaction.create(
+            Deadline.create(),
+            2,
+            1,
+            [new MultisigCosignatoryModification(
+                MultisigCosignatoryModificationType.Add,
+                PublicAccount.createFromPublicKey(account.publicKey, NetworkType.MIJIN_TEST),
+            )],
+            NetworkType.MIJIN_TEST,
+        );
+        const signedTransaction = account.sign(modifyMultisig);
+        transactionHttp.announce(signedTransaction);
+    }
 }

e2e/service/MosaicService.spec.ts

@@ -1,7 +1,6 @@
 import { map, mergeMap, toArray } from 'rxjs/operators';
 import { AccountHttp } from '../../src/infrastructure/AccountHttp';
 import { MosaicHttp } from '../../src/infrastructure/MosaicHttp';
-import { NamespaceHttp } from '../../src/infrastructure/NamespaceHttp';
 import { Address } from '../../src/model/account/Address';
 import { MosaicService } from '../../src/service/MosaicService';
 import { APIUrl } from '../conf/conf.spec';
@@ -12,7 +11,6 @@ describe('MosaicService', () => {
         const mosaicService = new MosaicService(
             new AccountHttp(APIUrl),
             new MosaicHttp(APIUrl),
-            new NamespaceHttp(APIUrl),
         );
 
         const address = Address.createFromRawAddress('SCO2JY-N6OJSM-CJPPVS-Z3OX7P-TWPQEJ-GZTI6W-GLKK');

index.ts

@@ -17,3 +17,4 @@
 export * from './src/infrastructure/infrastructure';
 export * from './src/model/model';
 export * from './src/service/service';
+export * from './src/core/utils/utility';

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nem2-sdk",
-  "version": "0.10.3-4",
+  "version": "0.11.2",
   "description": "Reactive Nem2 sdk for typescript and javascript",
   "scripts": {
     "pretest": "npm run build",
@@ -53,7 +53,7 @@
     "@types/crypto-js": "^3.1.43",
     "crypto-js": "^3.1.9-1",
     "js-joda": "^1.6.2",
-    "nem2-library": "^0.9.11",
+    "nem2-library": "^0.9.13",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
     "rxjs": "^6.2.1",

package.json

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CreateTransactionFromDTO } from '../../infrastructure/transaction/CreateTransactionFromDTO';
+import { CreateTransactionFromPayload } from '../../infrastructure/transaction/CreateTransactionFromPayload';
+import { Transaction } from '../../model/transaction/Transaction';
+
+export class TransactionMapping {
+
+    /**
+     * Create transaction class from Json.
+     * @param {object} dataJson The transaction json object.
+     * @returns {module: model/transaction/transaction} The transaction class.
+     */
+    public static createFromDTO(dataJson: object): Transaction {
+        return CreateTransactionFromDTO(dataJson);
+    }
+
+    /**
+     * Create transaction class from payload binary.
+     * @param {string} dataBytes The transaction json object.
+     * @returns {module: model/transaction/transaction} The transaction class.
+     */
+    public static createFromPayload(dataBytes: string): Transaction {
+        return CreateTransactionFromPayload(dataBytes);
+    }
+}

src/core/utils/TransactionMapping.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2019 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './TransactionMapping';