Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
@wphan
wphan committed Jan 11, 2024
1 parent 6f45099 commit a98ec19
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 45 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},
"devDependencies": {
"@coral-xyz/anchor": "^0.26.0",
"@drift-labs/competitions-sdk": "0.2.125",
"@drift-labs/sdk": "2.54.0-beta.3",
"@drift-labs/competitions-sdk": "0.2.131",
"@drift-labs/sdk": "2.54.0-beta.9",
"@solana/web3.js": "1.73.2",
"@types/bn.js": "^5.1.0",
"@types/chai": "^4.3.0",
Expand Down
15 changes: 13 additions & 2 deletions ts/sdk/cli/commands/vaultInvariantChecks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,15 @@ export const vaultInvariantChecks = async (program: Command, cmdOpts: OptionValu
const spotMarket = driftVault.driftClient.getSpotMarketAccount(vault.spotMarketIndex);
const spotPrecision = new BN(10).pow(new BN(spotMarket!.decimals));

const allVaultDepositors = await driftVault.getAllVaultDepositors(vaultAddress);
let allVaultDepositors = await driftVault.getAllVaultDepositors(vaultAddress);

// Sort allVaultDepositors by vaultShares in descending order
allVaultDepositors = allVaultDepositors.sort((a, b) => b.account.vaultShares.cmp(a.account.vaultShares));

let totalUserShares = new BN(0);
let totalUserProfitSharePaid = new BN(0);
let totalUserProfitShareSharesPaid = new BN(0);
let totalPendingProfitShareAmount = new BN(0);

for (const vd of allVaultDepositors) {
totalUserShares = totalUserShares.add(vd.account.vaultShares);
Expand All @@ -54,10 +59,12 @@ export const vaultInvariantChecks = async (program: Command, cmdOpts: OptionValu
// console.log(`Profit share paid: ${vd.publicKey.toBase58()} (auth: ${vd.account.authority.toBase58()}): ${Math.ceil(profitSharePaid * 100.0)}%`);
}
totalUserProfitSharePaid = totalUserProfitSharePaid.add(vd.account.profitShareFeePaid);
totalUserProfitShareSharesPaid = totalUserProfitShareSharesPaid.add(vd.account.cumulativeProfitShareAmount);

const pendingProfitShares = calculateApplyProfitShare(vd.account, vaultEquity, vault);
totalPendingProfitShareAmount = totalPendingProfitShareAmount.add(pendingProfitShares.profitShareAmount);

console.log(`Pending profit shares: ${vd.publicKey.toBase58()} (auth: ${vd.account.authority.toBase58()}): $${convertToNumber(pendingProfitShares.profitShareAmount, spotPrecision)}`);
console.log(` . ${pendingProfitShares.profitShareShares}, ${pendingProfitShares.profitShareAmount}`);
}
console.log(`==== Vault Depositor Shares == vault.user_shares ====`);
console.log(`total vd shares: ${totalUserShares.toString()}`);
Expand All @@ -69,4 +76,8 @@ export const vaultInvariantChecks = async (program: Command, cmdOpts: OptionValu
console.log(`total vault d profitshares: ${totalUserProfitSharePaid.toString()}`);
console.log(`vault total profit shares: ${vault.managerTotalProfitShare.toString()}`);
console.log(`diff: ${vault.managerTotalProfitShare.sub(totalUserProfitSharePaid)}`);

console.log(``);
console.log(`==== Pending profit shares to realize ====`);
console.log(`${convertToNumber(totalPendingProfitShareAmount, spotPrecision)}`);
};
4 changes: 2 additions & 2 deletions ts/sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"dependencies": {
"@coral-xyz/anchor": "^0.26.0",
"@drift-labs/competitions-sdk": "0.2.73",
"@drift-labs/sdk": "2.54.0-beta.3",
"@drift-labs/competitions-sdk": "0.2.131",
"@drift-labs/sdk": "2.54.0-beta.9",
"@solana/web3.js": "1.73.2",
"commander": "^11.0.0",
"dotenv": "^16.3.1",
Expand Down
9 changes: 2 additions & 7 deletions ts/sdk/src/vaultClient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,15 @@ export class VaultClient {
}

public async getSubscribedVaultUser(vaultDriftUserAccountPubKey: PublicKey) {
let vaultUser = this.vaultUsers.get(
vaultDriftUserAccountPubKey.toBase58()
);
let vaultUser = this.vaultUsers.get(vaultDriftUserAccountPubKey.toBase58());

if (!vaultUser) {
vaultUser = new User({
driftClient: this.driftClient,
userAccountPublicKey: vaultDriftUserAccountPubKey,
});
await vaultUser.subscribe();
this.vaultUsers.set(
vaultDriftUserAccountPubKey.toBase58(),
vaultUser
);
this.vaultUsers.set(vaultDriftUserAccountPubKey.toBase58(), vaultUser);
}

if (!vaultUser?.isSubscribed) {
Expand Down
32 changes: 9 additions & 23 deletions ts/sdk/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@
dependencies:
"@jridgewell/trace-mapping" "0.3.9"

"@drift-labs/[email protected].73":
version "0.2.73"
resolved "https://registry.yarnpkg.com/@drift-labs/competitions-sdk/-/competitions-sdk-0.2.73.tgz#1f036b24cbfbfc6852c3dda40e5d1b02a5a307a4"
integrity sha512-Os3eaECzYZASLY3/lp0gDC2Wn4qIY4ipU5r9aOBL6bmbB+BXAndkFb9vX+wn1PGU6FBLYnjhCBWcROrZSVklSw==
"@drift-labs/[email protected].131":
version "0.2.131"
resolved "https://registry.yarnpkg.com/@drift-labs/competitions-sdk/-/competitions-sdk-0.2.131.tgz#5783ec8383dc0484ecb85290d19c32ea8584f7ea"
integrity sha512-o32ufvAiwyqe1PcoOHPiqFz9QnCxwdiMwj+HLzkocC+1T4TFl7/3DOGCbW0Pjfv6iPCdw76i2NhDo3WTMMqTvg==
dependencies:
"@coral-xyz/anchor" "^0.26.0"
"@drift-labs/sdk" "2.49.0-beta.10"
"@drift-labs/sdk" "2.54.0-beta.9"
"@solana/web3.js" "1.73.2"
"@switchboard-xyz/solana.js" "^2.7.1"
cerializr "^3.1.4"
Expand All @@ -117,24 +117,10 @@
ts-node "^10.9.1"
typescript "^5.1.6"

"@drift-labs/[email protected]":
version "2.49.0-beta.10"
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.10.tgz#0d2021daf10174c6d19a07a6e36e6271ea465ecf"
integrity sha512-jSSqinLAajbqG2DxRGblKPrflp7w3/oqQ+di5YXVRRexsKs43XBkoApTtsoRy5KpNB3pkG3em88iwdk99a7hJg==
dependencies:
"@coral-xyz/anchor" "0.28.1-beta.2"
"@ellipsis-labs/phoenix-sdk" "^1.4.2"
"@project-serum/serum" "^0.13.38"
"@pythnetwork/client" "2.5.3"
"@solana/spl-token" "^0.3.7"
"@solana/web3.js" "1.73.2"
strict-event-emitter-types "^2.0.0"
uuid "^8.3.2"

"@drift-labs/[email protected]":
version "2.54.0-beta.3"
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.3.tgz#909c427b8c1606e599116d3f3877bd691eb51645"
integrity sha512-jlOZGWzY4H0nCaf06b2CySELP8x8/3aOw8J0p+DMALht5k5UZWRTH0NavSTzgL883wOcCfd+7Tdwm9vAzmQItA==
"@drift-labs/[email protected]":
version "2.54.0-beta.9"
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.9.tgz#99a49f44df57b22cf39c1dfbab19e5d1c08c02cc"
integrity sha512-pf6gnt8IntOmN58gfPPIhkKEC4SIoKbXIiZ6YuYBCWiGlEiNSOPm9Jo0iqFlyl4ZYsFRVkjMHTXlWzRSAj56sw==
dependencies:
"@coral-xyz/anchor" "0.28.1-beta.2"
"@ellipsis-labs/phoenix-sdk" "^1.4.2"
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@
dependencies:
"@jridgewell/trace-mapping" "0.3.9"

"@drift-labs/[email protected].125":
version "0.2.125"
resolved "https://registry.yarnpkg.com/@drift-labs/competitions-sdk/-/competitions-sdk-0.2.125.tgz#4e9cc8f6a52d7ed06860336e9713d0868c67d76c"
integrity sha512-Z3JcVNN7SNewmW9hzvzhlNmApEVcntXI8DTvOgocHeAtxP4ogsU5uNFZpnltCfS3s4q7BziHXJw/4DuDOmydSQ==
"@drift-labs/[email protected].131":
version "0.2.131"
resolved "https://registry.yarnpkg.com/@drift-labs/competitions-sdk/-/competitions-sdk-0.2.131.tgz#5783ec8383dc0484ecb85290d19c32ea8584f7ea"
integrity sha512-o32ufvAiwyqe1PcoOHPiqFz9QnCxwdiMwj+HLzkocC+1T4TFl7/3DOGCbW0Pjfv6iPCdw76i2NhDo3WTMMqTvg==
dependencies:
"@coral-xyz/anchor" "^0.26.0"
"@drift-labs/sdk" "2.54.0-beta.3"
"@drift-labs/sdk" "2.54.0-beta.9"
"@solana/web3.js" "1.73.2"
"@switchboard-xyz/solana.js" "^2.7.1"
cerializr "^3.1.4"
Expand All @@ -138,10 +138,10 @@
ts-node "^10.9.1"
typescript "^5.1.6"

"@drift-labs/[email protected].3":
version "2.54.0-beta.3"
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.3.tgz#909c427b8c1606e599116d3f3877bd691eb51645"
integrity sha512-jlOZGWzY4H0nCaf06b2CySELP8x8/3aOw8J0p+DMALht5k5UZWRTH0NavSTzgL883wOcCfd+7Tdwm9vAzmQItA==
"@drift-labs/[email protected].9":
version "2.54.0-beta.9"
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.9.tgz#99a49f44df57b22cf39c1dfbab19e5d1c08c02cc"
integrity sha512-pf6gnt8IntOmN58gfPPIhkKEC4SIoKbXIiZ6YuYBCWiGlEiNSOPm9Jo0iqFlyl4ZYsFRVkjMHTXlWzRSAj56sw==
dependencies:
"@coral-xyz/anchor" "0.28.1-beta.2"
"@ellipsis-labs/phoenix-sdk" "^1.4.2"
Expand Down

0 comments on commit a98ec19

Please sign in to comment.