refactor(proto): fix rust protocol::transactions module name to match proto package name

crates/astria-bridge-contracts/src/lib.rs

@@ -14,7 +14,7 @@ use astria_core::{
     },
     protocol::{
         memos,
-        transaction::v1alpha1::{
+        transactions::v1alpha1::{
             action::Ics20Withdrawal,
             Action,
         },
@@ -453,7 +453,7 @@ where
         let to = parse_destination_chain_as_address(&event)
             .map_err(GetWithdrawalActionsError::destination_chain_as_address)?;
 
-        let action = astria_core::protocol::transaction::v1alpha1::action::BridgeUnlockAction {
+        let action = astria_core::protocol::transactions::v1alpha1::action::BridgeUnlockAction {
             to,
             amount,
             memo,

crates/astria-bridge-withdrawer/src/bridge_withdrawer/batch.rs

@@ -1,4 +1,4 @@
-use astria_core::protocol::transaction::v1alpha1::Action;
+use astria_core::protocol::transactions::v1alpha1::Action;
 
 #[derive(Debug)]
 pub(crate) struct Batch {

crates/astria-bridge-withdrawer/src/bridge_withdrawer/startup.rs

@@ -13,7 +13,7 @@ use astria_core::{
         asset::v1alpha1::AllowedFeeAssetsResponse,
         bridge::v1alpha1::BridgeAccountLastTxHashResponse,
         memos,
-        transaction::v1alpha1::Action,
+        transactions::v1alpha1::Action,
     },
 };
 use astria_eyre::eyre::{
@@ -284,16 +284,16 @@ impl Startup {
         );
 
         let proto_tx =
-            astria_core::generated::protocol::transaction::v1alpha1::SignedTransaction::decode(
+            astria_core::generated::protocol::transactions::v1alpha1::SignedTransaction::decode(
                 &*last_transaction.tx,
             )
             .wrap_err_with(|| format!(
                             "failed to decode data in Sequencer CometBFT transaction as `{}`",
-                            astria_core::generated::protocol::transaction::v1alpha1::SignedTransaction::full_name(),
+                            astria_core::generated::protocol::transactions::v1alpha1::SignedTransaction::full_name(),
                         ))?;
 
         let tx = SignedTransaction::try_from_raw(proto_tx)
-            .wrap_err_with(|| format!("failed to verify {}", astria_core::generated::protocol::transaction::v1alpha1::SignedTransaction::full_name()))?;
+            .wrap_err_with(|| format!("failed to verify {}", astria_core::generated::protocol::transactions::v1alpha1::SignedTransaction::full_name()))?;
 
         info!(
             last_bridge_account_tx.hash = %telemetry::display::hex(&tx_hash),

crates/astria-bridge-withdrawer/src/bridge_withdrawer/submitter/mod.rs

@@ -11,7 +11,7 @@ use astria_core::{
         },
         GetPendingNonceRequest,
     },
-    protocol::transaction::v1alpha1::{
+    protocol::transactions::v1alpha1::{
         Action,
         TransactionParams,
         UnsignedTransaction,

crates/astria-bridge-withdrawer/tests/blackbox/helpers/mock_cometbft.rs

@@ -341,7 +341,7 @@ fn prepare_broadcast_tx_commit_response(response: tx_commit::Response) -> Mock {
 
 /// Convert a `Request` object to a `SignedTransaction`
 pub fn signed_tx_from_request(request: &wiremock::Request) -> SignedTransaction {
-    use astria_core::generated::protocol::transaction::v1alpha1::SignedTransaction as RawSignedTransaction;
+    use astria_core::generated::protocol::transactions::v1alpha1::SignedTransaction as RawSignedTransaction;
     use prost::Message as _;
 
     let wrapped_tx_sync_req: tendermint_rpc::request::Wrapper<tx_sync::Request> =

crates/astria-bridge-withdrawer/tests/blackbox/helpers/test_bridge_withdrawer.rs

@@ -21,7 +21,7 @@ use astria_core::{
             BridgeUnlock,
             Ics20WithdrawalFromRollup,
         },
-        transaction::v1alpha1::{
+        transactions::v1alpha1::{
             action::{
                 BridgeUnlockAction,
                 Ics20Withdrawal,

crates/astria-bridge-withdrawer/tests/blackbox/main.rs

@@ -1,4 +1,4 @@
-use astria_core::protocol::transaction::v1alpha1::Action;
+use astria_core::protocol::transactions::v1alpha1::Action;
 use helpers::{
     assert_actions_eq,
     default_sequencer_address,

crates/astria-cli/src/commands/bridge/collect.rs

@@ -19,7 +19,7 @@ use astria_core::{
         },
         Address,
     },
-    protocol::transaction::v1alpha1::Action,
+    protocol::transactions::v1alpha1::Action,
 };
 use clap::Args;
 use color_eyre::eyre::{

crates/astria-cli/src/commands/bridge/submit.rs

@@ -5,7 +5,7 @@ use std::path::{
 
 use astria_core::{
     crypto::SigningKey,
-    protocol::transaction::v1alpha1::{
+    protocol::transactions::v1alpha1::{
         Action,
         TransactionParams,
         UnsignedTransaction,

crates/astria-cli/src/commands/sequencer.rs

@@ -4,7 +4,7 @@ use astria_core::{
         Address,
         ADDRESS_LEN,
     },
-    protocol::transaction::v1alpha1::{
+    protocol::transactions::v1alpha1::{
         action::{
             Action,
             BridgeLockAction,

crates/astria-composer/src/collectors/geth.rs

@@ -20,7 +20,7 @@ use astria_core::{
         asset,
         RollupId,
     },
-    protocol::transaction::v1alpha1::action::SequenceAction,
+    protocol::transactions::v1alpha1::action::SequenceAction,
 };
 use astria_eyre::eyre::{
     self,

crates/astria-composer/src/collectors/grpc.rs

@@ -12,7 +12,7 @@ use astria_core::{
         asset,
         RollupId,
     },
-    protocol::transaction::v1alpha1::action::SequenceAction,
+    protocol::transactions::v1alpha1::action::SequenceAction,
 };
 use tokio::sync::mpsc::error::SendTimeoutError;
 use tonic::{

crates/astria-composer/src/executor/builder.rs

@@ -7,7 +7,7 @@ use std::{
 use astria_core::{
     crypto::SigningKey,
     primitive::v1::Address,
-    protocol::transaction::v1alpha1::action::SequenceAction,
+    protocol::transactions::v1alpha1::action::SequenceAction,
 };
 use astria_eyre::eyre::{
     self,

crates/astria-composer/src/executor/bundle_factory/mod.rs

@@ -10,7 +10,7 @@ use std::{
 
 use astria_core::{
     primitive::v1::RollupId,
-    protocol::transaction::v1alpha1::{
+    protocol::transactions::v1alpha1::{
         action::SequenceAction,
         Action,
     },

crates/astria-composer/src/executor/bundle_factory/tests.rs

@@ -3,7 +3,7 @@ use astria_core::{
         RollupId,
         ROLLUP_ID_LEN,
     },
-    protocol::transaction::v1alpha1::action::SequenceAction,
+    protocol::transactions::v1alpha1::action::SequenceAction,
 };
 
 mod sized_bundle {

crates/astria-composer/src/executor/mod.rs

@@ -14,7 +14,7 @@ use astria_core::{
     crypto::SigningKey,
     protocol::{
         abci::AbciErrorCode,
-        transaction::v1alpha1::{
+        transactions::v1alpha1::{
             action::SequenceAction,
             SignedTransaction,
             TransactionParams,

crates/astria-composer/src/executor/tests.rs

@@ -9,7 +9,7 @@ use astria_core::{
         RollupId,
         ROLLUP_ID_LEN,
     },
-    protocol::transaction::v1alpha1::action::SequenceAction,
+    protocol::transactions::v1alpha1::action::SequenceAction,
 };
 use astria_eyre::eyre;
 use once_cell::sync::Lazy;
@@ -174,7 +174,7 @@ async fn mount_default_nonce_query_mock(server: &MockServer) -> MockGuard {
 
 /// Convert a `Request` object to a `SignedTransaction`
 fn signed_tx_from_request(request: &Request) -> SignedTransaction {
-    use astria_core::generated::protocol::transaction::v1alpha1::SignedTransaction as RawSignedTransaction;
+    use astria_core::generated::protocol::transactions::v1alpha1::SignedTransaction as RawSignedTransaction;
     use prost::Message as _;
 
     let wrapped_tx_sync_req: request::Wrapper<tx_sync::Request> =

crates/astria-composer/src/test_utils.rs

@@ -4,7 +4,7 @@ use astria_core::{
         RollupId,
         ROLLUP_ID_LEN,
     },
-    protocol::transaction::v1alpha1::action::SequenceAction,
+    protocol::transactions::v1alpha1::action::SequenceAction,
     Protobuf as _,
 };
 

crates/astria-composer/tests/blackbox/helper/mod.rs

@@ -13,7 +13,7 @@ use astria_core::{
     primitive::v1::RollupId,
     protocol::{
         abci::AbciErrorCode,
-        transaction::v1alpha1::SignedTransaction,
+        transactions::v1alpha1::SignedTransaction,
     },
 };
 use astria_eyre::eyre;
@@ -153,7 +153,7 @@ pub async fn loop_until_composer_is_ready(addr: SocketAddr) {
 }
 
 fn signed_tx_from_request(request: &Request) -> SignedTransaction {
-    use astria_core::generated::protocol::transaction::v1alpha1::SignedTransaction as RawSignedTransaction;
+    use astria_core::generated::protocol::transactions::v1alpha1::SignedTransaction as RawSignedTransaction;
     use prost::Message as _;
 
     let wrapped_tx_sync_req: request::Wrapper<tx_sync::Request> =

crates/astria-core/src/protocol/mod.rs

@@ -1,6 +1,6 @@
 use bytes::Bytes;
 use indexmap::IndexMap;
-use transaction::v1alpha1::SignedTransaction;
+use transactions::v1alpha1::SignedTransaction;
 
 use crate::primitive::v1::RollupId;
 
@@ -9,7 +9,7 @@ pub mod account;
 pub mod asset;
 pub mod bridge;
 pub mod memos;
-pub mod transaction;
+pub mod transactions;
 
 #[cfg(any(feature = "test-utils", test))]
 pub mod test_utils;

crates/astria-core/src/protocol/test_utils.rs

@@ -7,7 +7,7 @@ use prost::Message as _;
 
 use super::{
     group_sequence_actions_in_signed_transaction_transactions_by_rollup_id,
-    transaction::v1alpha1::{
+    transactions::v1alpha1::{
         action::SequenceAction,
         TransactionParams,
         UnsignedTransaction,
@@ -64,7 +64,7 @@ impl ConfigureSequencerBlock {
         use tendermint::Time;
 
         use crate::{
-            protocol::transaction::v1alpha1::Action,
+            protocol::transactions::v1alpha1::Action,
             sequencerblock::v1alpha1::block::RollupData,
         };
 

crates/astria-core/src/protocol/transactions/mod.rs

@@ -0,0 +1,3 @@
+pub mod v1alpha1;
+
+use crate::generated::protocol::transactions::v1alpha1 as raw;

crates/astria-core/src/protocol/transaction/v1alpha1/mod.rs → crates/astria-core/src/protocol/transactions/v1alpha1/mod.rs

@@ -560,7 +560,7 @@ mod test {
             asset,
             Address,
         },
-        protocol::transaction::v1alpha1::action::TransferAction,
+        protocol::transactions::v1alpha1::action::TransferAction,
     };
     const ASTRIA_ADDRESS_PREFIX: &str = "astria";
 

crates/astria-core/src/protocol/transactions/v1alpha1/snapshots/astria_core__protocol__transactions__v1alpha1__test__signed_transaction_hash.snap

@@ -0,0 +1,38 @@
+---
+source: crates/astria-core/src/protocol/transactions/v1alpha1/mod.rs
+expression: tx.sha256_of_proto_encoding()
+---
+[
+  69,
+  121,
+  100,
+  127,
+  170,
+  148,
+  126,
+  89,
+  26,
+  55,
+  220,
+  69,
+  192,
+  9,
+  204,
+  228,
+  198,
+  50,
+  224,
+  128,
+  204,
+  76,
+  243,
+  148,
+  32,
+  203,
+  177,
+  19,
+  14,
+  106,
+  67,
+  114
+]

crates/astria-core/src/sequencerblock/v1alpha1/block.rs

@@ -30,7 +30,7 @@ use crate::{
         IncorrectRollupIdLength,
         RollupId,
     },
-    protocol::transaction::v1alpha1::{
+    protocol::transactions::v1alpha1::{
         action,
         SignedTransaction,
         SignedTransactionError,
@@ -727,7 +727,7 @@ impl SequencerBlock {
         let mut rollup_datas = IndexMap::new();
         for elem in data_list {
             let raw_tx =
-                crate::generated::protocol::transaction::v1alpha1::SignedTransaction::decode(
+                crate::generated::protocol::transactions::v1alpha1::SignedTransaction::decode(
                     &*elem,
                 )
                 .map_err(SequencerBlockError::signed_transaction_protobuf_decode)?;

crates/astria-sequencer-client/src/extension_trait.rs

@@ -39,7 +39,7 @@ use astria_core::protocol::{
         BridgeAccountInfoResponse,
         BridgeAccountLastTxHashResponse,
     },
-    transaction::v1alpha1::{
+    transactions::v1alpha1::{
         TransactionFeeResponse,
         UnsignedTransaction,
     },
@@ -51,7 +51,7 @@ pub use astria_core::{
             BalanceResponse,
             NonceResponse,
         },
-        transaction::v1alpha1::SignedTransaction,
+        transactions::v1alpha1::SignedTransaction,
     },
     sequencerblock::v1alpha1::{
         block::SequencerBlockError,
@@ -627,7 +627,7 @@ pub trait SequencerClientExt: Client {
             .map_err(|e| Error::tendermint_rpc("abci_query", e))?;
 
         let proto_response =
-            astria_core::generated::protocol::transaction::v1alpha1::TransactionFeeResponse::decode(
+            astria_core::generated::protocol::transactions::v1alpha1::TransactionFeeResponse::decode(
                 &*response.value,
             )
             .map_err(|e| {

crates/astria-sequencer-client/src/lib.rs

@@ -19,7 +19,7 @@ pub use astria_core::{
             BalanceResponse,
             NonceResponse,
         },
-        transaction::v1alpha1::SignedTransaction,
+        transactions::v1alpha1::SignedTransaction,
     },
     sequencerblock::v1alpha1::SequencerBlock,
 };

crates/astria-sequencer-client/src/tests/http.rs

@@ -2,7 +2,7 @@ use astria_core::{
     crypto::SigningKey,
     generated::protocol::asset::v1alpha1::AllowedFeeAssetsResponse,
     primitive::v1::Address,
-    protocol::transaction::v1alpha1::{
+    protocol::transactions::v1alpha1::{
         action::TransferAction,
         SignedTransaction,
         TransactionParams,
@@ -317,7 +317,7 @@ async fn get_bridge_account_last_transaction_hash() {
 
 #[tokio::test]
 async fn get_transaction_fee() {
-    use astria_core::generated::protocol::transaction::v1alpha1::{
+    use astria_core::generated::protocol::transactions::v1alpha1::{
         TransactionFee,
         TransactionFeeResponse,
     };

crates/astria-sequencer/src/accounts/action.rs

@@ -5,7 +5,7 @@ use anyhow::{
 };
 use astria_core::{
     primitive::v1::Address,
-    protocol::transaction::v1alpha1::action::TransferAction,
+    protocol::transactions::v1alpha1::action::TransferAction,
     Protobuf,
 };
 use tracing::instrument;