use sp_core::H256

common/src/auxiliary/gas_provider.rs

@@ -25,7 +25,7 @@ use crate::{
 };
 use alloc::collections::BTreeMap;
 use core::{cell::RefCell, ops::DerefMut};
-use primitive_types::H256;
+use sp_core::H256;
 
 /// Balance type used in the gas tree.
 pub(crate) type Balance = u64;

common/src/gas_provider/property_tests/mod.rs

@@ -82,8 +82,8 @@ use core::iter::FromIterator;
 use enum_iterator::all;
 use frame_support::{assert_err, assert_ok};
 use gear_utils::{NonEmpty, RingGet};
-use primitive_types::H256;
 use proptest::prelude::*;
+use sp_core::H256;
 use std::collections::{BTreeSet, HashMap};
 use strategies::GasTreeAction;
 

common/src/lib.rs

@@ -59,8 +59,9 @@ pub use gear_core::{
     pages::GearPage,
     program::{ActiveProgram, MemoryInfix, Program},
 };
-use primitive_types::H256;
+use primitive_types;
 use sp_arithmetic::traits::{BaseArithmetic, Saturating, UniqueSaturatedInto, Unsigned};
+use sp_core::H256;
 use sp_runtime::{
     codec::{self, Decode, Encode},
     scale_info::{self, TypeInfo},
@@ -121,6 +122,18 @@ impl Origin for H256 {
     }
 }
 
+impl Origin for primitive_types::H256 {
+    fn into_origin(self) -> H256 {
+        // H256 here refers to sp_core::H256 due to the import
+        H256(self.0)
+    }
+
+    fn from_origin(val: H256) -> Self {
+        // val is sp_core::H256, Self is primitive_types::H256
+        primitive_types::H256(val.0)
+    }
+}
+
 impl Origin for MessageId {
     fn into_origin(self) -> H256 {
         H256(self.into())

pallets/gas/Cargo.toml

@@ -25,6 +25,7 @@ gear-core.workspace = true
 frame-support.workspace = true
 frame-system.workspace = true
 frame-benchmarking = { workspace = true, optional = true }
+sp-core.workspace = true
 sp-std.workspace = true
 sp-runtime.workspace = true
 pallet-balances.workspace = true

pallets/gas/src/lib.rs

@@ -133,7 +133,7 @@ use common::{
 };
 use frame_support::{pallet_prelude::*, traits::StorageVersion};
 pub use pallet::*;
-pub use primitive_types::H256;
+pub use sp_core::H256;
 use sp_runtime::DispatchError;
 use sp_std::convert::TryInto;
 

pallets/gas/src/mock.rs

@@ -21,7 +21,7 @@ use frame_support::{
     construct_runtime, parameter_types, traits::ConstU32, weights::constants::RocksDbWeight,
 };
 use frame_system::{self as system, pallet_prelude::BlockNumberFor};
-use primitive_types::H256;
+use sp_core::H256;
 use sp_runtime::{
     traits::{BlakeTwo256, IdentityLookup},
     BuildStorage,

pallets/gas/src/tests.rs

@@ -24,7 +24,7 @@ use common::{
 };
 use frame_support::{assert_noop, assert_ok};
 use gear_core::ids::MessageId;
-use primitive_types::H256;
+use sp_core::H256;
 use sp_runtime::traits::Zero;
 
 type Gas = <Pallet<Test> as common::GasProvider>::GasTree;

pallets/gear-bank/src/migrations.rs

@@ -145,7 +145,7 @@ mod tests {
         weights::constants::RocksDbWeight,
         PalletId,
     };
-    use primitive_types::H256;
+    use sp_core::H256;
     use sp_runtime::{
         traits::{BlakeTwo256, IdentityLookup},
         AccountId32, BuildStorage,