Skip to content

Commit 4b19e1a

Browse files
committed
Merge branch 'devnet-ready' into feat/re-enable-alpha-fees
2 parents 6154251 + f07ec06 commit 4b19e1a

File tree

6 files changed

+628
-637
lines changed

6 files changed

+628
-637
lines changed

Cargo.lock

Lines changed: 410 additions & 410 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 214 additions & 214 deletions
Large diffs are not rendered by default.

node/src/mev_shield/proposer.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use ml_kem::kem::{Decapsulate, DecapsulationKey};
44
use ml_kem::{Ciphertext, Encoded, EncodedSizeUser, MlKem768, MlKem768Params};
55
use sc_service::SpawnTaskHandle;
66
use sc_transaction_pool_api::{TransactionPool, TransactionSource};
7-
use sp_consensus::BlockOrigin;
87
use sp_core::H256;
98
use sp_runtime::traits::{Header, SaturatedConversion};
109
use sp_runtime::{AccountId32, OpaqueExtrinsic};
@@ -167,9 +166,6 @@ pub fn spawn_revealer<B, C, Pool>(
167166
let mut import_stream = client.import_notification_stream();
168167

169168
while let Some(notif) = import_stream.next().await {
170-
if notif.origin != BlockOrigin::Own {
171-
continue;
172-
}
173169

174170
let at_hash = notif.hash;
175171
let block_number_u64: u64 = (*notif.header.number()).saturated_into();
@@ -650,7 +646,7 @@ pub fn spawn_revealer<B, C, Pool>(
650646
error_message,
651647
hex::encode(aead_body_hash),
652648
);
653-
failed_calls.push((id, create_failed_call(id, error_message)));
649+
//failed_calls.push((id, create_failed_call(id, error_message)));
654650
continue;
655651
}
656652
};

pallets/subtensor/src/staking/remove_stake.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ impl<T: Config> Pallet<T> {
480480
// - per (hot,cold) α VALUE (not shares) with fallback to raw share if pool uninitialized,
481481
// - track hotkeys to clear pool totals.
482482
let mut keys_to_remove: Vec<(T::AccountId, T::AccountId)> = Vec::new();
483-
let mut hotkeys_seen: Vec<T::AccountId> = Vec::new();
484483
let mut stakers: Vec<(T::AccountId, T::AccountId, u128)> = Vec::new();
485484
let mut total_alpha_value_u128: u128 = 0;
486485

@@ -495,9 +494,6 @@ impl<T: Config> Pallet<T> {
495494
continue;
496495
}
497496
keys_to_remove.push((hot.clone(), cold.clone()));
498-
if !hotkeys_seen.contains(hot) {
499-
hotkeys_seen.push(hot.clone());
500-
}
501497

502498
// Primary: actual α value via share pool.
503499
let pool = Self::get_alpha_share_pool(hot.clone(), netuid);
@@ -580,7 +576,7 @@ impl<T: Config> Pallet<T> {
580576
AlphaV2::<T>::remove((hot, cold, netuid));
581577
}
582578
// 7.b) Clear share‑pool totals for each hotkey on this subnet.
583-
for hot in hotkeys_seen {
579+
for hot in hotkeys_in_subnet {
584580
TotalHotkeyAlpha::<T>::remove(&hot, netuid);
585581
TotalHotkeyShares::<T>::remove(&hot, netuid);
586582
TotalHotkeySharesV2::<T>::remove(&hot, netuid);

precompiles/src/extensions.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ pub(crate) trait PrecompileHandleExt: PrecompileHandle {
131131
<R as frame_system::Config>::RuntimeCall,
132132
>>::post_dispatch((), &info, &mut post_info, 0, &result)
133133
.map_err(extension_error)?;
134-
log::error!("Dispatch failed. Error: {e:?}");
135-
log::warn!("Returning error PrecompileFailure::Error");
134+
log::info!("Precompile dispatch failed. message as: {e:?}");
136135
self.charge_and_refund_after_dispatch::<R, Call>(&info, &post_info)?;
137136

138137
Err(PrecompileFailure::Error {

runtime/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
241241
// `spec_version`, and `authoring_version` are the same between Wasm and native.
242242
// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
243243
// the compatible custom types.
244-
spec_version: 370,
244+
spec_version: 371,
245245
impl_version: 1,
246246
apis: RUNTIME_API_VERSIONS,
247247
transaction_version: 1,

0 commit comments

Comments
 (0)