Merge branch 'staging' into feat/roman/add-pr-merge-checkers

Author: basfroman

.github/workflows/check-rust.yml

@@ -24,7 +24,7 @@ jobs:
   cargo-fmt:
     name: cargo fmt
     runs-on: SubtensorCI
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-check-rust') }}
     env:
       RUST_BACKTRACE: full
     steps:
@@ -48,7 +48,7 @@ jobs:
   cargo-clippy-default-features:
     name: cargo clippy
     runs-on: SubtensorCI
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-check-rust') }}
     env:
       RUST_BACKTRACE: full
       SKIP_WASM_BUILD: 1
@@ -70,7 +70,7 @@ jobs:
   cargo-check-lints:
     name: check custom lints
     runs-on: SubtensorCI
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-check-rust') }}
     env:
       RUSTFLAGS: -D warnings
       RUST_BACKTRACE: full
@@ -93,10 +93,11 @@ jobs:
           cargo check 2>&1 | sed -r "s/\x1B\[[0-9;]*[mK]//g" | grep "warning:" && exit 1
           echo "No warnings found."
 
+
   cargo-clippy-all-features:
     name: cargo clippy --all-features
     runs-on: SubtensorCI
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-check-rust') }}
     env:
       RUST_BACKTRACE: full
       SKIP_WASM_BUILD: 1
@@ -119,7 +120,7 @@ jobs:
   cargo-test:
     name: cargo test
     runs-on: SubtensorCI
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-check-rust') }}
     env:
       RUST_BACKTRACE: full
       SKIP_WASM_BUILD: 1
@@ -142,7 +143,7 @@ jobs:
   cargo-fix:
     name: cargo fix
     runs-on: SubtensorCI
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-check-rust') }}
     env:
       RUST_BACKTRACE: full
       SKIP_WASM_BUILD: 1
@@ -174,7 +175,7 @@ jobs:
   check-feature-propagation:
     name: zepter run check
     runs-on: SubtensorCI
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-check-rust') }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -39,15 +39,17 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.x
+          python-version: "3.10"
+
       - name: Build wheels
         uses: PyO3/maturin-action@v1.44.0
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --find-interpreter
+          args: --release --out dist
           sccache: 'true'
           manylinux: auto
-          before-script-linux: (apt-get update && apt-get install -y apt-utils && apt-get install -y pkg-config libssl-dev) || (yum install openssl openssl-devel -y) 
+          before-script-linux: (apt-get update && apt-get install -y apt-utils && apt-get install -y pkg-config libssl-dev) || (yum install openssl openssl-devel -y)
+
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:

pyproject.toml

@@ -71,7 +71,7 @@ dev = [
     "ruff==0.4.7",
     "aioresponses==0.7.6",
     "factory-boy==3.3.0",
-    "maturin==1.7.0",
+    "maturin==1.8.3",
     "py-bip39-bindings==0.1.11",
     "ansible_vault~=2.1",
     "bittensor>=9.0.1",

src/python_bindings.rs

@@ -1101,7 +1101,7 @@ except argparse.ArgumentError:
     }
 
     #[pyo3(
-        signature = (uri, use_password=None, overwrite=None, suppress=None, save_coldkey_to_env=None, coldkey_password=None)
+        signature = (uri, use_password=false, overwrite=false, suppress=true, save_coldkey_to_env=false, coldkey_password=None)
     )]
     fn create_coldkey_from_uri(
         &mut self,
@@ -1131,7 +1131,7 @@ except argparse.ArgumentError:
     }
 
     #[pyo3(
-        signature = (uri, use_password=None, overwrite=None, suppress=None, save_hotkey_to_env=None, hotkey_password=None)
+        signature = (uri, use_password=false, overwrite=false, suppress=true, save_hotkey_to_env=false, hotkey_password=None)
     )]
     fn create_hotkey_from_uri(
         &mut self,

src/wallet.rs

@@ -463,8 +463,6 @@ impl Wallet {
         if !suppress {
             if let Some(m) = keypair.mnemonic() {
                 display_mnemonic_msg(m, "coldkey");
-            } else {
-                return Err(KeyFileError::Generic("Failed to get mnemonic".to_string()));
             }
         }
 
@@ -495,8 +493,6 @@ impl Wallet {
         if !suppress {
             if let Some(m) = keypair.mnemonic() {
                 display_mnemonic_msg(m, "hotkey");
-            } else {
-                return Err(KeyFileError::Generic("Failed to get mnemonic".to_string()));
             }
         }
 

tests/test_wallet.py

@@ -195,3 +195,35 @@ def test_wallet_string_representation_with_custom_arguments():
     assert w.name == wallet_name
     assert w.hotkey_str == wallet_hotkey
     assert w.path == wallet_path
+
+
+def test_create_coldkey_from_uri():
+    """Tests create_coldkey_from_uri method."""
+    # Preps
+    wallet_name = "test_wallet"
+    wallet_hotkey = "test_hotkey"
+    wallet_path = "/tmp/tests_wallets/"
+
+    # Call
+    w = Wallet(name=wallet_name, hotkey=wallet_hotkey, path=wallet_path)
+    w.create_coldkey_from_uri("//test", use_password=False, overwrite=True)
+
+    # Asserts
+    assert w.coldkey.ss58_address is not None
+    assert w.coldkeypub.ss58_address is not None
+
+
+def test_hotkey_coldkey_from_uri():
+    """Tests create_coldkey_from_uri method."""
+    # Preps
+    wallet_name = "test_wallet"
+    wallet_hotkey = "test_hotkey"
+    wallet_path = "/tmp/tests_wallets/"
+
+    # Call
+    w = Wallet(name=wallet_name, hotkey=wallet_hotkey, path=wallet_path)
+    w.create_hotkey_from_uri("//test", use_password=False, overwrite=True)
+
+    # Asserts
+    assert w.coldkey.ss58_address is not None
+    assert w.coldkeypub.ss58_address is not None