type renames

Author: vaporif

e2e/interchaintestv8/solana/test_helpers.go

@@ -28,10 +28,10 @@ func (s *Solana) SubmitChunkedRelayPackets(
 ) (solana.Signature, error) {
 	t.Helper()
 
-	var batch relayertypes.RelayPacketBatch
+	var batch relayertypes.SolanaRelayPacketBatch
 	err := proto.Unmarshal(resp.Tx, &batch)
 	if err != nil {
-		return solana.Signature{}, fmt.Errorf("failed to unmarshal RelayPacketBatch: %w", err)
+		return solana.Signature{}, fmt.Errorf("failed to unmarshal SolanaRelayPacketBatch: %w", err)
 	}
 	if len(batch.Packets) == 0 {
 		return solana.Signature{}, fmt.Errorf("no relay packets provided")
@@ -60,7 +60,7 @@ func (s *Solana) SubmitChunkedRelayPackets(
 	packetResults := make(chan packetResult, len(batch.Packets))
 
 	for packetIdx, packet := range batch.Packets {
-		go func(pktIdx int, pkt *relayertypes.PacketTransactions) {
+		go func(pktIdx int, pkt *relayertypes.SolanaPacketTxs) {
 			packetStart := time.Now()
 			t.Logf("--- Packet %d: Starting (%d chunks + 1 final tx) ---", pktIdx+1, len(pkt.Chunks))
 

e2e/interchaintestv8/solana_test.go

@@ -1489,7 +1489,6 @@ func (s *IbcEurekaSolanaTestSuite) Test_CleanupOrphanedTendermintHeaderChunks()
 	s.Require().True(s.Run("Call cleanup_chunks instruction", func() {
 		cleanupInstruction, err := ics07_tendermint.NewCleanupIncompleteUploadInstruction(
 			submitter,
-			submitter,
 		)
 		s.Require().NoError(err)
 

e2e/interchaintestv8/types/relayer/relayer.pb.go

@@ -194,17 +194,9 @@ impl RelayerService for CosmosToSolanaRelayerModuleService {
             packet_txs.len()
         );
 
-        // Serialize packet transactions into RelayPacketBatch
-        let packets = packet_txs
-            .iter()
-            .map(|pkt| api::PacketTransactions {
-                chunks: pkt.chunk_txs.clone(),
-                final_tx: pkt.final_tx.clone(),
-                cleanup_tx: pkt.cleanup_tx.clone(),
-            })
-            .collect();
-
-        let batch = api::RelayPacketBatch { packets };
+        let batch = api::SolanaRelayPacketBatch {
+            packets: packet_txs,
+        };
         let tx = prost::Message::encode_to_vec(&batch);
 
         Ok(Response::new(api::RelayByTxResponse {

packages/go-anchor/ics07tendermint/instructions.go

@@ -44,7 +44,7 @@ use tendermint_proto::Protobuf;
 
 use crate::constants::ANCHOR_DISCRIMINATOR_SIZE;
 use crate::gmp;
-use ibc_eureka_relayer_core::api;
+use ibc_eureka_relayer_core::api::{self, SolanaPacketTxs};
 
 use solana_ibc_types::{
     ics07::{ics07_instructions, ClientState, ConsensusState, SignatureData},
@@ -87,17 +87,6 @@ struct UploadChunkParams {
     chunk_data: Vec<u8>,
 }
 
-/// Organized transactions for chunked packet operations
-#[derive(Debug, serde::Serialize, serde::Deserialize)]
-pub struct SolanaPacketTxs {
-    /// All chunk upload transactions for payloads and proof
-    pub chunk_txs: Vec<Vec<u8>>,
-    /// Final packet transaction (recv/ack/timeout)
-    pub final_tx: Vec<u8>,
-    /// Cleanup transaction (reclaims rent from chunks)
-    pub cleanup_tx: Vec<u8>,
-}
-
 /// Helper to derive header chunk PDA
 fn derive_header_chunk(
     submitter: Pubkey,
@@ -1385,7 +1374,7 @@ impl TxBuilder {
         )?;
 
         Ok(SolanaPacketTxs {
-            chunk_txs,
+            chunks: chunk_txs,
             final_tx: recv_tx,
             cleanup_tx,
         })
@@ -1448,7 +1437,7 @@ impl TxBuilder {
         )?;
 
         Ok(SolanaPacketTxs {
-            chunk_txs,
+            chunks: chunk_txs,
             final_tx: ack_tx,
             cleanup_tx,
         })
@@ -1494,7 +1483,7 @@ impl TxBuilder {
         )?;
 
         Ok(SolanaPacketTxs {
-            chunk_txs,
+            chunks: chunk_txs,
             final_tx: timeout_tx,
             cleanup_tx,
         })

packages/relayer/modules/cosmos-to-solana/src/lib.rs

@@ -3,10 +3,9 @@ use anchor_lang::prelude::*;
 use anchor_lang::Discriminator;
 
 /// Cleans up incomplete update client uploads by closing both `HeaderChunk` and `SignatureVerification` PDAs
-pub fn cleanup_incomplete_upload(
-    ctx: Context<CleanupIncompleteUpload>,
-    submitter: Pubkey,
-) -> Result<()> {
+pub fn cleanup_incomplete_upload(ctx: Context<CleanupIncompleteUpload>) -> Result<()> {
+    let submitter = ctx.accounts.submitter.key();
+
     for account in ctx.remaining_accounts {
         if account.owner != &crate::ID || account.lamports() == 0 {
             continue;
@@ -15,7 +14,7 @@ pub fn cleanup_incomplete_upload(
         let should_close = is_owned_by_submitter(account, submitter)?;
 
         if should_close {
-            crate::helpers::close_account(account, &ctx.accounts.submitter_account)?;
+            crate::helpers::close_account(account, &ctx.accounts.submitter)?;
         }
     }
 

packages/relayer/modules/cosmos-to-solana/src/tx_builder.rs

@@ -138,8 +138,8 @@ fn setup_test_accounts_with_chunks(
     }
 }
 
-fn create_cleanup_instruction(test_accounts: &TestAccounts, submitter: Pubkey) -> Instruction {
-    let instruction_data = crate::instruction::CleanupIncompleteUpload { submitter };
+fn create_cleanup_instruction(test_accounts: &TestAccounts) -> Instruction {
+    let instruction_data = crate::instruction::CleanupIncompleteUpload;
 
     let mut account_metas = vec![AccountMeta::new(test_accounts.submitter, true)];
 
@@ -203,7 +203,7 @@ fn test_cleanup_successful_with_rent_reclaim() {
     let total_expected_rent = chunk_rent_per * u64::from(num_chunks);
     let initial_submitter_balance = 10_000_000_000u64;
 
-    let instruction = create_cleanup_instruction(&test_accounts, submitter);
+    let instruction = create_cleanup_instruction(&test_accounts);
 
     let result = assert_instruction_succeeds(&instruction, &test_accounts.accounts);
 
@@ -358,7 +358,7 @@ fn test_cleanup_with_missing_chunks() {
         },
     ));
 
-    let instruction_data = crate::instruction::CleanupIncompleteUpload { submitter };
+    let instruction_data = crate::instruction::CleanupIncompleteUpload;
 
     let instruction = Instruction {
         program_id: crate::ID,
@@ -425,7 +425,7 @@ fn test_cleanup_with_wrong_chunk_order() {
     let test_accounts =
         setup_test_accounts_with_chunks(chain_id, cleanup_height, submitter, 3, true);
 
-    let instruction_data = crate::instruction::CleanupIncompleteUpload { submitter };
+    let instruction_data = crate::instruction::CleanupIncompleteUpload;
 
     // Pass chunks in wrong order (2, 0, 1 instead of 0, 1, 2)
     let instruction = Instruction {