Merge branch 'task/g50-account-properties' of https://github.com/rg911/nem2-sdk-typescript-javascript into task/g50-account-properties

Author: rg911

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nem2-sdk",
-  "version": "0.10.3-1",
+  "version": "0.10.3-2",
   "description": "Reactive Nem2 sdk for typescript and javascript",
   "scripts": {
     "pretest": "npm run build",

package.json

@@ -74,7 +74,7 @@ export const CreateTransactionFromDTO = (transactionDTO): Transaction => {
             transactionDTO.transaction.type,
             extractTransactionVersion(transactionDTO.transaction.version),
             Deadline.createFromDTO(transactionDTO.transaction.deadline),
-            new UInt64(transactionDTO.transaction.fee),
+            new UInt64(transactionDTO.transaction.fee || [0, 0]),
             innerTransactions,
             transactionDTO.transaction.cosignatures ? transactionDTO.transaction.cosignatures
                 .map((aggregateCosignatureDTO) => {
@@ -118,7 +118,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             Address.createFromEncoded(transactionDTO.recipient),
             transactionDTO.mosaics === undefined ? [] :
                 transactionDTO.mosaics
@@ -134,7 +134,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             transactionDTO.namespaceType,
             transactionDTO.name,
             new NamespaceId(transactionDTO.namespaceId),
@@ -149,7 +149,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             transactionDTO.nonce,
             new MosaicId(transactionDTO.mosaicId),
             new MosaicProperties(
@@ -166,7 +166,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             new MosaicId(transactionDTO.mosaicId),
             transactionDTO.direction,
             new UInt64(transactionDTO.delta),
@@ -179,7 +179,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             transactionDTO.minApprovalDelta,
             transactionDTO.minRemovalDelta,
             transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new MultisigCosignatoryModification(
@@ -196,7 +196,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             networkType,
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             new Mosaic(new MosaicId(transactionDTO.mosaicId), new UInt64(transactionDTO.amount)),
             new UInt64(transactionDTO.duration),
             new SignedTransaction('', transactionDTO.hash, '', TransactionType.AGGREGATE_BONDED, networkType),
@@ -209,7 +209,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             new Mosaic(new MosaicId(transactionDTO.mosaicId), new UInt64(transactionDTO.amount)),
             new UInt64(transactionDTO.duration),
             transactionDTO.hashAlgorithm,
@@ -224,7 +224,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             transactionDTO.hashAlgorithm,
             transactionDTO.secret,
             transactionDTO.proof,
@@ -237,7 +237,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             transactionDTO.actionType,
             transactionDTO.namespaceId,
             transactionDTO.mosaicId,
@@ -250,7 +250,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),
-            new UInt64(transactionDTO.fee),
+            new UInt64(transactionDTO.fee || [0, 0]),
             transactionDTO.actionType,
             transactionDTO.namespaceId,
             transactionDTO.address,

src/infrastructure/transaction/CreateTransactionFromDTO.ts

@@ -15,16 +15,21 @@
  */
 
 import {expect} from 'chai';
-import {ChronoUnit} from 'js-joda';
+import {ChronoUnit, Instant, LocalDateTime, ZoneId} from 'js-joda';
 import {Deadline} from '../../../src/model/transaction/Deadline';
 
 describe('Deadline', () => {
     it('should createComplete timestamp today', () => {
         const deadline = Deadline.create();
-        const date = new Date();
-        expect(deadline.value.dayOfMonth()).to.be.equal(date.getDate());
-        expect(deadline.value.monthValue()).to.be.equal(date.getMonth() + 1);
-        expect(deadline.value.year()).to.be.equal(date.getFullYear());
+
+        // avoid SYSTEM and UTC differences
+        const networkTimeStamp = (new Date()).getTime();
+        const timestampLocal = LocalDateTime.ofInstant(Instant.ofEpochMilli(networkTimeStamp), ZoneId.SYSTEM);
+        const reproducedDate = timestampLocal.plus(2, ChronoUnit.HOURS);
+
+        expect(deadline.value.dayOfMonth()).to.be.equal(reproducedDate.dayOfMonth());
+        expect(deadline.value.monthValue()).to.be.equal(reproducedDate.monthValue());
+        expect(deadline.value.year()).to.be.equal(reproducedDate.year());
     });
 
     it('should throw error deadline smaller than timeStamp', () => {