Skip to content

Commit 173b6cd

Browse files
fboucquezfboucquez
committed
Merged master
1 parent 1a57f2d commit 173b6cd

File tree

3 files changed

+67
-84
lines changed

3 files changed

+67
-84
lines changed

‎src/infrastructure/transaction/CreateTransactionFromDTO.ts‎

Lines changed: 52 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,47 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import {Convert as convert} from '../../core/format';
16+
import { Convert as convert } from '../../core/format';
1717
import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
18-
import {Address} from '../../model/account/Address';
19-
import {PublicAccount} from '../../model/account/PublicAccount';
20-
import {NetworkType} from '../../model/blockchain/NetworkType';
18+
import { Address } from '../../model/account/Address';
19+
import { PublicAccount } from '../../model/account/PublicAccount';
20+
import { NetworkType } from '../../model/blockchain/NetworkType';
2121
import { EncryptedMessage } from '../../model/message/EncryptedMessage';
2222
import { MessageType } from '../../model/message/MessageType';
2323
import { PersistentHarvestingDelegationMessage } from '../../model/message/PersistentHarvestingDelegationMessage';
24-
import {EmptyMessage, PlainMessage} from '../../model/message/PlainMessage';
25-
import {Mosaic} from '../../model/mosaic/Mosaic';
26-
import {MosaicFlags} from '../../model/mosaic/MosaicFlags';
27-
import {MosaicId} from '../../model/mosaic/MosaicId';
28-
import {NamespaceId} from '../../model/namespace/NamespaceId';
29-
import {AccountAddressRestrictionTransaction} from '../../model/transaction/AccountAddressRestrictionTransaction';
24+
import { EmptyMessage, PlainMessage } from '../../model/message/PlainMessage';
25+
import { Mosaic } from '../../model/mosaic/Mosaic';
26+
import { MosaicFlags } from '../../model/mosaic/MosaicFlags';
27+
import { MosaicId } from '../../model/mosaic/MosaicId';
28+
import { NamespaceId } from '../../model/namespace/NamespaceId';
29+
import { AccountAddressRestrictionTransaction } from '../../model/transaction/AccountAddressRestrictionTransaction';
3030
import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction';
3131
import { AccountMetadataTransaction } from '../../model/transaction/AccountMetadataTransaction';
32-
import {AccountMosaicRestrictionTransaction} from '../../model/transaction/AccountMosaicRestrictionTransaction';
33-
import {AccountOperationRestrictionTransaction} from '../../model/transaction/AccountOperationRestrictionTransaction';
34-
import {AddressAliasTransaction} from '../../model/transaction/AddressAliasTransaction';
35-
import {AggregateTransaction} from '../../model/transaction/AggregateTransaction';
36-
import {AggregateTransactionCosignature} from '../../model/transaction/AggregateTransactionCosignature';
37-
import {AggregateTransactionInfo} from '../../model/transaction/AggregateTransactionInfo';
38-
import {Deadline} from '../../model/transaction/Deadline';
39-
import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction';
32+
import { AccountMosaicRestrictionTransaction } from '../../model/transaction/AccountMosaicRestrictionTransaction';
33+
import { AccountOperationRestrictionTransaction } from '../../model/transaction/AccountOperationRestrictionTransaction';
34+
import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction';
35+
import { AggregateTransaction } from '../../model/transaction/AggregateTransaction';
36+
import { AggregateTransactionCosignature } from '../../model/transaction/AggregateTransactionCosignature';
37+
import { AggregateTransactionInfo } from '../../model/transaction/AggregateTransactionInfo';
38+
import { Deadline } from '../../model/transaction/Deadline';
39+
import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction';
4040
import { MosaicAddressRestrictionTransaction } from '../../model/transaction/MosaicAddressRestrictionTransaction';
41-
import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction';
42-
import {MosaicDefinitionTransaction} from '../../model/transaction/MosaicDefinitionTransaction';
41+
import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction';
42+
import { MosaicDefinitionTransaction } from '../../model/transaction/MosaicDefinitionTransaction';
4343
import { MosaicGlobalRestrictionTransaction } from '../../model/transaction/MosaicGlobalRestrictionTransaction';
4444
import { MosaicMetadataTransaction } from '../../model/transaction/MosaicMetadataTransaction';
45-
import {MosaicSupplyChangeTransaction} from '../../model/transaction/MosaicSupplyChangeTransaction';
46-
import {MultisigAccountModificationTransaction} from '../../model/transaction/MultisigAccountModificationTransaction';
45+
import { MosaicSupplyChangeTransaction } from '../../model/transaction/MosaicSupplyChangeTransaction';
46+
import { MultisigAccountModificationTransaction } from '../../model/transaction/MultisigAccountModificationTransaction';
4747
import { NamespaceMetadataTransaction } from '../../model/transaction/NamespaceMetadataTransaction';
48-
import {NamespaceRegistrationTransaction} from '../../model/transaction/NamespaceRegistrationTransaction';
49-
import {SecretLockTransaction} from '../../model/transaction/SecretLockTransaction';
50-
import {SecretProofTransaction} from '../../model/transaction/SecretProofTransaction';
51-
import {SignedTransaction} from '../../model/transaction/SignedTransaction';
52-
import {Transaction} from '../../model/transaction/Transaction';
53-
import {TransactionInfo} from '../../model/transaction/TransactionInfo';
54-
import {TransactionType} from '../../model/transaction/TransactionType';
55-
import {TransferTransaction} from '../../model/transaction/TransferTransaction';
56-
import {UInt64} from '../../model/UInt64';
48+
import { NamespaceRegistrationTransaction } from '../../model/transaction/NamespaceRegistrationTransaction';
49+
import { SecretLockTransaction } from '../../model/transaction/SecretLockTransaction';
50+
import { SecretProofTransaction } from '../../model/transaction/SecretProofTransaction';
51+
import { SignedTransaction } from '../../model/transaction/SignedTransaction';
52+
import { Transaction } from '../../model/transaction/Transaction';
53+
import { TransactionInfo } from '../../model/transaction/TransactionInfo';
54+
import { TransactionType } from '../../model/transaction/TransactionType';
55+
import { TransferTransaction } from '../../model/transaction/TransferTransaction';
56+
import { UInt64 } from '../../model/UInt64';
5757

5858
/**
5959
* @internal
@@ -122,7 +122,8 @@ export const CreateTransactionFromDTO = (transactionDTO): Transaction => {
122122
* @constructor
123123
*/
124124
const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Transaction => {
125-
125+
const signer = transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
126+
transactionDTO.network) : undefined;
126127
if (transactionDTO.type === TransactionType.TRANSFER) {
127128
return new TransferTransaction(
128129
transactionDTO.network,
@@ -133,8 +134,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
133134
extractMosaics(transactionDTO.mosaics),
134135
extractMessage(transactionDTO.message !== undefined ? transactionDTO.message : undefined),
135136
transactionDTO.signature,
136-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
137-
transactionDTO.network) : undefined,
137+
signer,
138138
transactionInfo,
139139
);
140140
} else if (transactionDTO.type === TransactionType.NAMESPACE_REGISTRATION) {
@@ -149,8 +149,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
149149
transactionDTO.registrationType === 0 ? UInt64.fromNumericString(transactionDTO.duration) : undefined,
150150
transactionDTO.registrationType === 1 ? NamespaceId.createFromEncoded(transactionDTO.parentId) : undefined,
151151
transactionDTO.signature,
152-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
153-
transactionDTO.network) : undefined,
152+
signer,
154153
transactionInfo,
155154
);
156155
} else if (transactionDTO.type === TransactionType.MOSAIC_DEFINITION) {
@@ -165,8 +164,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
165164
transactionDTO.divisibility,
166165
UInt64.fromNumericString(transactionDTO.duration),
167166
transactionDTO.signature,
168-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
169-
transactionDTO.network) : undefined,
167+
signer,
170168
transactionInfo,
171169
);
172170
} else if (transactionDTO.type === TransactionType.MOSAIC_SUPPLY_CHANGE) {
@@ -179,8 +177,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
179177
transactionDTO.action,
180178
UInt64.fromNumericString(transactionDTO.delta),
181179
transactionDTO.signature,
182-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
183-
transactionDTO.network) : undefined,
180+
signer,
184181
transactionInfo,
185182
);
186183
} else if (transactionDTO.type === TransactionType.MULTISIG_ACCOUNT_MODIFICATION) {
@@ -196,8 +193,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
196193
transactionDTO.publicKeyDeletions ? transactionDTO.publicKeyDeletions.map((deletion) =>
197194
PublicAccount.createFromPublicKey(deletion, transactionDTO.network)) : [],
198195
transactionDTO.signature,
199-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
200-
transactionDTO.network) : undefined,
196+
signer,
201197
transactionInfo,
202198
);
203199
} else if (transactionDTO.type === TransactionType.HASH_LOCK) {
@@ -211,7 +207,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
211207
UInt64.fromNumericString(transactionDTO.duration),
212208
new SignedTransaction('', transactionDTO.hash, '', TransactionType.AGGREGATE_BONDED, networkType),
213209
transactionDTO.signature,
214-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey, networkType) : undefined,
210+
signer,
215211
transactionInfo,
216212
);
217213
} else if (transactionDTO.type === TransactionType.SECRET_LOCK) {
@@ -228,8 +224,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
228224
transactionDTO.secret,
229225
extractRecipient(recipientAddress),
230226
transactionDTO.signature,
231-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
232-
transactionDTO.network) : undefined,
227+
signer,
233228
transactionInfo,
234229
);
235230
} else if (transactionDTO.type === TransactionType.SECRET_PROOF) {
@@ -244,8 +239,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
244239
extractRecipient(recipientAddress),
245240
transactionDTO.proof,
246241
transactionDTO.signature,
247-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
248-
transactionDTO.network) : undefined,
242+
signer,
249243
transactionInfo,
250244
);
251245
} else if (transactionDTO.type === TransactionType.MOSAIC_ALIAS) {
@@ -258,8 +252,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
258252
NamespaceId.createFromEncoded(transactionDTO.namespaceId),
259253
new MosaicId(transactionDTO.mosaicId),
260254
transactionDTO.signature,
261-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
262-
transactionDTO.network) : undefined,
255+
signer,
263256
transactionInfo,
264257
);
265258
} else if (transactionDTO.type === TransactionType.ADDRESS_ALIAS) {
@@ -272,8 +265,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
272265
NamespaceId.createFromEncoded(transactionDTO.namespaceId),
273266
extractRecipient(transactionDTO.address) as Address,
274267
transactionDTO.signature,
275-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
276-
transactionDTO.network) : undefined,
268+
signer,
277269
transactionInfo,
278270
);
279271
} else if (transactionDTO.type === TransactionType.ACCOUNT_ADDRESS_RESTRICTION) {
@@ -288,8 +280,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
288280
transactionDTO.restrictionDeletions ? transactionDTO.restrictionDeletions.map((deletion) =>
289281
extractRecipient(deletion)) : [],
290282
transactionDTO.signature,
291-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
292-
transactionDTO.network) : undefined,
283+
signer,
293284
transactionInfo,
294285
);
295286
} else if (transactionDTO.type === TransactionType.ACCOUNT_OPERATION_RESTRICTION) {
@@ -302,8 +293,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
302293
transactionDTO.restrictionAdditions ? transactionDTO.restrictionAdditions : [],
303294
transactionDTO.restrictionDeletions ? transactionDTO.restrictionDeletions : [],
304295
transactionDTO.signature,
305-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
306-
transactionDTO.network) : undefined,
296+
signer,
307297
transactionInfo,
308298
);
309299
} else if (transactionDTO.type === TransactionType.ACCOUNT_MOSAIC_RESTRICTION) {
@@ -318,8 +308,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
318308
transactionDTO.restrictionDeletions ? transactionDTO.restrictionDeletions.map((deletion) =>
319309
UnresolvedMapping.toUnresolvedMosaic(deletion)) : [],
320310
transactionDTO.signature,
321-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
322-
transactionDTO.network) : undefined,
311+
signer,
323312
transactionInfo,
324313
);
325314
} else if (transactionDTO.type === TransactionType.ACCOUNT_LINK) {
@@ -331,8 +320,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
331320
transactionDTO.remotePublicKey,
332321
transactionDTO.linkAction,
333322
transactionDTO.signature,
334-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
335-
transactionDTO.network) : undefined,
323+
signer,
336324
transactionInfo,
337325
);
338326
} else if (transactionDTO.type === TransactionType.MOSAIC_GLOBAL_RESTRICTION) {
@@ -349,8 +337,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
349337
UInt64.fromNumericString(transactionDTO.newRestrictionValue),
350338
transactionDTO.newRestrictionType,
351339
transactionDTO.signature,
352-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
353-
transactionDTO.network) : undefined,
340+
signer,
354341
transactionInfo,
355342
);
356343
} else if (transactionDTO.type === TransactionType.MOSAIC_ADDRESS_RESTRICTION) {
@@ -365,8 +352,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
365352
UInt64.fromNumericString(transactionDTO.previousRestrictionValue),
366353
UInt64.fromNumericString(transactionDTO.newRestrictionValue),
367354
transactionDTO.signature,
368-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
369-
transactionDTO.network) : undefined,
355+
signer,
370356
transactionInfo,
371357
);
372358
} else if (transactionDTO.type === TransactionType.ACCOUNT_METADATA) {
@@ -380,8 +366,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
380366
transactionDTO.valueSizeDelta,
381367
convert.decodeHex(transactionDTO.value),
382368
transactionDTO.signature,
383-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
384-
transactionDTO.network) : undefined,
369+
signer,
385370
transactionInfo,
386371
);
387372
} else if (transactionDTO.type === TransactionType.MOSAIC_METADATA) {
@@ -396,8 +381,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
396381
transactionDTO.valueSizeDelta,
397382
convert.decodeHex(transactionDTO.value),
398383
transactionDTO.signature,
399-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
400-
transactionDTO.network) : undefined,
384+
signer,
401385
transactionInfo,
402386
);
403387
} else if (transactionDTO.type === TransactionType.NAMESPACE_METADATA) {
@@ -412,8 +396,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
412396
transactionDTO.valueSizeDelta,
413397
convert.decodeHex(transactionDTO.value),
414398
transactionDTO.signature,
415-
transactionDTO.signerPublicKey ? PublicAccount.createFromPublicKey(transactionDTO.signerPublicKey,
416-
transactionDTO.network) : undefined,
399+
signer,
417400
transactionInfo,
418401
);
419402
}

0 commit comments

Comments
 (0)