fatcat: stake

glamsystems · Jan 28, 2025 · 3dec231 · 3dec231
1 parent 1b9e254
commit 3dec231
Show file tree

Hide file tree

Showing 12 changed files with 473 additions and 1,359 deletions.
diff --git a/anchor/package.json b/anchor/package.json
@@ -4,6 +4,7 @@
   "description": "TypeScript SDK for GLAM Protocol",
   "main": "./index.cjs",
   "module": "./index.esm.js",
+  "exports": "./src",
   "homepage": "https://www.glam.systems",
   "repository": {
     "type": "git",

diff --git a/anchor/programs/glam/src/instructions/jupiter.rs b/anchor/programs/glam/src/instructions/jupiter.rs
@@ -342,7 +342,7 @@ pub fn init_locked_voter_escrow_handler<'info>(ctx: Context<InitLockedVoterEscro
             locker: ctx.accounts.locker.to_account_info(),
             escrow: ctx.accounts.escrow.to_account_info(),
             escrow_owner: ctx.accounts.vault.to_account_info(),
-            payer: ctx.accounts.vault.to_account_info(),
+            payer: ctx.accounts.signer.to_account_info(),
             system_program: ctx.accounts.system_program.to_account_info(),
         },
         vault_signer_seeds,
@@ -444,7 +444,7 @@ pub fn increase_locked_amount_handler<'info>(
                 locker: ctx.accounts.locker.to_account_info(),
                 escrow: ctx.accounts.escrow.to_account_info(),
                 escrow_tokens: ctx.accounts.escrow_jup_ata.to_account_info(),
-                payer: ctx.accounts.vault.to_account_info(),
+                payer: ctx.accounts.signer.to_account_info(),
                 source_tokens: ctx.accounts.vault_jup_ata.to_account_info(),
                 token_program: ctx.accounts.token_program.to_account_info(),
             },
@@ -575,7 +575,7 @@ pub fn withdraw_all_staked_jup_handler<'info>(ctx: Context<WithdrawAllStakedJup>
             escrow_owner: ctx.accounts.vault.to_account_info(),
             escrow_tokens: ctx.accounts.escrow_jup_ata.to_account_info(),
             destination_tokens: ctx.accounts.vault_jup_ata.to_account_info(),
-            payer: ctx.accounts.vault.to_account_info(),
+            payer: ctx.accounts.signer.to_account_info(),
             token_program: ctx.accounts.token_program.to_account_info(),
         },
         vault_signer_seeds,
@@ -633,7 +633,7 @@ pub fn withdraw_partial_unstaking_handler<'info>(
             partial_unstake: ctx.accounts.partial_unstake.to_account_info(),
             escrow_tokens: ctx.accounts.escrow_jup_ata.to_account_info(),
             destination_tokens: ctx.accounts.vault_jup_ata.to_account_info(),
-            payer: ctx.accounts.vault.to_account_info(),
+            payer: ctx.accounts.signer.to_account_info(),
             token_program: ctx.accounts.token_program.to_account_info(),
         },
         vault_signer_seeds,
@@ -678,7 +678,7 @@ pub fn new_vote_handler<'info>(ctx: Context<NewVote>) -> Result<()> {
             JupNewVote {
                 proposal: ctx.accounts.proposal.to_account_info(),
                 vote: ctx.accounts.vote.to_account_info(),
-                payer: ctx.accounts.vault.to_account_info(),
+                payer: ctx.accounts.signer.to_account_info(),
                 system_program: ctx.accounts.system_program.to_account_info(),
             },
             vault_signer_seeds,

diff --git a/anchor/src/client/base.ts b/anchor/src/client/base.ts
@@ -141,7 +141,9 @@ export class BaseClient {
   isPhantom(): boolean {
     // TODO: Phantom can automatically estimates fees
     // https://docs.phantom.app/developer-powertools/solana-priority-fees#how-phantom-applies-priority-fees-to-dapp-transactions
-    return false;
+    return (
+      window?.phantom?.solana?.isPhantom && window?.phantom?.solana?.isConnected
+    );
   }
 
   /**

diff --git a/anchor/src/client/jupiter.ts b/anchor/src/client/jupiter.ts
@@ -125,7 +125,8 @@ export class JupiterClient {
     const escrowAccountInfo =
       await this.base.provider.connection.getAccountInfo(escrow);
     const escrowCreated = escrowAccountInfo ? true : false;
-    const preInstructions = [];
+    const preInstructions = txOptions.preInstructions || [];
+    console.log("preInstructions", preInstructions);
     if (!escrowCreated) {
       console.log("Will create escrow account:", escrow.toBase58());
       preInstructions.push(
@@ -149,7 +150,7 @@ export class JupiterClient {
       ),
     );
 
-    return await this.base.program.methods
+    const tx = await this.base.program.methods
       .increaseLockedAmount(amount)
       .accounts({
         state: statePda,
@@ -159,7 +160,15 @@ export class JupiterClient {
         vaultJupAta,
       })
       .preInstructions(preInstructions)
-      .rpc();
+      .transaction();
+
+    const vTx = await this.base.intoVersionedTransaction({
+      tx,
+      lookupTables: [],
+      ...txOptions,
+    });
+
+    return await this.base.sendAndConfirm(vTx);
   }
 
   public async unstakeJup(statePda: PublicKey, txOptions: TxOptions = {}) {

diff --git a/apps/fatcat/package.json b/apps/fatcat/package.json
@@ -9,7 +9,6 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@glamsystems/glam-sdk": "file:../../anchor",
     "@heroicons/react": "^2.1.5",
     "@hookform/resolvers": "^3.9.1",
     "@metaplex-foundation/mpl-toolbox": "^0.9.4",