,
/// Transaction pool instance.
pub pool: Arc,
/// Graph pool instance.
- pub graph: Arc
,
+ pub graph: Arc>,
/// Network service
pub network: Arc,
/// Chain syncing service
@@ -127,8 +114,8 @@ pub struct FullDeps {
}
/// Instantiate all RPC extensions.
-pub fn create_full(
- deps: FullDeps,
+pub fn create_full(
+ deps: FullDeps,
subscription_task_executor: SubscriptionTaskExecutor,
pubsub_notification_sinks: Arc<
fc_mapping_sync::EthereumBlockNotificationSinks<
@@ -136,7 +123,6 @@ pub fn create_full(
>,
>,
pending_consenus_data_provider: Box>,
- tracing_config: EvmTracingConfig,
) -> Result>
where
C: ProvideRuntimeApi
@@ -156,10 +142,9 @@ where
+ fp_rpc::ConvertTransactionRuntimeApi
+ fp_rpc::EthereumRuntimeRPCApi
+ BlockBuilder
- + AuraApi
- + moonbeam_rpc_primitives_debug::DebugRuntimeApi
- + moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi,
+ + AuraApi,
P: TransactionPool> + Sync + Send + 'static,
+ A: ChainApi + 'static,
BE: Backend + 'static,
BE::State: StateBackend,
BE::Blockchain: BlockchainBackend,
@@ -206,30 +191,11 @@ where
*timestamp,
slot_duration,
);
- // Create a dummy parachain inherent data provider which is required to pass
- // the checks by the para chain system. We use dummy values because in the 'pending
- // context' neither do we have access to the real values nor do we need them.
- let (relay_parent_storage_root, relay_chain_state) =
- RelayStateSproofBuilder::default().into_state_root_and_proof();
- let vfp = PersistedValidationData {
- // This is a hack to make
- // `cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases` happy. Relay
- // parent number can't be bigger than u32::MAX.
- relay_parent_number: u32::MAX,
- relay_parent_storage_root,
- ..Default::default()
- };
- let parachain_inherent_data = ParachainInherentData {
- validation_data: vfp,
- relay_chain_state,
- downward_messages: Default::default(),
- horizontal_messages: Default::default(),
- };
- Ok((slot, timestamp, parachain_inherent_data))
+ Ok((slot, timestamp))
};
module.merge(
- Eth::<_, _, _, _, _, _, ()>::new(
+ Eth::<_, _, _, _, _, A, _, LitentryEthConfig>::new(
client.clone(),
pool.clone(),
graph.clone(),
@@ -248,7 +214,6 @@ where
pending_create_inherent_data_providers,
Some(pending_consenus_data_provider),
)
- .replace_config::>()
.into_rpc(),
)?;
@@ -283,20 +248,7 @@ where
.into_rpc(),
)?;
- if tracing_config.enable_txpool {
- module.merge(TxPool::new(Arc::clone(&client), graph.clone()).into_rpc())?;
- }
-
- if let Some(trace_filter_requester) = tracing_config.tracing_requesters.trace {
- module.merge(
- Trace::new(client, trace_filter_requester, tracing_config.trace_filter_max_count)
- .into_rpc(),
- )?;
- }
-
- if let Some(debug_requester) = tracing_config.tracing_requesters.debug {
- module.merge(Debug::new(debug_requester).into_rpc())?;
- }
+ module.merge(TxPool::new(Arc::clone(&client), graph.clone()).into_rpc())?;
}
Ok(module)
diff --git a/parachain/node/src/service.rs b/parachain/node/src/service.rs
index 8cb0f7ef27..432de98d87 100644
--- a/parachain/node/src/service.rs
+++ b/parachain/node/src/service.rs
@@ -21,10 +21,7 @@
#![allow(clippy::too_many_arguments)]
use crate::{
- evm_tracing_types::{EthApi as EthApiCmd, EvmTracingConfig},
- fake_runtime_api::RuntimeApi as FakeRuntimeApi,
- standalone_block_import::StandaloneBlockImport,
- tracing::{self, RpcRequesters},
+ fake_runtime_api::RuntimeApi as FakeRuntimeApi, standalone_block_import::StandaloneBlockImport,
};
use cumulus_client_cli::CollatorOptions;
use cumulus_client_collator::service::CollatorService;
@@ -75,16 +72,12 @@ use sp_std::{collections::btree_map::BTreeMap, sync::Arc, time::Duration};
use substrate_prometheus_endpoint::Registry;
#[cfg(not(feature = "runtime-benchmarks"))]
-pub type HostFunctions = (
- cumulus_client_service::ParachainHostFunctions,
- moonbeam_primitives_ext::moonbeam_ext::HostFunctions,
-);
+pub type HostFunctions = cumulus_client_service::ParachainHostFunctions;
#[cfg(feature = "runtime-benchmarks")]
pub type HostFunctions = (
cumulus_client_service::ParachainHostFunctions,
frame_benchmarking::benchmarking::HostFunctions,
- moonbeam_primitives_ext::moonbeam_ext::HostFunctions,
);
type ParachainClient = TFullClient>;
@@ -120,6 +113,11 @@ pub fn new_partial(
Option,
Option,
Arc>,
+ Arc<
+ sc_transaction_pool::Pool<
+ sc_transaction_pool::FullChainApi,
+ >,
+ >,
),
>,
sc_service::Error,
@@ -185,6 +183,18 @@ where
.with_prometheus(config.prometheus_registry())
.build();
+ // Create a separate pool for Frontier RPC that has access to the inner Pool type
+ let chain_api = Arc::new(sc_transaction_pool::FullChainApi::new(
+ client.clone(),
+ None,
+ &task_manager.spawn_essential_handle(),
+ ));
+ let transaction_pool_inner = Arc::new(sc_transaction_pool::Pool::new(
+ sc_transaction_pool::Options::default(),
+ config.role.is_authority().into(),
+ chain_api,
+ ));
+
let select_chain = if is_standalone { Some(LongestChain::new(backend.clone())) } else { None };
let frontier_backend = crate::rpc::open_frontier_backend(client.clone(), config)?;
let frontier_block_import = FrontierBlockImport::new(client.clone(), client.clone());
@@ -224,16 +234,19 @@ where
task_manager,
transaction_pool: transaction_pool.into(),
select_chain,
- other: (block_import, telemetry, telemetry_worker_handle, frontier_backend),
+ other: (
+ block_import,
+ telemetry,
+ telemetry_worker_handle,
+ frontier_backend,
+ transaction_pool_inner,
+ ),
})
}
/// To add additional config to start_xyz_node functions
#[derive(Clone)]
pub struct AdditionalConfig {
- /// EVM tracing configuration
- pub evm_tracing_config: EvmTracingConfig,
-
/// Whether EVM RPC be enabled
pub enable_evm_rpc: bool,
}
@@ -293,7 +306,13 @@ where
let params =
new_partial::(¶chain_config, build_import_queue, false, delayed_best_block)?;
- let (block_import, mut telemetry, telemetry_worker_handle, frontier_backend) = params.other;
+ let (
+ block_import,
+ mut telemetry,
+ telemetry_worker_handle,
+ frontier_backend,
+ transaction_pool_graph,
+ ) = params.other;
let client = params.client.clone();
let backend = params.backend.clone();
@@ -371,35 +390,22 @@ where
> = Default::default();
let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks);
- let (
- filter_pool,
- fee_history_limit,
- fee_history_cache,
- block_data_cache,
- storage_override,
- tracing_requesters,
- ethapi_cmd,
- ) = start_node_evm_impl(
- client.clone(),
- backend.clone(),
- frontier_backend.clone(),
- &mut task_manager,
- ¶chain_config,
- additional_config.evm_tracing_config.clone(),
- sync_service.clone(),
- pubsub_notification_sinks.clone(),
- );
+ let (filter_pool, fee_history_limit, fee_history_cache, block_data_cache, storage_override) =
+ start_node_evm_impl(
+ client.clone(),
+ backend.clone(),
+ frontier_backend.clone(),
+ &mut task_manager,
+ ¶chain_config,
+ sync_service.clone(),
+ pubsub_notification_sinks.clone(),
+ );
let rpc_builder = {
let client = client.clone();
let transaction_pool = transaction_pool.clone();
let network = network.clone();
- let rpc_config = crate::rpc::EvmTracingConfig {
- tracing_requesters,
- trace_filter_max_count: additional_config.evm_tracing_config.ethapi_trace_max_count,
- enable_txpool: ethapi_cmd.contains(&EthApiCmd::TxPool),
- };
let sync = sync_service.clone();
let pubsub_notification_sinks = pubsub_notification_sinks.clone();
@@ -407,7 +413,7 @@ where
let deps = crate::rpc::FullDeps {
client: client.clone(),
pool: transaction_pool.clone(),
- graph: transaction_pool.clone(),
+ graph: transaction_pool_graph.clone(),
network: network.clone(),
sync: sync.clone(),
is_authority: validator,
@@ -428,7 +434,6 @@ where
subscription,
pubsub_notification_sinks.clone(),
pending_consensus_data_provider,
- rpc_config.clone(),
)
.map_err(Into::into)
};
@@ -650,7 +655,6 @@ pub fn build_import_queue(
// start a standalone node which doesn't need to connect to relaychain
pub async fn start_standalone_node(
config: Configuration,
- evm_tracing_config: crate::evm_tracing_types::EvmTracingConfig,
) -> Result {
let sc_service::PartialComponents {
client,
@@ -660,7 +664,7 @@ pub async fn start_standalone_node(
keystore_container,
select_chain: maybe_select_chain,
transaction_pool,
- other: (_, _, _, frontier_backend),
+ other: (_, _, _, frontier_backend, transaction_pool_graph),
} = new_partial::<_>(&config, build_import_queue, true, true)?;
// Sinks for pubsub notifications.
@@ -697,24 +701,16 @@ pub async fn start_standalone_node(
let force_authoring = config.force_authoring;
let backoff_authoring_blocks: Option<()> = None;
- let (
- filter_pool,
- fee_history_limit,
- fee_history_cache,
- block_data_cache,
- storage_override,
- tracing_requesters,
- ethapi_cmd,
- ) = start_node_evm_impl(
- client.clone(),
- backend.clone(),
- frontier_backend.clone(),
- &mut task_manager,
- &config,
- evm_tracing_config.clone(),
- sync_service.clone(),
- pubsub_notification_sinks.clone(),
- );
+ let (filter_pool, fee_history_limit, fee_history_cache, block_data_cache, storage_override) =
+ start_node_evm_impl(
+ client.clone(),
+ backend.clone(),
+ frontier_backend.clone(),
+ &mut task_manager,
+ &config,
+ sync_service.clone(),
+ pubsub_notification_sinks.clone(),
+ );
let select_chain = maybe_select_chain
.expect("In `standalone` mode, `new_partial` will return some `select_chain`; qed");
@@ -813,11 +809,6 @@ pub async fn start_standalone_node(
let client = client.clone();
let network = network.clone();
let transaction_pool = transaction_pool.clone();
- let rpc_config = crate::rpc::EvmTracingConfig {
- tracing_requesters,
- trace_filter_max_count: evm_tracing_config.ethapi_trace_max_count,
- enable_txpool: ethapi_cmd.contains(&EthApiCmd::TxPool),
- };
let sync = sync_service.clone();
let pubsub_notification_sinks = pubsub_notification_sinks;
@@ -825,7 +816,7 @@ pub async fn start_standalone_node(
let deps = crate::rpc::FullDeps {
client: client.clone(),
pool: transaction_pool.clone(),
- graph: transaction_pool.clone(),
+ graph: transaction_pool_graph.clone(),
network: network.clone(),
sync: sync.clone(),
is_authority: role.is_authority(),
@@ -847,7 +838,6 @@ pub async fn start_standalone_node(
subscription,
pubsub_notification_sinks.clone(),
pending_consensus_data_provider,
- rpc_config.clone(),
)
.map_err(Into::into)
})
@@ -878,7 +868,6 @@ pub fn start_node_evm_impl(
frontier_backend: Arc>,
task_manager: &mut TaskManager,
config: &Configuration,
- evm_tracing_config: crate::evm_tracing_types::EvmTracingConfig,
sync_service: Arc>,
pubsub_notification_sinks: Arc<
fc_mapping_sync::EthereumBlockNotificationSinks<
@@ -891,33 +880,12 @@ pub fn start_node_evm_impl(
FeeHistoryCache,
Arc>,
Arc>,
- RpcRequesters,
- Vec,
) {
let prometheus_registry = config.prometheus_registry().cloned();
let filter_pool: FilterPool = Arc::new(std::sync::Mutex::new(BTreeMap::new()));
let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new()));
let storage_override = Arc::new(StorageOverrideHandler::new(client.clone()));
- let ethapi_cmd = evm_tracing_config.ethapi.clone();
- let tracing_requesters =
- if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) {
- tracing::spawn_tracing_tasks(
- &evm_tracing_config,
- prometheus_registry.clone(),
- tracing::SpawnTasksParams {
- task_manager,
- client: client.clone(),
- substrate_backend: backend.clone(),
- frontier_backend: frontier_backend.clone(),
- filter_pool: Some(filter_pool.clone()),
- storage_override: storage_override.clone(),
- },
- )
- } else {
- tracing::RpcRequesters { debug: None, trace: None }
- };
-
// Frontier offchain DB task. Essential.
// Maps emulated ethereum data to substrate native data.
task_manager.spawn_essential_handle().spawn(
@@ -972,15 +940,7 @@ pub fn start_node_evm_impl(
prometheus_registry,
));
- (
- filter_pool,
- FEE_HISTORY_LIMIT,
- fee_history_cache,
- block_data_cache,
- storage_override,
- tracing_requesters,
- ethapi_cmd,
- )
+ (filter_pool, FEE_HISTORY_LIMIT, fee_history_cache, block_data_cache, storage_override)
}
/// Start consensus using the lookahead aura collator.
diff --git a/parachain/node/src/tracing.rs b/parachain/node/src/tracing.rs
deleted file mode 100644
index 1ce593e78f..0000000000
--- a/parachain/node/src/tracing.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2020-2024 Trust Computing GmbH.
-// This file is part of Litentry.
-//
-// Litentry is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Litentry is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Litentry. If not, see .
-
-use crate::evm_tracing_types::{EthApi as EthApiCmd, EvmTracingConfig};
-
-use fc_rpc_core::types::FilterPool;
-use fc_storage::StorageOverride;
-use fp_rpc::EthereumRuntimeRPCApi;
-use moonbeam_rpc_debug::{DebugHandler, DebugRequester};
-use moonbeam_rpc_trace::{CacheRequester as TraceFilterCacheRequester, CacheTask};
-use sc_client_api::{
- Backend, BlockOf, BlockchainEvents, HeaderBackend, StateBackend, StorageProvider,
-};
-use sc_service::TaskManager;
-use sp_api::ProvideRuntimeApi;
-use sp_block_builder::BlockBuilder;
-use sp_blockchain::{Error as BlockChainError, HeaderMetadata};
-use sp_core::H256;
-use sp_runtime::traits::{BlakeTwo256, Block as BlockT, Header as HeaderT};
-use std::sync::Arc;
-use substrate_prometheus_endpoint::Registry as PrometheusRegistry;
-use tokio::sync::Semaphore;
-
-#[derive(Clone)]
-pub struct RpcRequesters {
- pub debug: Option,
- pub trace: Option,
-}
-
-#[allow(dead_code)]
-pub struct SpawnTasksParams<'a, B: BlockT, C, BE> {
- pub task_manager: &'a TaskManager,
- pub client: Arc,
- pub substrate_backend: Arc,
- pub frontier_backend: Arc + Send + Sync>,
- pub filter_pool: Option,
- pub storage_override: Arc>,
-}
-
-pub fn spawn_tracing_tasks(
- rpc_config: &EvmTracingConfig,
- prometheus: Option,
- params: SpawnTasksParams,
-) -> RpcRequesters
-where
- C: ProvideRuntimeApi + BlockOf,
- C: StorageProvider,
- C: HeaderBackend + HeaderMetadata + 'static,
- C: BlockchainEvents,
- C: Send + Sync + 'static,
- C::Api: EthereumRuntimeRPCApi + moonbeam_rpc_primitives_debug::DebugRuntimeApi,
- C::Api: BlockBuilder,
- B: BlockT + Send + Sync + 'static,
- B::Header: HeaderT,
- BE: Backend + 'static,
- BE::State: StateBackend,
-{
- let permit_pool = Arc::new(Semaphore::new(rpc_config.ethapi_max_permits as usize));
-
- let (trace_filter_task, trace_filter_requester) =
- if rpc_config.ethapi.contains(&EthApiCmd::Trace) {
- let (trace_filter_task, trace_filter_requester) = CacheTask::create(
- Arc::clone(¶ms.client),
- Arc::clone(¶ms.substrate_backend),
- core::time::Duration::from_secs(rpc_config.ethapi_trace_cache_duration),
- Arc::clone(&permit_pool),
- Arc::clone(¶ms.storage_override),
- prometheus,
- );
- (Some(trace_filter_task), Some(trace_filter_requester))
- } else {
- (None, None)
- };
-
- let (debug_task, debug_requester) = if rpc_config.ethapi.contains(&EthApiCmd::Debug) {
- let (debug_task, debug_requester) = DebugHandler::task(
- Arc::clone(¶ms.client),
- Arc::clone(¶ms.substrate_backend),
- Arc::clone(¶ms.frontier_backend),
- Arc::clone(&permit_pool),
- Arc::clone(¶ms.storage_override),
- rpc_config.tracing_raw_max_memory_usage,
- );
- (Some(debug_task), Some(debug_requester))
- } else {
- (None, None)
- };
-
- // `trace_filter` cache task. Essential.
- // Proxies rpc requests to it's handler.
- if let Some(trace_filter_task) = trace_filter_task {
- params.task_manager.spawn_essential_handle().spawn(
- "trace-filter-cache",
- Some("eth-tracing"),
- trace_filter_task,
- );
- }
-
- // `debug` task if enabled. Essential.
- // Proxies rpc requests to it's handler.
- if let Some(debug_task) = debug_task {
- params.task_manager.spawn_essential_handle().spawn(
- "ethapi-debug",
- Some("eth-tracing"),
- debug_task,
- );
- }
-
- RpcRequesters { debug: debug_requester, trace: trace_filter_requester }
-}
diff --git a/parachain/pallets/omni-account/src/mock.rs b/parachain/pallets/omni-account/src/mock.rs
index 48a673c893..c078579ee6 100644
--- a/parachain/pallets/omni-account/src/mock.rs
+++ b/parachain/pallets/omni-account/src/mock.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Litentry. If not, see .
-use crate::{self as pallet_omni_account, Decode, Encode, EnsureOmniAccount};
+use crate::{self as pallet_omni_account, Encode, EnsureOmniAccount};
use frame_support::{
assert_ok, derive_impl,
pallet_prelude::EnsureOrigin,
@@ -25,7 +25,6 @@ use frame_system::EnsureRoot;
use heima_primitives::{DefaultOmniAccountConverter, Identity, MemberAccount};
pub use pallet_teebag::test_util::get_signer;
use pallet_teebag::test_util::{TEST8_CERT, TEST8_SIGNER_PUB, TEST8_TIMESTAMP, URL};
-use sp_core::RuntimeDebug;
use sp_keyring::AccountKeyring;
use sp_runtime::{
traits::{IdentifyAccount, IdentityLookup, Verify},
@@ -96,18 +95,22 @@ pub fn bob() -> Accounts {
create_accounts(AccountKeyring::Bob)
}
+#[allow(dead_code)]
pub fn charlie() -> Accounts {
create_accounts(AccountKeyring::Charlie)
}
+#[allow(dead_code)]
pub fn dave() -> Accounts {
create_accounts(AccountKeyring::Dave)
}
+#[allow(dead_code)]
pub fn public_member_account(accounts: Accounts) -> MemberAccount {
MemberAccount::Public(accounts.identity)
}
+#[allow(dead_code)]
pub fn private_member_account(accounts: Accounts) -> MemberAccount {
MemberAccount::Private(accounts.identity.encode(), accounts.identity.hash())
}
diff --git a/parachain/pallets/omni-account/src/tests.rs b/parachain/pallets/omni-account/src/tests.rs
index e8d331ceba..55e8f3b721 100644
--- a/parachain/pallets/omni-account/src/tests.rs
+++ b/parachain/pallets/omni-account/src/tests.rs
@@ -18,6 +18,7 @@ use crate::{mock::*, *};
use frame_support::{assert_noop, assert_ok};
use sp_std::vec;
+#[allow(dead_code)]
fn request_intent_call(intent: Intent) -> Box {
RuntimeCall::OmniAccount(crate::Call::request_intent { intent }).into()
}
diff --git a/parachain/precompiles/assets-erc20/src/lib.rs b/parachain/precompiles/assets-erc20/src/lib.rs
index 72b56b2e9c..55d1313542 100644
--- a/parachain/precompiles/assets-erc20/src/lib.rs
+++ b/parachain/precompiles/assets-erc20/src/lib.rs
@@ -117,18 +117,17 @@ impl Erc20AssetsPrecompileSet
where
Instance: 'static,
Runtime: pallet_assets::Config + pallet_evm::Config + frame_system::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
Runtime::RuntimeCall: From>,
- ::RuntimeOrigin: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
BalanceOf: TryFrom + Into + solidity::Codec,
Runtime: AddressToAssetId>,
<::RuntimeCall as Dispatchable>::RuntimeOrigin: OriginTrait,
AssetIdOf: Copy,
Runtime::AccountId:
From<<::AccountProvider as AccountProvider>::AccountId>,
+ ::RuntimeOrigin: From>,
{
/// PrecompileSet discriminant. Allows to knows if the address maps to an asset id,
/// and if this is the case which one.
diff --git a/parachain/precompiles/bridge-transfer/src/lib.rs b/parachain/precompiles/bridge-transfer/src/lib.rs
index e988037701..1fce7d59f4 100644
--- a/parachain/precompiles/bridge-transfer/src/lib.rs
+++ b/parachain/precompiles/bridge-transfer/src/lib.rs
@@ -15,7 +15,7 @@
// along with Litentry. If not, see .
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
use pallet_evm::AddressMapping;
@@ -33,12 +33,11 @@ pub struct BridgeTransferPrecompile(PhantomData);
impl BridgeTransferPrecompile
where
Runtime: pallet_bridge_transfer::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
Runtime::RuntimeCall: From>,
- ::RuntimeOrigin: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
BalanceOf: TryFrom + Into,
{
#[precompile::public("transferAssets(uint256,uint8,bytes32,bytes)")]
diff --git a/parachain/precompiles/collab-ai/aiusd-convertor/src/lib.rs b/parachain/precompiles/collab-ai/aiusd-convertor/src/lib.rs
index 6f5496c074..7e7fefe273 100644
--- a/parachain/precompiles/collab-ai/aiusd-convertor/src/lib.rs
+++ b/parachain/precompiles/collab-ai/aiusd-convertor/src/lib.rs
@@ -16,7 +16,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
use pallet_evm::AddressMapping;
use precompile_utils::prelude::*;
@@ -37,12 +37,11 @@ pub struct AIUSDConvertorPrecompile(PhantomData);
impl AIUSDConvertorPrecompile
where
Runtime: pallet_aiusd_convertor::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
Runtime::RuntimeCall: From>,
- ::RuntimeOrigin: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
AssetBalanceOf: TryFrom + Into,
AssetIdOf: TryFrom + Into,
{
diff --git a/parachain/precompiles/collab-ai/curator/src/lib.rs b/parachain/precompiles/collab-ai/curator/src/lib.rs
index 735e1e50a2..04e7d1de5b 100644
--- a/parachain/precompiles/collab-ai/curator/src/lib.rs
+++ b/parachain/precompiles/collab-ai/curator/src/lib.rs
@@ -16,7 +16,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
use frame_system::pallet_prelude::BlockNumberFor;
use pallet_evm::AddressMapping;
@@ -38,13 +38,12 @@ pub struct CuratorPrecompile(PhantomData);
impl CuratorPrecompile
where
Runtime: pallet_curator::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
Runtime::RuntimeCall: From>,
- ::RuntimeOrigin: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
BlockNumberFor: TryFrom + Into,
{
#[precompile::public("registCurator(bytes32)")]
diff --git a/parachain/precompiles/collab-ai/guardian/src/lib.rs b/parachain/precompiles/collab-ai/guardian/src/lib.rs
index 6d75d96636..0bb1fe3c7f 100644
--- a/parachain/precompiles/collab-ai/guardian/src/lib.rs
+++ b/parachain/precompiles/collab-ai/guardian/src/lib.rs
@@ -16,7 +16,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
use frame_system::pallet_prelude::BlockNumberFor;
use pallet_evm::AddressMapping;
@@ -38,13 +38,12 @@ pub struct GuardianPrecompile(PhantomData);
impl GuardianPrecompile
where
Runtime: pallet_guardian::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
Runtime::RuntimeCall: From>,
- ::RuntimeOrigin: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
BlockNumberFor: TryFrom + Into,
{
#[precompile::public("registGuardian(bytes32)")]
diff --git a/parachain/precompiles/collab-ai/investing-pool/src/lib.rs b/parachain/precompiles/collab-ai/investing-pool/src/lib.rs
index e5ba6efcc6..e4ac634b89 100644
--- a/parachain/precompiles/collab-ai/investing-pool/src/lib.rs
+++ b/parachain/precompiles/collab-ai/investing-pool/src/lib.rs
@@ -16,7 +16,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
use frame_system::pallet_prelude::BlockNumberFor;
use pallet_evm::AddressMapping;
@@ -37,13 +37,13 @@ pub struct InvestingPoolPrecompile(PhantomData);
impl InvestingPoolPrecompile
where
Runtime: pallet_investing_pool::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
::RuntimeCall:
Dispatchable + GetDispatchInfo,
::RuntimeCall: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
<::RuntimeCall as Dispatchable>::RuntimeOrigin:
From>,
AssetIdOf: TryFrom + Into,
diff --git a/parachain/precompiles/collab-ai/pool-proposal/src/lib.rs b/parachain/precompiles/collab-ai/pool-proposal/src/lib.rs
index cd5a88c5ae..2136870a54 100644
--- a/parachain/precompiles/collab-ai/pool-proposal/src/lib.rs
+++ b/parachain/precompiles/collab-ai/pool-proposal/src/lib.rs
@@ -16,7 +16,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::{
dispatch::{GetDispatchInfo, PostDispatchInfo},
traits::Currency,
@@ -45,13 +45,12 @@ type BalanceOf = <::Currency as Currency<
impl PoolProposalPrecompile
where
Runtime: pallet_pool_proposal::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
::RuntimeCall:
Dispatchable + GetDispatchInfo,
::RuntimeCall: From>,
+ <::RuntimeCall as Dispatchable>::RuntimeOrigin:
+ From::AccountId>>,
<::RuntimeCall as Dispatchable>::RuntimeOrigin:
From>,
AssetBalanceOf: TryFrom + Into,
diff --git a/parachain/precompiles/omni-bridge/src/lib.rs b/parachain/precompiles/omni-bridge/src/lib.rs
index eb573b8c13..e3ab6f6c98 100644
--- a/parachain/precompiles/omni-bridge/src/lib.rs
+++ b/parachain/precompiles/omni-bridge/src/lib.rs
@@ -15,7 +15,7 @@
// along with Litentry. If not, see .
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::{
dispatch::{GetDispatchInfo, PostDispatchInfo},
traits::fungible::NativeOrWithId,
@@ -36,12 +36,11 @@ type BridgeBalanceOf = ::Balance
impl OmniBridgePrecompile
where
Runtime: pallet_omni_bridge::Config> + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
Runtime::RuntimeCall: From>,
- ::RuntimeOrigin: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
BridgeBalanceOf: TryFrom + Into,
{
#[precompile::public("payIn(uint256,uint8,bool,uint256,bytes)")]
diff --git a/parachain/precompiles/parachain-staking/src/lib.rs b/parachain/precompiles/parachain-staking/src/lib.rs
index bbd77f62af..819a2a2583 100644
--- a/parachain/precompiles/parachain-staking/src/lib.rs
+++ b/parachain/precompiles/parachain-staking/src/lib.rs
@@ -20,7 +20,7 @@ mod mock;
#[cfg(test)]
mod tests;
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::{
dispatch::{GetDispatchInfo, PostDispatchInfo},
sp_runtime::Percent,
@@ -50,13 +50,11 @@ pub struct ParachainStakingPrecompile(PhantomData);
impl ParachainStakingPrecompile
where
Runtime: pallet_parachain_staking::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
- Runtime::AccountId: From<[u8; 32]>,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
- ::RuntimeOrigin: From>,
Runtime::RuntimeCall: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
BalanceOf: TryFrom + Into + solidity::Codec,
{
#[precompile::public("delegationRequestIsPending(bytes32,bytes32)")]
diff --git a/parachain/precompiles/score-staking/src/lib.rs b/parachain/precompiles/score-staking/src/lib.rs
index 0203469ea1..d7f296447c 100644
--- a/parachain/precompiles/score-staking/src/lib.rs
+++ b/parachain/precompiles/score-staking/src/lib.rs
@@ -15,7 +15,7 @@
// along with Litentry. If not, see .
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileFailure, PrecompileHandle};
+use fp_evm::{PrecompileFailure, PrecompileHandle};
use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
use pallet_evm::AddressMapping;
use sp_core::U256;
@@ -36,12 +36,11 @@ pub struct ScoreStakingPrecompile(PhantomData);
impl ScoreStakingPrecompile
where
Runtime: pallet_score_staking::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
Runtime::RuntimeCall: From>,
- ::RuntimeOrigin: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
BalanceOf: TryFrom + Into,
{
#[precompile::public("claim(uint256)")]
diff --git a/parachain/precompiles/vesting/src/lib.rs b/parachain/precompiles/vesting/src/lib.rs
index eff90cdc77..d5150fad03 100644
--- a/parachain/precompiles/vesting/src/lib.rs
+++ b/parachain/precompiles/vesting/src/lib.rs
@@ -15,7 +15,7 @@
// along with Litentry. If not, see .
#![cfg_attr(not(feature = "std"), no_std)]
-use fp_evm::{AccountProvider, PrecompileHandle};
+use fp_evm::PrecompileHandle;
use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
use pallet_evm::AddressMapping;
use precompile_utils::prelude::*;
@@ -28,12 +28,11 @@ pub struct VestingPrecompile(PhantomData);
impl VestingPrecompile
where
Runtime: pallet_vesting::Config + pallet_evm::Config,
- Runtime::RuntimeOrigin: From<
- Option<<::AccountProvider as AccountProvider>::AccountId>,
- >,
+ Runtime::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
Runtime::RuntimeCall: Dispatchable + GetDispatchInfo,
Runtime::RuntimeCall: From>,
- ::RuntimeOrigin: From>,
+ ::RuntimeOrigin:
+ From::AccountId>>,
{
#[precompile::public("vest()")]
fn vest(handle: &mut impl PrecompileHandle) -> EvmResult {
diff --git a/parachain/primitives/src/identity.rs b/parachain/primitives/src/identity.rs
index 25e76c037d..0c27fe5b61 100644
--- a/parachain/primitives/src/identity.rs
+++ b/parachain/primitives/src/identity.rs
@@ -421,7 +421,9 @@ impl Identity {
match self {
Identity::Substrate(address) => Some(address.into()),
Identity::Evm(address) => {
- Some(HashedAddressMapping::into_account_id(H160::from_slice(address.as_ref())))
+ let account =
+ HashedAddressMapping::into_account_id(H160::from_slice(address.as_ref()));
+ Some(account)
},
// we use identity hash for non substrate/evm web3 accounts, as they
// can't connect to the parachain directly
diff --git a/parachain/primitives/src/teebag/sgx_verify/fuzz-shim/Cargo.lock b/parachain/primitives/src/teebag/sgx_verify/fuzz-shim/Cargo.lock
index 7d52766cff..34a6a9a6cd 100644
--- a/parachain/primitives/src/teebag/sgx_verify/fuzz-shim/Cargo.lock
+++ b/parachain/primitives/src/teebag/sgx_verify/fuzz-shim/Cargo.lock
@@ -14,9 +14,9 @@ dependencies = [
[[package]]
name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
dependencies = [
"gimli",
]
@@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"once_cell",
"version_check",
"zerocopy",
@@ -52,9 +52,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
dependencies = [
"memchr",
]
@@ -67,9 +67,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
[[package]]
name = "anyhow"
-version = "1.0.98"
+version = "1.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
[[package]]
name = "approx"
@@ -91,14 +91,14 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "arbitrary"
-version = "1.4.1"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
[[package]]
name = "ark-bls12-377"
@@ -249,13 +249,13 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "async-trait"
-version = "0.1.88"
+version = "0.1.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -266,7 +266,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -277,9 +277,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "backtrace"
-version = "0.3.75"
+version = "0.3.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
dependencies = [
"addr2line",
"cfg-if",
@@ -287,7 +287,7 @@ dependencies = [
"miniz_oxide",
"object",
"rustc-demangle",
- "windows-targets",
+ "windows-link",
]
[[package]]
@@ -323,7 +323,7 @@ checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
[[package]]
name = "binary-merkle-tree"
version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"hash-db",
"log",
@@ -354,9 +354,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.9.1"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
[[package]]
name = "bitvec"
@@ -437,9 +437,9 @@ checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d"
[[package]]
name = "bytemuck"
-version = "1.23.1"
+version = "1.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
+checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
[[package]]
name = "byteorder"
@@ -449,9 +449,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.10.1"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
[[package]]
name = "cargo_toml"
@@ -465,10 +465,11 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.2.27"
+version = "1.2.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
+checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07"
dependencies = [
+ "find-msvc-tools",
"jobserver",
"libc",
"shlex",
@@ -485,15 +486,15 @@ dependencies = [
[[package]]
name = "cfg-if"
-version = "1.0.1"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
[[package]]
name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
dependencies = [
"num-traits",
"serde",
@@ -533,9 +534,9 @@ dependencies = [
[[package]]
name = "const_format"
-version = "0.2.34"
+version = "0.2.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
dependencies = [
"const_format_proc_macros",
]
@@ -568,9 +569,9 @@ dependencies = [
[[package]]
name = "crunchy"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
[[package]]
name = "crypto-bigint"
@@ -629,7 +630,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -641,6 +642,7 @@ dependencies = [
"const-oid",
"der_derive",
"flagset",
+ "pem-rfc7468",
"zeroize",
]
@@ -652,14 +654,14 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "deranged"
-version = "0.4.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
dependencies = [
"powerfmt",
]
@@ -683,7 +685,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -703,7 +705,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -748,7 +750,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.104",
+ "syn 2.0.111",
"termcolor",
"toml",
"walkdir",
@@ -772,14 +774,14 @@ checksum = "7e8671d54058979a37a26f3511fbf8d198ba1aa35ffb202c42587d918d77213a"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "dyn-clone"
-version = "1.0.19"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
[[package]]
name = "ecdsa"
@@ -808,9 +810,9 @@ dependencies = [
[[package]]
name = "ed25519-dalek"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
dependencies = [
"curve25519-dalek",
"ed25519",
@@ -822,16 +824,17 @@ dependencies = [
[[package]]
name = "ed25519-zebra"
-version = "4.0.3"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9"
+checksum = "0017d969298eec91e3db7a2985a8cab4df6341d86e6f3a6f5878b13fb7846bc9"
dependencies = [
"curve25519-dalek",
"ed25519",
- "hashbrown 0.14.5",
- "hex",
+ "hashbrown 0.15.5",
+ "pkcs8",
"rand_core",
"sha2 0.10.9",
+ "subtle",
"zeroize",
]
@@ -924,7 +927,7 @@ dependencies = [
[[package]]
name = "evm"
version = "0.42.0"
-source = "git+https://github.com/rust-ethereum/evm?rev=e81732d6bb47e3d3d68d233e43919c4522598361#e81732d6bb47e3d3d68d233e43919c4522598361"
+source = "git+https://github.com/rust-ethereum/evm?rev=6d86fe2d3bcc14887c2575f62958a67ac2d523db#6d86fe2d3bcc14887c2575f62958a67ac2d523db"
dependencies = [
"auto_impl",
"environmental",
@@ -944,7 +947,7 @@ dependencies = [
[[package]]
name = "evm-core"
version = "0.42.0"
-source = "git+https://github.com/rust-ethereum/evm?rev=e81732d6bb47e3d3d68d233e43919c4522598361#e81732d6bb47e3d3d68d233e43919c4522598361"
+source = "git+https://github.com/rust-ethereum/evm?rev=6d86fe2d3bcc14887c2575f62958a67ac2d523db#6d86fe2d3bcc14887c2575f62958a67ac2d523db"
dependencies = [
"parity-scale-codec",
"primitive-types",
@@ -955,7 +958,7 @@ dependencies = [
[[package]]
name = "evm-gasometer"
version = "0.42.0"
-source = "git+https://github.com/rust-ethereum/evm?rev=e81732d6bb47e3d3d68d233e43919c4522598361#e81732d6bb47e3d3d68d233e43919c4522598361"
+source = "git+https://github.com/rust-ethereum/evm?rev=6d86fe2d3bcc14887c2575f62958a67ac2d523db#6d86fe2d3bcc14887c2575f62958a67ac2d523db"
dependencies = [
"environmental",
"evm-core",
@@ -966,7 +969,7 @@ dependencies = [
[[package]]
name = "evm-runtime"
version = "0.42.0"
-source = "git+https://github.com/rust-ethereum/evm?rev=e81732d6bb47e3d3d68d233e43919c4522598361#e81732d6bb47e3d3d68d233e43919c4522598361"
+source = "git+https://github.com/rust-ethereum/evm?rev=6d86fe2d3bcc14887c2575f62958a67ac2d523db#6d86fe2d3bcc14887c2575f62958a67ac2d523db"
dependencies = [
"auto_impl",
"environmental",
@@ -987,7 +990,7 @@ dependencies = [
"prettyplease",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -1016,6 +1019,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+
[[package]]
name = "fixed-hash"
version = "0.8.0"
@@ -1034,10 +1043,16 @@ version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
[[package]]
name = "fp-account"
version = "1.0.0-dev"
-source = "git+https://github.com/AstarNetwork/frontier?branch=stable2412-txpoolwrapper#e74325d1b2150a6e505c20a4190236db4daca2bb"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
dependencies = [
"hex",
"impl-serde",
@@ -1056,7 +1071,7 @@ dependencies = [
[[package]]
name = "fp-evm"
version = "3.0.0-dev"
-source = "git+https://github.com/AstarNetwork/frontier?branch=stable2412-txpoolwrapper#e74325d1b2150a6e505c20a4190236db4daca2bb"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
dependencies = [
"environmental",
"evm",
@@ -1072,7 +1087,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"frame-support",
"frame-support-procedural",
@@ -1108,7 +1123,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"aquamarine",
"array-bytes",
@@ -1151,7 +1166,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "31.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"Inflector",
"cfg-expr",
@@ -1165,35 +1180,35 @@ dependencies = [
"proc-macro2",
"quote",
"sp-crypto-hashing",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "frame-support-procedural-tools"
version = "13.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "frame-support-procedural-tools-derive"
version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "frame-system"
version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"cfg-if",
"docify",
@@ -1282,7 +1297,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -1317,9 +1332,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
dependencies = [
"typenum",
"version_check",
@@ -1334,19 +1349,19 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if",
"libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
]
[[package]]
name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
"libc",
"r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
]
[[package]]
@@ -1361,9 +1376,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
[[package]]
name = "group"
@@ -1402,19 +1417,20 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.14.5"
+version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
dependencies = [
- "ahash",
"allocator-api2",
+ "equivalent",
+ "foldhash",
]
[[package]]
name = "hashbrown"
-version = "0.15.4"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
[[package]]
name = "heck"
@@ -1427,7 +1443,7 @@ name = "heima-primitives"
version = "0.1.0"
dependencies = [
"base58",
- "base64 0.13.1",
+ "base64 0.22.1",
"chrono",
"der",
"ecdsa",
@@ -1435,7 +1451,7 @@ dependencies = [
"heima-utils",
"heima-utils-proc-macros",
"hex",
- "hex-literal",
+ "hex-literal 1.1.0",
"p256",
"pallet-evm",
"parity-scale-codec",
@@ -1467,7 +1483,7 @@ dependencies = [
"cargo_toml",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -1494,6 +1510,12 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+[[package]]
+name = "hex-literal"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1"
+
[[package]]
name = "hmac"
version = "0.8.1"
@@ -1570,7 +1592,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -1594,12 +1616,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.9.0"
+version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
dependencies = [
"equivalent",
- "hashbrown 0.15.4",
+ "hashbrown 0.16.1",
]
[[package]]
@@ -1637,11 +1659,11 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"libc",
]
@@ -1676,15 +1698,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
-version = "0.2.174"
+version = "0.2.177"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
[[package]]
name = "libfuzzer-sys"
-version = "0.4.9"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
dependencies = [
"arbitrary",
"cc",
@@ -1749,19 +1771,18 @@ dependencies = [
[[package]]
name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
dependencies = [
- "autocfg",
"scopeguard",
]
[[package]]
name = "log"
-version = "0.4.27"
+version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
[[package]]
name = "macro_magic"
@@ -1772,7 +1793,7 @@ dependencies = [
"macro_magic_core",
"macro_magic_macros",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -1786,7 +1807,7 @@ dependencies = [
"macro_magic_core_macros",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -1797,7 +1818,7 @@ checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -1808,16 +1829,16 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869"
dependencies = [
"macro_magic_core",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
]
[[package]]
@@ -1832,9 +1853,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
[[package]]
name = "memory-db"
@@ -1889,12 +1910,11 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]]
name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
dependencies = [
- "overload",
- "winapi",
+ "windows-sys",
]
[[package]]
@@ -1973,9 +1993,9 @@ dependencies = [
[[package]]
name = "num_enum"
-version = "0.7.4"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
+checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
dependencies = [
"num_enum_derive",
"rustversion",
@@ -1983,21 +2003,21 @@ dependencies = [
[[package]]
name = "num_enum_derive"
-version = "0.7.4"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
+checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "object"
-version = "0.36.7"
+version = "0.37.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
dependencies = [
"memchr",
]
@@ -2014,12 +2034,6 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
[[package]]
name = "p256"
version = "0.13.2"
@@ -2035,7 +2049,7 @@ dependencies = [
[[package]]
name = "pallet-evm"
version = "6.0.0-dev"
-source = "git+https://github.com/AstarNetwork/frontier?branch=stable2412-txpoolwrapper#e74325d1b2150a6e505c20a4190236db4daca2bb"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
dependencies = [
"environmental",
"evm",
@@ -2045,7 +2059,7 @@ dependencies = [
"frame-support",
"frame-system",
"hash-db",
- "hex-literal",
+ "hex-literal 0.4.1",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
@@ -2094,7 +2108,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -2105,9 +2119,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
[[package]]
name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -2115,15 +2129,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
- "windows-targets",
+ "windows-link",
]
[[package]]
@@ -2153,6 +2167,15 @@ dependencies = [
"password-hash",
]
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
[[package]]
name = "pin-project-lite"
version = "0.2.16"
@@ -2199,7 +2222,7 @@ dependencies = [
"polkavm-common",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -2209,7 +2232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
dependencies = [
"polkavm-derive-impl",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -2229,12 +2252,12 @@ dependencies = [
[[package]]
name = "prettyplease"
-version = "0.2.35"
+version = "0.2.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
dependencies = [
"proc-macro2",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -2263,11 +2286,11 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
dependencies = [
- "toml_edit",
+ "toml_edit 0.23.7",
]
[[package]]
@@ -2302,23 +2325,23 @@ checksum = "75eea531cfcd120e0851a3f8aed42c4841f78c889eefafd96339c72677ae42c3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.40"
+version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
dependencies = [
"proc-macro2",
]
@@ -2373,76 +2396,61 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "redox_syscall"
-version = "0.5.13"
+version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
]
[[package]]
name = "ref-cast"
-version = "1.0.24"
+version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.24"
+version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "regex"
-version = "1.11.1"
+version = "1.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
]
[[package]]
name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
]
[[package]]
name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
[[package]]
name = "rfc6979"
@@ -2473,14 +2481,14 @@ checksum = "652db34deaaa57929e10ca18e5454a32cb0efc351ae80d320334bbf907b908b3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "rustc-demangle"
-version = "0.1.25"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
[[package]]
name = "rustc-hex"
@@ -2499,9 +2507,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
[[package]]
name = "ryu"
@@ -2550,7 +2558,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -2566,9 +2574,9 @@ dependencies = [
[[package]]
name = "schnorrkel"
-version = "0.11.4"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
+checksum = "6e9fcb6c2e176e86ec703e22560d99d65a5ee9056ae45a08e13e84ebf796296f"
dependencies = [
"aead",
"arrayref",
@@ -2633,49 +2641,61 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.26"
+version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
[[package]]
name = "serde"
-version = "1.0.219"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
dependencies = [
+ "serde_core",
"serde_derive",
]
[[package]]
name = "serde_bytes"
-version = "0.11.17"
+version = "0.11.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
dependencies = [
"serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "serde_json"
-version = "1.0.138"
+version = "1.0.145"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
dependencies = [
"itoa",
"memchr",
"ryu",
"serde",
+ "serde_core",
]
[[package]]
@@ -2778,9 +2798,9 @@ dependencies = [
[[package]]
name = "simba"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa"
+checksum = "c99284beb21666094ba2b75bbceda012e610f5479dfcc2d6e2426f53197ffd95"
dependencies = [
"approx",
"num-complex",
@@ -2797,9 +2817,9 @@ checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18"
[[package]]
name = "slab"
-version = "0.4.10"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
[[package]]
name = "smallvec"
@@ -2810,7 +2830,7 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]]
name = "sp-api"
version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"docify",
"hash-db",
@@ -2831,8 +2851,8 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
-version = "21.0.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+version = "21.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"Inflector",
"blake2",
@@ -2840,13 +2860,13 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "sp-application-crypto"
version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -2858,7 +2878,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"docify",
"integer-sqrt",
@@ -2872,7 +2892,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -2888,7 +2908,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -2899,7 +2919,7 @@ dependencies = [
[[package]]
name = "sp-core"
version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"array-bytes",
"bitflags 1.3.2",
@@ -2945,7 +2965,7 @@ dependencies = [
[[package]]
name = "sp-crypto-hashing"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"blake2b_simd",
"byteorder",
@@ -2958,27 +2978,27 @@ dependencies = [
[[package]]
name = "sp-crypto-hashing-proc-macro"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"quote",
"sp-crypto-hashing",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "sp-debug-derive"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "sp-externalities"
version = "0.30.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -2988,7 +3008,7 @@ dependencies = [
[[package]]
name = "sp-genesis-builder"
version = "0.16.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -3000,7 +3020,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -3013,7 +3033,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "39.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"bytes",
"docify",
@@ -3039,7 +3059,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"parity-scale-codec",
"parking_lot",
@@ -3050,7 +3070,7 @@ dependencies = [
[[package]]
name = "sp-metadata-ir"
version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"frame-metadata",
"parity-scale-codec",
@@ -3060,7 +3080,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "13.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"backtrace",
"regex",
@@ -3069,7 +3089,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"binary-merkle-tree",
"docify",
@@ -3098,7 +3118,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -3117,20 +3137,20 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "18.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"Inflector",
"expander",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "sp-staking"
version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -3143,7 +3163,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"hash-db",
"log",
@@ -3163,12 +3183,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
[[package]]
name = "sp-storage"
version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -3180,7 +3200,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -3192,7 +3212,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "17.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"parity-scale-codec",
"tracing",
@@ -3203,7 +3223,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"ahash",
"hash-db",
@@ -3225,7 +3245,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -3242,19 +3262,19 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"parity-scale-codec",
"proc-macro-warning",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "sp-wasm-interface"
version = "21.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
@@ -3265,7 +3285,7 @@ dependencies = [
[[package]]
name = "sp-weights"
version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"bounded-collections",
"parity-scale-codec",
@@ -3304,14 +3324,14 @@ dependencies = [
[[package]]
name = "staging-xcm"
version = "15.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"array-bytes",
"bounded-collections",
"derivative",
"environmental",
"frame-support",
- "hex-literal",
+ "hex-literal 0.4.1",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
@@ -3330,27 +3350,26 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "strum"
-version = "0.26.3"
+version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
[[package]]
name = "strum_macros"
-version = "0.26.4"
+version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "rustversion",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "substrate-bip39"
version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"hmac 0.12.1",
"pbkdf2",
@@ -3378,9 +3397,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.104"
+version = "2.0.111"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
dependencies = [
"proc-macro2",
"quote",
@@ -3419,7 +3438,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -3433,9 +3452,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.41"
+version = "0.3.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
dependencies = [
"deranged",
"itoa",
@@ -3448,15 +3467,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
[[package]]
name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
dependencies = [
"num-conv",
"time-core",
@@ -3473,9 +3492,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.9.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
dependencies = [
"tinyvec_macros",
]
@@ -3504,7 +3523,7 @@ checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
@@ -3515,8 +3534,8 @@ checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
dependencies = [
"serde",
"serde_spanned",
- "toml_datetime",
- "toml_edit",
+ "toml_datetime 0.6.11",
+ "toml_edit 0.22.27",
]
[[package]]
@@ -3528,6 +3547,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "toml_datetime"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+dependencies = [
+ "serde_core",
+]
+
[[package]]
name = "toml_edit"
version = "0.22.27"
@@ -3537,11 +3565,32 @@ dependencies = [
"indexmap",
"serde",
"serde_spanned",
- "toml_datetime",
+ "toml_datetime 0.6.11",
"toml_write",
"winnow",
]
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap",
+ "toml_datetime 0.7.3",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+dependencies = [
+ "winnow",
+]
+
[[package]]
name = "toml_write"
version = "0.1.2"
@@ -3562,20 +3611,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "tracing-core"
-version = "0.1.34"
+version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
dependencies = [
"once_cell",
"valuable",
@@ -3594,14 +3643,14 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
dependencies = [
"matchers",
"nu-ansi-term",
"once_cell",
- "regex",
+ "regex-automata",
"sharded-slab",
"smallvec",
"thread_local",
@@ -3658,9 +3707,9 @@ dependencies = [
[[package]]
name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
[[package]]
name = "uint"
@@ -3676,9 +3725,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
[[package]]
name = "unicode-normalization"
@@ -3746,12 +3795,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
]
[[package]]
@@ -3782,9 +3831,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys",
]
@@ -3796,95 +3845,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "windows-sys"
-version = "0.59.0"
+name = "windows-link"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets",
-]
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
[[package]]
-name = "windows-targets"
-version = "0.52.6"
+name = "windows-sys"
+version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows-link",
]
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
[[package]]
name = "winnow"
-version = "0.7.11"
+version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
dependencies = [
"memchr",
]
[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.1",
-]
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
[[package]]
name = "wyz"
@@ -3910,39 +3898,39 @@ dependencies = [
[[package]]
name = "xcm-procedural"
version = "11.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2412#128a93179953ddfbf807c874a04060350c4902e6"
+source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
dependencies = [
"Inflector",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "zerocopy"
-version = "0.8.26"
+version = "0.8.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "4ea879c944afe8a2b25fef16bb4ba234f47c694565e97383b36f3a878219065c"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "cf955aa904d6040f70dc8e9384444cb1030aed272ba3cb09bbc4ab9e7c1f34f5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
[[package]]
name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
dependencies = [
"zeroize_derive",
]
@@ -3955,5 +3943,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.111",
]
diff --git a/parachain/primitives/src/teebag/sgx_verify/tests.rs b/parachain/primitives/src/teebag/sgx_verify/tests.rs
index e5af838baa..c551d042c0 100644
--- a/parachain/primitives/src/teebag/sgx_verify/tests.rs
+++ b/parachain/primitives/src/teebag/sgx_verify/tests.rs
@@ -5,6 +5,7 @@ use super::{
*,
};
use crate::{MrEnclave, QeAuthenticationData, QeCertificationData, SgxBuildMode};
+use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine};
use frame_support::assert_err;
use hex_literal::hex;
use parity_scale_codec::Decode;
@@ -168,7 +169,7 @@ fn deserialize_tcb_info_works() {
#[test]
fn verify_tcb_info_signature() {
let cert = QE_IDENTITY_CERT.replace('\n', "");
- let cert_bytes = base64::decode(cert).unwrap();
+ let cert_bytes = BASE64_STANDARD.decode(cert).unwrap();
let cert = Certificate::from_der(&cert_bytes).unwrap();
let data = br#"{"version":2,"issueDate":"2022-10-18T21:45:02Z","nextUpdate":"2022-11-17T21:45:02Z","fmspc":"00906EA10000","pceId":"0000","tcbType":0,"tcbEvaluationDataNumber":12,"tcbLevels":[{"tcb":{"sgxtcbcomp01svn":17,"sgxtcbcomp02svn":17,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":7,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":11},"tcbDate":"2021-11-10T00:00:00Z","tcbStatus":"SWHardeningNeeded"},{"tcb":{"sgxtcbcomp01svn":17,"sgxtcbcomp02svn":17,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":7,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":10},"tcbDate":"2020-11-11T00:00:00Z","tcbStatus":"OutOfDate"},{"tcb":{"sgxtcbcomp01svn":17,"sgxtcbcomp02svn":17,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":11},"tcbDate":"2021-11-10T00:00:00Z","tcbStatus":"ConfigurationAndSWHardeningNeeded"},{"tcb":{"sgxtcbcomp01svn":17,"sgxtcbcomp02svn":17,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":10},"tcbDate":"2020-11-11T00:00:00Z","tcbStatus":"OutOfDateConfigurationNeeded"},{"tcb":{"sgxtcbcomp01svn":15,"sgxtcbcomp02svn":15,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":7,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":10},"tcbDate":"2020-06-10T00:00:00Z","tcbStatus":"OutOfDate"},{"tcb":{"sgxtcbcomp01svn":15,"sgxtcbcomp02svn":15,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":10},"tcbDate":"2020-06-10T00:00:00Z","tcbStatus":"OutOfDateConfigurationNeeded"},{"tcb":{"sgxtcbcomp01svn":14,"sgxtcbcomp02svn":14,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":7,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":10},"tcbDate":"2019-12-11T00:00:00Z","tcbStatus":"OutOfDate"},{"tcb":{"sgxtcbcomp01svn":14,"sgxtcbcomp02svn":14,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":10},"tcbDate":"2019-12-11T00:00:00Z","tcbStatus":"OutOfDateConfigurationNeeded"},{"tcb":{"sgxtcbcomp01svn":13,"sgxtcbcomp02svn":13,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":3,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":9},"tcbDate":"2019-11-13T00:00:00Z","tcbStatus":"OutOfDate"},{"tcb":{"sgxtcbcomp01svn":13,"sgxtcbcomp02svn":13,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":9},"tcbDate":"2019-11-13T00:00:00Z","tcbStatus":"OutOfDateConfigurationNeeded"},{"tcb":{"sgxtcbcomp01svn":6,"sgxtcbcomp02svn":6,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":1,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":7},"tcbDate":"2019-05-15T00:00:00Z","tcbStatus":"OutOfDate"},{"tcb":{"sgxtcbcomp01svn":6,"sgxtcbcomp02svn":6,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":7},"tcbDate":"2019-05-15T00:00:00Z","tcbStatus":"OutOfDateConfigurationNeeded"},{"tcb":{"sgxtcbcomp01svn":5,"sgxtcbcomp02svn":5,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":1,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":7},"tcbDate":"2019-01-09T00:00:00Z","tcbStatus":"OutOfDate"},{"tcb":{"sgxtcbcomp01svn":5,"sgxtcbcomp02svn":5,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":1,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":6},"tcbDate":"2018-08-15T00:00:00Z","tcbStatus":"OutOfDate"},{"tcb":{"sgxtcbcomp01svn":5,"sgxtcbcomp02svn":5,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":7},"tcbDate":"2019-01-09T00:00:00Z","tcbStatus":"OutOfDateConfigurationNeeded"},{"tcb":{"sgxtcbcomp01svn":5,"sgxtcbcomp02svn":5,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":6},"tcbDate":"2018-08-15T00:00:00Z","tcbStatus":"OutOfDateConfigurationNeeded"},{"tcb":{"sgxtcbcomp01svn":4,"sgxtcbcomp02svn":4,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":5},"tcbDate":"2018-01-04T00:00:00Z","tcbStatus":"OutOfDate"},{"tcb":{"sgxtcbcomp01svn":2,"sgxtcbcomp02svn":2,"sgxtcbcomp03svn":2,"sgxtcbcomp04svn":4,"sgxtcbcomp05svn":1,"sgxtcbcomp06svn":128,"sgxtcbcomp07svn":0,"sgxtcbcomp08svn":0,"sgxtcbcomp09svn":0,"sgxtcbcomp10svn":0,"sgxtcbcomp11svn":0,"sgxtcbcomp12svn":0,"sgxtcbcomp13svn":0,"sgxtcbcomp14svn":0,"sgxtcbcomp15svn":0,"sgxtcbcomp16svn":0,"pcesvn":4},"tcbDate":"2017-07-26T00:00:00Z","tcbStatus":"OutOfDate"}]}"#;
let signature = hex!("e0cc3102e9ffdb21cf156ba30f13d027210ab11f3bff349e670e4c49b2f0cb6889c7eeb436149c7efe53e15c97e6ec3fc9f34c3440e732a4c760f8eb91834a36");
@@ -199,7 +200,7 @@ fn parse_pck_crl() {
#[test]
fn parse_pck_certificate() {
let der = DCAP_QUOTE_CERT.replace('\n', "");
- let der = base64::decode(der).unwrap();
+ let der = BASE64_STANDARD.decode(der).unwrap();
let ext = get_intel_extension(&der).unwrap();
assert_eq!(453, ext.len());
diff --git a/parachain/runtime/heima/Cargo.toml b/parachain/runtime/heima/Cargo.toml
index bf2c4e0c4c..311e6a3c17 100644
--- a/parachain/runtime/heima/Cargo.toml
+++ b/parachain/runtime/heima/Cargo.toml
@@ -119,9 +119,6 @@ pallet-evm-precompile-parachain-staking = { workspace = true }
pallet-evm-precompile-score-staking = { workspace = true }
pallet-evm-precompile-vesting = { workspace = true }
-moonbeam-evm-tracer = { workspace = true }
-moonbeam-rpc-primitives-debug = { workspace = true }
-moonbeam-rpc-primitives-txpool = { workspace = true }
precompile-utils = { workspace = true }
[dev-dependencies]
@@ -222,9 +219,6 @@ std = [
"frame-try-runtime?/std",
"hex?/std",
"log/std",
- "moonbeam-evm-tracer/std",
- "moonbeam-rpc-primitives-debug/std",
- "moonbeam-rpc-primitives-txpool/std",
"num_enum/std",
"pallet-account-fix/std",
"pallet-asset-manager/std",
diff --git a/parachain/runtime/heima/src/lib.rs b/parachain/runtime/heima/src/lib.rs
index 1c80a8c565..d56cc8520e 100644
--- a/parachain/runtime/heima/src/lib.rs
+++ b/parachain/runtime/heima/src/lib.rs
@@ -247,7 +247,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: alloc::borrow::Cow::Borrowed("heima"),
authoring_version: 1,
// same versioning-mechanism as polkadot: use last digit for minor updates
- spec_version: 9251,
+ spec_version: 9260,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 2,
@@ -1841,179 +1841,6 @@ impl_runtime_apis! {
}
}
- impl moonbeam_rpc_primitives_debug::DebugRuntimeApi for Runtime {
- fn trace_transaction(
- extrinsics: Vec<::Extrinsic>,
- traced_transaction: &pallet_ethereum::Transaction,
- header: &::Header,
- ) -> Result<
- (),
- sp_runtime::DispatchError,
- > {
- use moonbeam_evm_tracer::tracer::EvmTracer;
-
- // We need to follow the order when replaying the transactions.
- // Block initialize happens first then apply_extrinsic.
- Executive::initialize_block(header);
-
- // Apply the a subset of extrinsics: all the substrate-specific or ethereum
- // transactions that preceded the requested transaction.
- for ext in extrinsics.into_iter() {
- let _ = match &ext.0.function {
- RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => {
- if transaction == traced_transaction {
- EvmTracer::new().trace(|| Executive::apply_extrinsic(ext));
- return Ok(());
- } else {
- Executive::apply_extrinsic(ext)
- }
- }
- _ => Executive::apply_extrinsic(ext),
- };
- }
- Err(sp_runtime::DispatchError::Other(
- "Failed to find Ethereum transaction among the extrinsics.",
- ))
- }
-
- fn trace_block(
- extrinsics: Vec<