feat(sdk): use classic TokenProgram for SpendingLimits by default

Squads-Protocol · Jul 3, 2023 · dd0f478 · dd0f478
1 parent c2e81e1
commit dd0f478
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/sdk/multisig/src/instructions/spendingLimitUse.ts b/sdk/multisig/src/instructions/spendingLimitUse.ts
@@ -5,7 +5,7 @@ import {
 } from "@solana/web3.js";
 import {
   getAssociatedTokenAddressSync,
-  TOKEN_2022_PROGRAM_ID,
+  TOKEN_PROGRAM_ID,
   ASSOCIATED_TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
 import { createSpendingLimitUseInstruction } from "../generated";
@@ -20,6 +20,7 @@ export function spendingLimitUse({
   amount,
   decimals,
   destination,
+  tokenProgram = TOKEN_PROGRAM_ID,
   memo,
 }: {
   multisigPda: PublicKey;
@@ -31,6 +32,7 @@ export function spendingLimitUse({
   amount: number;
   decimals: number;
   destination: PublicKey;
+  tokenProgram?: PublicKey;
   memo?: string;
 }): TransactionInstruction {
   const [vaultPda] = getVaultPda({ multisigPda, index: vaultIndex });
@@ -41,7 +43,7 @@ export function spendingLimitUse({
       mint,
       vaultPda,
       true,
-      TOKEN_2022_PROGRAM_ID,
+      tokenProgram,
       ASSOCIATED_TOKEN_PROGRAM_ID
     );
 
@@ -51,12 +53,10 @@ export function spendingLimitUse({
       mint,
       destination,
       true,
-      TOKEN_2022_PROGRAM_ID,
+      tokenProgram,
       ASSOCIATED_TOKEN_PROGRAM_ID
     );
 
-  const tokenProgram = mint ? TOKEN_2022_PROGRAM_ID : undefined;
-
   return createSpendingLimitUseInstruction(
     {
       multisig: multisigPda,
@@ -68,7 +68,7 @@ export function spendingLimitUse({
       mint,
       vaultTokenAccount,
       destinationTokenAccount,
-      tokenProgram,
+      tokenProgram: mint ? tokenProgram : undefined,
     },
     { args: { amount, decimals, memo: memo ?? null } }
   );

diff --git a/sdk/multisig/src/rpc/spendingLimitUse.ts b/sdk/multisig/src/rpc/spendingLimitUse.ts
@@ -19,6 +19,7 @@ export async function spendingLimitUse({
   amount,
   decimals,
   destination,
+  tokenProgram,
   memo,
   sendOptions,
 }: {
@@ -33,6 +34,7 @@ export async function spendingLimitUse({
   amount: number;
   decimals: number;
   destination: PublicKey;
+  tokenProgram?: PublicKey;
   memo?: string;
   sendOptions?: SendOptions;
 }): Promise<TransactionSignature> {
@@ -49,6 +51,7 @@ export async function spendingLimitUse({
     amount,
     decimals,
     destination,
+    tokenProgram,
     memo,
   });
 

diff --git a/sdk/multisig/src/transactions/spendingLimitUse.ts b/sdk/multisig/src/transactions/spendingLimitUse.ts
@@ -20,6 +20,7 @@ export function spendingLimitUse({
   amount,
   decimals,
   destination,
+  tokenProgram,
   memo,
 }: {
   blockhash: string;
@@ -33,6 +34,7 @@ export function spendingLimitUse({
   amount: number;
   decimals: number;
   destination: PublicKey;
+  tokenProgram?: PublicKey;
   memo?: string;
 }): VersionedTransaction {
   const message = new TransactionMessage({
@@ -48,6 +50,7 @@ export function spendingLimitUse({
         amount,
         decimals,
         destination,
+        tokenProgram,
         memo,
       }),
     ],

diff --git a/tests/suites/examples/spending-limits.ts b/tests/suites/examples/spending-limits.ts
@@ -11,7 +11,7 @@ import {
   createMint,
   getAssociatedTokenAddressSync,
   mintTo,
-  TOKEN_2022_PROGRAM_ID,
+  TOKEN_PROGRAM_ID,
   createAssociatedTokenAccountInstruction,
   createAssociatedTokenAccount,
 } from "@solana/spl-token";
@@ -85,7 +85,7 @@ describe("Examples / Spending Limits", () => {
       mintDecimals,
       undefined,
       undefined,
-      TOKEN_2022_PROGRAM_ID
+      TOKEN_PROGRAM_ID
     );
 
     splSpendingLimitParams = {
@@ -106,7 +106,7 @@ describe("Examples / Spending Limits", () => {
       splMint,
       vaultPda,
       true,
-      TOKEN_2022_PROGRAM_ID,
+      TOKEN_PROGRAM_ID,
       ASSOCIATED_TOKEN_PROGRAM_ID
     );
     const message = new TransactionMessage({
@@ -118,7 +118,7 @@ describe("Examples / Spending Limits", () => {
           vaultTokenAccount,
           vaultPda,
           splMint,
-          TOKEN_2022_PROGRAM_ID,
+          TOKEN_PROGRAM_ID,
           ASSOCIATED_TOKEN_PROGRAM_ID
         ),
       ],
@@ -137,7 +137,7 @@ describe("Examples / Spending Limits", () => {
       100 * 10 ** mintDecimals,
       undefined,
       undefined,
-      TOKEN_2022_PROGRAM_ID
+      TOKEN_PROGRAM_ID
     );
   });
 
@@ -341,7 +341,7 @@ describe("Examples / Spending Limits", () => {
       splMint,
       destination,
       undefined,
-      TOKEN_2022_PROGRAM_ID,
+      TOKEN_PROGRAM_ID,
       ASSOCIATED_TOKEN_PROGRAM_ID
     );
 
@@ -366,6 +366,7 @@ describe("Examples / Spending Limits", () => {
         decimals: 6,
         // Transfer tokens to one of the allowed destinations.
         destination,
+        tokenProgram: TOKEN_PROGRAM_ID,
         // You can optionally add a memo.
         memo: "Using my allowance!",
       })
@@ -398,6 +399,7 @@ describe("Examples / Spending Limits", () => {
           amount: 1,
           decimals: 6,
           destination,
+          tokenProgram: TOKEN_PROGRAM_ID,
         }),
       /Spending limit exceeded/
     );