@0dotxyz/p0-ts-sdk 2.1.2 → 2.1.4
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.
- package/dist/index.cjs +6 -17
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +2 -9
- package/dist/index.d.ts +2 -9
- package/dist/index.js +6 -17
- package/dist/index.js.map +1 -1
- package/dist/vendor.cjs +2 -2
- package/dist/vendor.cjs.map +1 -1
- package/dist/vendor.d.cts +1 -1
- package/dist/vendor.d.ts +1 -1
- package/dist/vendor.js +2 -2
- package/dist/vendor.js.map +1 -1
- package/package.json +1 -7
package/dist/index.d.cts
CHANGED
|
@@ -14736,8 +14736,6 @@ interface BankType {
|
|
|
14736
14736
|
group: PublicKey;
|
|
14737
14737
|
mint: PublicKey;
|
|
14738
14738
|
mintDecimals: number;
|
|
14739
|
-
mintRate: number | null;
|
|
14740
|
-
mintPrice: number;
|
|
14741
14739
|
assetShareValue: BigNumber$1;
|
|
14742
14740
|
liabilityShareValue: BigNumber$1;
|
|
14743
14741
|
liquidityVault: PublicKey;
|
|
@@ -15094,10 +15092,7 @@ interface BankMetadata$2 {
|
|
|
15094
15092
|
tokenName: string;
|
|
15095
15093
|
tokenSymbol: string;
|
|
15096
15094
|
}
|
|
15097
|
-
declare function parseBankRaw(address: PublicKey, accountParsed: BankRaw, bankMetadata?: BankMetadata$2
|
|
15098
|
-
mintRate: number | null;
|
|
15099
|
-
mintPrice: number;
|
|
15100
|
-
}): BankType;
|
|
15095
|
+
declare function parseBankRaw(address: PublicKey, accountParsed: BankRaw, bankMetadata?: BankMetadata$2): BankType;
|
|
15101
15096
|
declare function dtoToBank(bankDto: BankTypeDto): BankType;
|
|
15102
15097
|
declare function dtoToEmodeSettings(emodeSettingsDto: EmodeSettingsDto): EmodeSettingsType;
|
|
15103
15098
|
declare function dtoToBankConfig(bankConfigDto: BankConfigDto): BankConfigType;
|
|
@@ -18699,8 +18694,6 @@ declare class Bank implements BankType {
|
|
|
18699
18694
|
readonly mint: PublicKey;
|
|
18700
18695
|
readonly mintDecimals: number;
|
|
18701
18696
|
readonly group: PublicKey;
|
|
18702
|
-
readonly mintRate: number | null;
|
|
18703
|
-
readonly mintPrice: number;
|
|
18704
18697
|
readonly assetShareValue: BigNumber$1;
|
|
18705
18698
|
readonly liabilityShareValue: BigNumber$1;
|
|
18706
18699
|
readonly liquidityVault: PublicKey;
|
|
@@ -18747,7 +18740,7 @@ declare class Bank implements BankType {
|
|
|
18747
18740
|
readonly lendingPositionCount?: BigNumber$1 | undefined;
|
|
18748
18741
|
readonly borrowingPositionCount?: BigNumber$1 | undefined;
|
|
18749
18742
|
readonly tokenSymbol?: string | undefined;
|
|
18750
|
-
constructor(address: PublicKey, mint: PublicKey, mintDecimals: number, group: PublicKey,
|
|
18743
|
+
constructor(address: PublicKey, mint: PublicKey, mintDecimals: number, group: PublicKey, assetShareValue: BigNumber$1, liabilityShareValue: BigNumber$1, liquidityVault: PublicKey, liquidityVaultBump: number, liquidityVaultAuthorityBump: number, insuranceVault: PublicKey, insuranceVaultBump: number, insuranceVaultAuthorityBump: number, collectedInsuranceFeesOutstanding: BigNumber$1, feeVault: PublicKey, feeVaultBump: number, feeVaultAuthorityBump: number, collectedGroupFeesOutstanding: BigNumber$1, lastUpdate: number, config: BankConfig, totalAssetShares: BigNumber$1, totalLiabilityShares: BigNumber$1, emissionsActiveBorrowing: boolean, emissionsActiveLending: boolean, emissionsRate: number, emissionsMint: PublicKey, emissionsRemaining: BigNumber$1, oracleKey: PublicKey, emode: EmodeSettings, kaminoIntegrationAccounts?: {
|
|
18751
18744
|
kaminoReserve: PublicKey;
|
|
18752
18745
|
kaminoObligation: PublicKey;
|
|
18753
18746
|
} | undefined, driftIntegrationAccounts?: {
|
package/dist/index.d.ts
CHANGED
|
@@ -14736,8 +14736,6 @@ interface BankType {
|
|
|
14736
14736
|
group: PublicKey;
|
|
14737
14737
|
mint: PublicKey;
|
|
14738
14738
|
mintDecimals: number;
|
|
14739
|
-
mintRate: number | null;
|
|
14740
|
-
mintPrice: number;
|
|
14741
14739
|
assetShareValue: BigNumber$1;
|
|
14742
14740
|
liabilityShareValue: BigNumber$1;
|
|
14743
14741
|
liquidityVault: PublicKey;
|
|
@@ -15094,10 +15092,7 @@ interface BankMetadata$2 {
|
|
|
15094
15092
|
tokenName: string;
|
|
15095
15093
|
tokenSymbol: string;
|
|
15096
15094
|
}
|
|
15097
|
-
declare function parseBankRaw(address: PublicKey, accountParsed: BankRaw, bankMetadata?: BankMetadata$2
|
|
15098
|
-
mintRate: number | null;
|
|
15099
|
-
mintPrice: number;
|
|
15100
|
-
}): BankType;
|
|
15095
|
+
declare function parseBankRaw(address: PublicKey, accountParsed: BankRaw, bankMetadata?: BankMetadata$2): BankType;
|
|
15101
15096
|
declare function dtoToBank(bankDto: BankTypeDto): BankType;
|
|
15102
15097
|
declare function dtoToEmodeSettings(emodeSettingsDto: EmodeSettingsDto): EmodeSettingsType;
|
|
15103
15098
|
declare function dtoToBankConfig(bankConfigDto: BankConfigDto): BankConfigType;
|
|
@@ -18699,8 +18694,6 @@ declare class Bank implements BankType {
|
|
|
18699
18694
|
readonly mint: PublicKey;
|
|
18700
18695
|
readonly mintDecimals: number;
|
|
18701
18696
|
readonly group: PublicKey;
|
|
18702
|
-
readonly mintRate: number | null;
|
|
18703
|
-
readonly mintPrice: number;
|
|
18704
18697
|
readonly assetShareValue: BigNumber$1;
|
|
18705
18698
|
readonly liabilityShareValue: BigNumber$1;
|
|
18706
18699
|
readonly liquidityVault: PublicKey;
|
|
@@ -18747,7 +18740,7 @@ declare class Bank implements BankType {
|
|
|
18747
18740
|
readonly lendingPositionCount?: BigNumber$1 | undefined;
|
|
18748
18741
|
readonly borrowingPositionCount?: BigNumber$1 | undefined;
|
|
18749
18742
|
readonly tokenSymbol?: string | undefined;
|
|
18750
|
-
constructor(address: PublicKey, mint: PublicKey, mintDecimals: number, group: PublicKey,
|
|
18743
|
+
constructor(address: PublicKey, mint: PublicKey, mintDecimals: number, group: PublicKey, assetShareValue: BigNumber$1, liabilityShareValue: BigNumber$1, liquidityVault: PublicKey, liquidityVaultBump: number, liquidityVaultAuthorityBump: number, insuranceVault: PublicKey, insuranceVaultBump: number, insuranceVaultAuthorityBump: number, collectedInsuranceFeesOutstanding: BigNumber$1, feeVault: PublicKey, feeVaultBump: number, feeVaultAuthorityBump: number, collectedGroupFeesOutstanding: BigNumber$1, lastUpdate: number, config: BankConfig, totalAssetShares: BigNumber$1, totalLiabilityShares: BigNumber$1, emissionsActiveBorrowing: boolean, emissionsActiveLending: boolean, emissionsRate: number, emissionsMint: PublicKey, emissionsRemaining: BigNumber$1, oracleKey: PublicKey, emode: EmodeSettings, kaminoIntegrationAccounts?: {
|
|
18751
18744
|
kaminoReserve: PublicKey;
|
|
18752
18745
|
kaminoObligation: PublicKey;
|
|
18753
18746
|
} | undefined, driftIntegrationAccounts?: {
|
package/dist/index.js
CHANGED
|
@@ -16044,7 +16044,7 @@ function parseEmodeSettingsRaw(emodeSettingsRaw) {
|
|
|
16044
16044
|
};
|
|
16045
16045
|
return emodeSettings;
|
|
16046
16046
|
}
|
|
16047
|
-
function parseBankRaw(address, accountParsed, bankMetadata
|
|
16047
|
+
function parseBankRaw(address, accountParsed, bankMetadata) {
|
|
16048
16048
|
const flags = accountParsed.flags.toNumber();
|
|
16049
16049
|
const mint = accountParsed.mint;
|
|
16050
16050
|
const mintDecimals = accountParsed.mintDecimals;
|
|
@@ -16143,8 +16143,6 @@ function parseBankRaw(address, accountParsed, bankMetadata, mintData) {
|
|
|
16143
16143
|
borrowingPositionCount,
|
|
16144
16144
|
emode,
|
|
16145
16145
|
tokenSymbol,
|
|
16146
|
-
mintRate: mintData?.mintRate ?? null,
|
|
16147
|
-
mintPrice: mintData?.mintPrice ?? 0,
|
|
16148
16146
|
kaminoIntegrationAccounts,
|
|
16149
16147
|
driftIntegrationAccounts,
|
|
16150
16148
|
solendIntegrationAccounts,
|
|
@@ -16185,9 +16183,6 @@ function dtoToBank(bankDto) {
|
|
|
16185
16183
|
feesDestinationAccount: bankDto.feesDestinationAccount ? new PublicKey(bankDto.feesDestinationAccount) : void 0,
|
|
16186
16184
|
lendingPositionCount: bankDto.lendingPositionCount ? new BigNumber3(bankDto.lendingPositionCount) : void 0,
|
|
16187
16185
|
borrowingPositionCount: bankDto.borrowingPositionCount ? new BigNumber3(bankDto.borrowingPositionCount) : void 0,
|
|
16188
|
-
mintRate: null,
|
|
16189
|
-
// TODO: move these out
|
|
16190
|
-
mintPrice: 0,
|
|
16191
16186
|
kaminoIntegrationAccounts: bankDto.kaminoIntegrationAccounts ? {
|
|
16192
16187
|
kaminoReserve: new PublicKey(bankDto.kaminoIntegrationAccounts.kaminoReserve),
|
|
16193
16188
|
kaminoObligation: new PublicKey(bankDto.kaminoIntegrationAccounts.kaminoObligation)
|
|
@@ -43799,7 +43794,7 @@ var SEED_RESERVE = "reserve";
|
|
|
43799
43794
|
var SEED_RATE_MODEL = "rate_model";
|
|
43800
43795
|
var SEED_USER_SUPPLY_POSITION = "user_supply_position";
|
|
43801
43796
|
var SEED_LENDING_REWARDS_RATE_MODEL = "lending_rewards_rate_model";
|
|
43802
|
-
function getAllDerivedJupLendAccounts(mint) {
|
|
43797
|
+
function getAllDerivedJupLendAccounts(mint, tokenProgram) {
|
|
43803
43798
|
const [fTokenMint] = deriveJupLendFTokenMint(mint);
|
|
43804
43799
|
const [lending] = deriveJupLendLending(mint, fTokenMint);
|
|
43805
43800
|
const [liquidity] = deriveJupLendLiquidity();
|
|
@@ -43809,7 +43804,7 @@ function getAllDerivedJupLendAccounts(mint) {
|
|
|
43809
43804
|
supplyTokenReservesLiquidity: deriveJupLendTokenReserve(mint)[0],
|
|
43810
43805
|
lendingSupplyPositionOnLiquidity: deriveJupLendLiquiditySupplyPositionPda(mint, lending)[0],
|
|
43811
43806
|
rateModel: deriveJupLendRateModel(mint)[0],
|
|
43812
|
-
vault: deriveJupLendLiquidityVaultAta(mint, liquidity),
|
|
43807
|
+
vault: deriveJupLendLiquidityVaultAta(mint, liquidity, tokenProgram),
|
|
43813
43808
|
liquidity,
|
|
43814
43809
|
rewardsRateModel: deriveJupLendLendingRewardsRateModel(mint)[0]
|
|
43815
43810
|
};
|
|
@@ -45549,7 +45544,7 @@ async function makeJuplendWithdrawIx2({
|
|
|
45549
45544
|
lendingAdmin,
|
|
45550
45545
|
rateModel,
|
|
45551
45546
|
vault,
|
|
45552
|
-
liquidity} = getAllDerivedJupLendAccounts(bank.mint);
|
|
45547
|
+
liquidity} = getAllDerivedJupLendAccounts(bank.mint, tokenProgram);
|
|
45553
45548
|
if (opts.observationBanksOverride) {
|
|
45554
45549
|
remainingAccounts.push(...opts.observationBanksOverride);
|
|
45555
45550
|
} else {
|
|
@@ -46172,7 +46167,7 @@ async function makeJuplendDepositIx2({
|
|
|
46172
46167
|
if (!bank.jupLendIntegrationAccounts) {
|
|
46173
46168
|
throw new Error("Bank has no JupLend integration accounts");
|
|
46174
46169
|
}
|
|
46175
|
-
const derivedAccounts = getAllDerivedJupLendAccounts(bank.mint);
|
|
46170
|
+
const derivedAccounts = getAllDerivedJupLendAccounts(bank.mint, tokenProgram);
|
|
46176
46171
|
const {
|
|
46177
46172
|
fTokenMint,
|
|
46178
46173
|
lendingAdmin,
|
|
@@ -50861,13 +50856,11 @@ async function fetchBankIntegrationMetadata(options) {
|
|
|
50861
50856
|
return bankIntegrationMap;
|
|
50862
50857
|
}
|
|
50863
50858
|
var Bank = class _Bank {
|
|
50864
|
-
constructor(address, mint, mintDecimals, group,
|
|
50859
|
+
constructor(address, mint, mintDecimals, group, assetShareValue, liabilityShareValue, liquidityVault, liquidityVaultBump, liquidityVaultAuthorityBump, insuranceVault, insuranceVaultBump, insuranceVaultAuthorityBump, collectedInsuranceFeesOutstanding, feeVault, feeVaultBump, feeVaultAuthorityBump, collectedGroupFeesOutstanding, lastUpdate, config, totalAssetShares, totalLiabilityShares, emissionsActiveBorrowing, emissionsActiveLending, emissionsRate, emissionsMint, emissionsRemaining, oracleKey, emode, kaminoIntegrationAccounts, driftIntegrationAccounts, solendIntegrationAccounts, jupLendIntegrationAccounts, feesDestinationAccount, lendingPositionCount, borrowingPositionCount, tokenSymbol) {
|
|
50865
50860
|
this.address = address;
|
|
50866
50861
|
this.mint = mint;
|
|
50867
50862
|
this.mintDecimals = mintDecimals;
|
|
50868
50863
|
this.group = group;
|
|
50869
|
-
this.mintRate = mintRate;
|
|
50870
|
-
this.mintPrice = mintPrice;
|
|
50871
50864
|
this.assetShareValue = assetShareValue;
|
|
50872
50865
|
this.liabilityShareValue = liabilityShareValue;
|
|
50873
50866
|
this.liquidityVault = liquidityVault;
|
|
@@ -50937,8 +50930,6 @@ var Bank = class _Bank {
|
|
|
50937
50930
|
bankType.mint,
|
|
50938
50931
|
bankType.mintDecimals,
|
|
50939
50932
|
bankType.group,
|
|
50940
|
-
bankType.mintRate,
|
|
50941
|
-
bankType.mintPrice,
|
|
50942
50933
|
bankType.assetShareValue,
|
|
50943
50934
|
bankType.liabilityShareValue,
|
|
50944
50935
|
bankType.liquidityVault,
|
|
@@ -50980,8 +50971,6 @@ var Bank = class _Bank {
|
|
|
50980
50971
|
props.mint,
|
|
50981
50972
|
props.mintDecimals,
|
|
50982
50973
|
props.group,
|
|
50983
|
-
props.mintRate,
|
|
50984
|
-
props.mintPrice,
|
|
50985
50974
|
props.assetShareValue,
|
|
50986
50975
|
props.liabilityShareValue,
|
|
50987
50976
|
props.liquidityVault,
|