Skip to content

Commit 72bc167

Browse files
author
Grégory Saive
authored
Merge pull request #75 from evias/task/g74-dto-fee-breaking
Fix cow upgrade websocket DTO error with fee field
2 parents 7761b89 + 18cb826 commit 72bc167

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/infrastructure/transaction/CreateTransactionFromDTO.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export const CreateTransactionFromDTO = (transactionDTO): Transaction => {
7070
transactionDTO.transaction.type,
7171
extractTransactionVersion(transactionDTO.transaction.version),
7272
Deadline.createFromDTO(transactionDTO.transaction.deadline),
73-
new UInt64(transactionDTO.transaction.fee),
73+
new UInt64(transactionDTO.transaction.fee || [0, 0]),
7474
innerTransactions,
7575
transactionDTO.transaction.cosignatures ? transactionDTO.transaction.cosignatures
7676
.map((aggregateCosignatureDTO) => {
@@ -114,7 +114,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
114114
extractNetworkType(transactionDTO.version),
115115
extractTransactionVersion(transactionDTO.version),
116116
Deadline.createFromDTO(transactionDTO.deadline),
117-
new UInt64(transactionDTO.fee),
117+
new UInt64(transactionDTO.fee || [0, 0]),
118118
Address.createFromEncoded(transactionDTO.recipient),
119119
transactionDTO.mosaics === undefined ? [] :
120120
transactionDTO.mosaics
@@ -130,7 +130,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
130130
extractNetworkType(transactionDTO.version),
131131
extractTransactionVersion(transactionDTO.version),
132132
Deadline.createFromDTO(transactionDTO.deadline),
133-
new UInt64(transactionDTO.fee),
133+
new UInt64(transactionDTO.fee || [0, 0]),
134134
transactionDTO.namespaceType,
135135
transactionDTO.name,
136136
new NamespaceId(transactionDTO.namespaceId),
@@ -145,7 +145,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
145145
extractNetworkType(transactionDTO.version),
146146
extractTransactionVersion(transactionDTO.version),
147147
Deadline.createFromDTO(transactionDTO.deadline),
148-
new UInt64(transactionDTO.fee),
148+
new UInt64(transactionDTO.fee || [0, 0]),
149149
transactionDTO.nonce,
150150
new MosaicId(transactionDTO.mosaicId),
151151
new MosaicProperties(
@@ -162,7 +162,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
162162
extractNetworkType(transactionDTO.version),
163163
extractTransactionVersion(transactionDTO.version),
164164
Deadline.createFromDTO(transactionDTO.deadline),
165-
new UInt64(transactionDTO.fee),
165+
new UInt64(transactionDTO.fee || [0, 0]),
166166
new MosaicId(transactionDTO.mosaicId),
167167
transactionDTO.direction,
168168
new UInt64(transactionDTO.delta),
@@ -175,7 +175,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
175175
extractNetworkType(transactionDTO.version),
176176
extractTransactionVersion(transactionDTO.version),
177177
Deadline.createFromDTO(transactionDTO.deadline),
178-
new UInt64(transactionDTO.fee),
178+
new UInt64(transactionDTO.fee || [0, 0]),
179179
transactionDTO.minApprovalDelta,
180180
transactionDTO.minRemovalDelta,
181181
transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new MultisigCosignatoryModification(
@@ -192,7 +192,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
192192
networkType,
193193
extractTransactionVersion(transactionDTO.version),
194194
Deadline.createFromDTO(transactionDTO.deadline),
195-
new UInt64(transactionDTO.fee),
195+
new UInt64(transactionDTO.fee || [0, 0]),
196196
new Mosaic(new MosaicId(transactionDTO.mosaicId), new UInt64(transactionDTO.amount)),
197197
new UInt64(transactionDTO.duration),
198198
new SignedTransaction('', transactionDTO.hash, '', TransactionType.AGGREGATE_BONDED, networkType),
@@ -205,7 +205,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
205205
extractNetworkType(transactionDTO.version),
206206
extractTransactionVersion(transactionDTO.version),
207207
Deadline.createFromDTO(transactionDTO.deadline),
208-
new UInt64(transactionDTO.fee),
208+
new UInt64(transactionDTO.fee || [0, 0]),
209209
new Mosaic(new MosaicId(transactionDTO.mosaicId), new UInt64(transactionDTO.amount)),
210210
new UInt64(transactionDTO.duration),
211211
transactionDTO.hashAlgorithm,
@@ -220,7 +220,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
220220
extractNetworkType(transactionDTO.version),
221221
extractTransactionVersion(transactionDTO.version),
222222
Deadline.createFromDTO(transactionDTO.deadline),
223-
new UInt64(transactionDTO.fee),
223+
new UInt64(transactionDTO.fee || [0, 0]),
224224
transactionDTO.hashAlgorithm,
225225
transactionDTO.secret,
226226
transactionDTO.proof,
@@ -233,7 +233,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
233233
extractNetworkType(transactionDTO.version),
234234
extractTransactionVersion(transactionDTO.version),
235235
Deadline.createFromDTO(transactionDTO.deadline),
236-
new UInt64(transactionDTO.fee),
236+
new UInt64(transactionDTO.fee || [0, 0]),
237237
transactionDTO.actionType,
238238
transactionDTO.namespaceId,
239239
transactionDTO.mosaicId,
@@ -246,7 +246,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
246246
extractNetworkType(transactionDTO.version),
247247
extractTransactionVersion(transactionDTO.version),
248248
Deadline.createFromDTO(transactionDTO.deadline),
249-
new UInt64(transactionDTO.fee),
249+
new UInt64(transactionDTO.fee || [0, 0]),
250250
transactionDTO.actionType,
251251
transactionDTO.namespaceId,
252252
transactionDTO.address,

0 commit comments

Comments
 (0)