Skip to content

Commit 893dc03

Browse files
committed
Uppded toUpperCase for hash comparision
1 parent e8a957a commit 893dc03

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

src/infrastructure/Listener.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,13 @@ export class Listener implements IListener {
232232
filter((_) => _.message instanceof Transaction),
233233
map((_) => _.message as Transaction),
234234
filter((_) => this.transactionFromAddress(_, address)),
235-
filter((_) => transactionHash === undefined || _.transactionInfo!.hash === transactionHash),
235+
filter((_) => {
236+
if (transactionHash === undefined) {
237+
return true;
238+
} else {
239+
const metaHash = _.transactionInfo!.hash;
240+
return metaHash !== undefined ? metaHash.toUpperCase() === transactionHash.toUpperCase() : false;
241+
}}),
236242
);
237243
}
238244

@@ -333,7 +339,7 @@ export class Listener implements IListener {
333339
public cosignatureAdded(address: Address): Observable<CosignatureSignedTransaction> {
334340
this.subscribeTo(`cosignature/${address.plain()}`);
335341
return this.messageSubject.asObservable().pipe(
336-
filter((_) => _.channelName === ListenerChannelName.cosignature),
342+
filter((_) => _.channelName.toUpperCase() === ListenerChannelName.cosignature.toUpperCase()),
337343
filter((_) => _.message instanceof CosignatureSignedTransaction),
338344
map((_) => _.message as CosignatureSignedTransaction));
339345
}

src/model/transaction/Transaction.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,9 @@ export abstract class Transaction {
298298
*/
299299
public isUnconfirmed(): boolean {
300300
return this.transactionInfo != null && this.transactionInfo.height.compact() === 0
301-
&& this.transactionInfo.hash === this.transactionInfo.merkleComponentHash;
301+
&& this.transactionInfo.hash !== undefined
302+
&& this.transactionInfo.merkleComponentHash !== undefined
303+
&& this.transactionInfo.hash.toUpperCase() === this.transactionInfo.merkleComponentHash.toUpperCase();
302304
}
303305

304306
/**
@@ -314,8 +316,10 @@ export abstract class Transaction {
314316
* @returns {boolean}
315317
*/
316318
public hasMissingSignatures(): boolean {
317-
return this.transactionInfo != null && this.transactionInfo.height.compact() === 0 &&
318-
this.transactionInfo.hash !== this.transactionInfo.merkleComponentHash;
319+
return this.transactionInfo != null && this.transactionInfo.height.compact() === 0
320+
&& this.transactionInfo.hash !== undefined
321+
&& this.transactionInfo.merkleComponentHash !== undefined
322+
&& this.transactionInfo.hash.toUpperCase() === this.transactionInfo.merkleComponentHash.toUpperCase();
319323
}
320324

321325
/**

0 commit comments

Comments
 (0)