Align Events between Bulletin and SDK

prdoc/pr_10445.prdoc

@@ -0,0 +1,9 @@
+title: Align Events Between Bulletin and SDK
+doc:
+  - audience: Runtime Dev
+    description: |
+      Extends `Stored` and `Renewed` events with a `hash: ContentHash` field.
+      Replaces `log` with `tracing` to match Bulletin’s logging approach.
+crates:
+- name: pallet-transaction-storage
+  bump: major

substrate/frame/transaction-storage/Cargo.toml

@@ -21,14 +21,14 @@ codec = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-log = { workspace = true }
 pallet-balances = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, workspace = true, default-features = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-transaction-storage-proof = { workspace = true }
+tracing = { workspace = true }
 
 [dev-dependencies]
 sp-transaction-storage-proof = { default-features = true, workspace = true }
@@ -40,13 +40,13 @@ std = [
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
 	"pallet-balances/std",
 	"scale-info/std",
 	"serde",
 	"sp-inherents/std",
 	"sp-io/std",
 	"sp-runtime/std",
+	"tracing/std",
 ]
 runtime-benchmarks = [
 	"array-bytes",

substrate/frame/transaction-storage/src/benchmarking.rs

@@ -128,30 +128,31 @@ mod benchmarks {
 	fn store(l: Linear<1, { T::MaxTransactionSize::get() }>) {
 		let caller: T::AccountId = whitelisted_caller();
 		let initial_balance = BalanceOf::<T>::max_value().checked_div(&2u32.into()).unwrap();
+		let data = vec![0u8; l as usize];
+		let content_hash = sp_io::hashing::blake2_256(&data);
 		T::Currency::set_balance(&caller, initial_balance);
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()), vec![0u8; l as usize]);
+		_(RawOrigin::Signed(caller.clone()), data);
 
 		assert!(!BlockTransactions::<T>::get().is_empty());
-		assert_last_event::<T>(Event::Stored { index: 0 }.into());
+		assert_last_event::<T>(Event::Stored { index: 0, content_hash }.into());
 	}
 
 	#[benchmark]
 	fn renew() -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let initial_balance = BalanceOf::<T>::max_value().checked_div(&2u32.into()).unwrap();
+		let data = vec![0u8; T::MaxTransactionSize::get() as usize];
+		let content_hash = sp_io::hashing::blake2_256(&data);
 		T::Currency::set_balance(&caller, initial_balance);
-		Pallet::<T>::store(
-			RawOrigin::Signed(caller.clone()).into(),
-			vec![0u8; T::MaxTransactionSize::get() as usize],
-		)?;
+		Pallet::<T>::store(RawOrigin::Signed(caller.clone()).into(), data)?;
 		run_to_block::<T>(1u32.into());
 
 		#[extrinsic_call]
 		_(RawOrigin::Signed(caller.clone()), BlockNumberFor::<T>::zero(), 0);
 
-		assert_last_event::<T>(Event::Renewed { index: 0 }.into());
+		assert_last_event::<T>(Event::Renewed { index: 0, content_hash }.into());
 
 		Ok(())
 	}

substrate/frame/transaction-storage/src/lib.rs

@@ -61,6 +61,9 @@ pub use weights::WeightInfo;
 pub const DEFAULT_MAX_TRANSACTION_SIZE: u32 = 8 * 1024 * 1024;
 pub const DEFAULT_MAX_BLOCK_TRANSACTIONS: u32 = 512;
 
+/// Hash of a stored blob of data.
+type ContentHash = [u8; 32];
+
 /// State data for a stored transaction.
 #[derive(
 	Encode,
@@ -264,7 +267,7 @@ pub mod pallet {
 					.map_err(|_| Error::<T>::TooManyTransactions)?;
 				Ok(())
 			})?;
-			Self::deposit_event(Event::Stored { index });
+			Self::deposit_event(Event::Stored { index, content_hash });
 			Ok(())
 		}
 
@@ -288,8 +291,8 @@ pub mod pallet {
 				frame_system::Pallet::<T>::extrinsic_index().ok_or(Error::<T>::BadContext)?;
 
 			Self::apply_fee(sender, info.size)?;
-
-			sp_io::transaction_index::renew(extrinsic_index, info.content_hash.into());
+			let content_hash = info.content_hash.into();
+			sp_io::transaction_index::renew(extrinsic_index, content_hash);
 
 			let mut index = 0;
 			BlockTransactions::<T>::mutate(|transactions| {
@@ -308,7 +311,7 @@ pub mod pallet {
 					})
 					.map_err(|_| Error::<T>::TooManyTransactions)
 			})?;
-			Self::deposit_event(Event::Renewed { index });
+			Self::deposit_event(Event::Renewed { index, content_hash });
 			Ok(().into())
 		}
 
@@ -349,11 +352,24 @@ pub mod pallet {
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// Stored data under specified index.
-		Stored { index: u32 },
+		Stored { index: u32, content_hash: ContentHash },
 		/// Renewed data under specified index.
-		Renewed { index: u32 },
+		Renewed { index: u32, content_hash: ContentHash },
 		/// Storage proof was successfully checked.
 		ProofChecked,
+		/// An account `who` was authorized to store `bytes` bytes in `transactions` transactions.
+		AccountAuthorized { who: T::AccountId, transactions: u32, bytes: u64 },
+		/// An authorization for account `who` was refreshed.
+		AccountAuthorizationRefreshed { who: T::AccountId },
+		/// Authorization was given for a preimage of `content_hash` (not exceeding `max_size`) to
+		/// be stored by anyone.
+		PreimageAuthorized { content_hash: ContentHash, max_size: u64 },
+		/// An authorization for a preimage of `content_hash` was refreshed.
+		PreimageAuthorizationRefreshed { content_hash: ContentHash },
+		/// An expired account authorization was removed.
+		ExpiredAccountAuthorizationRemoved { who: T::AccountId },
+		/// An expired preimage authorization was removed.
+		ExpiredPreimageAuthorizationRemoved { content_hash: ContentHash },
 	}
 
 	/// Collection of transaction metadata by block number.