Merge branch 'devnet-ready' into hybrid-node

Author: liamaharon

evm-tests/test/leasing.precompile.test.ts

@@ -20,7 +20,6 @@ describe("Test Leasing precompile", () => {
 
     let wallet1: ethers.Wallet;
     let wallet2: ethers.Wallet;
-    let wallet3: ethers.Wallet;
     let leaseContract: ethers.Contract;
     let crowdloanContract: ethers.Contract;
     let neuronContract: ethers.Contract;
@@ -34,22 +33,18 @@ describe("Test Leasing precompile", () => {
 
         wallet1 = generateRandomEthersWallet();
         wallet2 = generateRandomEthersWallet();
-        wallet3 = generateRandomEthersWallet();
         leaseContract = new ethers.Contract(ILEASING_ADDRESS, ILeasingABI, wallet1);
         crowdloanContract = new ethers.Contract(ICROWDLOAN_ADDRESS, ICrowdloanABI, wallet1);
         neuronContract = new ethers.Contract(INEURON_ADDRESS, INeuronABI, wallet1);
 
         await forceSetBalanceToEthAddress(api, wallet1.address);
         await forceSetBalanceToEthAddress(api, wallet2.address);
-        await forceSetBalanceToEthAddress(api, wallet3.address);
-        await neuronContract.burnedRegister(1, convertH160ToPublicKey(wallet3.address));
-        await forceSetBalanceToEthAddress(api, wallet1.address);
     });
 
     it("gets an existing lease created on substrate side, its subnet id and its contributor shares", async () => {
         const nextCrowdloanId = await api.query.Crowdloan.NextCrowdloanId.getValue();
         const crowdloanDeposit = BigInt(100_000_000_000); // 100 TAO
-        const crowdloanCap = BigInt(10_000_000_000_000); // 10000 TAO
+        const crowdloanCap = await api.query.SubtensorModule.NetworkLastLockCost.getValue() * BigInt(2);
         const crowdloanEnd = await api.query.System.Number.getValue() + 100;
         const leaseEmissionsShare = 15;
         const leaseEnd = await api.query.System.Number.getValue() + 300;
@@ -104,7 +99,7 @@ describe("Test Leasing precompile", () => {
         const nextCrowdloanId = await api.query.Crowdloan.NextCrowdloanId.getValue();
         const crowdloanDeposit = BigInt(100_000_000_000); // 100 TAO
         const crowdloanMinContribution = BigInt(1_000_000_000); // 1 TAO
-        const crowdloanCap = BigInt(10_000_000_000_000); // 10000 TAO
+        const crowdloanCap = await api.query.SubtensorModule.NetworkLastLockCost.getValue() * BigInt(2);
         const crowdloanEnd = await api.query.System.Number.getValue() + 100;
         const leasingEmissionsShare = 15;
         const leasingEndBlock = await api.query.System.Number.getValue() + 300;
@@ -158,15 +153,19 @@ describe("Test Leasing precompile", () => {
     });
 
     it("terminates a lease", async () => {
+        const hotkey = generateRandomEthersWallet();
+        let tx = await neuronContract.burnedRegister(1, convertH160ToPublicKey(hotkey.address));
+        await tx.wait();
+
         const nextCrowdloanId = await api.query.Crowdloan.NextCrowdloanId.getValue();
         const crowdloanDeposit = BigInt(100_000_000_000); // 100 TAO
         const crowdloanMinContribution = BigInt(1_000_000_000); // 1 TAO
-        const crowdloanCap = BigInt(10_000_000_000_000); // 10000 TAO
+        const crowdloanCap = await api.query.SubtensorModule.NetworkLastLockCost.getValue() * BigInt(2);
         const crowdloanEnd = await api.query.System.Number.getValue() + 100;
         const leasingEmissionsShare = 15;
         const leasingEndBlock = await api.query.System.Number.getValue() + 200;
 
-        let tx = await leaseContract.createLeaseCrowdloan(
+        tx = await leaseContract.createLeaseCrowdloan(
             crowdloanDeposit,
             crowdloanMinContribution,
             crowdloanCap,
@@ -193,7 +192,7 @@ describe("Test Leasing precompile", () => {
         assert.isDefined(lease);
         const netuid = lease.netuid;
 
-        tx = await leaseContract.terminateLease(nextLeaseId, convertH160ToPublicKey(wallet3.address));
+        tx = await leaseContract.terminateLease(nextLeaseId, convertH160ToPublicKey(hotkey.address));
         await tx.wait();
 
         lease = await api.query.SubtensorModule.SubnetLeases.getValue(nextLeaseId);
@@ -203,6 +202,6 @@ describe("Test Leasing precompile", () => {
         const ownerColdkey = await api.query.SubtensorModule.SubnetOwner.getValue(netuid);
         const ownerHotkey = await api.query.SubtensorModule.SubnetOwnerHotkey.getValue(netuid);
         assert.equal(ownerColdkey, convertH160ToSS58(wallet1.address));
-        assert.equal(ownerHotkey, convertH160ToSS58(wallet3.address));
+        assert.equal(ownerHotkey, convertH160ToSS58(hotkey.address));
     });
 })

pallets/subtensor/rpc/src/lib.rs

@@ -54,7 +54,7 @@ pub trait SubtensorCustomApi<BlockHash> {
     fn get_subnets_info(&self, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
     #[method(name = "subnetInfo_getSubnetInfo_v2")]
     fn get_subnet_info_v2(&self, netuid: NetUid, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
-    #[method(name = "subnetInfo_getSubnetsInf_v2")]
+    #[method(name = "subnetInfo_getSubnetsInfo_v2")]
     fn get_subnets_info_v2(&self, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
     #[method(name = "subnetInfo_getSubnetHyperparams")]
     fn get_subnet_hyperparams(&self, netuid: NetUid, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;

pallets/subtensor/src/coinbase/run_coinbase.rs

@@ -76,7 +76,7 @@ impl<T: Config> Pallet<T> {
             log::debug!("alpha_emission_i: {:?}", alpha_emission_i);
 
             // Get initial alpha_in
-            let alpha_in_i: U96F32;
+            let mut alpha_in_i: U96F32;
             let mut tao_in_i: U96F32;
             let tao_in_ratio: U96F32 = default_tao_in_i.safe_div_or(
                 U96F32::saturating_from_num(block_emission),
@@ -108,12 +108,14 @@ impl<T: Config> Pallet<T> {
             log::debug!("alpha_in_i: {:?}", alpha_in_i);
 
             // Get alpha_out.
-            let alpha_out_i = alpha_emission_i;
+            let mut alpha_out_i = alpha_emission_i;
             // Only emit TAO if the subnetwork allows registration.
             if !Self::get_network_registration_allowed(*netuid_i)
                 && !Self::get_network_pow_registration_allowed(*netuid_i)
             {
                 tao_in_i = asfloat!(0.0);
+                alpha_in_i = asfloat!(0.0);
+                alpha_out_i = asfloat!(0.0);
             }
             // Insert values into maps
             tao_in.insert(*netuid_i, tao_in_i);

runtime/src/lib.rs

@@ -218,7 +218,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     //   `spec_version`, and `authoring_version` are the same between Wasm and native.
     // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
     //   the compatible custom types.
-    spec_version: 298,
+    spec_version: 299,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,