Skip to content

Commit ae97ac6

Browse files
author
Greg S
committed
WIP #48: updating MosaicDefinition models for cow upgrade (+nonce,-names)
1 parent fa54f9f commit ae97ac6

File tree

7 files changed

+34
-44
lines changed

7 files changed

+34
-44
lines changed

‎e2e/infrastructure/TransactionHttp.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ describe('TransactionHttp', () => {
151151
it('standalone', (done) => {
152152
const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
153153
Deadline.create(),
154-
'test-mosaic-name-' + Math.floor(Math.random() * 10000),
155-
namespaceName,
154+
UInt64.fromUint(1),
155+
UInt64.fromUint(1),
156156
MosaicProperties.create({
157157
supplyMutable: true,
158158
transferable: true,
@@ -170,8 +170,8 @@ describe('TransactionHttp', () => {
170170
it('aggregate', (done) => {
171171
const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
172172
Deadline.create(),
173-
'test-mosaic-name-' + Math.floor(Math.random() * 10000),
174-
namespaceName,
173+
UInt64.fromUint(1),
174+
UInt64.fromUint(1),
175175
MosaicProperties.create({
176176
supplyMutable: true,
177177
transferable: true,

‎e2e/infrastructure/transaction/CreateTransactionFromDTO.spec.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -413,10 +413,9 @@ describe('CreateTransactionFromDTO', () => {
413413
3248159581,
414414
740240531,
415415
],
416-
name: 'ie7rfaqxiorum1jor',
417-
parentId: [
418-
3316183705,
419-
3829351378,
416+
mosaicNonce: [
417+
1,
418+
0,
420419
],
421420
properties: [
422421
{
@@ -502,10 +501,9 @@ describe('CreateTransactionFromDTO', () => {
502501
3248159581,
503502
740240531,
504503
],
505-
name: 'ie7rfaqxiorum1jor',
506-
parentId: [
507-
3316183705,
508-
3829351378,
504+
mosaicNonce: [
505+
1,
506+
0,
509507
],
510508
properties: [
511509
{

‎src/infrastructure/transaction/CreateTransactionFromDTO.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,8 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
144144
extractTransactionVersion(transactionDTO.version),
145145
Deadline.createFromDTO(transactionDTO.deadline),
146146
new UInt64(transactionDTO.fee),
147-
new NamespaceId(transactionDTO.parentId),
147+
new UInt64(transactionDTO.mosaicNonce),
148148
new MosaicId(transactionDTO.mosaicId),
149-
transactionDTO.name,
150149
new MosaicProperties(
151150
new UInt64(transactionDTO.properties[0].value),
152151
(new UInt64(transactionDTO.properties[1].value)).compact(),

‎src/model/mosaic/MosaicInfo.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class MosaicInfo {
4848
*/
4949
public readonly metaId: string,
5050
/**
51-
* The mosaic nonce.
51+
* The mosaic id.
5252
*/
5353
public readonly mosaicId: MosaicId,
5454
/**

‎src/model/transaction/MosaicDefinitionTransaction.ts‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,16 @@ export class MosaicDefinitionTransaction extends Transaction {
4242
* @returns {MosaicDefinitionTransaction}
4343
*/
4444
public static create(deadline: Deadline,
45-
mosaicName: string,
46-
namespaceName: string,
45+
mosaicNonce: UInt64,
46+
mosaicId: UInt64,
4747
mosaicProperties: MosaicProperties,
4848
networkType: NetworkType): MosaicDefinitionTransaction {
4949
return new MosaicDefinitionTransaction(networkType,
5050
2,
5151
deadline,
5252
new UInt64([0, 0]),
53-
new NamespaceId(namespaceName),
54-
new MosaicId(mosaicIdLibrary(namespaceName, mosaicName)),
55-
mosaicName,
53+
mosaicNonce,
54+
new MosaicId(mosaicId.toDTO()),
5655
mosaicProperties,
5756
);
5857
}
@@ -62,9 +61,8 @@ export class MosaicDefinitionTransaction extends Transaction {
6261
* @param version
6362
* @param deadline
6463
* @param fee
65-
* @param parentId
64+
* @param mosaicNonce
6665
* @param mosaicId
67-
* @param mosaicName
6866
* @param mosaicProperties
6967
* @param signature
7068
* @param signer
@@ -75,17 +73,13 @@ export class MosaicDefinitionTransaction extends Transaction {
7573
deadline: Deadline,
7674
fee: UInt64,
7775
/**
78-
* The namespace id.
76+
* The mosaic nonce.
7977
*/
80-
public readonly parentId: NamespaceId,
78+
public readonly mosaicNonce: UInt64,
8179
/**
8280
* The mosaic id.
8381
*/
8482
public readonly mosaicId: MosaicId,
85-
/**
86-
* The name of the mosaic.
87-
*/
88-
public readonly mosaicName: string,
8983
/**
9084
* The mosaic properties.
9185
*/
@@ -107,9 +101,8 @@ export class MosaicDefinitionTransaction extends Transaction {
107101
.addVersion(this.versionToDTO())
108102
.addDivisibility(this.mosaicProperties.divisibility)
109103
.addDuration(this.mosaicProperties.duration.toDTO())
110-
.addParentId(this.parentId.id.toDTO())
111-
.addMosaicId(this.mosaicId.id.toDTO())
112-
.addMosaicName(this.mosaicName);
104+
.addNonce(this.mosaicNonce.toDTO())
105+
.addMosaicId(this.mosaicId.id.toDTO());
113106

114107
if (this.mosaicProperties.supplyMutable === true) {
115108
mosaicDefinitionTransaction = mosaicDefinitionTransaction.addSupplyMutable();

‎test/model/transaction/AggregateTransaction.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ describe('AggregateTransaction', () => {
9898
it('should createComplete an AggregateTransaction object with MosaicDefinitionTransaction', () => {
9999
const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
100100
Deadline.create(),
101-
'test-mosaic-name',
102-
'test-parent-name',
101+
UInt64.fromUint(1), // nonce
102+
UInt64.fromUint(1), // ID
103103
MosaicProperties.create({
104104
supplyMutable: true,
105105
transferable: true,
@@ -119,12 +119,12 @@ describe('AggregateTransaction', () => {
119119

120120
const signedTransaction = aggregateTransaction.signWith(account);
121121

122-
expect(signedTransaction.payload.substring(0, 8)).to.be.equal('D1000000');
123-
expect(signedTransaction.payload.substring(240, 256)).to.be.equal('5500000055000000');
122+
expect(signedTransaction.payload.substring(0, 8)).to.be.equal('C2000000');
123+
expect(signedTransaction.payload.substring(240, 256)).to.be.equal('4600000046000000');
124124
expect(signedTransaction.payload.substring(
125125
320,
126126
signedTransaction.payload.length,
127-
)).to.be.equal('02904D41967D149BA9BC5A5B4CCCD78612DDF5CA10010703746573742D6D6F736169632D6E616D6502E803000000000000');
127+
)).to.be.equal('02904D4101000000000000000100000000000000000107030002E803000000000000');
128128
});
129129

130130
it('should createComplete an AggregateTransaction object with MosaicSupplyChangeTransaction', () => {

‎test/model/transaction/MosaicDefinitionTransaction.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ describe('MosaicDefinitionTransaction', () => {
3333
it('should createComplete an MosaicDefinitionTransaction object and sign it with flags 7', () => {
3434
const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
3535
Deadline.create(),
36-
'test-mosaic-name',
37-
'test-parent-name',
36+
UInt64.fromUint(1),
37+
UInt64.fromUint(1),
3838
MosaicProperties.create({
3939
supplyMutable: true,
4040
transferable: true,
@@ -45,7 +45,7 @@ describe('MosaicDefinitionTransaction', () => {
4545
NetworkType.MIJIN_TEST,
4646
);
4747

48-
expect(mosaicDefinitionTransaction.mosaicName).to.be.equal('test-mosaic-name');
48+
expect(mosaicDefinitionTransaction.mosaicNonce.compact()).to.be.equal(1);
4949
expect(mosaicDefinitionTransaction.mosaicProperties.duration.lower).to.be.equal(1000);
5050
expect(mosaicDefinitionTransaction.mosaicProperties.duration.higher).to.be.equal(0);
5151
expect(mosaicDefinitionTransaction.mosaicProperties.divisibility).to.be.equal(3);
@@ -58,15 +58,15 @@ describe('MosaicDefinitionTransaction', () => {
5858
expect(signedTransaction.payload.substring(
5959
240,
6060
signedTransaction.payload.length,
61-
)).to.be.equal('967D149BA9BC5A5B4CCCD78612DDF5CA10010703746573742D6D6F736169632D6E616D6502E803000000000000');
61+
)).to.be.equal('01000000000000000100000000000000000107030002E803000000000000');
6262

6363
});
6464

6565
it('should createComplete an MosaicDefinitionTransaction object and sign it with flags 0', () => {
6666
const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
6767
Deadline.create(),
68-
'test-mosaic-name',
69-
'test-parent-name',
68+
UInt64.fromUint(1),
69+
UInt64.fromUint(1),
7070
MosaicProperties.create({
7171
supplyMutable: false,
7272
transferable: false,
@@ -77,7 +77,7 @@ describe('MosaicDefinitionTransaction', () => {
7777
NetworkType.MIJIN_TEST,
7878
);
7979

80-
expect(mosaicDefinitionTransaction.mosaicName).to.be.equal('test-mosaic-name');
80+
expect(mosaicDefinitionTransaction.mosaicNonce.compact()).to.be.equal(1);
8181
expect(mosaicDefinitionTransaction.mosaicProperties.duration.lower).to.be.equal(1000);
8282
expect(mosaicDefinitionTransaction.mosaicProperties.duration.higher).to.be.equal(0);
8383
expect(mosaicDefinitionTransaction.mosaicProperties.divisibility).to.be.equal(3);
@@ -90,7 +90,7 @@ describe('MosaicDefinitionTransaction', () => {
9090
expect(signedTransaction.payload.substring(
9191
240,
9292
signedTransaction.payload.length,
93-
)).to.be.equal('967D149BA9BC5A5B4CCCD78612DDF5CA10010003746573742D6D6F736169632D6E616D6502E803000000000000');
93+
)).to.be.equal('01000000000000000100000000000000000100030002E803000000000000');
9494

9595
});
9696
});

0 commit comments

Comments
 (0)