From 3ff5a6687da5b50a59a6bc2019c60f72ecc9925a Mon Sep 17 00:00:00 2001
From: dougefresh <dchimento@gmail.com>
Date: Sun, 2 Nov 2025 18:51:08 +0000
Subject: [PATCH] feat: remove token minter arg requirement

---
 .../src/helpers/receive_message_helpers.rs        |  3 +--
 examples/circle-cctp/src/main.rs                  |  8 ++------
 scripts/gen.sh                                    | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/encoders/circle-message-transmitter-v2-encoder/src/helpers/receive_message_helpers.rs b/encoders/circle-message-transmitter-v2-encoder/src/helpers/receive_message_helpers.rs
index 6d3d528..f12069b 100644
--- a/encoders/circle-message-transmitter-v2-encoder/src/helpers/receive_message_helpers.rs
+++ b/encoders/circle-message-transmitter-v2-encoder/src/helpers/receive_message_helpers.rs
@@ -82,7 +82,6 @@ pub async fn fee_recipient_token_account<T: FeeRecipientFetcher>(
 
 pub fn recv_from_attestation(
     destination_owner: Pubkey,
-    token_minter_program_id: Pubkey,
     attestation: Vec<u8>,
     message: Vec<u8>,
 ) -> InstructionBuilder<crate::instructions::receive_message::ReceiveMessage> {
@@ -100,7 +99,7 @@ pub fn recv_from_attestation(
         destination_owner,
         Pubkey::find_program_address(&[b"message_transmitter"], &crate::ID).0,
         used_nonce,
-        token_minter_program_id,
+        TOKEN_MINTER_PROGRAM_ID,
         crate::ID,
     )
 }
diff --git a/examples/circle-cctp/src/main.rs b/examples/circle-cctp/src/main.rs
index 18b9569..1e9046a 100644
--- a/examples/circle-cctp/src/main.rs
+++ b/examples/circle-cctp/src/main.rs
@@ -265,12 +265,8 @@ pub async fn main() -> Result<()> {
                 alloy_primitives::hex::encode(&attest),
                 alloy_primitives::hex::encode(&message),
             );
-            let builder = receive_message_helpers::recv_from_attestation(
-                owner.pubkey(),
-                TOKEN_MINTER_PROGRAM_ID,
-                attest,
-                message,
-            );
+            let builder =
+                receive_message_helpers::recv_from_attestation(owner.pubkey(), attest, message);
             let fee_recipient =
                 receive_message_helpers::fee_recipient_token_account(&rpc, &SOLANA_USDC_ADDRESS)
                     .await?;
diff --git a/scripts/gen.sh b/scripts/gen.sh
index 15caeba..ddd3ae6 100755
--- a/scripts/gen.sh
+++ b/scripts/gen.sh
@@ -1,3 +1,14 @@
+#!/bin/bash
+set -e
 rm -rf /tmp/encoders
-cargo run -p nitrogen-cli -- parse --idl ./idls/token_messenger_minter_v2.json --crate-name nitrogen-circle-token-messenger-minter-v2-encoder --output /tmp/encoders --filter deposit_for_burn,deposit_for_burn_with_hook &&
-  cargo run -p nitrogen-cli -- parse --idl ./idls/message_transmitter_v2.json --crate-name nitrogen-circle-message-transmitter-v2-encoder --output /tmp/encoders --filter reclaim_event_account,receive_message
+cargo run -p nitrogen-cli -- \
+parse --idl ./idls/token_messenger_minter_v2.json \
+--crate-name nitrogen-circle-token-messenger-minter-v2-encoder \
+--output /tmp/encoders \
+--filter deposit_for_burn,deposit_for_burn_with_hook
+
+cargo run -p nitrogen-cli -- \
+parse --idl ./idls/message_transmitter_v2.json \
+--crate-name nitrogen-circle-message-transmitter-v2-encoder \
+--output /tmp/encoders \
+--filter reclaim_event_account,receive_message