add stake is ok

open-junius · open-junius · commit e7fa965486a7 · 2025-10-30T09:45:59.000+08:00
diff --git a/evm-tests/bittensor/lib.rs b/evm-tests/bittensor/lib.rs
@@ -5,23 +5,23 @@ use parity_scale_codec::{Compact, CompactAs, Error as CodecError};
 #[derive(Debug, Clone)]
 pub struct CustomEnvironment;
 
-// pub enum FunctionId {
-//     GetStakeInfoForHotkeyColdkeyNetuidV1 = 0,
-//     AddStakeV1 = 1,
-//     RemoveStakeV1 = 2,
-//     UnstakeAllV1 = 3,
-//     UnstakeAllAlphaV1 = 4,
-//     MoveStakeV1 = 5,
-//     TransferStakeV1 = 6,
-//     SwapStakeV1 = 7,
-//     AddStakeLimitV1 = 8,
-//     RemoveStakeLimitV1 = 9,
-//     SwapStakeLimitV1 = 10,
-//     RemoveStakeFullLimitV1 = 11,
-//     SetColdkeyAutoStakeHotkeyV1 = 12,
-//     AddProxyV1 = 13,
-//     RemoveProxyV1 = 14,
-// }
+pub enum FunctionId {
+    GetStakeInfoForHotkeyColdkeyNetuidV1 = 0,
+    AddStakeV1 = 1,
+    RemoveStakeV1 = 2,
+    UnstakeAllV1 = 3,
+    UnstakeAllAlphaV1 = 4,
+    MoveStakeV1 = 5,
+    TransferStakeV1 = 6,
+    SwapStakeV1 = 7,
+    AddStakeLimitV1 = 8,
+    RemoveStakeLimitV1 = 9,
+    SwapStakeLimitV1 = 10,
+    RemoveStakeFullLimitV1 = 11,
+    SetColdkeyAutoStakeHotkeyV1 = 12,
+    AddProxyV1 = 13,
+    RemoveProxyV1 = 14,
+}
 
 #[ink::chain_extension(extension = 0x1000)]
 pub trait RuntimeReadWrite {
@@ -34,8 +34,12 @@ pub trait RuntimeReadWrite {
         netuid: u16,
     ) -> Option<StakeInfo<ink::primitives::AccountId>>;
 
-    // #[ink(function = 1)]
-    // fn add_stake(hotkey: &[u8], netuid: &[u8], amount: &[u8]);
+    #[ink(function = 1)]
+    fn add_stake(
+        hotkey: <CustomEnvironment as ink::env::Environment>::AccountId,
+        netuid: NetUid,
+        amount: AlphaCurrency,
+    );
 
     // #[ink(function = 2)]
     // fn remove_stake(hotkey: &[u8], netuid: &[u8], amount: &[u8]);
@@ -240,21 +244,39 @@ mod bittensor {
         }
 
         #[ink(message)]
-        pub fn get_stake_info_for_hotkey_coldkey_netuid(
-            &mut self,
+        pub fn dummy(&self) -> Result<bool, ReadWriteErrorCode> {
+            Ok(true)
+        }
+
+        #[ink(message)]
+        pub fn add_stake(
+            &self,
             hotkey: [u8; 32],
-            coldkey: [u8; 32],
             netuid: u16,
-        ) -> Result<Option<StakeInfo<ink::primitives::AccountId>>, ReadWriteErrorCode> {
+            amount: u64,
+        ) -> Result<(), ReadWriteErrorCode> {
             self.env()
                 .extension()
-                .get_stake_info_for_hotkey_coldkey_netuid(
-                    hotkey.into(),
-                    coldkey.into(),
-                    netuid.into(),
-                )
-                .map_err(|_e| ReadWriteErrorCode::ReadFailed)
+                .add_stake(hotkey.into(), netuid.into(), amount.into())
+                .map_err(|_e| ReadWriteErrorCode::WriteFailed)
         }
+
+        // #[ink(message)]
+        // pub fn get_stake_info_for_hotkey_coldkey_netuid(
+        //     &mut self,
+        //     hotkey: [u8; 32],
+        //     coldkey: [u8; 32],
+        //     netuid: u16,
+        // ) -> Result<Option<StakeInfo<ink::primitives::AccountId>>, ReadWriteErrorCode> {
+        //     self.env()
+        //         .extension()
+        //         .get_stake_info_for_hotkey_coldkey_netuid(
+        //             hotkey.into(),
+        //             coldkey.into(),
+        //             netuid.into(),
+        //         )
+        //         .map_err(|_e| ReadWriteErrorCode::ReadFailed)
+        // }
     }
 
     /// Unit tests in Rust are normally defined within such a `#[cfg(test)]`
diff --git a/evm-tests/package.json b/evm-tests/package.json
@@ -6,21 +6,22 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@localpapi/descriptors": "file:.papi/descriptors",
     "@polkadot-api/descriptors": "file:.papi/descriptors",
+    "@polkadot-api/ink-contracts": "^0.4.1",
+    "@polkadot-api/sdk-ink": "^0.5.1",
     "@polkadot-labs/hdkd": "^0.0.23",
     "@polkadot-labs/hdkd-helpers": "^0.0.23",
     "@polkadot/api": "^16.4.9",
     "@types/mocha": "^10.0.10",
     "dotenv": "17.2.1",
     "ethers": "^6.13.5",
     "mocha": "^11.1.0",
-    "polkadot-api": "^1.9.5",
+    "polkadot-api": "^1.20.0",
     "rxjs": "^7.8.2",
     "scale-ts": "^1.6.1",
     "viem": "2.23.4",
-    "ws": "^8.18.2",
-    "@polkadot-api/ink-contracts": "^0.4.1",
-    "@polkadot-api/sdk-ink": "^0.5.1"
+    "ws": "^8.18.2"
   },
   "devDependencies": {
     "@types/bun": "^1.1.13",
diff --git a/evm-tests/test/wasm.contract.test.ts b/evm-tests/test/wasm.contract.test.ts
@@ -1,14 +1,16 @@
 import * as assert from "assert";
-import { getDevnetApi, getAliceSigner, getRandomSubstrateKeypair } from "../src/substrate"
-import { devnet, contracts, MultiAddress } from "@polkadot-api/descriptors"
+import { getDevnetApi, getAliceSigner, getRandomSubstrateKeypair, getSignerFromKeypair } from "../src/substrate"
+import { devnet, MultiAddress } from "@polkadot-api/descriptors";
 import { Binary, PolkadotSigner, TypedApi } from "polkadot-api";
 
+import { contracts } from "../.papi/descriptors";
+
 import { ETH_LOCAL_URL } from "../src/config";
 import { ISTAKING_ADDRESS, ISTAKING_V2_ADDRESS, IStakingABI, IStakingV2ABI } from "../src/contracts/staking"
-import { getInkClient, InkClient } from "@polkadot-api/ink-contracts"
+import { getInkClient, InkClient, } from "@polkadot-api/ink-contracts"
 import fs from "fs"
 import { convertPublicKeyToSs58 } from "../src/address-utils";
-import { forceSetBalanceToSs58Address } from "../src/subtensor";
+import { addNewSubnetwork, burnedRegister, forceSetBalanceToSs58Address, startCall } from "../src/subtensor";
 
 const bittensorWasmPath = "./bittensor/target/ink/bittensor.wasm"
 const bittensorBytecode = fs.readFileSync(bittensorWasmPath)
@@ -20,7 +22,7 @@ describe("Test wasm contract", () => {
     const hotkey = getRandomSubstrateKeypair();
     const coldkey = getRandomSubstrateKeypair();
 
-    let inkClient: InkClient<typeof contracts.bittensor>;
+    // let inkClient: InkClient<typeof contracts.bittensor>;
     let contractAddress: string;
 
     // sudo account alice as signer
@@ -29,13 +31,20 @@ describe("Test wasm contract", () => {
         // init variables got from await and async  
         api = await getDevnetApi()
         alice = await getAliceSigner();
-        await forceSetBalanceToSs58Address(api, convertPublicKeyToSs58(hotkey.publicKey))
+
         await forceSetBalanceToSs58Address(api, convertPublicKeyToSs58(coldkey.publicKey))
+        let netuid = await addNewSubnetwork(api, hotkey, coldkey)
+        await forceSetBalanceToSs58Address(api, convertPublicKeyToSs58(hotkey.publicKey))
+        await startCall(api, netuid, coldkey)
+
+        console.log("test the case on subnet ", netuid)
+        await burnedRegister(api, netuid, convertPublicKeyToSs58(hotkey.publicKey), coldkey)
+
     })
 
     it("Can instantiate contract", async () => {
-        const signer = await getAliceSigner();
-        inkClient = getInkClient(contracts.bittensor)
+        const signer = getSignerFromKeypair(coldkey);
+        const inkClient = getInkClient(contracts.bittensor)
         const constructor = inkClient.constructor('new')
         const data = constructor.encode()
         const instantiate_with_code = await api.tx.Contracts.instantiate_with_code({
@@ -50,7 +59,6 @@ describe("Test wasm contract", () => {
             salt: Binary.fromHex("0x"),
         }).signAndSubmit(signer)
 
-
         let codeStoredEvents = await api.event.Contracts.Instantiated.filter(instantiate_with_code.events)
         if (codeStoredEvents.length === 0) {
             throw new Error("No events found")
@@ -62,8 +70,71 @@ describe("Test wasm contract", () => {
 
 
     it("Can query stake info from contract", async () => {
+        let netuid = (await api.query.SubtensorModule.TotalNetworks.getValue()) - 1
+        const signer = getSignerFromKeypair(coldkey);
+        const inkClient = getInkClient(contracts.bittensor)
+        const query = inkClient.message("dummy")
+        const data = query.encode() // No parameters needed
+        // const queryTx = await api.tx.Contracts.call({
+        //     dest: MultiAddress.Id(contractAddress),
+        //     data: Binary.fromBytes(data.asBytes()),
+        //     value: BigInt(0),
+        //     gas_limit: {
+        //         ref_time: BigInt(1000000000),
+        //         proof_size: BigInt(10000000),
+        //     },
+        //     storage_deposit_limit: BigInt(10000000),
+        // }).signAndSubmit(signer)
+
+        const response = await api.apis.ContractsApi.call(
+            convertPublicKeyToSs58(coldkey.publicKey),
+            contractAddress,
+            BigInt(0),
+            {
+                ref_time: BigInt(1000000000),
+                proof_size: BigInt(10000000),
+            },
+            BigInt(1000000000),
+            Binary.fromBytes(data.asBytes()),
+            undefined,
+        )
+
+        // console.log("===== response", response.result.asBytes().toString())
 
     })
 
+    it("Can add stake to contract", async () => {
+        console.log("===== Can add stake to contract")
+        let netuid = (await api.query.SubtensorModule.TotalNetworks.getValue()) - 1
+        let amount = BigInt(100000000)
+
+        const balance = await api.query.System.Account.getValue(convertPublicKeyToSs58(coldkey.publicKey))
+        console.log("===== balance", balance.data.free)
+
+        const signer = getSignerFromKeypair(coldkey);
+        const inkClient = getInkClient(contracts.bittensor)
+        const message = inkClient.message("add_stake")
+        const data = message.encode({
+            hotkey: Binary.fromBytes(hotkey.publicKey),
+            netuid: netuid,
+            amount: amount,
+        })
+
+        const tx = await api.tx.Contracts.call({
+            value: BigInt(0),
+            dest: MultiAddress.Id(contractAddress),
+            data: Binary.fromBytes(data.asBytes()),
+            gas_limit: {
+                ref_time: BigInt(10000000000),
+                proof_size: BigInt(10000000),
+            },
+            storage_deposit_limit: BigInt(1000000000)
+        }).signAndSubmit(signer)
 
+        // const response = await api.event.Contracts.Call.filter(tx.events)
+        // if (response.length === 0) {
+        //     throw new Error("No events found")
+        // }
+        console.log("===== response", tx.events)
+    })
 });
