Merge branch 'master' into fix/accountRepository

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 [email protected] 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/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');

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nem2-sdk",
-  "version": "0.10.3-4",
+  "version": "0.11.1",
   "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.12",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
     "rxjs": "^6.2.1",

package.json

@@ -19,7 +19,6 @@ import {from as observableFrom, Observable} from 'rxjs';
 import {map, mergeMap} from 'rxjs/operators';
 import {AccountInfo} from '../model/account/AccountInfo';
 import { AccountPropertiesInfo } from '../model/account/AccountPropertiesInfo';
-import { AccountProperty } from '../model/account/AccountProperty';
 import {Address} from '../model/account/Address';
 import {MultisigAccountGraphInfo} from '../model/account/MultisigAccountGraphInfo';
 import {MultisigAccountInfo} from '../model/account/MultisigAccountInfo';

src/infrastructure/AccountHttp.ts

@@ -20,6 +20,7 @@ import * as WebSocket from 'ws';
 import {Address} from '../model/account/Address';
 import {PublicAccount} from '../model/account/PublicAccount';
 import {BlockInfo} from '../model/blockchain/BlockInfo';
+import {NamespaceId} from '../model/namespace/NamespaceId';
 import {AggregateTransaction} from '../model/transaction/AggregateTransaction';
 import {AggregateTransactionCosignature} from '../model/transaction/AggregateTransactionCosignature';
 import {CosignatureSignedTransaction} from '../model/transaction/CosignatureSignedTransaction';
@@ -375,8 +376,16 @@ export class Listener {
      * @param address
      * @returns {boolean}
      */
-    private transactionHasSignerOrReceptor(transaction: Transaction, address: Address): boolean {
-        return transaction.signer!.address.equals(address) ||
-            (transaction instanceof TransferTransaction && transaction.recipient.equals(address));
+    private transactionHasSignerOrReceptor(transaction: Transaction, address: Address | NamespaceId): boolean {
+
+        if (address instanceof NamespaceId) {
+            return transaction instanceof TransferTransaction
+                && (transaction.recipient as NamespaceId).equals(address);
+        }
+
+        return transaction.signer!.address.equals(address) || (
+               transaction instanceof TransferTransaction
+            && (transaction.recipient as Address).equals(address)
+        );
     }
 }

src/infrastructure/Listener.ts

@@ -61,14 +61,12 @@ export class MosaicHttp extends Http implements MosaicRepository {
             mergeMap((networkType) => observableFrom(
                 this.mosaicRoutesApi.getMosaic(mosaicId.toHex())).pipe(map((mosaicInfoDTO) => {
                 return new MosaicInfo(
-                    mosaicInfoDTO.meta.active,
-                    mosaicInfoDTO.meta.index,
                     mosaicInfoDTO.meta.id,
                     new MosaicId(mosaicInfoDTO.mosaic.mosaicId),
-                    new UInt64(mosaicInfoDTO.mosaic.nonce),
                     new UInt64(mosaicInfoDTO.mosaic.supply),
                     new UInt64(mosaicInfoDTO.mosaic.height),
                     PublicAccount.createFromPublicKey(mosaicInfoDTO.mosaic.owner, networkType),
+                    mosaicInfoDTO.mosaic.revision,
                     new MosaicProperties(
                         new UInt64(mosaicInfoDTO.mosaic.properties[0]),
                         (new UInt64(mosaicInfoDTO.mosaic.properties[1])).compact(),
@@ -93,14 +91,12 @@ export class MosaicHttp extends Http implements MosaicRepository {
                 this.mosaicRoutesApi.getMosaics(mosaicIdsBody)).pipe(map((mosaicInfosDTO) => {
                 return mosaicInfosDTO.map((mosaicInfoDTO) => {
                     return new MosaicInfo(
-                        mosaicInfoDTO.meta.active,
-                        mosaicInfoDTO.meta.index,
                         mosaicInfoDTO.meta.id,
                         new MosaicId(mosaicInfoDTO.mosaic.mosaicId),
-                        new UInt64(mosaicInfoDTO.mosaic.nonce),
                         new UInt64(mosaicInfoDTO.mosaic.supply),
                         new UInt64(mosaicInfoDTO.mosaic.height),
                         PublicAccount.createFromPublicKey(mosaicInfoDTO.mosaic.owner, networkType),
+                        mosaicInfoDTO.mosaic.revision,
                         new MosaicProperties(
                             new UInt64(mosaicInfoDTO.mosaic.properties[0]),
                             (new UInt64(mosaicInfoDTO.mosaic.properties[1])).compact(),

src/infrastructure/MosaicHttp.ts

@@ -13,24 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import {convert} from 'nem2-library';
+import {uint64 as UInt64Library} from 'nem2-library';
 import {Address} from '../../model/account/Address';
 import {PublicAccount} from '../../model/account/PublicAccount';
 import {NetworkType} from '../../model/blockchain/NetworkType';
-import { AccountPropertyModification,
-    ModifyAccountPropertyAddressTransaction,
-    ModifyAccountPropertyEntityTypeTransaction,
-    ModifyAccountPropertyMosaicTransaction } from '../../model/model';
+import {Id} from '../../model/Id';
 import {Mosaic} from '../../model/mosaic/Mosaic';
 import {MosaicId} from '../../model/mosaic/MosaicId';
 import {MosaicProperties} from '../../model/mosaic/MosaicProperties';
 import {NamespaceId} from '../../model/namespace/NamespaceId';
+import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction';
+import {AccountPropertyModification} from '../../model/transaction/AccountPropertyModification';
 import {AddressAliasTransaction} from '../../model/transaction/AddressAliasTransaction';
 import {AggregateTransaction} from '../../model/transaction/AggregateTransaction';
 import {AggregateTransactionCosignature} from '../../model/transaction/AggregateTransactionCosignature';
 import {AggregateTransactionInfo} from '../../model/transaction/AggregateTransactionInfo';
 import {Deadline} from '../../model/transaction/Deadline';
+import { LinkAction } from '../../model/transaction/LinkAction';
 import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction';
+import {ModifyAccountPropertyAddressTransaction} from '../../model/transaction/ModifyAccountPropertyAddressTransaction';
+import {ModifyAccountPropertyEntityTypeTransaction} from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction';
+import {ModifyAccountPropertyMosaicTransaction} from '../../model/transaction/ModifyAccountPropertyMosaicTransaction';
 import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction';
 import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction';
 import {MosaicDefinitionTransaction} from '../../model/transaction/MosaicDefinitionTransaction';
@@ -119,10 +123,8 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
             new UInt64(transactionDTO.fee || [0, 0]),
-            Address.createFromEncoded(transactionDTO.recipient),
-            transactionDTO.mosaics === undefined ? [] :
-                transactionDTO.mosaics
-                    .map((mosaicDTO) => new Mosaic(new MosaicId(mosaicDTO.id), new UInt64(mosaicDTO.amount))),
+            extractRecipient(transactionDTO.recipient),
+            extractMosaics(transactionDTO.mosaics),
             transactionDTO.message !== undefined ?
                 PlainMessage.createFromDTO(transactionDTO.message.payload) : EmptyMessage,
             transactionDTO.signature,
@@ -303,6 +305,18 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             PublicAccount.createFromPublicKey(transactionDTO.signer, extractNetworkType(transactionDTO.version)),
             transactionInfo,
         );
+    } else if (transactionDTO.type === TransactionType.LINK_ACCOUNT) {
+        return new AccountLinkTransaction(
+            extractNetworkType(transactionDTO.version),
+            extractTransactionVersion(transactionDTO.version),
+            Deadline.createFromDTO(transactionDTO.deadline),
+            new UInt64(transactionDTO.fee || [0, 0]),
+            transactionDTO.remoteAccountKey,
+            transactionDTO.linkAction,
+            transactionDTO.signature,
+            PublicAccount.createFromPublicKey(transactionDTO.signer, extractNetworkType(transactionDTO.version)),
+            transactionInfo,
+        );
     }
 
     throw new Error('Unimplemented transaction with type ' + transactionDTO.type);
@@ -325,3 +339,60 @@ const extractNetworkType = (version: number): NetworkType => {
 const extractTransactionVersion = (version: number): number => {
     return parseInt(version.toString(16).substr(2, 2), 16);
 };
+
+/**
+ * Extract recipient value from encoded hexadecimal notation.
+ *
+ * If bit 0 of byte 0 is not set (e.g. 0x90), then it is a regular address.
+ * Else (e.g. 0x91) it represents a namespace id which starts at byte 1.
+ *
+ * @param recipient {string} Encoded hexadecimal recipient notation
+ * @return {Address | NamespaceId}
+ */
+const extractRecipient = (recipient: string): Address | NamespaceId => {
+    // If bit 0 of byte 0 is not set (like in 0x90), then it is a regular address.
+    // Else (e.g. 0x91) it represents a namespace id which starts at byte 1.
+    const bit0 = convert.hexToUint8(recipient.substr(1, 2))[0];
+
+    if ((bit0 & 16) === 16) {
+        // namespaceId encoded hexadecimal notation provided
+        // only 8 bytes are relevant to resolve the NamespaceId
+        const relevantPart = recipient.substr(2, 16);
+        return NamespaceId.createFromEncoded(relevantPart);
+    }
+
+    // read address from encoded hexadecimal notation
+    return Address.createFromEncoded(recipient);
+};
+
+/**
+ * Extract mosaics from encoded UInt64 notation.
+ *
+ * If most significant bit of byte 0 is set, then it is a namespaceId.
+ * If most significant bit of byte 0 is not set, then it is a mosaicId.
+ *
+ * @param mosaics {Array | undefined} The DTO array of mosaics (with UInt64 Id notation)
+ * @return {Mosaic[]}
+ */
+const extractMosaics = (mosaics: any): Mosaic[] => {
+
+    if (mosaics === undefined) {
+        return [];
+    }
+
+    return mosaics.map((mosaicDTO) => {
+
+        // convert ID to UInt8 bytes array and get first byte (most significant byte)
+        const uint64 = new Id(mosaicDTO.id);
+        const bytes = convert.hexToUint8(UInt64Library.toHex(uint64.toDTO()));
+        const byte0 = bytes[0];
+
+        // if most significant bit of byte 0 is set, then we have a namespaceId
+        if ((byte0 & 128) === 128) {
+            return new Mosaic(new NamespaceId(mosaicDTO.id), new UInt64(mosaicDTO.amount));
+        }
+
+        // most significant bit of byte 0 is not set => mosaicId
+        return new Mosaic(new MosaicId(mosaicDTO.id), new UInt64(mosaicDTO.amount));
+    });
+};

src/infrastructure/transaction/CreateTransactionFromDTO.ts

@@ -61,6 +61,7 @@ export * from './namespace/NamespaceType';
 export * from './namespace/AliasActionType';
 
 // Transaction
+export * from './transaction/AccountLinkTransaction';
 export * from './transaction/AccountPropertyTransaction';
 export * from './transaction/ModifyAccountPropertyAddressTransaction';
 export * from './transaction/ModifyAccountPropertyEntityTypeTransaction';
@@ -77,6 +78,7 @@ export * from './transaction/Deadline';
 export * from './transaction/HashLockTransaction';
 export * from './transaction/HashType';
 export * from './transaction/InnerTransaction';
+export * from './transaction/LinkAction';
 export * from './transaction/LockFundsTransaction';
 export * from './transaction/Message';
 export * from './transaction/ModifyMultisigAccountTransaction';