diff --git a/crates/astria-bridge-contracts/src/lib.rs b/crates/astria-bridge-contracts/src/lib.rs index 9587a81e23..5dc68f619c 100644 --- a/crates/astria-bridge-contracts/src/lib.rs +++ b/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, diff --git a/crates/astria-bridge-withdrawer/src/bridge_withdrawer/batch.rs b/crates/astria-bridge-withdrawer/src/bridge_withdrawer/batch.rs index 7a56861819..79d5674c2d 100644 --- a/crates/astria-bridge-withdrawer/src/bridge_withdrawer/batch.rs +++ b/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 { diff --git a/crates/astria-bridge-withdrawer/src/bridge_withdrawer/startup.rs b/crates/astria-bridge-withdrawer/src/bridge_withdrawer/startup.rs index 52412ccdc6..35becf7b4c 100644 --- a/crates/astria-bridge-withdrawer/src/bridge_withdrawer/startup.rs +++ b/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), diff --git a/crates/astria-bridge-withdrawer/src/bridge_withdrawer/submitter/mod.rs b/crates/astria-bridge-withdrawer/src/bridge_withdrawer/submitter/mod.rs index 4febe56ecf..76736158e0 100644 --- a/crates/astria-bridge-withdrawer/src/bridge_withdrawer/submitter/mod.rs +++ b/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, diff --git a/crates/astria-bridge-withdrawer/tests/blackbox/helpers/mock_cometbft.rs b/crates/astria-bridge-withdrawer/tests/blackbox/helpers/mock_cometbft.rs index 29b17f1c34..d6c7a0ea2d 100644 --- a/crates/astria-bridge-withdrawer/tests/blackbox/helpers/mock_cometbft.rs +++ b/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 = diff --git a/crates/astria-bridge-withdrawer/tests/blackbox/helpers/test_bridge_withdrawer.rs b/crates/astria-bridge-withdrawer/tests/blackbox/helpers/test_bridge_withdrawer.rs index 2d48ca54a1..83adea835c 100644 --- a/crates/astria-bridge-withdrawer/tests/blackbox/helpers/test_bridge_withdrawer.rs +++ b/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, diff --git a/crates/astria-bridge-withdrawer/tests/blackbox/main.rs b/crates/astria-bridge-withdrawer/tests/blackbox/main.rs index 00aa141f39..6cb5a0a32e 100644 --- a/crates/astria-bridge-withdrawer/tests/blackbox/main.rs +++ b/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, diff --git a/crates/astria-cli/src/commands/bridge/collect.rs b/crates/astria-cli/src/commands/bridge/collect.rs index 317b9d574f..81d84df513 100644 --- a/crates/astria-cli/src/commands/bridge/collect.rs +++ b/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::{ diff --git a/crates/astria-cli/src/commands/bridge/submit.rs b/crates/astria-cli/src/commands/bridge/submit.rs index 7287fee1a4..a557095028 100644 --- a/crates/astria-cli/src/commands/bridge/submit.rs +++ b/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, diff --git a/crates/astria-cli/src/commands/sequencer.rs b/crates/astria-cli/src/commands/sequencer.rs index 63311c7df5..ab19761117 100644 --- a/crates/astria-cli/src/commands/sequencer.rs +++ b/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, diff --git a/crates/astria-composer/src/collectors/geth.rs b/crates/astria-composer/src/collectors/geth.rs index 5b819de468..f1f1f2feba 100644 --- a/crates/astria-composer/src/collectors/geth.rs +++ b/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, diff --git a/crates/astria-composer/src/collectors/grpc.rs b/crates/astria-composer/src/collectors/grpc.rs index 091cca23b2..047c3f0056 100644 --- a/crates/astria-composer/src/collectors/grpc.rs +++ b/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::{ diff --git a/crates/astria-composer/src/executor/builder.rs b/crates/astria-composer/src/executor/builder.rs index 871a4f1b33..e4b7a5e9a5 100644 --- a/crates/astria-composer/src/executor/builder.rs +++ b/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, diff --git a/crates/astria-composer/src/executor/bundle_factory/mod.rs b/crates/astria-composer/src/executor/bundle_factory/mod.rs index 58a3e5a9b2..e5e9ba8c9b 100644 --- a/crates/astria-composer/src/executor/bundle_factory/mod.rs +++ b/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, }, diff --git a/crates/astria-composer/src/executor/bundle_factory/tests.rs b/crates/astria-composer/src/executor/bundle_factory/tests.rs index dd8af22cf7..6f460cd693 100644 --- a/crates/astria-composer/src/executor/bundle_factory/tests.rs +++ b/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 { diff --git a/crates/astria-composer/src/executor/mod.rs b/crates/astria-composer/src/executor/mod.rs index c0e60240fe..f2095cd9ed 100644 --- a/crates/astria-composer/src/executor/mod.rs +++ b/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, diff --git a/crates/astria-composer/src/executor/tests.rs b/crates/astria-composer/src/executor/tests.rs index 0529fd449f..594c8392df 100644 --- a/crates/astria-composer/src/executor/tests.rs +++ b/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 = diff --git a/crates/astria-composer/src/test_utils.rs b/crates/astria-composer/src/test_utils.rs index 0759b81666..aadfbc7faa 100644 --- a/crates/astria-composer/src/test_utils.rs +++ b/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 _, }; diff --git a/crates/astria-composer/tests/blackbox/helper/mod.rs b/crates/astria-composer/tests/blackbox/helper/mod.rs index 6b287a29b0..45119e1ff2 100644 --- a/crates/astria-composer/tests/blackbox/helper/mod.rs +++ b/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 = diff --git a/crates/astria-core/src/generated/mod.rs b/crates/astria-core/src/generated/mod.rs index 5762c6e3c5..0203c38a9d 100644 --- a/crates/astria-core/src/generated/mod.rs +++ b/crates/astria-core/src/generated/mod.rs @@ -96,7 +96,7 @@ pub mod protocol { } } #[path = ""] - pub mod transaction { + pub mod transactions { pub mod v1alpha1 { include!("astria.protocol.transactions.v1alpha1.rs"); diff --git a/crates/astria-core/src/protocol/mod.rs b/crates/astria-core/src/protocol/mod.rs index 2d30299b22..d01eb39fab 100644 --- a/crates/astria-core/src/protocol/mod.rs +++ b/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; diff --git a/crates/astria-core/src/protocol/test_utils.rs b/crates/astria-core/src/protocol/test_utils.rs index 1f399a4227..e0faebee7a 100644 --- a/crates/astria-core/src/protocol/test_utils.rs +++ b/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, }; diff --git a/crates/astria-core/src/protocol/transaction/mod.rs b/crates/astria-core/src/protocol/transaction/mod.rs deleted file mode 100644 index 5607443876..0000000000 --- a/crates/astria-core/src/protocol/transaction/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod v1alpha1; - -use crate::generated::protocol::transaction::v1alpha1 as raw; diff --git a/crates/astria-core/src/protocol/transactions/mod.rs b/crates/astria-core/src/protocol/transactions/mod.rs new file mode 100644 index 0000000000..1f44391b58 --- /dev/null +++ b/crates/astria-core/src/protocol/transactions/mod.rs @@ -0,0 +1,3 @@ +pub mod v1alpha1; + +use crate::generated::protocol::transactions::v1alpha1 as raw; diff --git a/crates/astria-core/src/protocol/transaction/v1alpha1/action.rs b/crates/astria-core/src/protocol/transactions/v1alpha1/action.rs similarity index 100% rename from crates/astria-core/src/protocol/transaction/v1alpha1/action.rs rename to crates/astria-core/src/protocol/transactions/v1alpha1/action.rs diff --git a/crates/astria-core/src/protocol/transaction/v1alpha1/mod.rs b/crates/astria-core/src/protocol/transactions/v1alpha1/mod.rs similarity index 99% rename from crates/astria-core/src/protocol/transaction/v1alpha1/mod.rs rename to crates/astria-core/src/protocol/transactions/v1alpha1/mod.rs index c7569452f8..7eb822ae6c 100644 --- a/crates/astria-core/src/protocol/transaction/v1alpha1/mod.rs +++ b/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"; diff --git a/crates/astria-core/src/protocol/transaction/v1alpha1/snapshots/astria_core__protocol__transaction__v1alpha1__test__signed_transaction_hash.snap b/crates/astria-core/src/protocol/transactions/v1alpha1/snapshots/astria_core__protocol__transaction__v1alpha1__test__signed_transaction_hash.snap similarity index 100% rename from crates/astria-core/src/protocol/transaction/v1alpha1/snapshots/astria_core__protocol__transaction__v1alpha1__test__signed_transaction_hash.snap rename to crates/astria-core/src/protocol/transactions/v1alpha1/snapshots/astria_core__protocol__transaction__v1alpha1__test__signed_transaction_hash.snap diff --git a/crates/astria-core/src/protocol/transactions/v1alpha1/snapshots/astria_core__protocol__transactions__v1alpha1__test__signed_transaction_hash.snap b/crates/astria-core/src/protocol/transactions/v1alpha1/snapshots/astria_core__protocol__transactions__v1alpha1__test__signed_transaction_hash.snap new file mode 100644 index 0000000000..52d245496f --- /dev/null +++ b/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 +] diff --git a/crates/astria-core/src/sequencerblock/v1alpha1/block.rs b/crates/astria-core/src/sequencerblock/v1alpha1/block.rs index 140f8c3706..9952b9ef13 100644 --- a/crates/astria-core/src/sequencerblock/v1alpha1/block.rs +++ b/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)?; diff --git a/crates/astria-sequencer-client/src/extension_trait.rs b/crates/astria-sequencer-client/src/extension_trait.rs index 5180f0b13f..fcdf78a451 100644 --- a/crates/astria-sequencer-client/src/extension_trait.rs +++ b/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| { diff --git a/crates/astria-sequencer-client/src/lib.rs b/crates/astria-sequencer-client/src/lib.rs index 4f8c018f01..95c8baa700 100644 --- a/crates/astria-sequencer-client/src/lib.rs +++ b/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, }; diff --git a/crates/astria-sequencer-client/src/tests/http.rs b/crates/astria-sequencer-client/src/tests/http.rs index a7f40c365f..9bad7193f7 100644 --- a/crates/astria-sequencer-client/src/tests/http.rs +++ b/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, }; diff --git a/crates/astria-sequencer/src/accounts/action.rs b/crates/astria-sequencer/src/accounts/action.rs index 8d4853ea68..8578bd0a08 100644 --- a/crates/astria-sequencer/src/accounts/action.rs +++ b/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; diff --git a/crates/astria-sequencer/src/app/mod.rs b/crates/astria-sequencer/src/app/mod.rs index cc59071f13..e709778844 100644 --- a/crates/astria-sequencer/src/app/mod.rs +++ b/crates/astria-sequencer/src/app/mod.rs @@ -18,11 +18,11 @@ use anyhow::{ Context, }; use astria_core::{ - generated::protocol::transaction::v1alpha1 as raw, + generated::protocol::transactions::v1alpha1 as raw, primitive::v1::Address, protocol::{ abci::AbciErrorCode, - transaction::v1alpha1::{ + transactions::v1alpha1::{ action::ValidatorUpdate, Action, SignedTransaction, diff --git a/crates/astria-sequencer/src/app/test_utils.rs b/crates/astria-sequencer/src/app/test_utils.rs index 09b3571a0a..be7d0353a5 100644 --- a/crates/astria-sequencer/src/app/test_utils.rs +++ b/crates/astria-sequencer/src/app/test_utils.rs @@ -1,7 +1,7 @@ use astria_core::{ crypto::SigningKey, primitive::v1::RollupId, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::{ SequenceAction, ValidatorUpdate, diff --git a/crates/astria-sequencer/src/app/tests_app.rs b/crates/astria-sequencer/src/app/tests_app.rs index 195b810999..813f76a47a 100644 --- a/crates/astria-sequencer/src/app/tests_app.rs +++ b/crates/astria-sequencer/src/app/tests_app.rs @@ -5,7 +5,7 @@ use astria_core::{ asset::TracePrefixed, RollupId, }, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::{ BridgeLockAction, SequenceAction, diff --git a/crates/astria-sequencer/src/app/tests_breaking_changes.rs b/crates/astria-sequencer/src/app/tests_breaking_changes.rs index 8c1bb2d097..118c84a8c7 100644 --- a/crates/astria-sequencer/src/app/tests_breaking_changes.rs +++ b/crates/astria-sequencer/src/app/tests_breaking_changes.rs @@ -16,7 +16,7 @@ use std::{ use astria_core::{ primitive::v1::RollupId, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::{ BridgeLockAction, BridgeSudoChangeAction, @@ -181,7 +181,7 @@ async fn app_finalize_block_snapshot() { #[allow(clippy::too_many_lines)] #[tokio::test] async fn app_execute_transaction_with_every_action_snapshot() { - use astria_core::protocol::transaction::v1alpha1::action::{ + use astria_core::protocol::transactions::v1alpha1::action::{ FeeAssetChangeAction, InitBridgeAccountAction, SudoAddressChangeAction, diff --git a/crates/astria-sequencer/src/app/tests_execute_transaction.rs b/crates/astria-sequencer/src/app/tests_execute_transaction.rs index e2d3449c78..250c30d6c8 100644 --- a/crates/astria-sequencer/src/app/tests_execute_transaction.rs +++ b/crates/astria-sequencer/src/app/tests_execute_transaction.rs @@ -6,7 +6,7 @@ use astria_core::{ asset, RollupId, }, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::{ BridgeLockAction, BridgeUnlockAction, @@ -476,7 +476,7 @@ async fn app_execute_transaction_sudo_address_change_error() { #[tokio::test] async fn app_execute_transaction_fee_asset_change_addition() { - use astria_core::protocol::transaction::v1alpha1::action::FeeAssetChangeAction; + use astria_core::protocol::transactions::v1alpha1::action::FeeAssetChangeAction; let alice = get_alice_signing_key(); let alice_address = astria_address(&alice.address_bytes()); @@ -502,7 +502,7 @@ async fn app_execute_transaction_fee_asset_change_addition() { #[tokio::test] async fn app_execute_transaction_fee_asset_change_removal() { - use astria_core::protocol::transaction::v1alpha1::action::FeeAssetChangeAction; + use astria_core::protocol::transactions::v1alpha1::action::FeeAssetChangeAction; let alice = get_alice_signing_key(); let alice_address = astria_address(&alice.address_bytes()); @@ -534,7 +534,7 @@ async fn app_execute_transaction_fee_asset_change_removal() { #[tokio::test] async fn app_execute_transaction_fee_asset_change_invalid() { - use astria_core::protocol::transaction::v1alpha1::action::FeeAssetChangeAction; + use astria_core::protocol::transactions::v1alpha1::action::FeeAssetChangeAction; let alice = get_alice_signing_key(); @@ -562,7 +562,7 @@ async fn app_execute_transaction_fee_asset_change_invalid() { #[tokio::test] async fn app_execute_transaction_init_bridge_account_ok() { - use astria_core::protocol::transaction::v1alpha1::action::InitBridgeAccountAction; + use astria_core::protocol::transactions::v1alpha1::action::InitBridgeAccountAction; let alice = get_alice_signing_key(); let alice_address = astria_address(&alice.address_bytes()); @@ -624,7 +624,7 @@ async fn app_execute_transaction_init_bridge_account_ok() { #[tokio::test] async fn app_execute_transaction_init_bridge_account_account_already_registered() { - use astria_core::protocol::transaction::v1alpha1::action::InitBridgeAccountAction; + use astria_core::protocol::transactions::v1alpha1::action::InitBridgeAccountAction; let alice = get_alice_signing_key(); let mut app = initialize_app(None, vec![]).await; @@ -753,7 +753,7 @@ async fn app_execute_transaction_bridge_lock_action_ok() { #[tokio::test] async fn app_execute_transaction_bridge_lock_action_invalid_for_eoa() { - use astria_core::protocol::transaction::v1alpha1::action::BridgeLockAction; + use astria_core::protocol::transactions::v1alpha1::action::BridgeLockAction; let alice = get_alice_signing_key(); let mut app = initialize_app(None, vec![]).await; diff --git a/crates/astria-sequencer/src/authority/action.rs b/crates/astria-sequencer/src/authority/action.rs index baf6220db9..674cc9b083 100644 --- a/crates/astria-sequencer/src/authority/action.rs +++ b/crates/astria-sequencer/src/authority/action.rs @@ -6,7 +6,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::{ + protocol::transactions::v1alpha1::action::{ FeeChange, FeeChangeAction, SudoAddressChangeAction, diff --git a/crates/astria-sequencer/src/authority/component.rs b/crates/astria-sequencer/src/authority/component.rs index 91d8d71c7b..58afe9a9e6 100644 --- a/crates/astria-sequencer/src/authority/component.rs +++ b/crates/astria-sequencer/src/authority/component.rs @@ -6,7 +6,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::ValidatorUpdate, + protocol::transactions::v1alpha1::action::ValidatorUpdate, }; use tendermint::abci::request::{ BeginBlock, diff --git a/crates/astria-sequencer/src/authority/mod.rs b/crates/astria-sequencer/src/authority/mod.rs index 0eb1de4a6b..876df381de 100644 --- a/crates/astria-sequencer/src/authority/mod.rs +++ b/crates/astria-sequencer/src/authority/mod.rs @@ -8,7 +8,7 @@ use anyhow::Context as _; use astria_core::{ crypto::VerificationKey, primitive::v1::ADDRESS_LEN, - protocol::transaction::v1alpha1::action::ValidatorUpdate, + protocol::transactions::v1alpha1::action::ValidatorUpdate, }; use serde::{ Deserialize, diff --git a/crates/astria-sequencer/src/authority/state_ext.rs b/crates/astria-sequencer/src/authority/state_ext.rs index afdb4856a8..8ff0047160 100644 --- a/crates/astria-sequencer/src/authority/state_ext.rs +++ b/crates/astria-sequencer/src/authority/state_ext.rs @@ -126,7 +126,7 @@ impl StateWriteExt for T {} #[cfg(test)] mod tests { - use astria_core::protocol::transaction::v1alpha1::action::ValidatorUpdate; + use astria_core::protocol::transactions::v1alpha1::action::ValidatorUpdate; use cnidarium::StateDelta; use super::{ diff --git a/crates/astria-sequencer/src/bridge/bridge_lock_action.rs b/crates/astria-sequencer/src/bridge/bridge_lock_action.rs index 2326593150..d7e0fbf311 100644 --- a/crates/astria-sequencer/src/bridge/bridge_lock_action.rs +++ b/crates/astria-sequencer/src/bridge/bridge_lock_action.rs @@ -5,7 +5,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::{ + protocol::transactions::v1alpha1::action::{ BridgeLockAction, TransferAction, }, diff --git a/crates/astria-sequencer/src/bridge/bridge_sudo_change_action.rs b/crates/astria-sequencer/src/bridge/bridge_sudo_change_action.rs index 518a9417e9..2675797313 100644 --- a/crates/astria-sequencer/src/bridge/bridge_sudo_change_action.rs +++ b/crates/astria-sequencer/src/bridge/bridge_sudo_change_action.rs @@ -5,7 +5,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::BridgeSudoChangeAction, + protocol::transactions::v1alpha1::action::BridgeSudoChangeAction, }; use tracing::instrument; diff --git a/crates/astria-sequencer/src/bridge/bridge_unlock_action.rs b/crates/astria-sequencer/src/bridge/bridge_unlock_action.rs index 550cf5dce4..00566c229d 100644 --- a/crates/astria-sequencer/src/bridge/bridge_unlock_action.rs +++ b/crates/astria-sequencer/src/bridge/bridge_unlock_action.rs @@ -6,7 +6,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::{ + protocol::transactions::v1alpha1::action::{ BridgeUnlockAction, TransferAction, }, diff --git a/crates/astria-sequencer/src/bridge/init_bridge_account_action.rs b/crates/astria-sequencer/src/bridge/init_bridge_account_action.rs index 986a314bfe..d21920ea25 100644 --- a/crates/astria-sequencer/src/bridge/init_bridge_account_action.rs +++ b/crates/astria-sequencer/src/bridge/init_bridge_account_action.rs @@ -6,7 +6,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::InitBridgeAccountAction, + protocol::transactions::v1alpha1::action::InitBridgeAccountAction, }; use tracing::instrument; diff --git a/crates/astria-sequencer/src/fee_asset_change.rs b/crates/astria-sequencer/src/fee_asset_change.rs index 7ccdfdf804..8eca22fa32 100644 --- a/crates/astria-sequencer/src/fee_asset_change.rs +++ b/crates/astria-sequencer/src/fee_asset_change.rs @@ -6,7 +6,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::FeeAssetChangeAction, + protocol::transactions::v1alpha1::action::FeeAssetChangeAction, }; use async_trait::async_trait; diff --git a/crates/astria-sequencer/src/ibc/ibc_relayer_change.rs b/crates/astria-sequencer/src/ibc/ibc_relayer_change.rs index cb37a1ac30..a0718f0eb6 100644 --- a/crates/astria-sequencer/src/ibc/ibc_relayer_change.rs +++ b/crates/astria-sequencer/src/ibc/ibc_relayer_change.rs @@ -5,7 +5,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::IbcRelayerChangeAction, + protocol::transactions::v1alpha1::action::IbcRelayerChangeAction, }; use async_trait::async_trait; diff --git a/crates/astria-sequencer/src/ibc/ics20_withdrawal.rs b/crates/astria-sequencer/src/ibc/ics20_withdrawal.rs index 859ca1d920..42660a34a6 100644 --- a/crates/astria-sequencer/src/ibc/ics20_withdrawal.rs +++ b/crates/astria-sequencer/src/ibc/ics20_withdrawal.rs @@ -10,7 +10,7 @@ use astria_core::{ asset::Denom, Address, }, - protocol::transaction::v1alpha1::action, + protocol::transactions::v1alpha1::action, }; use ibc_types::core::channel::{ ChannelId, diff --git a/crates/astria-sequencer/src/mempool/benchmarks.rs b/crates/astria-sequencer/src/mempool/benchmarks.rs index dacf377f00..cce73ba1fe 100644 --- a/crates/astria-sequencer/src/mempool/benchmarks.rs +++ b/crates/astria-sequencer/src/mempool/benchmarks.rs @@ -15,7 +15,7 @@ use astria_core::{ }, RollupId, }, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::{ Action, SequenceAction, diff --git a/crates/astria-sequencer/src/mempool/mod.rs b/crates/astria-sequencer/src/mempool/mod.rs index 6ccf5f9e22..0170328ee5 100644 --- a/crates/astria-sequencer/src/mempool/mod.rs +++ b/crates/astria-sequencer/src/mempool/mod.rs @@ -21,7 +21,7 @@ use anyhow::Context; use astria_core::{ crypto::SigningKey, primitive::v1::ADDRESS_LEN, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ SignedTransaction, TransactionParams, UnsignedTransaction, diff --git a/crates/astria-sequencer/src/proposal/commitment.rs b/crates/astria-sequencer/src/proposal/commitment.rs index 1578b47208..dc63e36873 100644 --- a/crates/astria-sequencer/src/proposal/commitment.rs +++ b/crates/astria-sequencer/src/proposal/commitment.rs @@ -4,7 +4,7 @@ use astria_core::{ primitive::v1::RollupId, protocol::{ group_sequence_actions_in_signed_transaction_transactions_by_rollup_id, - transaction::v1alpha1::SignedTransaction, + transactions::v1alpha1::SignedTransaction, }, sequencerblock::v1alpha1::block::{ Deposit, @@ -93,7 +93,7 @@ pub(crate) fn generate_rollup_datas_commitment( mod test { use astria_core::{ crypto::SigningKey, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::{ SequenceAction, TransferAction, diff --git a/crates/astria-sequencer/src/sequence/action.rs b/crates/astria-sequencer/src/sequence/action.rs index 5b52bfe760..faa77ee977 100644 --- a/crates/astria-sequencer/src/sequence/action.rs +++ b/crates/astria-sequencer/src/sequence/action.rs @@ -5,7 +5,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::action::SequenceAction, + protocol::transactions::v1alpha1::action::SequenceAction, Protobuf, }; use tracing::instrument; diff --git a/crates/astria-sequencer/src/service/consensus.rs b/crates/astria-sequencer/src/service/consensus.rs index a57706023b..0cf3a01489 100644 --- a/crates/astria-sequencer/src/service/consensus.rs +++ b/crates/astria-sequencer/src/service/consensus.rs @@ -210,7 +210,7 @@ mod test { VerificationKey, }, primitive::v1::RollupId, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::SequenceAction, TransactionParams, UnsignedTransaction, diff --git a/crates/astria-sequencer/src/service/mempool.rs b/crates/astria-sequencer/src/service/mempool.rs index 8ce3d114d3..dc0e8b1b6a 100644 --- a/crates/astria-sequencer/src/service/mempool.rs +++ b/crates/astria-sequencer/src/service/mempool.rs @@ -9,10 +9,10 @@ use std::{ use anyhow::Context as _; use astria_core::{ - generated::protocol::transaction::v1alpha1 as raw, + generated::protocol::transactions::v1alpha1 as raw, protocol::{ abci::AbciErrorCode, - transaction::v1alpha1::SignedTransaction, + transactions::v1alpha1::SignedTransaction, }, }; use cnidarium::Storage; diff --git a/crates/astria-sequencer/src/transaction/checks.rs b/crates/astria-sequencer/src/transaction/checks.rs index e73e18acf7..93ac8fff6d 100644 --- a/crates/astria-sequencer/src/transaction/checks.rs +++ b/crates/astria-sequencer/src/transaction/checks.rs @@ -10,7 +10,7 @@ use astria_core::{ Address, RollupId, }, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::{ Action, BridgeLockAction, @@ -325,7 +325,7 @@ mod tests { RollupId, ADDRESS_LEN, }, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::{ SequenceAction, TransferAction, diff --git a/crates/astria-sequencer/src/transaction/mod.rs b/crates/astria-sequencer/src/transaction/mod.rs index 1426a91804..84e19e58af 100644 --- a/crates/astria-sequencer/src/transaction/mod.rs +++ b/crates/astria-sequencer/src/transaction/mod.rs @@ -11,7 +11,7 @@ use anyhow::{ }; use astria_core::{ primitive::v1::Address, - protocol::transaction::v1alpha1::{ + protocol::transactions::v1alpha1::{ action::Action, SignedTransaction, UnsignedTransaction, diff --git a/crates/astria-sequencer/src/transaction/query.rs b/crates/astria-sequencer/src/transaction/query.rs index 1bda4fe45d..c2d100f7af 100644 --- a/crates/astria-sequencer/src/transaction/query.rs +++ b/crates/astria-sequencer/src/transaction/query.rs @@ -1,8 +1,8 @@ use astria_core::{ - generated::protocol::transaction::v1alpha1::UnsignedTransaction as RawUnsignedTransaction, + generated::protocol::transactions::v1alpha1::UnsignedTransaction as RawUnsignedTransaction, protocol::{ abci::AbciErrorCode, - transaction::v1alpha1::UnsignedTransaction, + transactions::v1alpha1::UnsignedTransaction, }, }; use cnidarium::Storage; @@ -23,7 +23,7 @@ pub(crate) async fn transaction_fee_request( request: request::Query, _params: Vec<(String, String)>, ) -> response::Query { - use astria_core::protocol::transaction::v1alpha1::TransactionFeeResponse; + use astria_core::protocol::transactions::v1alpha1::TransactionFeeResponse; let tx = match preprocess_request(&request) { Ok(tx) => tx, diff --git a/crates/astria-sequencer/src/utils.rs b/crates/astria-sequencer/src/utils.rs index 0ee4ffffa6..f77444cfd1 100644 --- a/crates/astria-sequencer/src/utils.rs +++ b/crates/astria-sequencer/src/utils.rs @@ -1,7 +1,7 @@ use anyhow::Context as _; use astria_core::{ generated::astria_vendored::tendermint::abci as raw, - protocol::transaction::v1alpha1::action::ValidatorUpdate, + protocol::transactions::v1alpha1::action::ValidatorUpdate, Protobuf as _, };