Investments 1.4.0

investments/Cargo.toml

@@ -2,9 +2,4 @@
 members = [
    "client",
    "programs/*",
-]
-
-[patch.crates-io]
-anchor-lang = { git = "https://github.com/clockwork-xyz/anchor", branch = "0.25.0-solana.1.13.4" }
-anchor-spl = { git = "https://github.com/clockwork-xyz/anchor", branch = "0.25.0-solana.1.13.4" }
-clockwork-sdk = { git = "https://github.com/clockwork-xyz/clockwork", tag = "v1.3.9" }
+]

investments/client/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 [dependencies]
 investments-program = { path = "../programs/investments", features = ["no-entrypoint"], version = "0.1.0" }
 serum-crank = { path = "../../serum_crank/programs/serum_crank", features = ["no-entrypoint"], version = "0.1.0" }
-clockwork-sdk = { version = "1.3.9", features = ["client"] }
-anchor-spl = { version = "0.25.0", features = ["dex"] }
-anchor-lang = "0.25.0"
-solana-sdk = "1.10.34"
-solana-client = "1.10.34"
+clockwork-client = "1.4.0"
+anchor-spl = { version = "0.26.0", features = ["dex"] }
+anchor-lang = "0.26.0"
+solana-sdk = "1.13.5"
+solana-client = "1.13.5"
 serum-common = { version = "0.4.7", features = ["client"] }

investments/client/src/main.rs

@@ -11,7 +11,10 @@ use {
         },
         token,
     },
-    clockwork_sdk::client::{thread_program, Client, ClientResult, SplToken},
+    clockwork_client::{
+        thread::{self, state::Thread},
+        Client, ClientResult, SplToken,
+    },
     serum_common::client::rpc::mint_to_new_account,
     solana_sdk::{
         instruction::Instruction, native_token::LAMPORTS_PER_SOL, signature::Keypair,
@@ -47,15 +50,11 @@ fn main() -> ClientResult<()> {
         market_keys.pc_mint,
         market_keys.coin_mint,
     );
-    let investment_thread = clockwork_sdk::thread_program::accounts::Thread::pubkey(
-        investment,
-        "investment".to_string(),
-    );
+    let investment_thread = Thread::pubkey(investment, "investment".to_string());
 
     // derive serum_crank PDAs
     let crank = serum_crank::state::Crank::pubkey(market_keys.market);
-    let crank_thread =
-        clockwork_sdk::thread_program::accounts::Thread::pubkey(crank, "crank".into());
+    let crank_thread = Thread::pubkey(crank, "crank".into());
 
     print_explorer_link(investment_thread, "investment_thread".to_string())?;
     print_explorer_link(crank_thread, "crank_thread".to_string())?;
@@ -284,7 +283,7 @@ fn initialize_serum_crank(
     let initialize_ix = Instruction {
         program_id: serum_crank::ID,
         accounts: vec![
-            AccountMeta::new_readonly(thread_program::ID, false),
+            AccountMeta::new_readonly(thread::ID, false),
             AccountMeta::new(crank, false),
             AccountMeta::new(crank_thread, false),
             AccountMeta::new_readonly(anchor_spl::dex::ID, false),
@@ -329,7 +328,7 @@ fn create_investment_and_deposit(
         program_id: investments_program::ID,
         accounts: vec![
             AccountMeta::new_readonly(associated_token::ID, false),
-            AccountMeta::new_readonly(thread_program::ID, false),
+            AccountMeta::new_readonly(thread::ID, false),
             AccountMeta::new_readonly(anchor_spl::dex::ID, false),
             AccountMeta::new(investment, false),
             AccountMeta::new(investment_mint_a_token_account, false),

investments/client/src/utils.rs

@@ -1,6 +1,6 @@
 use {
     anchor_lang::{prelude::*, solana_program::sysvar},
-    clockwork_sdk::client::{Client, ClientResult},
+    clockwork_client::{Client, ClientResult},
     solana_sdk::{
         instruction::Instruction, signature::Keypair, signer::Signer, transaction::Transaction,
     },

investments/programs/investments/Cargo.toml

@@ -18,6 +18,7 @@ default = []
 [profile.release]
 overflow-checks = true
 
-anchor-lang = { version = "0.26.0", features = ["init-if-needed"] }
-anchor-spl = { version = "0.26.0", features = ["token"] }
-clockwork-sdk = { version = "1.4.0" }
+[dependencies]
+anchor-spl = { version = "0.26.0", features = ["dex"] }
+anchor-lang = "0.26.0"
+clockwork-sdk = "1.4.0"

investments/programs/investments/src/instructions/claim.rs

@@ -46,8 +46,8 @@ pub struct Claim<'info> {
     #[account(address = sysvar::rent::ID)]
     pub rent: Sysvar<'info, Rent>,
 
-    #[account(address = clockwork_sdk::thread_program::ID)]
-    pub scheduler_program: Program<'info, clockwork_sdk::thread_program::ThreadProgram>,
+    #[account(address = clockwork_sdk::ID)]
+    pub scheduler_program: Program<'info, clockwork_sdk::ThreadProgram>,
 
     #[account(address = system_program::ID)]
     pub system_program: Program<'info, System>,