gear-tech · ukint-vs · May 21, 2025 · May 21, 2025 · May 21, 2025 · May 26, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/common/src/auxiliary/gas_provider.rs b/common/src/auxiliary/gas_provider.rs
@@ -25,7 +25,7 @@ use crate::{
 };
 use alloc::collections::BTreeMap;
 use core::{cell::RefCell, ops::DerefMut};
-use sp_core::H256;
+use primitive_types::H256;
 
 /// Balance type used in the gas tree.
 pub(crate) type Balance = u64;

diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -49,7 +49,7 @@ use frame_support::{
     sp_runtime::{
         self,
         generic::{CheckedExtrinsic, UncheckedExtrinsic},
-        traits::{Dispatchable, SignedExtension},
+        traits::Dispatchable,
     },
     traits::Get,
 };
@@ -254,7 +254,7 @@ impl<Address, Call, Signature, Extra> ExtractCall<Call>
     for UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
     Call: Dispatchable + Clone,
-    Extra: SignedExtension,
+    Extra: Decode,
 {
     fn extract_call(&self) -> Call {
         self.function.clone()

diff --git a/ethexe/common/src/gear.rs b/ethexe/common/src/gear.rs
@@ -114,7 +114,7 @@ impl ToDigest for OperatorRewardsCommitment {
     fn update_hasher(&self, hasher: &mut sha3::Keccak256) {
         let OperatorRewardsCommitment { amount, root } = self;
 
-        hasher.update(<[u8; 32]>::from(*amount));
+        hasher.update(amount.to_little_endian());
         hasher.update(root);
     }
 }
@@ -144,10 +144,10 @@ impl ToDigest for StakerRewardsCommitment {
             .iter()
             .for_each(|StakerRewards { vault, amount }| {
                 hasher.update(vault);
-                hasher.update(<[u8; 32]>::from(*amount));
+                hasher.update(amount.to_little_endian());
             });
 
-        hasher.update(<[u8; 32]>::from(*total_amount));
+        hasher.update(total_amount.to_little_endian());
         hasher.update(token);
     }
 }

diff --git a/ethexe/ethereum/src/abi/mod.rs b/ethexe/ethereum/src/abi/mod.rs
@@ -106,8 +106,7 @@ pub(crate) mod utils {
     }
 
     pub fn u256_to_uint256(value: U256) -> Uint256 {
-        let mut bytes = [0u8; Uint256::BYTES];
-        value.to_little_endian(&mut bytes);
+        let bytes = value.to_little_endian();
         Uint256::from_le_bytes(bytes)
     }
 

diff --git a/gclient/src/lib.rs b/gclient/src/lib.rs
@@ -126,6 +126,7 @@
 //! }
 //! ```
 
+#![allow(clippy::result_large_err)]
 #![warn(missing_docs)]
 #![doc(html_logo_url = "https://docs.gear.rs/logo.svg")]
 #![doc(html_favicon_url = "https://gear-tech.io/favicons/favicon.ico")]

diff --git a/gsdk/Cargo.toml b/gsdk/Cargo.toml
@@ -13,7 +13,7 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-anyhow.workspace = true
+anyhow = { workspace = true, features = ["std"] }
 base64.workspace = true
 colored.workspace = true
 futures-util.workspace = true

diff --git a/gsdk/src/lib.rs b/gsdk/src/lib.rs
@@ -18,6 +18,7 @@
 
 #![doc(html_logo_url = "https://docs.gear.rs/logo.svg")]
 #![doc(html_favicon_url = "https://gear-tech.io/favicons/favicon.ico")]
+#![allow(clippy::result_large_err)]
 
 //! Gear api
 pub use crate::{

diff --git a/gsdk/src/metadata/generated.rs b/gsdk/src/metadata/generated.rs
diff --git a/gsdk/src/utils.rs b/gsdk/src/utils.rs
@@ -94,6 +94,7 @@ pub(crate) fn write_storage_address_root_bytes(addr: &impl Address, out: &mut Ve
 
 /// Outputs the [`storage_address_root_bytes`] as well as any additional bytes that represent
 /// a lookup in a storage map at that location.
+#[allow(clippy::result_large_err)]
 pub(crate) fn storage_address_bytes(
     addr: &impl Address,
     metadata: &Metadata,

diff --git a/node/authorship/src/authorship.rs b/node/authorship/src/authorship.rs
@@ -489,7 +489,7 @@ where
         let mut skipped = 0;
         let mut unqueue_invalid = Vec::new();
 
-        let mut t1 = self.transaction_pool.ready_at(self.parent_number).fuse();
+        let mut t1 = self.transaction_pool.ready_at(self.parent_hash).fuse();
         let mut t2 =
             futures_timer::Delay::new(deadline.saturating_duration_since((self.now)()) / 8).fuse();
 
@@ -567,7 +567,7 @@ where
             }
 
             trace!(target: LOG_TARGET, "[{:?}] Pushing to the block.", pending_tx_hash);
-            match block_builder.push(pending_tx_data) {
+            match block_builder.push((*pending_tx_data).clone()) {
                 Ok(()) => {
                     transaction_pushed = true;
                     debug!(target: LOG_TARGET, "[{:?}] Pushed to the block.", pending_tx_hash);

diff --git a/node/authorship/src/tests.rs b/node/authorship/src/tests.rs
@@ -40,7 +40,7 @@ use parking_lot::{Mutex, RwLock};
 use runtime_primitives::{Block as TestBlock, BlockNumber};
 use sc_client_api::Backend as _;
 use sc_service::client::Client;
-use sc_transaction_pool::{BasicPool, FullPool};
+use sc_transaction_pool::{BasicPool, FullChainApi};
 use sc_transaction_pool_api::{
     ChainEvent, MaintainedTransactionPool, TransactionPool, TransactionSource,
 };
@@ -53,7 +53,7 @@ use sp_consensus_babe::{
 };
 use sp_inherents::InherentDataProvider;
 use sp_runtime::{
-    generic::BlockId,
+    generic::{BlockId, ExtrinsicFormat},
     traits::{Block as BlockT, Header as HeaderT, NumberFor},
     Digest, DigestItem, OpaqueExtrinsic, Perbill, Percent,
 };
@@ -69,7 +69,7 @@ use testing::{
         Backend as TestBackend, Client as TestClient, ClientBlockImportExt, RuntimeExecutor,
         TestClientBuilder, TestClientBuilderExt,
     },
-    keyring::{alice, bob, sign, signed_extra, CheckedExtrinsic},
+    keyring::{alice, bob, sign, tx_ext, CheckedExtrinsic},
 };
 use vara_runtime::{
     AccountId, Runtime, RuntimeApi as RA, RuntimeCall, UncheckedExtrinsic, SLOT_DURATION, VERSION,
@@ -120,7 +120,7 @@ where
     let last_nonce = starting_nonce + n;
     (starting_nonce..last_nonce)
         .map(|nonce| CheckedExtrinsic {
-            signed: Some((signer.clone(), signed_extra(nonce))),
+            format: ExtrinsicFormat::Signed(signer.clone(), tx_ext(nonce)),
             function: f(),
         })
         .collect()
@@ -221,7 +221,7 @@ pub(crate) fn init_logger() {
 pub fn init() -> (
     Arc<TestClient>,
     Arc<TestBackend>,
-    Arc<FullPool<TestBlock, TestClient>>,
+    Arc<BasicPool<FullChainApi<TestClient, TestBlock>, TestBlock>>,
     sp_core::testing::TaskExecutor,
     [u8; 32],
 ) {
@@ -230,13 +230,13 @@ pub fn init() -> (
     let executor = get_executor().read();
     let client = Arc::new(client_builder.build(Some(executor.clone())));
     let spawner = sp_core::testing::TaskExecutor::new();
-    let txpool = BasicPool::new_full(
+    let txpool = Arc::from(BasicPool::new_full(
         Default::default(),
         true.into(),
         None,
         spawner.clone(),
         client.clone(),
-    );
+    ));
 
     let genesis_hash =
         <[u8; 32]>::try_from(&client.info().best_hash[..]).expect("H256 is a 32 byte type");
@@ -385,7 +385,7 @@ fn test_queue_remains_intact_if_processing_fails() {
 
     // Disable queue processing in Gear pallet as the root
     checked.push(CheckedExtrinsic {
-        signed: Some((alice(), signed_extra(0))),
+        format: ExtrinsicFormat::Signed(alice(), tx_ext(0)),
         function: CallBuilder::toggle_run_queue(false).build(),
     });
     let extrinsics = sign_extrinsics(
@@ -605,12 +605,10 @@ fn test_pseudo_inherent_discarded_from_txpool() {
 
     // Create Gear::run() extrinsic - both unsigned and signed
     let unsigned_gear_run_xt =
-        UncheckedExtrinsic::new_unsigned(RuntimeCall::Gear(pallet_gear::Call::run {
-            max_gas: None,
-        }));
+        UncheckedExtrinsic::new_bare(RuntimeCall::Gear(pallet_gear::Call::run { max_gas: None }));
     let signed_gear_run_xt = sign(
         CheckedExtrinsic {
-            signed: Some((bob(), signed_extra(0))),
+            format: ExtrinsicFormat::Signed(bob(), tx_ext(0)),
             function: RuntimeCall::Gear(pallet_gear::Call::run { max_gas: None }),
         },
         VERSION.spec_version,
@@ -621,7 +619,7 @@ fn test_pseudo_inherent_discarded_from_txpool() {
     // A `DispatchClass::Normal` extrinsic - supposed to end up in the txpool
     let legit_xt = sign(
         CheckedExtrinsic {
-            signed: Some((alice(), signed_extra(0))),
+            format: ExtrinsicFormat::Signed(alice(), tx_ext(0)),
             function: CallBuilder::noop().build(),
         },
         VERSION.spec_version,
@@ -734,7 +732,7 @@ fn test_proposal_timing_consistent() {
 
     // Disable queue processing in block #1
     let mut checked = vec![CheckedExtrinsic {
-        signed: Some((alice(), signed_extra(0))),
+        format: ExtrinsicFormat::Signed(alice(), tx_ext(0)),
         function: CallBuilder::toggle_run_queue(false).build(),
     }];
 
@@ -787,7 +785,7 @@ fn test_proposal_timing_consistent() {
     // Re-enable queue processing in block #2
     let extrinsics = sign_extrinsics(
         vec![CheckedExtrinsic {
-            signed: Some((alice(), signed_extra(1))),
+            format: ExtrinsicFormat::Signed(alice(), tx_ext(1)),
             function: CallBuilder::toggle_run_queue(true).build(),
         }],
         VERSION.spec_version,
@@ -917,7 +915,7 @@ mod basic_tests {
     {
         sign_extrinsics::<E>(
             vec![CheckedExtrinsic {
-                signed: Some((alice(), signed_extra(nonce))),
+                format: ExtrinsicFormat::Signed(alice(), tx_ext(nonce)),
                 function: CallBuilder::toggle_run_queue(false).build(),
             }],
             VERSION.spec_version,

diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
@@ -29,6 +29,7 @@ use sc_service::{
     TaskManager,
 };
 use sc_telemetry::{Telemetry, TelemetryWorker};
+use sc_transaction_pool::TransactionPoolHandle;
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_api::ConstructRuntimeApi;
 use sp_runtime::{
@@ -73,7 +74,8 @@ type FullGrandpaBlockImport<RuntimeApi, ChainSelection = FullSelectChain> =
     >;
 
 /// The transaction pool type definition.
-type TransactionPool<RuntimeApi> = sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi>>;
+pub type TransactionPool =
+    sc_transaction_pool::TransactionPoolHandle<Block, FullClient<crate::vara_runtime::RuntimeApi>>;
 
 /// The minimum period of blocks on which justifications will be
 /// imported and generated.
@@ -145,7 +147,7 @@ pub fn new_partial<RuntimeApi>(
         FullBackend,
         FullSelectChain,
         sc_consensus::DefaultImportQueue<Block>,
-        sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi>>,
+        sc_transaction_pool::TransactionPoolHandle<Block, FullClient<RuntimeApi>>,
         (
             impl Fn(
                     sc_rpc::SubscriptionTaskExecutor,
@@ -215,12 +217,15 @@ where
 
     let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
-    let transaction_pool = sc_transaction_pool::BasicPool::new_full(
-        config.transaction_pool.clone(),
-        config.role.is_authority().into(),
-        config.prometheus_registry(),
-        task_manager.spawn_essential_handle(),
-        client.clone(),
+    let transaction_pool = Arc::from(
+        sc_transaction_pool::Builder::new(
+            task_manager.spawn_essential_handle(),
+            client.clone(),
+            config.role.is_authority().into(),
+        )
+        .with_options(config.transaction_pool.clone())
+        .with_prometheus(config.prometheus_registry())
+        .build(),
     );
 
     let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import(
@@ -345,7 +350,7 @@ where
     /// The syncing service of the node.
     pub sync: Arc<SyncingService<Block>>,
     /// The transaction pool of the node.
-    pub transaction_pool: Arc<TransactionPool<RuntimeApi>>,
+    pub transaction_pool: Arc<TransactionPoolHandle<Block, FullClient<RuntimeApi>>>,
     /// The rpc handlers of the node.
     pub rpc_handlers: RpcHandlers,
 }
@@ -638,23 +643,25 @@ where
     }
 
     if enable_offchain_worker {
-        task_manager.spawn_handle().spawn(
-            "offchain-workers-runner",
-            "offchain-worker",
+        let offchain_workers =
             sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
                 runtime_api_provider: client.clone(),
-                is_validator: role.is_authority(),
                 keystore: Some(keystore_container.keystore()),
                 offchain_db: backend.offchain_storage(),
                 transaction_pool: Some(OffchainTransactionPoolFactory::new(
                     transaction_pool.clone(),
                 )),
                 network_provider: Arc::new(network.clone()),
+                is_validator: role.is_authority(),
                 enable_http_requests: true,
                 custom_extensions: |_| vec![],
-            })
-            .run(client.clone(), task_manager.spawn_handle())
-            .boxed(),
+            })?;
+        task_manager.spawn_handle().spawn(
+            "offchain-workers-runner",
+            "offchain-work",
+            offchain_workers
+                .run(client.clone(), task_manager.spawn_handle())
+                .boxed(),
         );
     }