Merge branch 'main' into vbrunet/2025_11_30-airdrop-contract

Author: crypto-vincent

.github/workflows/build-run-manager.yml

@@ -2,38 +2,28 @@ name: Build run-manager
 
 on:
   push:
-    branches:
-      - main
-      - dy/tool-run-manager # TODO remove once merged to main
-  workflow_dispatch: # Allow manual triggering of the workflow
+    paths:
+      - 'tools/rust-tools/run-manager/**'
+      - '.github/workflows/build-run-manager.yml'
+  workflow_dispatch: # Allow manual triggering
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    # If we use ubuntu-latest it will link against a newer version of glibc making
+    # the binary non-portable to our 22.04 servers, so use this for compatibility.
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Free disk space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: true
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: false
-          swap-storage: false
-
-      - name: Install Nix
-        uses: nixbuild/nix-quick-install-action@v31
-        with:
-          nix_conf: |
-            experimental-features = nix-command flakes
-            accept-flake-config = true
-            substituters = https://cache.nixos.org https://cache.garnix.io https://nix-community.cachix.org
-            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential pkg-config libssl-dev perl
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Cache Cargo build artifacts
         uses: actions/cache@v4
@@ -49,10 +39,11 @@ jobs:
             ${{ runner.os }}-cargo-run-manager-
             ${{ runner.os }}-cargo-
 
-      - name: Build run-manager with Cargo in Nix shell
+      - name: Build run-manager binary
         run: |
-          nix develop --command cargo build --release -p run-manager
+          cargo build --release --package run-manager
           ls -lh target/release/run-manager
+          ldd target/release/run-manager
 
       - name: Upload binary artifact
         uses: actions/upload-artifact@v4

.github/workflows/push-docker.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Download image from Garnix cache
         run: |
-          nix build --max-jobs 0 .#docker-psyche-solana-client --no-link --print-out-paths > image-path.txt
+          nix build .#docker-psyche-solana-client --no-link --print-out-paths > image-path.txt
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

Cargo.lock

@@ -24,6 +24,7 @@ psyche-core = { path = "./shared/core" }
 psyche-client = { path = "./shared/client" }
 psyche-data-provider = { path = "./shared/data-provider" }
 psyche-eval = { path = "./shared/eval" }
+psyche-inference = { path = "./shared/inference" }
 psyche-network = { path = "./shared/network" }
 psyche-modeling = { path = "./shared/modeling" }
 psyche-python-extension = { path = "./python" }

Cargo.toml

@@ -0,0 +1,31 @@
+# Client versioning in Runs
+
+There are two ways to specify the client version for a run:
+
+- Via the docker `RepoId` hash
+- Via a docker version tag
+
+## Docker RepoId hash
+
+Once the client docker image is uploaded to DockerHub, a `RepoId` hash is associated with that image. This string is what should be used for
+setting the client version in a run, toguether with the "sha256" part. For example, "sha256:ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb".
+
+## Docker version tag
+
+For setting a docker version tag, the image should be built with that tag set beforehand. This should be done in the `docker.nix` file, changing the `tag` field in the `docker-psyche-solana-client` docker package.
+
+## Updating client docker version for a run
+
+Once the new docker image uploaded to DockerHub and some version selected, you can update the client version required
+for a particular run with the following command:
+
+[!] You should have the run owner solana key to successfully run this command
+[!] The run must be paused beforehand to do the client version update
+
+```bash
+cargo run --release --bin psyche-solana-client \
+	-- update-config \
+	--wallet-private-key-path <path_to_run_owner_private_key> \
+	--run-id <your_run_id> \
+	--client-version <new_version>
+```

architectures/decentralized/RELEASES.md

@@ -49,7 +49,10 @@ pub async fn command_can_join_execute(
         authorizer,
     );
     if backend.get_balance(&authorization).await? == 0 {
-        bail!("Authorization does not exist for authorizer: {authorizer:?} and user: {address}");
+        bail!(
+            "Authorization does not exist for authorizer: {authorizer:?} (authorization address: {authorization:?}, join authority: {0:?}). Authorizer must be set to grantee pubkey for permissioned runs",
+            coordinator_instance_state.join_authority
+        );
     }
     if !backend
         .get_authorization(&authorization)

architectures/decentralized/client_versioning.md

@@ -2,20 +2,20 @@
 
 - [Intro to Psyche](./intro.md)
 
-- [Psyche in depth](./explain/index.md)
-  - [General workflow](./explain/general-workflow.md)
-  - [Data provider](./explain/data-provider.md)
-  - [Model sharing](./explain/model-sharing.md)
-  - [Rewards](./explain/rewards.md)
-  - [Glossary](./explain/glossary.md)
-
 - [End-user usage](./enduser/index.md)
   - [Joining a run](./enduser/join-run.md)
   - [Creating a run](./enduser/create-run.md)
   - [Run configuration](./enduser/run-config.md)
   - [Authentication](./enduser/authentication.md)
   - [Client FAQ](./enduser/client-faq.md)
 
+- [Psyche in depth](./explain/index.md)
+  - [General workflow](./explain/general-workflow.md)
+  - [Data provider](./explain/data-provider.md)
+  - [Model sharing](./explain/model-sharing.md)
+  - [Rewards](./explain/rewards.md)
+  - [Glossary](./explain/glossary.md)
+
 - [Development](./development/index.md)
   - [Setup & Useful Commands](./development/setup.md)
   - [Running on-chain](./development/running-onchain.md)

architectures/decentralized/solana-client/src/command/can_join.rs

@@ -11,16 +11,11 @@ If you can't / don't want to use Nix, it's also possible to manually install all
 
 #### Installing Nix
 
-To install `nix`, simply run `curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install` or find it at your local package manager.
+To install Nix, simply run the `./setup-nix.sh` script. This will install Nix and configure it appropriately.
 
-You may need to add the following line to `~/.config/nix/nix.conf` or `/etc/nix/nix.conf`
-
-```
-experimental-features = nix-command flakes
-```
-
-#### Binary cache
+##### Binary cache
 
+If you already have Nix installed, or are installing it manually,
 To speed up your builds & your local dev shell, we recommend enabling the binary cache from `garnix`, our CI provider.
 
 In order to use the cache that garnix provides, change your `nix.conf`, adding `https://cache.garnix.io` to substituters, and `cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=` to `trusted-public-keys`.