Skip to content

Commit 8b73b66

Browse files
committed
update sdk types file to be up to parity
1 parent 6f881ba commit 8b73b66

File tree

2 files changed

+67
-42
lines changed

2 files changed

+67
-42
lines changed

sdk/src/adminClient.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -779,18 +779,16 @@ export class AdminClient extends DriftClient {
779779
}
780780

781781
public async getResetAmmCacheIx(): Promise<TransactionInstruction> {
782-
return this.program.instruction.resetAmmCache(
783-
{
784-
accounts: {
785-
state: await this.getStatePublicKey(),
786-
admin: this.isSubscribed
787-
? this.getStateAccount().admin
788-
: this.wallet.publicKey,
789-
ammCache: getAmmCachePublicKey(this.program.programId),
790-
systemProgram: anchor.web3.SystemProgram.programId,
791-
},
792-
}
793-
);
782+
return this.program.instruction.resetAmmCache({
783+
accounts: {
784+
state: await this.getStatePublicKey(),
785+
admin: this.isSubscribed
786+
? this.getStateAccount().admin
787+
: this.wallet.publicKey,
788+
ammCache: getAmmCachePublicKey(this.program.programId),
789+
systemProgram: anchor.web3.SystemProgram.programId,
790+
},
791+
});
794792
}
795793

796794
public async initializePredictionMarket(

sdk/src/types.ts

Lines changed: 57 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,7 @@ export type PerpMarketAccount = {
898898
lpFeeTransferScalar: number;
899899
lpExchangeFeeExcluscionScalar: number;
900900
lpStatus: number;
901+
lpPausedOperations: number;
901902
};
902903

903904
export type HistoricalOracleData = {
@@ -1724,38 +1725,54 @@ export type AmmConstituentDatum = AddAmmConstituentMappingDatum & {
17241725
};
17251726

17261727
export type AmmConstituentMapping = {
1728+
lpPool: PublicKey;
17271729
bump: number;
17281730
weights: AmmConstituentDatum[];
17291731
};
17301732

17311733
export type TargetDatum = {
17321734
costToTradeBps: number;
1733-
beta: number;
1734-
targetBase: BN;
17351735
lastSlot: BN;
1736+
targetBase: BN;
17361737
};
17371738

17381739
export type ConstituentTargetBaseAccount = {
1740+
lpPool: PublicKey;
17391741
bump: number;
17401742
targets: TargetDatum[];
17411743
};
17421744

1745+
export type ConstituentCorrelations = {
1746+
lpPool: PublicKey;
1747+
bump: number;
1748+
correlations: BN[];
1749+
};
1750+
17431751
export type LPPoolAccount = {
17441752
name: number[];
17451753
pubkey: PublicKey;
17461754
mint: PublicKey;
1755+
whitelistMint: PublicKey;
1756+
constituentTargetBase: PublicKey;
1757+
constituentCorrelations: PublicKey;
17471758
maxAum: BN;
17481759
lastAum: BN;
1749-
lastAumSlot: BN;
1750-
lastAumTs: BN;
1751-
lastHedgeTs: BN;
1752-
bump: number;
1753-
totalMintRedeemFeesPaid: BN;
17541760
cumulativeQuoteSentToPerpMarkets: BN;
17551761
cumulativeQuoteReceivedFromPerpMarkets: BN;
1756-
constituents: number;
1757-
whitelistMint: PublicKey;
1762+
totalMintRedeemFeesPaid: BN;
1763+
lastAumSlot: BN;
1764+
maxSettleQuoteAmount: BN;
1765+
lastHedgeTs: BN;
1766+
mintRedeemId: BN;
1767+
settleId: BN;
1768+
minMintFee: BN;
17581769
tokenSupply: BN;
1770+
volatility: BN;
1771+
constituents: number;
1772+
quoteConstituentIndex: number;
1773+
bump: number;
1774+
gammaExecution: number;
1775+
xi: number;
17591776
};
17601777

17611778
export type ConstituentSpotBalance = {
@@ -1797,49 +1814,59 @@ export enum ConstituentLpOperation {
17971814

17981815
export type ConstituentAccount = {
17991816
pubkey: PublicKey;
1800-
spotMarketIndex: number;
1801-
constituentIndex: number;
1802-
decimals: number;
1803-
bump: number;
1804-
constituentDerivativeIndex: number;
1817+
mint: PublicKey;
1818+
lpPool: PublicKey;
1819+
vault: PublicKey;
1820+
totalSwapFees: BN;
1821+
spotBalance: ConstituentSpotBalance;
1822+
lastSpotBalanceTokenAmount: BN;
1823+
cumulativeSpotInterestAccruedTokenAmount: BN;
18051824
maxWeightDeviation: BN;
1806-
maxBorrowTokenAmount: BN;
18071825
swapFeeMin: BN;
18081826
swapFeeMax: BN;
1809-
totalSwapFees: BN;
1827+
maxBorrowTokenAmount: BN;
18101828
vaultTokenBalance: BN;
1811-
spotBalance: ConstituentSpotBalance;
18121829
lastOraclePrice: BN;
18131830
lastOracleSlot: BN;
1814-
mint: PublicKey;
18151831
oracleStalenessThreshold: BN;
1816-
lpPool: PublicKey;
1817-
vault: PublicKey;
1832+
flashLoanInitialTokenAmount: BN;
18181833
nextSwapId: BN;
18191834
derivativeWeight: BN;
1820-
flashLoanInitialTokenAmount: BN;
1835+
volatility: BN;
1836+
constituentDerivativeDepegThreshold: BN;
1837+
constituentDerivativeIndex: number;
1838+
spotMarketIndex: number;
1839+
constituentIndex: number;
1840+
decimals: number;
1841+
bump: number;
1842+
vaultBump: number;
1843+
gammaInventory: number;
1844+
gammaExecution: number;
1845+
xi: number;
18211846
status: number;
18221847
pausedOperations: number;
18231848
};
18241849

18251850
export type CacheInfo = {
1826-
slot: BN;
1827-
position: BN;
1828-
lastOraclePriceTwap: BN;
18291851
oracle: PublicKey;
1830-
oracleSource: number;
1831-
oraclePrice: BN;
1832-
oracleSlot: BN;
1833-
lastExchangeFees: BN;
18341852
lastFeePoolTokenAmount: BN;
18351853
lastNetPnlPoolTokenAmount: BN;
1854+
lastExchangeFees: BN;
1855+
lastSettleAmmExFees: BN;
1856+
lastSettleAmmPnl: BN;
1857+
position: BN;
1858+
slot: BN;
18361859
lastSettleAmount: BN;
18371860
lastSettleSlot: BN;
18381861
lastSettleTs: BN;
1839-
lastSettleAmmPnl: BN;
1840-
lastSettleAmmExFees: BN;
18411862
quoteOwedFromLpPool: BN;
1863+
ammInventoryLimit: BN;
1864+
oraclePrice: BN;
1865+
oracleSlot: BN;
1866+
oracleSource: number;
1867+
oracleValidity: number;
18421868
lpStatusForPerpMarket: number;
1869+
ammPositionScalar: number;
18431870
};
18441871

18451872
export type AmmCache = {

0 commit comments

Comments
 (0)