fix(*): modify fn call_hybrid_vm called position

BolarityNetwork · Aug 13, 2024 · d854799 · d854799
1 parent 200a8f1
commit d854799
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/frame/hybrid-vm-port/src/lib.rs b/frame/hybrid-vm-port/src/lib.rs
@@ -569,9 +569,6 @@ impl<T: Config> Pallet<T> {
 		source: H160,
 		transaction: Transaction,
 	) -> Result<(PostDispatchInfo, CallOrCreateInfo), DispatchErrorWithPostInfo> {
-		if Self::is_hybrid_vm_transaction(transaction.clone()) {
-			return Self::call_hybrid_vm(source, TransactionData::from(&transaction));
-		}
 		let (to, _, info) = Self::execute(source, &transaction, None)?;
 
 		let pending = Pending::<T>::get();
@@ -732,6 +729,10 @@ impl<T: Config> Pallet<T> {
 		let is_transactional = true;
 		let validate = false;
 
+		if Self::is_hybrid_vm_transaction(transaction.clone()) {
+			return Self::call_hybrid_vm(from, transaction_data);
+		}
+
 		let (
 			input,
 			value,

diff --git a/frame/hybrid-vm-port/src/port.rs b/frame/hybrid-vm-port/src/port.rs
@@ -220,7 +220,7 @@ impl<T: Config> Pallet<T> {
 	pub fn call_hybrid_vm(
 		source: H160,
 		t: TransactionData,
-	) -> Result<(PostDispatchInfo, CallOrCreateInfo), DispatchErrorWithPostInfo> {
+	) -> Result<(Option<H160>, Option<H160>, CallOrCreateInfo), DispatchErrorWithPostInfo> {
 		let (
 			input,
 			value,
@@ -348,10 +348,8 @@ impl<T: Config> Pallet<T> {
 								        logs: vec![],
 							        };
 									return Ok((
-										PostDispatchInfo {
-											actual_weight: Some(info.gas_consumed),
-											pays_fee: Pays::Yes,
-										},
+										Some(target),
+										None,
 										CallOrCreateInfo::Call(call_info),
 									));
 								} else {