Adapt for weightv2

AstarNetwork · Jul 19, 2023 · 01b3f6e · 01b3f6e
1 parent f750615
commit 01b3f6e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/chain-extensions/xvm/src/lib.rs b/chain-extensions/xvm/src/lib.rs
@@ -18,7 +18,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::{dispatch::Encode, weights::Weight};
+use frame_support::dispatch::Encode;
 use pallet_contracts::{
     chain_extension::{ChainExtension, Environment, Ext, InitState, RetVal},
     Origin,

diff --git a/pallets/ethereum-checked/src/lib.rs b/pallets/ethereum-checked/src/lib.rs
@@ -193,6 +193,19 @@ impl<T: Config> Pallet<T> {
         let tx = checked_tx.into_ethereum_tx(Nonce::<T>::get(), chain_id);
         let tx_data: TransactionData = (&tx).into();
 
+        let (weight_limit, proof_size_base_cost) =
+            match <T as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
+                tx_data.gas_limit.unique_saturated_into(),
+                true,
+            ) {
+                weight_limit if weight_limit.proof_size() > 0 => (
+                    Some(weight_limit),
+                    // measured PoV should be correct to use here
+                    Some(WeightInfoOf::<T>::transact_without_apply().proof_size()),
+                ),
+                _ => (None, None),
+            };
+
         // Validate the tx.
         let _ = CheckEvmTransaction::<T::InvalidEvmTransactionError>::new(
             CheckEvmTransactionConfig {
@@ -203,10 +216,8 @@ impl<T: Config> Pallet<T> {
                 is_transactional: true,
             },
             tx_data.into(),
-            // TODO: solve this prior to the merge
-            None,
-            // TODO: solve this prior to the merge
-            None,
+            weight_limit,
+            proof_size_base_cost,
         )
         // Gas limit validation. The fee payment has been validated as the tx is `checked`.
         .validate_common()
@@ -233,7 +244,11 @@ impl<T: Config> Pallet<T> {
                 CallInfo {
                     exit_reason: ExitReason::Succeed(ExitSucceed::Returned),
                     value: Default::default(),
-                    used_gas: checked_tx.gas_limit,
+                    used_gas: fp_evm::UsedGas {
+                        standard: checked_tx.gas_limit,
+                        effective: checked_tx.gas_limit,
+                    },
+                    weight_info: None,
                     logs: Default::default(),
                 },
             ));

diff --git a/pallets/pallet-xvm/src/pallet/mod.rs b/pallets/pallet-xvm/src/pallet/mod.rs
@@ -104,8 +104,6 @@ pub mod pallet {
 
             let result = T::SyncVM::xvm_call(context, from, to, input);
             let consumed_weight = consumed_weight(&result);
-            // TODO: solve this before merging the uplift PR - XVM should work with 2D weights!!!
-            let consumed_weight = Weight::from_parts(consumed_weight, 0);
 
             log::trace!(
                 target: "xvm::pallet::xvm_call",