@kamino-finance/klend-sdk 5.13.5 → 5.13.7

package/src/client_kamino_manager.ts

@@ -290,13 +290,20 @@ async function main() {
       const _createVaultSig = await processTxn(
         env.client,
         env.payer,
-        [...instructions.initVaultIxs, instructions.createLUTIx, instructions.initSharesMetadataIx],
+        [...instructions.createAtaIfNeededIxs, ...instructions.initVaultIxs, instructions.createLUTIx],
         mode,
         2500,
         [vaultKp]
       );
       await sleep(2000);
-      const _populateLUTSig = await processTxn(env.client, env.payer, instructions.populateLUTIxs, mode, 2500, []);
+      const _populateLUTSig = await processTxn(
+        env.client,
+        env.payer,
+        [...instructions.populateLUTIxs, ...instructions.cleanupIxs],
+        mode,
+        2500,
+        []
+      );
 
       const _setSharesMetadataSig = await processTxn(
         env.client,
@@ -679,6 +686,42 @@ async function main() {
       mode === 'execute' && console.log('Pending fees withdrawn:', withdrawPendingFeesSig);
     });
 
+  commands
+    .command('remove-vault-allocation')
+    .requiredOption('--vault <string>', 'Vault address')
+    .requiredOption('--reserve <string>', 'Reserve address')
+    .requiredOption(
+      `--mode <string>`,
+      'simulate - to print txn simulation, inspect - to get txn simulation in explorer, execute - execute txn, multisig - to get bs58 txn for multisig usage'
+    )
+    .option(`--staging`, 'If true, will use the staging programs')
+    .option(`--multisig <string>`, 'If using multisig mode this is required, otherwise will be ignored')
+    .action(async ({ vault, reserve, mode, staging, multisig }) => {
+      const env = initializeClient(mode === 'multisig', staging);
+      const reserveAddress = new PublicKey(reserve);
+      const vaultAddress = new PublicKey(vault);
+
+      if (mode === 'multisig' && !multisig) {
+        throw new Error('If using multisig mode, multisig is required');
+      }
+
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
+
+      const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
+      const instruction = await kaminoManager.removeReserveFromAllocationIx(kaminoVault, reserveAddress);
+
+      if (instruction) {
+        const updateVaultAllocationSig = await processTxn(env.client, env.payer, [instruction], mode, 2500, []);
+
+        mode === 'execute' && console.log('Vault allocation updated:', updateVaultAllocationSig);
+      }
+    });
+
   commands
     .command('stake')
     .requiredOption('--vault <string>', 'Vault address')

package/src/utils/metadata.ts

@@ -43,7 +43,7 @@ export function resolveMetadataFromToken(token: string, extra: string): { name:
   console.log('token', token);
   console.log('extra', extra);
   const name = `kVault ${token} ${extra}`;
-  const symbol = `kV${token.toUpperCase()}`;
+  const symbol = `kV-${token.toUpperCase()}`;
   return { name, symbol };
 }
 

package/src/utils/multisig.ts

@@ -0,0 +1,33 @@
+import { PublicKey } from '@solana/web3.js';
+
+const SQUADS_API_BASE_URL = 'https://4fnetmviidiqkjzenwxe66vgoa0soerr.lambda-url.us-east-1.on.aws/';
+
+export async function walletIsSquadsMultisig(wallet: PublicKey) {
+  const response = await fetch(`${SQUADS_API_BASE_URL}/is-multisig?wallet=${wallet.toBase58()}`);
+  const data = await response.json();
+  const squadsResponse = data as SquadsMultisigResponse;
+  return squadsResponse.isSquad;
+}
+
+// todo: find a way to get the admins number and threshold
+export async function getSquadsMultisigAdminsAndThreshold(_wallet: PublicKey): Promise<{
+  adminsNumber: number;
+  threshold: number;
+}> {
+  return {
+    adminsNumber: 1,
+    threshold: 1,
+  };
+}
+
+// {"isSquad":true,"version":"v3"}
+export type SquadsMultisigResponse = {
+  isSquad: boolean;
+  version: string;
+};
+
+export interface WalletType {
+  walletType: 'simpleWallet' | 'squadsMultisig';
+  walletAdminsNumber: number;
+  walletThreshold: number;
+}