@drift-labs/sdk 0.1.36-master.3 → 0.1.36-master.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. package/lib/accounts/bulkAccountLoader.d.ts +1 -0
  2. package/lib/accounts/bulkAccountLoader.js +4 -0
  3. package/lib/admin.js +1 -1
  4. package/lib/clearingHouse.d.ts +6 -4
  5. package/lib/clearingHouse.js +46 -8
  6. package/lib/examples/makeTradeExample.js +1 -1
  7. package/lib/factory/clearingHouse.js +4 -4
  8. package/lib/idl/clearing_house.json +72 -1
  9. package/lib/index.d.ts +1 -0
  10. package/lib/index.js +1 -0
  11. package/lib/math/oracles.d.ts +3 -0
  12. package/lib/math/oracles.js +26 -0
  13. package/lib/math/trade.d.ts +10 -6
  14. package/lib/math/trade.js +68 -13
  15. package/lib/mockUSDCFaucet.d.ts +2 -2
  16. package/lib/mockUSDCFaucet.js +3 -3
  17. package/lib/oracles/pythClient.js +1 -0
  18. package/lib/oracles/switchboardClient.js +4 -1
  19. package/lib/oracles/types.d.ts +1 -0
  20. package/lib/tx/defaultTxSender.d.ts +3 -3
  21. package/lib/tx/defaultTxSender.js +1 -1
  22. package/lib/tx/retryTxSender.d.ts +3 -3
  23. package/package.json +2 -2
  24. package/src/accounts/bulkAccountLoader.ts +5 -0
  25. package/src/accounts/webSocketAccountSubscriber.ts +3 -3
  26. package/src/admin.ts +2 -2
  27. package/src/clearingHouse.ts +81 -10
  28. package/src/examples/makeTradeExample.ts +6 -2
  29. package/src/factory/clearingHouse.ts +13 -5
  30. package/src/idl/clearing_house.json +72 -1
  31. package/src/index.ts +1 -0
  32. package/src/math/oracles.ts +36 -0
  33. package/src/math/trade.ts +84 -16
  34. package/src/mockUSDCFaucet.ts +5 -5
  35. package/src/oracles/pythClient.ts +1 -0
  36. package/src/oracles/switchboardClient.ts +7 -2
  37. package/src/oracles/types.ts +1 -0
  38. package/src/tx/defaultTxSender.ts +4 -4
  39. package/src/tx/retryTxSender.ts +3 -3
@@ -36,6 +36,7 @@ export class PythClient {
36
36
  priceData.twac.value,
37
37
  priceData.exponent
38
38
  ),
39
+ hasSufficientNumberOfDataPoints: true,
39
40
  };
40
41
  }
41
42
  }
@@ -4,7 +4,7 @@ import {
4
4
  } from '@switchboard-xyz/switchboard-v2';
5
5
  import { Connection, Keypair, PublicKey } from '@solana/web3.js';
6
6
  import { DriftEnv } from '../config';
7
- import { BN, Provider, Program, Idl } from '@project-serum/anchor';
7
+ import { BN, Program, Idl, AnchorProvider } from '@project-serum/anchor';
8
8
  import { MARK_PRICE_PRECISION, TEN } from '../constants/numericConstants';
9
9
  import { OracleClient, OraclePriceData } from './types';
10
10
  import { Wallet } from '../wallet';
@@ -48,11 +48,16 @@ export class SwitchboardClient implements OracleClient {
48
48
  .stdDeviation as SwitchboardDecimal
49
49
  );
50
50
 
51
+ const hasSufficientNumberOfDataPoints =
52
+ aggregatorAccountData.latestConfirmedRound.numSuccess >=
53
+ aggregatorAccountData.minOracleResults;
54
+
51
55
  const slot: BN = aggregatorAccountData.latestConfirmedRound.roundOpenSlot;
52
56
  return {
53
57
  price,
54
58
  slot,
55
59
  confidence,
60
+ hasSufficientNumberOfDataPoints,
56
61
  };
57
62
  }
58
63
 
@@ -74,7 +79,7 @@ async function getSwitchboardProgram(
74
79
  const DEFAULT_KEYPAIR = Keypair.fromSeed(new Uint8Array(32).fill(1));
75
80
  const programId = getSwitchboardPid(env);
76
81
  const wallet = new Wallet(DEFAULT_KEYPAIR);
77
- const provider = new Provider(connection, wallet, {});
82
+ const provider = new AnchorProvider(connection, wallet, {});
78
83
 
79
84
  return new Program(switchboardV2Idl as Idl, programId, provider);
80
85
  }
@@ -5,6 +5,7 @@ export type OraclePriceData = {
5
5
  price: BN;
6
6
  slot: BN;
7
7
  confidence: BN;
8
+ hasSufficientNumberOfDataPoints: boolean;
8
9
  twap?: BN;
9
10
  twapConfidence?: BN;
10
11
  };
@@ -5,12 +5,12 @@ import {
5
5
  Transaction,
6
6
  TransactionSignature,
7
7
  } from '@solana/web3.js';
8
- import { Provider } from '@project-serum/anchor';
8
+ import { AnchorProvider } from '@project-serum/anchor';
9
9
 
10
10
  export class DefaultTxSender implements TxSender {
11
- provider: Provider;
11
+ provider: AnchorProvider;
12
12
 
13
- public constructor(provider: Provider) {
13
+ public constructor(provider: AnchorProvider) {
14
14
  this.provider = provider;
15
15
  }
16
16
 
@@ -19,6 +19,6 @@ export class DefaultTxSender implements TxSender {
19
19
  additionalSigners?: Array<Signer>,
20
20
  opts?: ConfirmOptions
21
21
  ): Promise<TransactionSignature> {
22
- return this.provider.send(tx, additionalSigners, opts);
22
+ return this.provider.sendAndConfirm(tx, additionalSigners, opts);
23
23
  }
24
24
  }
@@ -10,7 +10,7 @@ import {
10
10
  TransactionSignature,
11
11
  Connection,
12
12
  } from '@solana/web3.js';
13
- import { Provider } from '@project-serum/anchor';
13
+ import { AnchorProvider } from '@project-serum/anchor';
14
14
  import assert from 'assert';
15
15
  import bs58 from 'bs58';
16
16
 
@@ -22,13 +22,13 @@ type ResolveReference = {
22
22
  };
23
23
 
24
24
  export class RetryTxSender implements TxSender {
25
- provider: Provider;
25
+ provider: AnchorProvider;
26
26
  timeout: number;
27
27
  retrySleep: number;
28
28
  additionalConnections: Connection[];
29
29
 
30
30
  public constructor(
31
- provider: Provider,
31
+ provider: AnchorProvider,
32
32
  timeout?: number,
33
33
  retrySleep?: number,
34
34
  additionalConnections = new Array<Connection>()