added treasury amount input + transfer

Author: Shiva953

src/app/api/createCompanyVesting/route.ts

@@ -1,9 +1,10 @@
 import { NextResponse } from 'next/server';
 import { Connection, Cluster, clusterApiUrl, PublicKey, Transaction, Keypair, Signer } from '@solana/web3.js';
-import { TOKEN_PROGRAM_ID, createMintToInstruction } from '@solana/spl-token';
+import { TOKEN_PROGRAM_ID, createMintToInstruction, createTransferInstruction, getAssociatedTokenAddressSync } from '@solana/spl-token';
 import * as anchor from "@coral-xyz/anchor";
 import { Program, AnchorProvider } from "@coral-xyz/anchor";
 import { Vesting, IDL } from "../../types/vesting";
+import { getDecimalsAndSupplyToken } from '@/app/lib/utils';
 
 export async function POST(req: Request) {
   const contentType = req.headers.get('content-type');
@@ -12,54 +13,61 @@ export async function POST(req: Request) {
     return NextResponse.json({ success: false, error: 'Content-Type must be application/json' }, { status: 400 });
   }
 
-  const { company_name, mint, beneficiary } = await req.json();
+  const { company_name, mint, signer, treasuryAmount } = await req.json();
 
-  // Validate input
-  if (!company_name || !mint || !beneficiary) {
+  if (!company_name || !mint || !signer || !treasuryAmount) {
     return NextResponse.json({ success: false, error: 'Missing required fields' }, { status: 400 });
   }
 
   try {
     const cluster = 'devnet' as Cluster;
     const connection = new Connection(clusterApiUrl(cluster), "confirmed");
-    const beneficiaryPubKey = new PublicKey(beneficiary);
-    const wall = { publicKey: beneficiaryPubKey } as anchor.Wallet;
+    const vestingAccountOwner = new PublicKey(signer);
+    const wall = { publicKey: vestingAccountOwner } as anchor.Wallet;
     const provider = new AnchorProvider(connection, wall);
 
     anchor.setProvider(provider);
-    // const program = anchor.workspace.Vesting as Program<Vesting>;
     const program = new Program<Vesting>(IDL as Vesting, provider);
 
     const createVestingAccIxn = await program.methods.createVestingAccount(company_name)
       .accounts({ 
-        signer: beneficiaryPubKey,
+        signer: provider.wallet.publicKey,
         mint: new PublicKey(mint),
         tokenProgram: TOKEN_PROGRAM_ID 
       })
       .instruction();
 
-    let [treasuryTokenAccount] = PublicKey.findProgramAddressSync(
-      [Buffer.from("vesting treasury"), Buffer.from(company_name)],
-      program.programId
-    );
+      const sourceATA = getAssociatedTokenAddressSync(
+        new PublicKey(mint),
+        vestingAccountOwner
+      );
+
+      let [treasuryTokenAccount] = PublicKey.findProgramAddressSync(
+        [Buffer.from("vesting treasury"), Buffer.from(company_name)],
+        program.programId
+      );
+
+      let decimals = 9
+      const tokenData = await getDecimalsAndSupplyToken(connection, mint);
+      if(tokenData){
+        decimals = tokenData.decimals;
+      }
 
-    const amount = 10_000 * 10 ** 9;
-    const mintTokensIxn = createMintToInstruction(
-      new PublicKey(mint),
+    const amount = treasuryAmount * (10**decimals);
+    const transferTokensToTreasury = createTransferInstruction(
+      sourceATA,
       treasuryTokenAccount,
-      beneficiaryPubKey,
+      provider.wallet.publicKey,
       amount,
-      [],
-      TOKEN_PROGRAM_ID,
     );
 
     const tx = new Transaction();
     tx.add(createVestingAccIxn);
-    tx.add(mintTokensIxn);
+    tx.add(transferTokensToTreasury);
 
     const { blockhash } = await connection.getLatestBlockhash();
     const keypair = Keypair.generate();
-    tx.feePayer = new PublicKey(beneficiary);
+    tx.feePayer = provider.wallet.publicKey;
     tx.recentBlockhash = blockhash;
 
     // tx.partialSign(keypair);

src/app/api/createEmployeeVesting/route.ts

@@ -12,23 +12,24 @@ export async function POST(req: Request) {
     return NextResponse.json({ success: false, error: 'Content-Type must be application/json' }, { status: 400 });
   }
 
-  const { start_time, end_time, total_allocation_amount, cliff, beneficiary, account } = await req.json();
+  const { start_time, end_time, total_allocation_amount, cliff, beneficiary, account, signer } = await req.json();
 
-  if (!start_time || !end_time || !beneficiary || !total_allocation_amount || !cliff || !account) {
+  if (!start_time || !end_time || !beneficiary || !total_allocation_amount || !cliff || !account || !signer) {
     return NextResponse.json({ success: false, error: 'Missing required fields' }, { status: 400 });
   }
 
   try {
     const cluster = 'devnet' as Cluster;
     const connection = new Connection(clusterApiUrl(cluster), "confirmed");
-    const beneficiaryPubKey = new PublicKey(beneficiary);
-    const wall = { publicKey: beneficiaryPubKey } as anchor.Wallet;
+    const signerPubKey = new PublicKey(signer)
+    const wall = { publicKey: signerPubKey } as anchor.Wallet;
     const provider = new AnchorProvider(connection, wall);
+    console.log("Provider should have signer wallet: ",provider)
 
     anchor.setProvider(provider);
     const program = new Program<Vesting>(IDL as Vesting, provider);
 
-    const ixn = await program.methods.createEmployeeVesting(new BN(start_time), new BN(end_time), new BN(total_allocation_amount), new BN(cliff), beneficiaryPubKey)
+    const ixn = await program.methods.createEmployeeVesting(new BN(start_time), new BN(end_time), new BN(total_allocation_amount), new BN(cliff))
     .accounts({
         beneficiary: new PublicKey(beneficiary),
         vestingAccount: new PublicKey(account),
@@ -40,7 +41,8 @@ export async function POST(req: Request) {
     tx.add(ixn);
 
     const { blockhash } = await connection.getLatestBlockhash();
-    tx.feePayer = new PublicKey(beneficiary);
+    tx.feePayer = provider.wallet.publicKey;
+    console.log("txn fee payer: ", tx.feePayer.toBase58())
     tx.recentBlockhash = blockhash;
 
     const serializedTx = tx.serialize({

src/app/lib/utils.ts

@@ -67,12 +67,7 @@ export async function getDecimalsAndSupplyToken(solanaConnection: Connection, to
     let mintPublicKey;
     let mintAccountInfo;
 
-    try {
       mintPublicKey = new PublicKey(tokenMintAddress);
-    } catch (error) {
-      console.error(`mintPublicKey: `, error);
-      return null;
-    }
 
 
     try {

src/app/types/vesting.ts

@@ -197,7 +197,8 @@ export type Vesting = {
           ]
         },
         {
-          "name": "beneficiary"
+          "name": "beneficiary",
+          "writable": true
         },
         {
           "name": "vestingAccount"
@@ -260,10 +261,6 @@ export type Vesting = {
         {
           "name": "cliff",
           "type": "i64"
-        },
-        {
-          "name": "benef",
-          "type": "pubkey"
         }
       ]
     },
@@ -668,7 +665,8 @@ export const IDL = {
           ]
         },
         {
-          "name": "beneficiary"
+          "name": "beneficiary",
+          "writable": true
         },
         {
           "name": "vesting_account"
@@ -731,10 +729,6 @@ export const IDL = {
         {
           "name": "cliff",
           "type": "i64"
-        },
-        {
-          "name": "benef",
-          "type": "pubkey"
         }
       ]
     },

src/components/vesting/vesting-card.tsx

@@ -20,6 +20,8 @@ import { TimeInput } from "@nextui-org/date-input";
 import useTokenDecimals from "../../hooks/useTokenDecimals";
 import { getUnixTimestamp, cliffPeriodToCliffTime } from "@/app/lib/utils"
 
+//move to mainnet, add jupiter tokens list
+
 export default function VestingCard({ account }: { account: string }){
     const { getVestingAccountStateQuery, createEmployeeAccountMutation } = useVestingProgramAccount({account: new PublicKey(account)})
     const [startDate, setStartDate] = useState<Date>();

src/components/vesting/vesting-data-access.tsx

@@ -107,15 +107,16 @@ export function useVestingProgram() {
   // create vesting account TXN
   const createVestingAccountMutation = useMutation({
     mutationKey: ["vestingAccount", "create", { cluster }],
-    mutationFn: async({ company_name, mint }: CreateVestingArgs) => {
+    mutationFn: async({ company_name, mint, treasuryAmount }: CreateVestingArgs) => {
       const connection = new Connection(clusterApiUrl("devnet"), "confirmed");
 
       const apiEndpoint = `${endpoint}/api/createCompanyVesting`
 
       const txn_metadata = await axios.post(apiEndpoint, {
         company_name: company_name,
         mint: mint,
-        beneficiary: wallet.publicKey?.toString()!
+        signer: wallet.publicKey?.toString()!,
+        treasuryAmount: treasuryAmount,
       }, {
         headers: {'Content-Type': 'application/json'},
       })
@@ -237,7 +238,8 @@ export function useVestingProgramAccount({ account }: { account: PublicKey }) {
             total_allocation_amount: total_allocation_amount,
             cliff: cliff,
             beneficiary: beneficiary,
-            account: account.toString()
+            account: account.toString(),
+            signer: wallet.publicKey?.toString(),
           }, {
             headers: {'Content-Type': 'application/json'},
           })

src/components/vesting/vesting-ui.tsx

@@ -13,10 +13,11 @@ import { ExternalLink } from 'lucide-react'
 export function VestingCreate() {
   const [newCompany, setNewCompany] = useState('')
   const [newMintAddress, setNewMintAddress] = useState('');
+  const [treasuryAmount, setTreasuryAmount] = useState('');
   const {createVestingAccountMutation} = useVestingProgram();
 
   return (
-    <main className="container relative bg-white w-full py-8 pb-8 px-32 mt--32 rounded-3xl flex justify-center">
+    <main className="container relative bg-white w-full py-8 pb-8 px-32 rounded-3xl flex justify-center">
       <div className="space-y-8 w-full max-w-3xl">
         <div className="grid grid-cols-4 items-center gap-4">
           <Label htmlFor="company" className="text-right text-base text-black">
@@ -26,30 +27,12 @@ export function VestingCreate() {
             id="company"
             value={newCompany}
             onChange={(e) => setNewCompany(e.target.value)}
-            className="
-              col-span-3 
-              rounded-full 
-              h-[3.5rem] 
-              w-full 
-              px-4 
-              py-3 
-              text-base 
-              sm:text-sm 
-              md:text-base 
-              lg:text-lg 
-              xl:text-xl 
-              border 
-              border-gray-300 
-              focus:border-blue-500 
-              focus:ring-2 
-              focus:ring-blue-200 
-              transition-all 
-              duration-300
-            "
+            className="col-span-3 rounded-full h-14 w-full px-4 py-3 text-base border border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-200 transition-all duration-300"
             placeholder="Company Name"
             autoComplete="off"
           />
         </div>
+        
         <div className="grid grid-cols-4 items-center gap-4">
           <Label htmlFor="mintAddress" className="text-right text-base text-black">
             Token Mint
@@ -58,42 +41,39 @@ export function VestingCreate() {
             id="mintAddress"
             value={newMintAddress}
             onChange={(e) => setNewMintAddress(e.target.value)}
-            className="
-              col-span-3 
-              rounded-full 
-              h-[3.5rem] 
-              w-full 
-              px-4 
-              py-3 
-              text-base 
-              sm:text-sm 
-              md:text-base 
-              lg:text-lg 
-              xl:text-xl 
-              border 
-              border-gray-300 
-              focus:border-blue-500 
-              focus:ring-2 
-              focus:ring-blue-200 
-              transition-all 
-              duration-300
-            "
+            className="col-span-3 rounded-full h-14 w-full px-4 py-3 text-base border border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-200 transition-all duration-300"
             placeholder="Mint Address"
             autoComplete="off"
           />
         </div>
+
+        <div className="grid grid-cols-4 items-center gap-4">
+          <Label htmlFor="treasuryAmount" className="text-right text-base text-black">
+            Treasury Amount
+          </Label>
+          <Input
+            id="treasuryAmount"
+            type="number"
+            value={treasuryAmount}
+            onChange={(e) => setTreasuryAmount(e.target.value)}
+            className="col-span-3 rounded-full h-14 w-full px-4 py-3 text-base border border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-200 transition-all duration-300"
+            placeholder="Amount to deposit in treasury"
+            autoComplete="off"
+          />
+        </div>
+
         <div className="flex justify-center">
           <Button 
             onClick={() => 
               createVestingAccountMutation.mutateAsync({
                 company_name: newCompany,
-                mint: newMintAddress
+                mint: newMintAddress,
+                treasuryAmount: Number(treasuryAmount)
               })}
-            disabled={createVestingAccountMutation.isPending}
+            disabled={createVestingAccountMutation.isPending || !treasuryAmount}
             className="bg-[#39C3EF] hover:bg-[#39C3EF]/90 text-white"
             style={{
-              boxShadow:
-                "0px -1px 0px 0px #ffffff40 inset, 0px 1px 0px 0px #ffffff40 inset",
+              boxShadow: "0px -1px 0px 0px #ffffff40 inset, 0px 1px 0px 0px #ffffff40 inset",
             }}
           >
             Create New Company Vesting Account

src/types/index.ts

@@ -36,6 +36,7 @@ export interface JupToken {
   export interface CreateVestingArgs {
     company_name: string;
     mint: string;
+    treasuryAmount: number,
   }
 
   export interface CreateEmployeeArgs {