@@ -32,10 +32,8 @@ import { addHexPrefix } from 'ethereumjs-util';
32
32
import { ethers , TransactionLike } from 'ethers' ;
33
33
import EventEmitter from 'eventemitter3' ;
34
34
import { t } from 'i18next' ;
35
- import { BehaviorSubject } from 'rxjs' ;
35
+ import { BehaviorSubject , interval as rxjsInterval , Subscription } from 'rxjs' ;
36
36
import { TransactionConfig , TransactionReceipt } from 'web3-core' ;
37
- import { Subscription } from 'web3-core-subscriptions' ;
38
- import { BlockHeader } from 'web3-eth' ;
39
37
40
38
import { SubmittableExtrinsic } from '@polkadot/api/promise/types' ;
41
39
import { Signer , SignerResult } from '@polkadot/api/types' ;
@@ -1041,10 +1039,10 @@ export default class TransactionService {
1041
1039
1042
1040
this . watchTransactionSubscribes [ id ] = new Promise < void > ( ( resolve , reject ) => {
1043
1041
// eslint-disable-next-line prefer-const
1044
- let subscribe : Subscription < BlockHeader > ;
1042
+ let subscribe : Subscription ;
1045
1043
1046
1044
const onComplete = ( ) => {
1047
- subscribe ?. unsubscribe ?.( ) ?. then ( console . debug ) . catch ( console . debug ) ;
1045
+ subscribe ?. unsubscribe ?.( ) ;
1048
1046
delete this . watchTransactionSubscribes [ id ] ;
1049
1047
} ;
1050
1048
@@ -1073,7 +1071,7 @@ export default class TransactionService {
1073
1071
web3Api . eth . getTransactionReceipt ( txHash ) . then ( onSuccess ) . catch ( onError ) ;
1074
1072
} ;
1075
1073
1076
- subscribe = web3Api . eth . subscribe ( 'newBlockHeaders' , onCheck ) ;
1074
+ subscribe = rxjsInterval ( 3000 ) . subscribe ( onCheck ) ;
1077
1075
} ) ;
1078
1076
} else {
1079
1077
this . removeTransaction ( id ) ;
0 commit comments