@@ -4,11 +4,13 @@ import {
4
4
CompilableTransaction ,
5
5
ITransactionWithBlockhashLifetime ,
6
6
ProgramDerivedAddress ,
7
+ Rpc ,
8
+ RpcSubscriptions ,
9
+ SolanaRpcApi ,
10
+ SolanaRpcSubscriptionsApi ,
7
11
TransactionSigner ,
8
12
airdropFactory ,
9
13
appendTransactionInstruction ,
10
- createDefaultRpcSubscriptionsTransport ,
11
- createDefaultRpcTransport ,
12
14
createSolanaRpc ,
13
15
createSolanaRpcSubscriptions ,
14
16
createTransaction ,
@@ -24,20 +26,13 @@ import {
24
26
import { findCounterPda , getCreateInstructionAsync } from '../src' ;
25
27
26
28
type Client = {
27
- rpc : ReturnType < typeof createSolanaRpc > ;
28
- rpcSubscriptions : ReturnType < typeof createSolanaRpcSubscriptions > ;
29
+ rpc : Rpc < SolanaRpcApi > ;
30
+ rpcSubscriptions : RpcSubscriptions < SolanaRpcSubscriptionsApi > ;
29
31
} ;
30
32
31
33
export const createDefaultSolanaClient = ( ) : Client => {
32
- const rpc = createSolanaRpc ( {
33
- transport : createDefaultRpcTransport ( { url : 'http://127.0.0.1:8899' } ) ,
34
- } ) ;
35
- const rpcSubscriptions = createSolanaRpcSubscriptions ( {
36
- transport : createDefaultRpcSubscriptionsTransport ( {
37
- url : 'ws://127.0.0.1:8900' ,
38
- } ) ,
39
- } ) ;
40
-
34
+ const rpc = createSolanaRpc ( 'http://127.0.0.1:8899' ) ;
35
+ const rpcSubscriptions = createSolanaRpcSubscriptions ( 'ws://127.0.0.1:8900' ) ;
41
36
return { rpc, rpcSubscriptions } ;
42
37
} ;
43
38
0 commit comments