Merge branch 'devnet-ready' into neuron-registration

Author: JohnReedV

.github/workflows/eco-tests.yml

@@ -0,0 +1,10 @@
+name: eco-tests
+
+on:
+  workflow_dispatch:
+
+jobs:
+  placeholder:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "ok"

.github/workflows/scheduled-smoke-tests.yml

@@ -0,0 +1,47 @@
+name: Scheduled Smoke Tests
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'
+
+env:
+  CARGO_TERM_COLOR: always
+
+permissions:
+  contents: read
+
+jobs:
+  run-smoke-tests:
+    runs-on: [self-hosted, type-ccx33]
+    timeout-minutes: 30
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - test: smoke_mainnet
+          - test: smoke_testnet
+
+    name: "smoke-e2e-${{ matrix.test }}"
+
+    steps:
+      - name: Check-out repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ts-tests/.nvmrc
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Install e2e dependencies
+        working-directory: ts-tests
+        run: pnpm install --frozen-lockfile
+
+      - name: Run smoke test
+        working-directory: ts-tests
+        run: pnpm moonwall test ${{ matrix.test }}

.github/workflows/e2e.yml .github/workflows/typescript-e2e.yml.github/workflows/e2e.yml renamed to .github/workflows/typescript-e2e.yml

@@ -1,25 +1,51 @@
-name: E2E Tests
+name: Typescript E2E Tests
 
 on:
   pull_request:
 
-  workflow_dispatch:
-    inputs:
-      verbose:
-        description: "Output more information when triggered manually"
-        required: false
-        default: ""
-
 env:
   CARGO_TERM_COLOR: always
 
 permissions:
   contents: read
 
 jobs:
+  typescript-formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check-out repository
+        uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ts-tests/.nvmrc
+
+      - name: Install system dependencies
+        run: |
+          sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get update
+          sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get install -y --no-install-recommends \
+            -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
+            build-essential clang curl git make libssl-dev llvm libudev-dev protobuf-compiler pkg-config
+
+      - name: Install e2e dependencies
+        working-directory: ts-tests
+        run: pnpm install --frozen-lockfile
+
+      - name: Formatting check
+        run: |
+          cd ts-tests
+          pnpm run fmt
+
   # Build the node binary in both variants and share as artifacts.
   build:
     runs-on: [self-hosted, type-ccx33]
+    needs: [typescript-formatting]
     timeout-minutes: 60
     strategy:
       matrix:
@@ -62,87 +88,52 @@ jobs:
           path: target/release/node-subtensor
           if-no-files-found: error
 
-  # Discover e2e packages that have a "test" script.
-  discover:
-    runs-on: ubuntu-latest
-    outputs:
-      packages: ${{ steps.find.outputs.packages }}
-    steps:
-      - name: Check-out repository
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: e2e
-
-      - name: Find testable packages
-        id: find
-        working-directory: e2e
-        run: |
-          packages=$(
-            find . -maxdepth 2 -name package.json -not -path './node_modules/*' \
-            | while read -r pkg; do
-                name=$(jq -r '.name // empty' "$pkg")
-                has_test=$(jq -r '.scripts.test // empty' "$pkg")
-                if [ -n "$has_test" ] && [ -n "$name" ]; then
-                  echo "$name"
-                fi
-              done \
-            | jq -R -s -c 'split("\n") | map(select(. != ""))'
-          )
-          echo "packages=$packages" >> "$GITHUB_OUTPUT"
-          echo "Discovered packages: $packages"
-
-  # Run each e2e package's tests in parallel.
-  test:
-    needs: [build, discover]
-    if: ${{ needs.discover.outputs.packages != '[]' }}
+  run-e2e-tests:
+    needs: [build]
     runs-on: [self-hosted, type-ccx33]
     timeout-minutes: 30
+
     strategy:
       fail-fast: false
       matrix:
-        package: ${{ fromJson(needs.discover.outputs.packages) }}
-    name: "e2e: ${{ matrix.package }}"
+        include:
+          - test: dev
+            binary: release
+          - test: zombienet_shield
+            binary: release
+          - test: zombienet_staking
+            binary: fast
+
+    name: "typescript-e2e-${{ matrix.test }}"
+
     steps:
       - name: Check-out repository
         uses: actions/checkout@v4
 
-      - name: Download release binary
+      - name: Download binary
         uses: actions/download-artifact@v4
         with:
-          name: node-subtensor-release
+          name: node-subtensor-${{ matrix.binary }}
           path: target/release
 
-      - name: Download fast binary
-        uses: actions/download-artifact@v4
-        with:
-          name: node-subtensor-fast
-          path: target/fast
-          
-      - name: Make binaries executable
-        run: chmod +x target/release/node-subtensor target/fast/node-subtensor
+      - name: Make binary executable
+        run: chmod +x target/release/node-subtensor
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: e2e/.nvmrc
+          node-version-file: ts-tests/.nvmrc
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 10
 
-      - name: Bootstrap papi types
-        working-directory: e2e
-        run: ./bootstrap_types.sh --skip-build
-
       - name: Install e2e dependencies
-        working-directory: e2e
+        working-directory: ts-tests
         run: pnpm install --frozen-lockfile
 
       - name: Run tests
-        working-directory: e2e
-        env:
-          # Use fast-runtime binary for staking package, release binary for others
-          # Path is relative to package directory (e2e/<package>/)
-          BINARY_PATH: ${{ matrix.package == 'e2e-staking' && '../../target/fast/node-subtensor' || '../../target/release/node-subtensor' }}
-        run: pnpm --filter ${{ matrix.package }} test
+        run: | 
+          cd ts-tests
+          pnpm moonwall test ${{ matrix.test }}

Cargo.lock

@@ -337,6 +337,10 @@ by appending your own. A few useful ones are as follow.
 ```
 -->
 
+## Testing
+
+Check [testing section](./docs/testing.md).
+
 ## License
 The MIT License (MIT)
 Copyright © 2021 Yuma Rao

README.md

@@ -0,0 +1,37 @@
+// Drand precompile address: 0x80e = 2062
+export const IDRAND_ADDRESS = "0x000000000000000000000000000000000000080e";
+
+export const IDrandABI = [
+    {
+        inputs: [
+            {
+                internalType: "uint64",
+                name: "round",
+                type: "uint64",
+            },
+        ],
+        name: "getRandomness",
+        outputs: [
+            {
+                internalType: "bytes32",
+                name: "",
+                type: "bytes32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "getLastStoredRound",
+        outputs: [
+            {
+                internalType: "uint64",
+                name: "",
+                type: "uint64",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+] as const;

contract-tests/src/contracts/drand.ts

@@ -419,4 +419,22 @@ export async function setNetworkLastLockCost(api: TypedApi<typeof devnet>, defau
 
     const valueOnChain = await api.query.SubtensorModule.NetworkLastLockCost.getValue()
     assert.equal(defaultNetworkLastLockCost, valueOnChain)
+}
+
+
+export async function getStake(api: TypedApi<typeof devnet>, hotkey: string, coldkey: string, netuid: number): Promise<bigint> {
+    const value = (await api.query.SubtensorModule.AlphaV2.getValue(hotkey, coldkey, netuid));
+
+    const mantissa = value.mantissa;
+    const exponent = value.exponent;
+
+    let result: bigint;
+
+    if (exponent >= 0) {
+        result = mantissa * BigInt(10) ** exponent;
+    } else {
+        result = mantissa / BigInt(10) ** -exponent;
+    }
+
+    return result;
 }

contract-tests/src/subtensor.ts

@@ -9,7 +9,7 @@ import { PublicClient } from "viem";
 import { TypedApi } from "polkadot-api";
 import { ALPHA_POOL_CONTRACT_ABI, ALPHA_POOL_CONTRACT_BYTECODE } from "../src/contracts/alphaPool";
 import { convertH160ToPublicKey, convertH160ToSS58, convertPublicKeyToSs58, toViemAddress } from "../src/address-utils";
-import { forceSetBalanceToEthAddress, disableWhiteListCheck, addNewSubnetwork, forceSetBalanceToSs58Address, startCall, burnedRegister } from "../src/subtensor";
+import { forceSetBalanceToEthAddress, disableWhiteListCheck, addNewSubnetwork, forceSetBalanceToSs58Address, startCall, burnedRegister, getStake } from "../src/subtensor";
 import { ethers } from "ethers"
 import { tao } from "../src/balance-math";
 import { ISTAKING_V2_ADDRESS, IStakingV2ABI } from "../src/contracts/staking";
@@ -46,7 +46,7 @@ describe("bridge token contract deployment", () => {
     let netuid = (await api.query.SubtensorModule.TotalNetworks.getValue()) - 1
     // the unit in V2 is RAO, not ETH
     let stakeBalance = tao(20)
-    const stakeBefore = await api.query.SubtensorModule.Alpha.getValue(convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(wallet.address), netuid)
+    const stakeBefore = await getStake(api, convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(wallet.address), netuid)
     const contract = new ethers.Contract(ISTAKING_V2_ADDRESS, IStakingV2ABI, wallet);
     const tx = await contract.addStake(hotkey.publicKey, stakeBalance.toString(), netuid)
     await tx.wait()
@@ -56,7 +56,7 @@ describe("bridge token contract deployment", () => {
     );
 
     assert.ok(stakeFromContract > stakeBefore)
-    const stakeAfter = await api.query.SubtensorModule.Alpha.getValue(convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(wallet.address), netuid)
+    const stakeAfter = await getStake(api, convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(wallet.address), netuid)
     assert.ok(stakeAfter > stakeBefore)
     assert.ok(stakeFromContract > tao(20))
   })
@@ -66,7 +66,7 @@ describe("bridge token contract deployment", () => {
     let netuid = (await api.query.SubtensorModule.TotalNetworks.getValue()) - 1
     const stakingPrecompile = new ethers.Contract(ISTAKING_V2_ADDRESS, IStakingV2ABI, wallet);
 
-    const stakeBeforeDeposit = await api.query.SubtensorModule.Alpha.getValue(convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(wallet.address), netuid)
+    const stakeBeforeDeposit = await getStake(api, convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(wallet.address), netuid)
 
     const contractFactory = new ethers.ContractFactory(ALPHA_POOL_CONTRACT_ABI, ALPHA_POOL_CONTRACT_BYTECODE, wallet)
     const contract = await contractFactory.deploy(hotkey.publicKey)
@@ -103,11 +103,11 @@ describe("bridge token contract deployment", () => {
     await depositAlphaTx.wait()
 
     // compare wallet stake
-    const stakeAftereDeposit = await api.query.SubtensorModule.Alpha.getValue(convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(wallet.address), netuid)
+    const stakeAftereDeposit = await getStake(api, convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(wallet.address), netuid)
     assert.ok(stakeAftereDeposit < stakeBeforeDeposit)
 
     // check the contract stake
-    const ContractStake = await api.query.SubtensorModule.Alpha.getValue(convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(contractAddress), netuid)
+    const ContractStake = await getStake(api, convertPublicKeyToSs58(hotkey.publicKey), convertH160ToSS58(contractAddress), netuid)
     assert.ok(ContractStake > 0)
 
     // check the wallet alpha balance in contract, the actual swapped alpha could be less than alphaAmount in deposit call