Big blobs p2p model sharing example

Cargo.toml

@@ -82,9 +82,9 @@ indicatif = "0.17.5"
 tokenizers = { version = "0.20.0", default-features = false, features = [
   "onig",
 ] }
-tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
-torch-sys = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
-pyo3-tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
+tch = { git = "https://github.com/NousResearch/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
+torch-sys = { git = "https://github.com/NousResearch/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
+pyo3-tch = { git = "https://github.com/NousResearch/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
 #tch = { path = "../tch-rs" }
 #torch-sys = { path = "../tch-rs/torch-sys" }
 #pyo3-tch = { path = "../tch-rs/pyo3-tch" }

architectures/decentralized/solana-client/src/app.rs

@@ -47,7 +47,6 @@ pub struct App {
     update_tui_interval: Interval,
     tx_tui_state: Option<Sender<TabsData>>,
     authorizer: Option<Pubkey>,
-    claimer: Option<Pubkey>,
     metrics: Arc<ClientMetrics>,
     allowlist: allowlist::AllowDynamic,
     p2p: NC,
@@ -62,7 +61,6 @@ pub struct AppParams {
     pub backup_clusters: Vec<Cluster>,
     pub tx_tui_state: Option<Sender<TabsData>>,
     pub authorizer: Option<Pubkey>,
-    pub claimer: Option<Pubkey>,
     pub train_args: TrainArgs,
 }
 
@@ -74,7 +72,6 @@ pub async fn build_app(
         backup_clusters,
         tx_tui_state,
         authorizer,
-        claimer,
         train_args: p,
     }: AppParams,
 ) -> Result<App> {
@@ -154,7 +151,6 @@ pub async fn build_app(
         tx_tui_state,
         update_tui_interval: interval(Duration::from_millis(150)),
         authorizer,
-        claimer,
         allowlist,
         metrics,
         p2p,
@@ -242,9 +238,8 @@ impl App {
                 .join_run(
                     coordinator_instance_pubkey,
                     coordinator_account,
-                    self.authorizer,
                     psyche_core::NodeIdentity::new(signer.to_bytes(), *p2p_identity.as_bytes()),
-                    self.claimer,
+                    self.authorizer,
                 )
                 .await?;
             info!(
@@ -360,9 +355,8 @@ impl App {
                                     .join_run(
                                         coordinator_instance_pubkey,
                                         coordinator_account,
-                                        self.authorizer,
                                         id,
-                                        self.claimer,
+                                        self.authorizer,
                                     )
                                     .await?;
                                 info!(

architectures/decentralized/solana-client/src/main.rs

@@ -79,11 +79,8 @@ enum Commands {
         rpc_3: String,
         #[clap(long, env, default_value_t = String::from(""))]
         ws_rpc_3: String,
-
         #[clap(long, env)]
         authorizer: Option<Pubkey>,
-        #[clap(long, env)]
-        claimer: Option<Pubkey>,
     },
     Predownload {
         #[clap(flatten)]
@@ -173,7 +170,6 @@ async fn async_main() -> Result<()> {
             rpc_3,
             ws_rpc_3,
             authorizer,
-            claimer,
         } => {
             psyche_client::prepare_environment();
             info!(
@@ -240,7 +236,6 @@ async fn async_main() -> Result<()> {
                 cluster: cluster.into(),
                 backup_clusters,
                 authorizer,
-                claimer,
                 train_args: args,
             })
             .await?;

architectures/decentralized/solana-common/src/backend.rs

@@ -260,9 +260,8 @@ impl SolanaBackend {
         &self,
         coordinator_instance: Pubkey,
         coordinator_account: Pubkey,
-        authorizer: Option<Pubkey>,
         id: psyche_core::NodeIdentity,
-        claimer: Option<Pubkey>,
+        authorizer: Option<Pubkey>,
     ) -> Result<Signature> {
         let coordinator_instance_state =
             self.get_coordinator_instance(&coordinator_instance).await?;
@@ -273,7 +272,6 @@ impl SolanaBackend {
             &coordinator_account,
             &authorization,
             id,
-            &claimer.unwrap_or(self.get_payer()),
         );
         // TODO (vbrunet) - what was the point of doing specifically a timeout here but not the other TXs ?
         // We timeout the transaction at 5s max, since internally send() polls Solana until the

architectures/decentralized/solana-common/src/instructions.rs

@@ -102,7 +102,6 @@ pub fn coordinator_join_run(
     coordinator_account: &Pubkey,
     authorization: &Pubkey,
     client_id: psyche_core::NodeIdentity,
-    claimer: &Pubkey,
 ) -> Instruction {
     anchor_instruction(
         psyche_solana_coordinator::ID,
@@ -113,10 +112,7 @@ pub fn coordinator_join_run(
             coordinator_account: *coordinator_account,
         },
         psyche_solana_coordinator::instruction::JoinRun {
-            params: psyche_solana_coordinator::logic::JoinRunParams {
-                client_id,
-                claimer: *claimer,
-            },
+            params: psyche_solana_coordinator::logic::JoinRunParams { client_id },
         },
     )
 }
@@ -318,31 +314,31 @@ pub fn treasurer_participant_create(
             payer: *payer,
             run,
             participant,
+            user: *user,
             system_program: system_program::ID,
         },
         psyche_solana_treasurer::instruction::ParticipantCreate {
-            params: psyche_solana_treasurer::logic::ParticipantCreateParams { user: *user },
+            params: psyche_solana_treasurer::logic::ParticipantCreateParams {},
         },
     )
 }
 
 pub fn treasurer_participant_claim(
     treasurer_index: u64,
-    claimer: &Pubkey,
-    claimer_collateral: &Pubkey,
     collateral_mint: &Pubkey,
     coordinator_account: &Pubkey,
     user: &Pubkey,
     claim_earned_points: u64,
 ) -> Instruction {
+    let user_collateral = associated_token::get_associated_token_address(user, collateral_mint);
     let run = psyche_solana_treasurer::find_run(treasurer_index);
     let run_collateral = associated_token::get_associated_token_address(&run, collateral_mint);
     let participant = psyche_solana_treasurer::find_participant(&run, user);
     anchor_instruction(
         psyche_solana_treasurer::ID,
         psyche_solana_treasurer::accounts::ParticipantClaimAccounts {
-            claimer: *claimer,
-            claimer_collateral: *claimer_collateral,
+            user: *user,
+            user_collateral,
             run,
             run_collateral,
             participant,
@@ -351,7 +347,6 @@ pub fn treasurer_participant_claim(
         },
         psyche_solana_treasurer::instruction::ParticipantClaim {
             params: psyche_solana_treasurer::logic::ParticipantClaimParams {
-                user: *user,
                 claim_earned_points,
             },
         },