Fix decimals in gas fees (max_fee_per_gas and max_priority_fee_per_gas)

Author: gztensor

Cargo.lock

@@ -1093,24 +1093,20 @@ parameter_types! {
 /// difference factor is 9 decimals, or 10^9
 const EVM_DECIMALS_FACTOR: u64 = 1_000_000_000_u64;
 
-pub struct SubtensorEvmBalanceConverter<F>(PhantomData<F>);
-impl<T: pallet_evm::Config> BalanceConverter<T> for SubtensorEvmBalanceConverter<T>
-where
-    pallet_evm::BalanceOf<T>: TryFrom<U256> + Into<U256>,
+pub struct SubtensorEvmBalanceConverter;
+impl BalanceConverter for SubtensorEvmBalanceConverter
 {
-    fn into_evm_balance(
-        value: <
-            <T as pallet_evm::Config>::Currency as frame_support::traits::tokens::fungible::Inspect<<T as frame_system::Config>::AccountId>
-        >::Balance,
-    ) -> Option<U256> {
+    fn into_evm_balance(value: U256) -> Option<U256> {
         U256::from(UniqueSaturatedInto::<u128>::unique_saturated_into(value))
             .checked_mul(U256::from(EVM_DECIMALS_FACTOR))
     }
 
-    fn into_substrate_balance(value: U256) -> Option<pallet_evm::BalanceOf<T>> {
-        value
-            .checked_div(U256::from(EVM_DECIMALS_FACTOR))
-            .and_then(|result| result.try_into().ok())
+    fn into_substrate_balance(value: U256) -> Option<U256> {
+        if value <= U256::from(u64::MAX) {
+            value.checked_div(U256::from(EVM_DECIMALS_FACTOR))
+        } else {
+            None
+        }
     }
 }
 
@@ -1136,7 +1132,7 @@ impl pallet_evm::Config for Runtime {
     type SuicideQuickClearLimit = SuicideQuickClearLimit;
     type Timestamp = Timestamp;
     type WeightInfo = pallet_evm::weights::SubstrateWeight<Self>;
-    type BalanceConverter = SubtensorEvmBalanceConverter<Self>;
+    type BalanceConverter = SubtensorEvmBalanceConverter;
 }
 
 parameter_types! {
@@ -1159,7 +1155,7 @@ impl pallet_dynamic_fee::Config for Runtime {
 }
 
 parameter_types! {
-    pub DefaultBaseFeePerGas: U256 = U256::from(20);
+    pub DefaultBaseFeePerGas: U256 = U256::from(20_000_000_000_u128);
     pub DefaultElasticity: Permill = Permill::from_parts(125_000);
 }
 pub struct BaseFeeThreshold;

runtime/src/lib.rs

@@ -4,7 +4,7 @@ use pallet_evm::{
     PrecompileOutput, PrecompileResult,
 };
 use sp_core::U256;
-use sp_runtime::traits::Dispatchable;
+use sp_runtime::traits::{Dispatchable, UniqueSaturatedInto};
 use sp_std::vec;
 
 use crate::{Runtime, RuntimeCall};
@@ -44,7 +44,7 @@ impl BalanceTransferPrecompile {
             let call =
                 RuntimeCall::Balances(pallet_balances::Call::<Runtime>::transfer_allow_death {
                     dest: account_id_dst.into(),
-                    value: amount_sub,
+                    value: amount_sub.unique_saturated_into(),
                 });
 
             let result = call.dispatch(RawOrigin::Signed(account_id_src).into());

runtime/src/precompiles/balance_transfer.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(not(feature = "std"), no_std)]
-
 extern crate alloc;
 
 use alloc::vec::Vec;

runtime/src/precompiles/ed25519.rs

@@ -32,7 +32,7 @@ use pallet_evm::{
 };
 use sp_core::crypto::Ss58Codec;
 use sp_core::U256;
-use sp_runtime::traits::BlakeTwo256;
+use sp_runtime::traits::{BlakeTwo256, UniqueSaturatedInto};
 use sp_runtime::traits::Dispatchable;
 use sp_runtime::AccountId32;
 
@@ -75,7 +75,7 @@ impl StakingPrecompile {
         // Create the add_stake call
         let call = RuntimeCall::SubtensorModule(pallet_subtensor::Call::<Runtime>::add_stake {
             hotkey,
-            amount_staked: amount_sub,
+            amount_staked: amount_sub.unique_saturated_into(),
         });
         // Dispatch the add_stake call
         Self::dispatch(handle, call)
@@ -96,7 +96,7 @@ impl StakingPrecompile {
 
         let call = RuntimeCall::SubtensorModule(pallet_subtensor::Call::<Runtime>::remove_stake {
             hotkey,
-            amount_unstaked: amount_sub,
+            amount_unstaked: amount_sub.unique_saturated_into(),
         });
         Self::dispatch(handle, call)
     }
@@ -164,7 +164,7 @@ impl StakingPrecompile {
         let transfer_call =
             RuntimeCall::Balances(pallet_balances::Call::<Runtime>::transfer_allow_death {
                 dest: account_id.clone().into(),
-                value: amount_sub,
+                value: amount_sub.unique_saturated_into(),
             });
 
         // Execute the transfer