From d09debd77d0c899679c01386dc623bca1d045a4e Mon Sep 17 00:00:00 2001
From: gigileungyingchi <lycgigi2020@gmail.com>
Date: Wed, 25 Oct 2023 14:52:50 +0200
Subject: [PATCH 1/2] Update fund-sender program ID

---
 Anchor.toml                          | 2 +-
 packages/fund-sender/client/index.ts | 2 +-
 programs/fund-sender/src/lib.rs      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Anchor.toml b/Anchor.toml
index 253c5c6..eec5945 100644
--- a/Anchor.toml
+++ b/Anchor.toml
@@ -8,7 +8,7 @@ skip-lint = false
 buy_burn_fixed = "stcGmoLCBsr2KSu2vvcSuqMiEZx36F32ySUtCXjab5B"
 buy_burn_switchboard = "sbnbpcN3HVfcj9jTwzncwLeNvCzSwbfMwNmdAgX36VW"
 yield_router = "syriqUnUPcFQjRSaxdFo2wPnXXPjbRsLmhiWUVoGdTo"
-fund_sender = "rodTth5pXjkUfQpqMp7tEFdN1sdv2JwqhXg8RH9YrWD"
+fund_sender = "sfsH2CVS2SaXwnrGwgTVrG7ytZAxSCsTnW82BvjWTGz"
 
 [registry]
 url = "https://api.apr.dev"
diff --git a/packages/fund-sender/client/index.ts b/packages/fund-sender/client/index.ts
index 883ca97..179ae6e 100644
--- a/packages/fund-sender/client/index.ts
+++ b/packages/fund-sender/client/index.ts
@@ -9,7 +9,7 @@ import BN from "bn.js";
 import { FundSender, IDL } from "../../types/fund_sender";
 
 export const PROGRAM_ID = new PublicKey(
-  "rodTth5pXjkUfQpqMp7tEFdN1sdv2JwqhXg8RH9YrWD"
+  "sfsH2CVS2SaXwnrGwgTVrG7ytZAxSCsTnW82BvjWTGz"
 );
 
 /**
diff --git a/programs/fund-sender/src/lib.rs b/programs/fund-sender/src/lib.rs
index 2e0dbc9..c787add 100644
--- a/programs/fund-sender/src/lib.rs
+++ b/programs/fund-sender/src/lib.rs
@@ -6,7 +6,7 @@ use anchor_lang::prelude::*;
 mod utils;
 
 // how to write it to leave it to be filled with new id for each deployed program for each climate project?
-declare_id!("rodTth5pXjkUfQpqMp7tEFdN1sdv2JwqhXg8RH9YrWD");
+declare_id!("sfsH2CVS2SaXwnrGwgTVrG7ytZAxSCsTnW82BvjWTGz");
 
 #[program]
 pub mod fund_sender {

From 7363123c46fc30d7d03e86f72e1b34c336cec26e Mon Sep 17 00:00:00 2001
From: gigileungyingchi <lycgigi2020@gmail.com>
Date: Wed, 25 Oct 2023 14:54:11 +0200
Subject: [PATCH 2/2] Fix `storeCertificate.ts` client script

---
 .../fund-sender/scripts/storeCertificates.ts  | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/fund-sender/scripts/storeCertificates.ts b/packages/fund-sender/scripts/storeCertificates.ts
index 9fbd2a1..e6a8d72 100644
--- a/packages/fund-sender/scripts/storeCertificates.ts
+++ b/packages/fund-sender/scripts/storeCertificates.ts
@@ -1,10 +1,9 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-import { AnchorProvider } from "@coral-xyz/anchor";
 import { FundSenderClient } from "../client";
 import { logSplBalance } from "./lib/util";
-import { Keypair, PublicKey } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import {
-  getOrCreateAssociatedTokenAccount,
+  getAssociatedTokenAddressSync,
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
 
@@ -29,11 +28,6 @@ const destinationName = process.argv[2];
 
   console.log("state address", stateAddress.toBase58());
   console.log("state account data", client.config);
-  const provider = AnchorProvider.local();
-  const connection = provider.connection;
-  const anchorWallet = Keypair.fromSecretKey(
-    Buffer.from(require(process.env.ANCHOR_WALLET as string))
-  );
   const allInputTokenAccountsResponse =
     await client.provider.connection.getParsedTokenAccountsByOwner(
       client.getInputAccount(),
@@ -54,19 +48,18 @@ const destinationName = process.argv[2];
       inputTokenAccount.pubkey.toBase58()
     );
 
-    const mint = inputTokenAccount.account.data.parsed.info.mint;
+    const mint = new PublicKey(inputTokenAccount.account.data.parsed.info.mint);
+    console.log(mint);
 
-    const certificateVaultAta = await getOrCreateAssociatedTokenAccount(
-      connection,
-      anchorWallet,
+    const certificateVaultAta = getAssociatedTokenAddressSync(
       mint,
       client.config.certificateVault,
-      false
+      true
     );
 
     await client.storeCertificates(
       inputTokenAccount.pubkey,
-      certificateVaultAta.address,
+      certificateVaultAta,
       mint
     );
 
@@ -74,6 +67,6 @@ const destinationName = process.argv[2];
       "remaining input certificate token in account",
       inputTokenAccount.pubkey
     );
-    await log("token in certificate vault ATA", certificateVaultAta.address);
+    await log("token in certificate vault ATA", certificateVaultAta);
   }
 })().catch(console.error);