Skip to content

Commit 25199cc

Browse files
rg911rg911
committed
Fixed networkType issue in create from dto
1 parent 69e866a commit 25199cc

File tree

4 files changed

+46
-49
lines changed

4 files changed

+46
-49
lines changed

‎src/infrastructure/transaction/CreateTransactionFromDTO.ts‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export const CreateTransactionFromDTO = (transactionDTO): Transaction => {
7878
return CreateStandaloneTransactionFromDTO(innerTransactionDTO.transaction, aggregateTransactionInfo);
7979
});
8080
return new AggregateTransaction(
81-
transactionDTO.transaction.networkType,
81+
transactionDTO.transaction.network,
8282
transactionDTO.transaction.type,
8383
transactionDTO.transaction.version,
8484
Deadline.createFromDTO(transactionDTO.transaction.deadline),
@@ -89,11 +89,11 @@ export const CreateTransactionFromDTO = (transactionDTO): Transaction => {
8989
return new AggregateTransactionCosignature(
9090
aggregateCosignatureDTO.signature,
9191
PublicAccount.createFromPublicKey(aggregateCosignatureDTO.signerPublicKey,
92-
transactionDTO.transaction.networkType));
92+
transactionDTO.transaction.network));
9393
}) : [],
9494
transactionDTO.transaction.signature,
9595
transactionDTO.transaction.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.transaction.signerPublicKey,
96-
transactionDTO.transaction.networkType) : undefined,
96+
transactionDTO.transaction.network) : undefined,
9797
transactionDTO.meta ? new TransactionInfo(
9898
UInt64.fromNumericString(transactionDTO.meta.height),
9999
transactionDTO.meta.index,
@@ -125,7 +125,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
125125

126126
if (transactionDTO.type === TransactionType.TRANSFER) {
127127
return new TransferTransaction(
128-
transactionDTO.networkType,
128+
transactionDTO.network,
129129
transactionDTO.version,
130130
Deadline.createFromDTO(transactionDTO.deadline),
131131
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -134,12 +134,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
134134
extractMessage(transactionDTO.message !== undefined ? transactionDTO.message : undefined),
135135
transactionDTO.signature,
136136
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
137-
transactionDTO.networkType) : undefined,
137+
transactionDTO.network) : undefined,
138138
transactionInfo,
139139
);
140140
} else if (transactionDTO.type === TransactionType.REGISTER_NAMESPACE) {
141141
return new NamespaceRegistrationTransaction(
142-
transactionDTO.networkType,
142+
transactionDTO.network,
143143
transactionDTO.version,
144144
Deadline.createFromDTO(transactionDTO.deadline),
145145
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -150,12 +150,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
150150
transactionDTO.registrationType === 1 ? NamespaceId.createFromEncoded(transactionDTO.parentId) : undefined,
151151
transactionDTO.signature,
152152
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
153-
transactionDTO.networkType) : undefined,
153+
transactionDTO.network) : undefined,
154154
transactionInfo,
155155
);
156156
} else if (transactionDTO.type === TransactionType.MOSAIC_DEFINITION) {
157157
return new MosaicDefinitionTransaction(
158-
transactionDTO.networkType,
158+
transactionDTO.network,
159159
transactionDTO.version,
160160
Deadline.createFromDTO(transactionDTO.deadline),
161161
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -166,12 +166,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
166166
UInt64.fromNumericString(transactionDTO.duration),
167167
transactionDTO.signature,
168168
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
169-
transactionDTO.networkType) : undefined,
169+
transactionDTO.network) : undefined,
170170
transactionInfo,
171171
);
172172
} else if (transactionDTO.type === TransactionType.MOSAIC_SUPPLY_CHANGE) {
173173
return new MosaicSupplyChangeTransaction(
174-
transactionDTO.networkType,
174+
transactionDTO.network,
175175
transactionDTO.version,
176176
Deadline.createFromDTO(transactionDTO.deadline),
177177
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -180,28 +180,28 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
180180
UInt64.fromNumericString(transactionDTO.delta),
181181
transactionDTO.signature,
182182
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
183-
transactionDTO.networkType) : undefined,
183+
transactionDTO.network) : undefined,
184184
transactionInfo,
185185
);
186186
} else if (transactionDTO.type === TransactionType.MODIFY_MULTISIG_ACCOUNT) {
187187
return new MultisigAccountModificationTransaction(
188-
transactionDTO.networkType,
188+
transactionDTO.network,
189189
transactionDTO.version,
190190
Deadline.createFromDTO(transactionDTO.deadline),
191191
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
192192
transactionDTO.minApprovalDelta,
193193
transactionDTO.minRemovalDelta,
194194
transactionDTO.publicKeyAdditions ? transactionDTO.publicKeyAdditions.map((addition) =>
195-
PublicAccount.createFromPublicKey(addition, transactionDTO.networkType)) : [],
195+
PublicAccount.createFromPublicKey(addition, transactionDTO.network)) : [],
196196
transactionDTO.publicKeyDeletions ? transactionDTO.publicKeyDeletions.map((deletion) =>
197-
PublicAccount.createFromPublicKey(deletion, transactionDTO.networkType)) : [],
197+
PublicAccount.createFromPublicKey(deletion, transactionDTO.network)) : [],
198198
transactionDTO.signature,
199199
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
200-
transactionDTO.networkType) : undefined,
200+
transactionDTO.network) : undefined,
201201
transactionInfo,
202202
);
203203
} else if (transactionDTO.type === TransactionType.LOCK) {
204-
const networkType = transactionDTO.networkType;
204+
const networkType = transactionDTO.network;
205205
return new LockFundsTransaction(
206206
networkType,
207207
transactionDTO.version,
@@ -218,7 +218,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
218218
const recipientAddress = transactionDTO.recipientAddress;
219219
const mosaicId = UnresolvedMapping.toUnresolvedMosaic(transactionDTO.mosaicId);
220220
return new SecretLockTransaction(
221-
transactionDTO.networkType,
221+
transactionDTO.network,
222222
transactionDTO.version,
223223
Deadline.createFromDTO(transactionDTO.deadline),
224224
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -229,13 +229,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
229229
extractRecipient(recipientAddress),
230230
transactionDTO.signature,
231231
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
232-
transactionDTO.networkType) : undefined,
232+
transactionDTO.network) : undefined,
233233
transactionInfo,
234234
);
235235
} else if (transactionDTO.type === TransactionType.SECRET_PROOF) {
236236
const recipientAddress = transactionDTO.recipientAddress;
237237
return new SecretProofTransaction(
238-
transactionDTO.networkType,
238+
transactionDTO.network,
239239
transactionDTO.version,
240240
Deadline.createFromDTO(transactionDTO.deadline),
241241
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -245,12 +245,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
245245
transactionDTO.proof,
246246
transactionDTO.signature,
247247
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
248-
transactionDTO.networkType) : undefined,
248+
transactionDTO.network) : undefined,
249249
transactionInfo,
250250
);
251251
} else if (transactionDTO.type === TransactionType.MOSAIC_ALIAS) {
252252
return new MosaicAliasTransaction(
253-
transactionDTO.networkType,
253+
transactionDTO.network,
254254
transactionDTO.version,
255255
Deadline.createFromDTO(transactionDTO.deadline),
256256
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -259,12 +259,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
259259
new MosaicId(transactionDTO.mosaicId),
260260
transactionDTO.signature,
261261
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
262-
transactionDTO.networkType) : undefined,
262+
transactionDTO.network) : undefined,
263263
transactionInfo,
264264
);
265265
} else if (transactionDTO.type === TransactionType.ADDRESS_ALIAS) {
266266
return new AddressAliasTransaction(
267-
transactionDTO.networkType,
267+
transactionDTO.network,
268268
transactionDTO.version,
269269
Deadline.createFromDTO(transactionDTO.deadline),
270270
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -273,12 +273,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
273273
extractRecipient(transactionDTO.address) as Address,
274274
transactionDTO.signature,
275275
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
276-
transactionDTO.networkType) : undefined,
276+
transactionDTO.network) : undefined,
277277
transactionInfo,
278278
);
279279
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_ADDRESS) {
280280
return new AccountAddressRestrictionTransaction(
281-
transactionDTO.networkType,
281+
transactionDTO.network,
282282
transactionDTO.version,
283283
Deadline.createFromDTO(transactionDTO.deadline),
284284
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -289,12 +289,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
289289
extractRecipient(deletion)) : [],
290290
transactionDTO.signature,
291291
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
292-
transactionDTO.networkType) : undefined,
292+
transactionDTO.network) : undefined,
293293
transactionInfo,
294294
);
295295
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_OPERATION) {
296296
return new AccountOperationRestrictionTransaction(
297-
transactionDTO.networkType,
297+
transactionDTO.network,
298298
transactionDTO.version,
299299
Deadline.createFromDTO(transactionDTO.deadline),
300300
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -303,12 +303,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
303303
transactionDTO.restrictionDeletions ? transactionDTO.restrictionDeletions : [],
304304
transactionDTO.signature,
305305
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
306-
transactionDTO.networkType) : undefined,
306+
transactionDTO.network) : undefined,
307307
transactionInfo,
308308
);
309309
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_MOSAIC) {
310310
return new AccountMosaicRestrictionTransaction(
311-
transactionDTO.networkType,
311+
transactionDTO.network,
312312
transactionDTO.version,
313313
Deadline.createFromDTO(transactionDTO.deadline),
314314
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -319,25 +319,25 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
319319
UnresolvedMapping.toUnresolvedMosaic(deletion)) : [],
320320
transactionDTO.signature,
321321
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
322-
transactionDTO.networkType) : undefined,
322+
transactionDTO.network) : undefined,
323323
transactionInfo,
324324
);
325325
} else if (transactionDTO.type === TransactionType.LINK_ACCOUNT) {
326326
return new AccountLinkTransaction(
327-
transactionDTO.networkType,
327+
transactionDTO.network,
328328
transactionDTO.version,
329329
Deadline.createFromDTO(transactionDTO.deadline),
330330
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
331331
transactionDTO.remotePublicKey,
332332
transactionDTO.linkAction,
333333
transactionDTO.signature,
334334
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
335-
transactionDTO.networkType) : undefined,
335+
transactionDTO.network) : undefined,
336336
transactionInfo,
337337
);
338338
} else if (transactionDTO.type === TransactionType.MOSAIC_GLOBAL_RESTRICTION) {
339339
return new MosaicGlobalRestrictionTransaction(
340-
transactionDTO.networkType,
340+
transactionDTO.network,
341341
transactionDTO.version,
342342
Deadline.createFromDTO(transactionDTO.deadline),
343343
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -350,12 +350,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
350350
transactionDTO.newRestrictionType,
351351
transactionDTO.signature,
352352
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
353-
transactionDTO.networkType) : undefined,
353+
transactionDTO.network) : undefined,
354354
transactionInfo,
355355
);
356356
} else if (transactionDTO.type === TransactionType.MOSAIC_ADDRESS_RESTRICTION) {
357357
return new MosaicAddressRestrictionTransaction(
358-
transactionDTO.networkType,
358+
transactionDTO.network,
359359
transactionDTO.version,
360360
Deadline.createFromDTO(transactionDTO.deadline),
361361
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -366,12 +366,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
366366
UInt64.fromNumericString(transactionDTO.newRestrictionValue),
367367
transactionDTO.signature,
368368
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
369-
transactionDTO.networkType) : undefined,
369+
transactionDTO.network) : undefined,
370370
transactionInfo,
371371
);
372372
} else if (transactionDTO.type === TransactionType.ACCOUNT_METADATA_TRANSACTION) {
373373
return new AccountMetadataTransaction(
374-
transactionDTO.networkType,
374+
transactionDTO.network,
375375
transactionDTO.version,
376376
Deadline.createFromDTO(transactionDTO.deadline),
377377
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -381,12 +381,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
381381
convert.decodeHex(transactionDTO.value),
382382
transactionDTO.signature,
383383
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
384-
transactionDTO.networkType) : undefined,
384+
transactionDTO.network) : undefined,
385385
transactionInfo,
386386
);
387387
} else if (transactionDTO.type === TransactionType.MOSAIC_METADATA_TRANSACTION) {
388388
return new MosaicMetadataTransaction(
389-
transactionDTO.networkType,
389+
transactionDTO.network,
390390
transactionDTO.version,
391391
Deadline.createFromDTO(transactionDTO.deadline),
392392
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -397,12 +397,12 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
397397
convert.decodeHex(transactionDTO.value),
398398
transactionDTO.signature,
399399
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
400-
transactionDTO.networkType) : undefined,
400+
transactionDTO.network) : undefined,
401401
transactionInfo,
402402
);
403403
} else if (transactionDTO.type === TransactionType.NAMESPACE_METADATA_TRANSACTION) {
404404
return new NamespaceMetadataTransaction(
405-
transactionDTO.networkType,
405+
transactionDTO.network,
406406
transactionDTO.version,
407407
Deadline.createFromDTO(transactionDTO.deadline),
408408
UInt64.fromNumericString(transactionDTO.maxFee || '0'),
@@ -413,7 +413,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
413413
convert.decodeHex(transactionDTO.value),
414414
transactionDTO.signature,
415415
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
416-
transactionDTO.networkType) : undefined,
416+
transactionDTO.network) : undefined,
417417
transactionInfo,
418418
);
419419
}

‎src/model/account/Address.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import { Convert, RawAddress, RawArray } from '../../core/format';
16+
import { Convert, RawAddress } from '../../core/format';
1717
import { NetworkType } from '../blockchain/NetworkType';
18-
import { SHA3Hasher, SignSchema } from "../../core/crypto";
19-
import { keccak256, sha3_256 } from "js-sha3";
2018

2119
/**
2220
* The address structure describes an address with its network
@@ -75,7 +73,6 @@ export class Address {
7573
.addressToString(Convert.hexToUint8(encoded)));
7674
}
7775

78-
7976
/**
8077
* Determines the validity of an raw address string.
8178
* @param {string} rawAddress The raw address string. Expected format SCHCZBZ6QVJAHGJTKYVPW5FBSO2IXXJQBPV5XE6P

‎src/model/transaction/Transaction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ export abstract class Transaction {
300300
public toJSON() {
301301
const commonTransactionObject = {
302302
type: this.type,
303-
networkType: this.networkType,
303+
network: this.networkType,
304304
version: this.versionToDTO(),
305305
maxFee: this.maxFee.toString(),
306306
deadline: this.deadline.toString(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,13 @@ describe('AggregateTransaction', () => {
326326
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
327327
type: 16725,
328328
version: 1,
329-
networkType: 144,
329+
network: 144,
330330
},
331331
},
332332
],
333333
type: 16705,
334334
version: 1,
335-
networkType: 144,
335+
network: 144,
336336
},
337337
};
338338

0 commit comments

Comments
 (0)