Skip to content

Commit f34b21b

Browse files
committed
[Issue-52] Fix HTTP provider error when subscribe tx status
1 parent daa3c3d commit f34b21b

File tree

1 file changed

+4
-6
lines changed
  • packages/extension-base/src/services/transaction-service

1 file changed

+4
-6
lines changed

packages/extension-base/src/services/transaction-service/index.ts

+4-6
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ import { addHexPrefix } from 'ethereumjs-util';
3232
import { ethers, TransactionLike } from 'ethers';
3333
import EventEmitter from 'eventemitter3';
3434
import { t } from 'i18next';
35-
import { BehaviorSubject } from 'rxjs';
35+
import { BehaviorSubject, interval as rxjsInterval, Subscription } from 'rxjs';
3636
import { TransactionConfig, TransactionReceipt } from 'web3-core';
37-
import { Subscription } from 'web3-core-subscriptions';
38-
import { BlockHeader } from 'web3-eth';
3937

4038
import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
4139
import { Signer, SignerResult } from '@polkadot/api/types';
@@ -1041,10 +1039,10 @@ export default class TransactionService {
10411039

10421040
this.watchTransactionSubscribes[id] = new Promise<void>((resolve, reject) => {
10431041
// eslint-disable-next-line prefer-const
1044-
let subscribe: Subscription<BlockHeader>;
1042+
let subscribe: Subscription;
10451043

10461044
const onComplete = () => {
1047-
subscribe?.unsubscribe?.()?.then(console.debug).catch(console.debug);
1045+
subscribe?.unsubscribe?.();
10481046
delete this.watchTransactionSubscribes[id];
10491047
};
10501048

@@ -1073,7 +1071,7 @@ export default class TransactionService {
10731071
web3Api.eth.getTransactionReceipt(txHash).then(onSuccess).catch(onError);
10741072
};
10751073

1076-
subscribe = web3Api.eth.subscribe('newBlockHeaders', onCheck);
1074+
subscribe = rxjsInterval(3000).subscribe(onCheck);
10771075
});
10781076
} else {
10791077
this.removeTransaction(id);

0 commit comments

Comments
 (0)