Bump python and neo-mamba versions (#1251)

Author: roman-khimov

.github/workflows/run-unit-tests.yml

@@ -23,11 +23,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.12"]
+        python-version: ["3.13"]
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/system-tests.yml

@@ -123,9 +123,9 @@ jobs:
           - run: go version
 
           - name: Set up Python
-            uses: actions/setup-python@v5
+            uses: actions/setup-python@v6.1.0
             with:
-                python-version: '3.12'
+                python-version: '3.13'
           - run: python --version
 
           - name: Checkout neofs-testcases repository

Makefile

@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 VENV_DIR := venv.pytest
-PYTHON := python3.12
-PIP := pip3.12
+PYTHON := python3.13
+PIP := pip3.13
 ENV_FILE := .env
 BINARIES := neo-go neofs-adm neofs-cli neofs-ir neofs-lens neofs-node neofs-rest-gw neofs-s3-authmate neofs-s3-gw
 

neofs-testlib/neofs_testlib/utils/wallet.py

@@ -20,7 +20,7 @@ def init_wallet(wallet_path: str, wallet_password: str) -> str:
     account = neo3_account.Account.create_new(wallet_password)
     wallet.account_add(account)
     with open(wallet_path, "w") as out:
-        json.dump(wallet.to_json(), out)
+        json.dump(wallet.to_json(wallet_password), out)
     logger.info(f"Init new wallet: {wallet_path}, address: {account.address}")
     return account.address
 

neofs-testlib/neofs_testlib_tests/unit/test_wallet.py

@@ -47,7 +47,7 @@ def test_get_last_address_from_wallet_with_multiple_accounts(self):
         wallet.account_add(account2)
 
         with open(wallet_file_path, "w") as out:
-            json.dump(wallet.to_json(), out)
+            json.dump(wallet.to_json(self.DEFAULT_PASSWORD), out)
 
         with open(wallet_file_path, "r") as wallet_file:
             wallet = Wallet.from_json(json.load(wallet_file), passwords=[self.DEFAULT_PASSWORD, self.DEFAULT_PASSWORD])

pytest_tests/lib/helpers/grpc_utils.py

@@ -33,9 +33,7 @@ def get_wallet_keys(default_wallet: NodeWallet):
     neo3_wallet: Wallet = load_wallet(default_wallet.path, default_wallet.password)
     acc = neo3_wallet.accounts[0]
     public_key = acc.public_key.encode_point(True)
-    private_key = acc.private_key_from_nep2(
-        acc.encrypted_key.decode("utf-8"), default_wallet.password, _scrypt_parameters=acc.scrypt_parameters
-    )
+    private_key = acc.private_key
     return public_key, private_key
 
 

pytest_tests/lib/helpers/wallet_helpers.py

@@ -150,9 +150,7 @@ def create_wallet_with_money(neofs_env_with_mainchain: NeoFSEnv) -> NodeWallet:
 def get_private_key(wallet: NodeWallet) -> bytes:
     neo3_wallet: Wallet = load_wallet(wallet.path, passwords=[wallet.password] * 3)
     acc = neo3_wallet.accounts[0]
-    return acc.private_key_from_nep2(
-        acc.encrypted_key.decode("utf-8"), wallet.password, _scrypt_parameters=acc.scrypt_parameters
-    )
+    return acc.private_key
 
 
 def sign_string(str_to_sign: str, private_key: bytes) -> str:

pytest_tests/lib/rest_gw/rest_utils.py

@@ -20,9 +20,7 @@ def generate_credentials(
     neo3_wallet: Wallet = load_wallet(wallet.path, wallet.password)
     acc = neo3_wallet.accounts[0]
     token = get_container_token(gw_endpoint, acc.address, verb=verb, bearer_for_all_users=bearer_for_all_users)
-    private_key = acc.private_key_from_nep2(
-        acc.encrypted_key.decode("utf-8"), wallet.password, _scrypt_parameters=acc.scrypt_parameters
-    )
+    private_key = acc.private_key
 
     if wallet_connect:
         prefix = b"\x01\x00\x01\xf0"

pytest_tests/tests/container/test_container.py

@@ -46,7 +46,7 @@ def _create_multi_account_wallet(self, accounts: list[neo3_account.Account], pre
         for account in accounts:
             wallet.account_add(account)
         with open(wallet_path, "w") as out:
-            json.dump(wallet.to_json(), out)
+            json.dump(wallet.to_json(self.DEFAULT_PASSWORD), out)
         return wallet_path
 
     def _refill_gas(self, wallet_path: str, address: str, amount: str = "200.0"):

pytest_tests/tests/contract/test_n3.py

@@ -104,9 +104,7 @@ def calculate_invocation_script(datadir: str, container: bytes) -> str:
 
     neo3_wallet: Wallet = load_wallet(os.path.join(datadir, "user_wallet.json"), "user")
     acc = neo3_wallet.accounts[0]
-    private_key = acc.private_key_from_nep2(
-        acc.encrypted_key.decode("utf-8"), "user", _scrypt_parameters=acc.scrypt_parameters
-    )
+    private_key = acc.private_key
     signing_key = SigningKey.from_string(private_key, curve=NIST256p)
     r, s = sign_ecdsa(signing_key, hashlib.sha256(signed_data).digest(), hashlib.sha256)
     signature = get_signature_slice(NIST256p, r, s)