Merge pull request #70 from evias/master

Fixed MosaicDefinitionTransaction.create() to accept MosaicNonce and MosaicId

Author: Grégory Saive

e2e/infrastructure/TransactionHttp.spec.ts

@@ -26,6 +26,7 @@ import {Address} from '../../src/model/account/Address';
 import {PublicAccount} from '../../src/model/account/PublicAccount';
 import {NetworkType} from '../../src/model/blockchain/NetworkType';
 import {MosaicId} from '../../src/model/mosaic/MosaicId';
+import {MosaicNonce} from '../../src/model/mosaic/MosaicNonce';
 import {MosaicProperties} from '../../src/model/mosaic/MosaicProperties';
 import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType';
 import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
@@ -151,8 +152,8 @@ describe('TransactionHttp', () => {
             it('standalone', (done) => {
                 const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
                     Deadline.create(),
-                    new Uint8Array([0xE6, 0xDE, 0x84, 0xB8]),
-                    UInt64.fromUint(1),
+                    new MosaicNonce(new Uint8Array([0xE6, 0xDE, 0x84, 0xB8])), // nonce
+                    new MosaicId(UInt64.fromUint(1).toDTO()), // ID
                     MosaicProperties.create({
                         supplyMutable: true,
                         transferable: true,
@@ -170,8 +171,8 @@ describe('TransactionHttp', () => {
             it('aggregate', (done) => {
                 const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
                     Deadline.create(),
-                    new Uint8Array([0xE6, 0xDE, 0x84, 0xB8]),
-                    UInt64.fromUint(1),
+                    new MosaicNonce(new Uint8Array([0xE6, 0xDE, 0x84, 0xB8])), // nonce
+                    new MosaicId(UInt64.fromUint(1).toDTO()), // ID
                     MosaicProperties.create({
                         supplyMutable: true,
                         transferable: true,

package-lock.json

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

package.json

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { MosaicCreationTransaction as MosaicDefinitionTransactionLibrary, mosaicId as mosaicIdLibrary, VerifiableTransaction } from 'nem2-library';
+import { 
+    MosaicCreationTransaction as MosaicDefinitionTransactionLibrary,
+    mosaicId as mosaicIdLibrary,
+    VerifiableTransaction,
+} from 'nem2-library';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
 import { MosaicId } from '../mosaic/MosaicId';
@@ -37,23 +41,23 @@ export class MosaicDefinitionTransaction extends Transaction {
     /**
      * Create a mosaic creation transaction object
      * @param deadline - The deadline to include the transaction.
-     * @param nonce - The mosaic nonce ex: [0xE6, 0xDE, 0x84, 0xB8].
-     * @param mosaicId - The mosaic id ex: [481110499, 231112638].
+     * @param nonce - The mosaic nonce ex: MosaicNonce.createRandom().
+     * @param mosaicId - The mosaic id ex: new MosaicId([481110499, 231112638]).
      * @param mosaicProperties - The mosaic properties.
      * @param networkType - The network type.
      * @returns {MosaicDefinitionTransaction}
      */
     public static create(deadline: Deadline,
-                         nonce: Uint8Array,
-                         mosaicId: UInt64,
+                         nonce: MosaicNonce,
+                         mosaicId: MosaicId,
                          mosaicProperties: MosaicProperties,
                          networkType: NetworkType): MosaicDefinitionTransaction {
         return new MosaicDefinitionTransaction(networkType,
             TransactionVersion.MOSAIC_DEFINITION,
             deadline,
             new UInt64([0, 0]),
-            new MosaicNonce(nonce),
-            new MosaicId(mosaicId.toDTO()),
+            nonce,
+            mosaicId,
             mosaicProperties,
         );
     }

src/model/transaction/MosaicDefinitionTransaction.ts

@@ -22,6 +22,7 @@ import {Address} from '../../../src/model/account/Address';
 import {PublicAccount} from '../../../src/model/account/PublicAccount';
 import {NetworkType} from '../../../src/model/blockchain/NetworkType';
 import {MosaicId} from '../../../src/model/mosaic/MosaicId';
+import {MosaicNonce} from '../../../src/model/mosaic/MosaicNonce';
 import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties';
 import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType';
 import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction';
@@ -98,8 +99,8 @@ describe('AggregateTransaction', () => {
     it('should createComplete an AggregateTransaction object with MosaicDefinitionTransaction', () => {
         const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
             Deadline.create(),
-            new Uint8Array([0xE6, 0xDE, 0x84, 0xB8]), // nonce
-            UInt64.fromUint(1), // ID
+            new MosaicNonce(new Uint8Array([0xE6, 0xDE, 0x84, 0xB8])), // nonce
+            new MosaicId(UInt64.fromUint(1).toDTO()), // ID
             MosaicProperties.create({
                 supplyMutable: true,
                 transferable: true,

test/model/transaction/AggregateTransaction.spec.ts

@@ -17,6 +17,8 @@
 import {expect} from 'chai';
 import {Account} from '../../../src/model/account/Account';
 import {NetworkType} from '../../../src/model/blockchain/NetworkType';
+import {MosaicId} from '../../../src/model/mosaic/MosaicId';
+import {MosaicNonce} from '../../../src/model/mosaic/MosaicNonce';
 import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties';
 import {Deadline} from '../../../src/model/transaction/Deadline';
 import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction';
@@ -34,8 +36,8 @@ describe('MosaicDefinitionTransaction', () => {
     it('should createComplete an MosaicDefinitionTransaction object and sign it with flags 7', () => {
         const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
             Deadline.create(),
-            new Uint8Array([0xE6, 0xDE, 0x84, 0xB8]),
-            UInt64.fromUint(1),
+            new MosaicNonce(new Uint8Array([0xE6, 0xDE, 0x84, 0xB8])), // nonce
+            new MosaicId(UInt64.fromUint(1).toDTO()), // ID
             MosaicProperties.create({
                 supplyMutable: true,
                 transferable: true,
@@ -64,11 +66,10 @@ describe('MosaicDefinitionTransaction', () => {
 
     it('should createComplete an MosaicDefinitionTransaction object and sign it with flags 0', () => {
 
-        const nonce = [0xE6, 0xDE, 0x84, 0xB8];
         const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
             Deadline.create(),
-            new Uint8Array(nonce),
-            UInt64.fromUint(mosaicId(nonce, convert.hexToUint8(account.publicKey))),
+            new MosaicNonce(new Uint8Array([0xE6, 0xDE, 0x84, 0xB8])), // nonce
+            new MosaicId(UInt64.fromUint(1).toDTO()), // ID
             MosaicProperties.create({
                 supplyMutable: false,
                 transferable: false,
@@ -91,7 +92,7 @@ describe('MosaicDefinitionTransaction', () => {
         expect(signedTransaction.payload.substring(
             240,
             signedTransaction.payload.length,
-        )).to.be.equal('E6DE84B8000000000000000001000302E803000000000000');
+        )).to.be.equal('E6DE84B8010000000000000001000302E803000000000000');
 
     });
 });