Merge branch 'vaporif/relayer-controlled-metadata' of github.com:cosmos/solidity-ibc-eureka into vaporif/relayer-controlled-metadata

Author: vaporif

flake.lock

@@ -11,6 +11,10 @@
     foundry.url = "github:shazow/foundry.nix/main";
     rust-overlay.url = "github:oxalica/rust-overlay";
     natlint.url = "github:srdtrk/natlint";
+    sp1 = {
+      url = "github:vaporif/sp1-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs:
@@ -24,6 +28,7 @@
             (import inputs.rust-overlay)
             inputs.foundry.overlay
             inputs.solc.overlay
+            inputs.sp1.overlays.default
           ];
         };
 
@@ -32,7 +37,6 @@
         common = import ./nix/common.nix {inherit pkgs;};
         solidity = import ./nix/solidity.nix {inherit pkgs inputs system;};
         node-modules = import ./nix/node-modules.nix {inherit pkgs;};
-
         anchor = pkgs.callPackage ./nix/anchor.nix {};
         solana-agave = pkgs.callPackage ./nix/agave.nix {
           inherit (pkgs) rust-bin;
@@ -42,7 +46,18 @@
       in {
         devShells = {
           default = pkgs.mkShell {
-            buildInputs = rust.packages ++ go.packages ++ common.packages ++ solidity.packages ++ [node-modules];
+            buildInputs =
+              rust.packages
+              ++ go.packages
+              ++ common.packages
+              ++ solidity.packages
+              ++ [
+                node-modules
+              ]
+              ++ (with pkgs.sp1."v5.2.4"; [
+                cargo-prove
+                sp1-rust-toolchain
+              ]);
             inherit (rust) NIX_LD_LIBRARY_PATH;
             inherit (rust.env) RUST_SRC_PATH;
             shellHook =
@@ -53,11 +68,6 @@
                     ln -sfn "${node-modules}/node_modules" node_modules
                   fi
                 fi
-
-                if [ ! -x "$HOME/.sp1/bin/cargo-prove" ]; then
-                  echo "SP1 toolchain is not installed. To install:"
-                  echo "https://docs.succinct.xyz/docs/sp1/getting-started/install"
-                fi
               '';
           };
 

flake.nix

@@ -15,8 +15,8 @@ use crate::state::IFTAppMintState;
 pub fn mint_to_account<'info>(
     mint_state: &mut IFTAppMintState,
     clock: &Clock,
-    mint: &InterfaceAccount<'info, Mint>,
-    to: &InterfaceAccount<'info, TokenAccount>,
+    mint: &mut InterfaceAccount<'info, Mint>,
+    token_account: &mut InterfaceAccount<'info, TokenAccount>,
     mint_authority: &AccountInfo<'info>,
     token_program: &Interface<'info, TokenInterface>,
     amount: u64,
@@ -33,12 +33,16 @@ pub fn mint_to_account<'info>(
 
     let mint_accounts = MintTo {
         mint: mint.to_account_info(),
-        to: to.to_account_info(),
+        to: token_account.to_account_info(),
         authority: mint_authority.to_account_info(),
     };
     let mint_ctx =
         CpiContext::new_with_signer(token_program.to_account_info(), mint_accounts, signer_seeds);
-    token_interface::mint_to(mint_ctx, amount)
+    token_interface::mint_to(mint_ctx, amount)?;
+
+    mint.reload()?;
+    token_account.reload()?;
+    Ok(())
 }
 
 const fn current_day(clock: &Clock) -> u64 {

programs/solana/programs/ift/src/helpers.rs

@@ -223,8 +223,8 @@ pub fn admin_mint(ctx: Context<AdminMint>, msg: AdminMintMsg) -> Result<()> {
     mint_to_account(
         &mut ctx.accounts.app_mint_state,
         &clock,
-        &ctx.accounts.mint,
-        &ctx.accounts.receiver_token_account,
+        &mut ctx.accounts.mint,
+        &mut ctx.accounts.receiver_token_account,
         &ctx.accounts.mint_authority,
         &ctx.accounts.token_program,
         msg.amount,