Merge branch 'devnet-ready' into feat/leasing-precompiles

Author: l0r1s

Cargo.lock

@@ -72,8 +72,6 @@ services:
       - --no-mdns
       - --bootnodes=/dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr
       - --sync=warp
-      - --reserved-nodes=/dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr
-      - --reserved-only
       - --database paritydb
       - --db-cache 4096
       - --trie-cache-size 2048
@@ -91,5 +89,3 @@ services:
       - --no-mdns
       - --bootnodes=/dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr
       - --pruning=archive
-      - --reserved-nodes=/dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr
-      - --reserved-only

docker-compose.yml

@@ -353,16 +353,6 @@ export async function setMaxChildkeyTake(api: TypedApi<typeof devnet>, take: num
     await waitForTransactionWithRetry(api, tx, alice)
 }
 
-// use the alice as wrong mapped account to send extrinsic
-export async function setPureProxyAccount(api: TypedApi<typeof devnet>, address: string, account: string) {
-    const alice = getAliceSigner()
-    const call = api.tx.SubtensorModule.set_pure_proxy_account({
-        address: ethAddressToH160(address),
-        account
-    })
-    await waitForTransactionWithRetry(api, call, alice)
-}
-
 // Swap coldkey to contract address
 export async function swapColdkey(
     api: TypedApi<typeof devnet>,

evm-tests/src/contracts/pureProxy.ts

@@ -45,7 +45,6 @@ pallet-scheduler = { workspace = true }
 pallet-grandpa = { workspace = true }
 sp-std = { workspace = true }
 pallet-subtensor-swap = { workspace = true }
-pallet-evm = { workspace = true }
 pallet-crowdloan = { workspace = true, default-features = false }
 pallet-preimage = { workspace = true, default-features = false }
 
@@ -59,7 +58,6 @@ std = [
 	"log/std",
 	"pallet-balances/std",
 	"pallet-drand/std",
-	"pallet-evm/std",
 	"pallet-evm-chain-id/std",
 	"pallet-grandpa/std",
 	"pallet-scheduler/std",
@@ -86,7 +84,6 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-drand/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
 	"pallet-grandpa/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-subtensor/runtime-benchmarks",
@@ -100,7 +97,6 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-drand/try-runtime",
-	"pallet-evm/try-runtime",
 	"pallet-evm-chain-id/try-runtime",
 	"pallet-grandpa/try-runtime",
 	"pallet-scheduler/try-runtime",

evm-tests/src/subtensor.ts

@@ -22,15 +22,6 @@ use sp_weights::Weight;
 use subtensor_runtime_common::NetUid;
 
 type Block = frame_system::mocking::MockBlock<Test>;
-
-pub struct DummyAddressMap;
-
-impl pallet_evm::AddressMapping<AccountId> for DummyAddressMap {
-    fn into_account_id(address: sp_core::H160) -> AccountId {
-        let account = pallet_evm::HashedAddressMapping::<BlakeTwo256>::into_account_id(address);
-        U256::from_big_endian(account.as_ref())
-    }
-}
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
     pub enum Test {
@@ -230,7 +221,6 @@ impl pallet_subtensor::Config for Test {
     type SwapInterface = Swap;
     type KeySwapOnSubnetCost = InitialKeySwapOnSubnetCost;
     type HotkeySwapOnSubnetInterval = HotkeySwapOnSubnetInterval;
-    type AddressMapping = DummyAddressMap;
     type ProxyInterface = ();
     type LeaseDividendsDistributionInterval = LeaseDividendsDistributionInterval;
 }

evm-tests/test/pure-proxy.precompile.test.ts

@@ -49,7 +49,6 @@ subtensor-runtime-common = { workspace = true, features = ["approx"] }
 
 pallet-collective = { version = "4.0.0-dev", default-features = false, path = "../collective" }
 pallet-drand = { path = "../drand", default-features = false }
-pallet-evm = { workspace = true }
 pallet-membership = { workspace = true }
 hex-literal = { workspace = true }
 num-traits = { version = "0.2.19", default-features = false, features = [
@@ -93,7 +92,6 @@ std = [
 	"pallet-balances/std",
 	"pallet-collective/std",
 	"pallet-drand/std",
-	"pallet-evm/std",
 	"pallet-membership/std",
 	"pallet-preimage/std",
 	"pallet-scheduler/std",
@@ -136,7 +134,6 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
 	"pallet-drand/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
@@ -152,7 +149,6 @@ try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-evm/try-runtime",
 	"pallet-membership/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-scheduler/try-runtime",

pallets/admin-utils/Cargo.toml

@@ -9,7 +9,7 @@ use frame_benchmarking::v2::*;
 use frame_support::{StorageDoubleMap, assert_ok};
 use frame_system::{RawOrigin, pallet_prelude::BlockNumberFor};
 pub use pallet::*;
-use sp_core::{H160, H256};
+use sp_core::H256;
 use sp_runtime::{
     BoundedVec, Percent,
     traits::{BlakeTwo256, Hash},
@@ -20,7 +20,6 @@ use subtensor_runtime_common::{AlphaCurrency, NetUid};
 #[frame_benchmarking::v2::benchmarks]
 mod pallet_benchmarks {
     use super::*;
-    use pallet_evm::AddressMapping;
 
     #[benchmark]
     fn register() {
@@ -1382,16 +1381,6 @@ mod pallet_benchmarks {
         _(RawOrigin::Signed(coldkey), hotkey);
     }
 
-    #[benchmark]
-    fn set_pure_proxy_account() {
-        let address: H160 = H160::zero();
-        let mapped_account = T::AddressMapping::into_account_id(address);
-        let proxy_account: T::AccountId = account("A", 0, 7);
-
-        #[extrinsic_call]
-        _(RawOrigin::Signed(mapped_account), address, proxy_account);
-    }
-
     #[benchmark]
     fn remove_stake_full_limit() {
         let netuid = NetUid::from(1);

pallets/admin-utils/src/tests/mock.rs

@@ -1717,11 +1717,6 @@ pub mod pallet {
     pub type AssociatedEvmAddress<T: Config> =
         StorageDoubleMap<_, Twox64Concat, NetUid, Twox64Concat, u16, (H160, u64), OptionQuery>;
 
-    #[pallet::storage]
-    /// --- MAP (H160) --> T::AccountId
-    pub type PureProxyAccount<T: Config> =
-        StorageMap<_, Twox64Concat, H160, T::AccountId, OptionQuery>;
-
     /// ========================
     /// ==== Subnet Leasing ====
     /// ========================