Working on recoding so that we can use spl tokens

js/packages/cli/src/fair-launch-cli.ts

@@ -418,6 +418,16 @@ program
     const remainingAccounts = [];
     const instructions = [];
     const signers = [];
+    //@ts-ignore
+    const tokenAta = fairLaunchObj.treasuryMint
+      ? (
+          await getAtaForMint(
+            //@ts-ignore
+            fairLaunchObj.treasuryMint,
+            walletKeyPair.publicKey,
+          )
+        )[0]
+      : undefined;
 
     //@ts-ignore
     if (!fairLaunchObj.treasuryMint) {
@@ -434,13 +444,6 @@ program
       );
       const mintInfo = await token.getMintInfo();
       amountNumber = Math.ceil(amountNumber * 10 ** mintInfo.decimals);
-      const tokenAta = (
-        await getAtaForMint(
-          //@ts-ignore
-          fairLaunchObj.treasuryMint,
-          walletKeyPair.publicKey,
-        )
-      )[0];
 
       instructions.push(
         Token.createApproveInstruction(
@@ -479,7 +482,11 @@ program
       });
     }
 
-    await anchorProgram.rpc.purchaseTicket(bump, new anchor.BN(amountNumber), {
+    instructions.push(
+      await anchorProgram.instruction.purchaseTicket(
+        bump,
+        new anchor.BN(amountNumber),
+        {
           accounts: {
             fairLaunchTicket,
             fairLaunch,
@@ -492,17 +499,43 @@ program
             clock: anchor.web3.SYSVAR_CLOCK_PUBKEY,
           },
           remainingAccounts,
-      signers,
+        },
-      instructions: instructions.length > 0 ? instructions : undefined,
+      ),
-    });
+    );
 
+    if (tokenAta) {
+      instructions.push(
+        Token.createRevokeInstruction(
+          TOKEN_PROGRAM_ID,
+          tokenAta,
+          walletKeyPair.publicKey,
+          [],
+        ),
+      );
+    }
+
+    await sendTransactionWithRetryWithKeypair(
+      anchorProgram.provider.connection,
+      walletKeyPair,
+      instructions,
+      signers,
+      'max',
+    );
     console.log(
       `create fair launch ticket Done: ${fairLaunchTicket.toBase58()}. Trying to create seq now...we may or may not get a validator with data on chain. Either way, your ticket is secure.`,
     );
 
+    let fairLaunchTicketObj;
+    for (let i = 0; i < 10; i++) {
       await sleep(5000);
-    const fairLaunchTicketObj =
+      try {
+        fairLaunchTicketObj =
           await anchorProgram.account.fairLaunchTicket.fetch(fairLaunchTicket);
+        break;
+      } catch (e) {
+        console.log('Not found. Trying again...');
+      }
+    }
 
     const [fairLaunchTicketSeqLookup, seqBump] =
       await getFairLaunchTicketSeqLookup(
@@ -683,7 +716,16 @@ async function adjustTicket({
   const remainingAccounts = [];
   const instructions = [];
   const signers = [];
-
+  //@ts-ignore
+  const tokenAta = fairLaunchObj.treasuryMint
+    ? (
+        await getAtaForMint(
+          //@ts-ignore
+          fairLaunchObj.treasuryMint,
+          adjuster,
+        )
+      )[0]
+    : undefined;
   //@ts-ignore
   if (!fairLaunchObj.treasuryMint) {
     amountNumber = Math.ceil(amountNumber * LAMPORTS_PER_SOL);
@@ -698,18 +740,17 @@ async function adjustTicket({
     );
 
     const mintInfo = await token.getMintInfo();
+    amountNumber = Math.ceil(amountNumber * 10 ** mintInfo.decimals);
     if (amountNumber > 0) {
       instructions.push(
         Token.createApproveInstruction(
           TOKEN_PROGRAM_ID,
-          //@ts-ignore
+          tokenAta,
-          fairLaunchObj.treasuryMint,
           transferAuthority.publicKey,
           adjuster,
           [],
           //@ts-ignore
-          amountNumber * 10 ** mintInfo.decimals +
+          amountNumber,
-            fairLaunchObj.data.fees.toNumber(),
         ),
       );
     }
@@ -721,13 +762,7 @@ async function adjustTicket({
       isSigner: false,
     });
     remainingAccounts.push({
-      pubkey: (
+      pubkey: tokenAta,
-        await getAtaForMint(
-          //@ts-ignore
-          fairLaunchObj.treasuryMint,
-          adjuster,
-        )
-      )[0],
       isWritable: true,
       isSigner: false,
     });
@@ -743,7 +778,8 @@ async function adjustTicket({
     });
   }
 
-  await anchorProgram.rpc.adjustTicket(new anchor.BN(amountNumber), {
+  instructions.push(
+    await anchorProgram.instruction.adjustTicket(new anchor.BN(amountNumber), {
       accounts: {
         fairLaunchTicket,
         fairLaunch,
@@ -762,9 +798,27 @@ async function adjustTicket({
         },
         ...remainingAccounts,
       ],
+    }),
+  );
+
+  //@ts-ignore
+  if (fairLaunchObj.treasuryMint && amountNumber > 0) {
+    instructions.push(
+      Token.createRevokeInstruction(
+        FAIR_LAUNCH_PROGRAM_ID,
+        tokenAta,
+        payer.publicKey,
+        [],
+      ),
+    );
+  }
+
+  await sendTransactionWithRetryWithKeypair(
+    anchorProgram.provider.connection,
+    payer,
+    instructions,
     signers,
-    instructions: instructions.length > 0 ? instructions : undefined,
+  );
-  });
 
   console.log(
     `update fair launch ticket Done: ${fairLaunchTicket.toBase58()}.`,
@@ -1412,7 +1466,7 @@ program
       Token.createApproveInstruction(
         TOKEN_PROGRAM_ID,
         //@ts-ignore
-        fairLaunchObj.tokenMint,
+        buyerTokenAccount,
         transferAuthority.publicKey,
         walletKeyPair.publicKey,
         [],

rust/fair-launch/src/lib.rs

@@ -11,6 +11,7 @@ use {
         prelude::*,
         solana_program::{
             program::{invoke, invoke_signed},
+            program_option::COption,
             program_pack::Pack,
             system_instruction, system_program,
         },
@@ -317,10 +318,11 @@ pub mod fair_launch {
                 return Err(ErrorCode::TreasuryMintMismatch.into());
             }
 
-            if buyer_token_account.delegate.is_some() {
+            if let COption::Some(val) = buyer_token_account.delegate {
-                msg!("Delegate {}", buyer_token_account.delegate.unwrap());
+                if val != *transfer_authority_info.key {
                     return Err(ErrorCode::AccountShouldHaveNoDelegates.into());
                 }
+            }
 
             assert_owned_by(treasury_mint_info, &token_program.key)?;
             assert_owned_by(buyer_token_account_info, &token_program.key)?;
@@ -517,9 +519,11 @@ pub mod fair_launch {
                 ],
             )?;
 
-            if buyer_token_account.delegate.is_some() {
+            if let COption::Some(val) = buyer_token_account.delegate {
+                if val != *transfer_authority_info.key {
                     return Err(ErrorCode::AccountShouldHaveNoDelegates.into());
                 }
+            }
 
             let signer_seeds = [
                 PREFIX.as_bytes(),