implemented trait on Pallet

AstarNetwork · Jul 17, 2023 · 687f9a3 · 687f9a3
1 parent 1333fb6
commit 687f9a3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/deepmind/src/lib.rs b/frame/deepmind/src/lib.rs
@@ -73,6 +73,7 @@ pub mod pallet {
 		}
 	}
 }
+
 pub trait Tracer: Send {
 	// fn is_enabled() -> bool { false }
 
@@ -139,7 +140,7 @@ pub trait BlockTrait {
 	fn end_block(num: U256, size: u64, header: PartialHeader);
 }
 
-impl BlockTrait for BlockContext {
+impl<T> BlockTrait for Pallet<T> {
 	fn end_block(num: U256, size: u64, header: PartialHeader) {
 		print(
 			format!(

diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs
@@ -33,7 +33,7 @@ mod tests;
 
 // mod firehose;
 // use crate::firehose::BlockTrait;
-use deepmind::BlockTrait as Firehose;
+use deepmind::BlockTrait;
 
 pub use catch_exec_info::catch_exec_info;
 
@@ -203,6 +203,8 @@ pub mod pallet {
 		type PostLogContent: Get<PostLogContent>;
 		/// The maximum length of the extra data in the Executed event.
 		type ExtraDataLength: Get<u32>;
+		/// Firehose implementation pallet
+		type Firehose: BlockTrait;
 	}
 
 	#[pallet::hooks]
@@ -217,7 +219,8 @@ pub mod pallet {
 					frame_system::Pallet::<T>::block_number(),
 				)),
 			);
-			<deepmind::BlockContext as Firehose>::finalize_block(n.unique_saturated_into());
+			// <deepmind::BlockContext as Firehose>::finalize_block(n.unique_saturated_into());
+			T::Firehose::finalize_block(n.unique_saturated_into());
 			// move block hash pruning window by one block
 			let block_hash_count = T::BlockHashCount::get();
 			let to_remove = n
@@ -437,7 +440,7 @@ impl<T: Config> Pallet<T> {
 		};
 		let block = ethereum::Block::new(partial_header.clone(), transactions.clone(), ommers);
 
-		<deepmind::BlockContext as Firehose>::end_block(block_number, 0, partial_header.clone());
+		T::Firehose::end_block(block_number, 0, partial_header.clone());
 		CurrentBlock::<T>::put(block.clone());
 		CurrentReceipts::<T>::put(receipts.clone());
 		CurrentTransactionStatuses::<T>::put(statuses.clone());
@@ -543,7 +546,7 @@ impl<T: Config> Pallet<T> {
 		transaction: Transaction,
 	) -> DispatchResultWithPostInfo {
 		let (to, _, info) = Self::execute(source, &transaction, None)?;
-		<deepmind::BlockContext as Firehose>::start_transaction(&transaction, &source, to);
+		T::Firehose::start_transaction(&transaction, &source, to);
 
 		catch_exec_info::fill_exec_info(&info);
 

diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs
@@ -53,9 +53,12 @@ frame_support::construct_runtime! {
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage},
 		EVM: pallet_evm::{Pallet, Call, Storage, Config, Event<T>},
 		Ethereum: crate::{Pallet, Call, Storage, Event, Origin},
+		DeepMind: deepmind::{Pallet, Call, Storage},
 	}
 }
 
+impl deepmind::Config for Test {}
+
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
@@ -182,6 +185,7 @@ impl Config for Test {
 	type StateRoot = IntermediateStateRoot<Self>;
 	type PostLogContent = PostBlockAndTxnHashes;
 	type ExtraDataLength = ConstU32<30>;
+	type Firehose = DeepMind;
 }
 
 impl fp_self_contained::SelfContainedCall for RuntimeCall {

diff --git a/template/runtime/Cargo.toml b/template/runtime/Cargo.toml
@@ -48,6 +48,7 @@ fp-evm = { workspace = true }
 fp-rpc = { workspace = true }
 fp-self-contained = { workspace = true }
 # Frontier FRAME
+deepmind = {  workspace = true }
 pallet-base-fee = { workspace = true }
 pallet-dynamic-fee = { workspace = true }
 pallet-ethereum = { workspace = true }

diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
@@ -349,8 +349,11 @@ impl pallet_ethereum::Config for Runtime {
 	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
 	type PostLogContent = PostBlockAndTxnHashes;
 	type ExtraDataLength = ConstU32<30>;
+	type Firehose = DeepMind;
 }
 
+impl deepmind::Config for Runtime {}
+
 parameter_types! {
 	pub BoundDivision: U256 = U256::from(1024);
 }
@@ -409,6 +412,7 @@ construct_runtime!(
 		DynamicFee: pallet_dynamic_fee,
 		BaseFee: pallet_base_fee,
 		HotfixSufficients: pallet_hotfix_sufficients,
+		DeepMind: deepmind::{Pallet, Call, Storage},
 	}
 );