From 6c1f30ce04ca36f80f0427aa89cbed8e6e808379 Mon Sep 17 00:00:00 2001 From: Nick Garfield Date: Sat, 29 Oct 2022 16:38:42 -0400 Subject: [PATCH] Bump from 1.3.2 to 1.3.3 --- Cargo.lock | 18 +++++++++--------- VERSION | 2 +- cli/Cargo.toml | 6 +++--- client/Cargo.toml | 10 +++++----- cron/Cargo.toml | 2 +- plugin/Cargo.toml | 8 ++++---- plugin/src/builders/thread_exec.rs | 20 -------------------- plugin/src/observers/network.rs | 4 ++++ programs/network/Cargo.toml | 4 ++-- programs/thread/Cargo.toml | 8 ++++---- programs/webhook/Cargo.toml | 4 ++-- sdk/Cargo.toml | 6 +++--- utils/Cargo.toml | 2 +- 13 files changed, 39 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 42331719d..68568485e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -792,7 +792,7 @@ dependencies = [ [[package]] name = "clockwork-cli" -version = "1.3.2" +version = "1.3.3" dependencies = [ "anyhow", "chrono", @@ -818,7 +818,7 @@ dependencies = [ [[package]] name = "clockwork-client" -version = "1.3.2" +version = "1.3.3" dependencies = [ "anchor-lang", "anchor-spl", @@ -836,7 +836,7 @@ dependencies = [ [[package]] name = "clockwork-cron" -version = "1.3.2" +version = "1.3.3" dependencies = [ "chrono", "nom", @@ -845,7 +845,7 @@ dependencies = [ [[package]] name = "clockwork-network-program" -version = "1.3.2" +version = "1.3.3" dependencies = [ "anchor-lang", "anchor-spl", @@ -854,7 +854,7 @@ dependencies = [ [[package]] name = "clockwork-sdk" -version = "1.3.2" +version = "1.3.3" dependencies = [ "chrono", "clockwork-client", @@ -865,7 +865,7 @@ dependencies = [ [[package]] name = "clockwork-thread-program" -version = "1.3.2" +version = "1.3.3" dependencies = [ "anchor-lang", "chrono", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "clockwork-utils" -version = "1.3.2" +version = "1.3.3" dependencies = [ "anchor-lang", "static-pubkey", @@ -885,7 +885,7 @@ dependencies = [ [[package]] name = "clockwork-webhook-program" -version = "1.3.2" +version = "1.3.3" dependencies = [ "anchor-lang", "clockwork-network-program", @@ -893,7 +893,7 @@ dependencies = [ [[package]] name = "clockwork_plugin" -version = "1.3.2" +version = "1.3.3" dependencies = [ "anchor-lang", "bincode", diff --git a/VERSION b/VERSION index 1892b9267..31e5c8434 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.2 +1.3.3 diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 883279eb3..de9e6996f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-cli" -version = "1.3.2" +version = "1.3.3" description = "Command line interface for Clockwork" edition = "2021" license = "AGPL-3.0-or-later" @@ -13,9 +13,9 @@ keywords = ["solana"] [dependencies] anyhow = "1.0.61" clap = { version = "3.1.2", features = ["derive"] } -clockwork-client = { path = "../client", version = "1.3.2" } +clockwork-client = { path = "../client", version = "1.3.3" } clockwork-cron = { path = "../cron", version = "1.2.12" } -clockwork-utils = { path = "../utils", version = "1.3.2" } +clockwork-utils = { path = "../utils", version = "1.3.3" } chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } dirs-next = "2.0.0" serde = { version = "1.0.136", features = ["derive"] } diff --git a/client/Cargo.toml b/client/Cargo.toml index 726a91fa1..b3894679b 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-client" -version = "1.3.2" +version = "1.3.3" edition = "2021" description = "Clockwork client" license = "AGPL-3.0-or-later" @@ -19,10 +19,10 @@ anchor-lang = "0.25.0" anchor-spl = { features = ["mint", "token"], version = "0.25.0" } bincode = "1.3.3" borsh = "0.9.3" -clockwork-network-program = { path = "../programs/network", features = ["no-entrypoint"], version = "1.3.2" } -clockwork-thread-program = { path = "../programs/thread", features = ["no-entrypoint"], version = "1.3.2" } -clockwork-utils = { path = "../utils", version = "1.3.2" } -clockwork-webhook-program = { path = "../programs/webhook", features = ["no-entrypoint"], version = "1.3.2" } +clockwork-network-program = { path = "../programs/network", features = ["no-entrypoint"], version = "1.3.3" } +clockwork-thread-program = { path = "../programs/thread", features = ["no-entrypoint"], version = "1.3.3" } +clockwork-utils = { path = "../utils", version = "1.3.3" } +clockwork-webhook-program = { path = "../programs/webhook", features = ["no-entrypoint"], version = "1.3.3" } solana-client = "1.10.34" solana-sdk = "1.10.34" thiserror = "1.0.31" diff --git a/cron/Cargo.toml b/cron/Cargo.toml index 24190b447..e8a907ab2 100644 --- a/cron/Cargo.toml +++ b/cron/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-cron" -version = "1.3.2" +version = "1.3.3" description = "A cron expression parser that's safe to use in the Solana runtime" edition = "2021" license = "AGPL-3.0-or-later" diff --git a/plugin/Cargo.toml b/plugin/Cargo.toml index bee75d99a..8f6bc50c2 100644 --- a/plugin/Cargo.toml +++ b/plugin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork_plugin" -version = "1.3.2" +version = "1.3.3" edition = "2021" description = "Clockwork plugin for Solana validators" license = "AGPL-3.0-or-later" @@ -19,9 +19,9 @@ bincode = "1.3.3" bs58 = "0.4.0" bugsnag = "0.2.1" chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } -clockwork-client = { path = "../client", version = "1.3.2" } -clockwork-cron = { path = "../cron", version = "1.3.2" } -clockwork-utils = { path = "../utils", version = "1.3.2" } +clockwork-client = { path = "../client", version = "1.3.3" } +clockwork-cron = { path = "../cron", version = "1.3.3" } +clockwork-utils = { path = "../utils", version = "1.3.3" } dashmap = "5.3.3" log = "0.4" prost = "0.10.0" diff --git a/plugin/src/builders/thread_exec.rs b/plugin/src/builders/thread_exec.rs index df437e4b9..e11657949 100644 --- a/plugin/src/builders/thread_exec.rs +++ b/plugin/src/builders/thread_exec.rs @@ -150,26 +150,6 @@ fn build_kickoff_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> } => { // Save the trigger account. trigger_account_pubkey = Some(address); - - // Begin computing the data hash of this account. - // let data = client.get_account_data(&address).unwrap(); - // let mut hasher = DefaultHasher::new(); - // if offset + size < data.len() { - // data[offset..(offset + size)].hash(&mut hasher); - // } - // let data_hash = hasher.finish(); - - // // Check the exec context for the prior data hash. - // if let Some(exec_context) = thread.exec_context { - // match exec_context.trigger_context { - // TriggerContext::Account { - // data_hash: prior_data_hash, - // } => { - // // Inject the prior data hash as a seed. - // } - // _ => {} - // } - // } } _ => {} } diff --git a/plugin/src/observers/network.rs b/plugin/src/observers/network.rs index 7a6384892..4a560da9c 100644 --- a/plugin/src/observers/network.rs +++ b/plugin/src/observers/network.rs @@ -1,3 +1,5 @@ +use log::info; + use { crate::config::PluginConfig, clockwork_client::network::objects::{Pool, Registry, Snapshot, SnapshotFrame, Worker}, @@ -82,6 +84,8 @@ impl NetworkObserver { _ => {} } + info!("Pool positions: {}", w_pool_positions); + drop(w_pool_positions); Ok(()) }) diff --git a/programs/network/Cargo.toml b/programs/network/Cargo.toml index c33e58bff..22696ba06 100644 --- a/programs/network/Cargo.toml +++ b/programs/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-network-program" -version = "1.3.2" +version = "1.3.3" description = "Clockwork networking protocol" edition = "2021" license = "AGPL-3.0-or-later" @@ -24,4 +24,4 @@ default = [] [dependencies] anchor-lang = "0.25.0" anchor-spl = { features = ["mint", "token"], version = "0.25.0" } -clockwork-utils = { path = "../../utils", version = "1.3.2" } +clockwork-utils = { path = "../../utils", version = "1.3.3" } diff --git a/programs/thread/Cargo.toml b/programs/thread/Cargo.toml index 6b88a561d..225c0ffad 100644 --- a/programs/thread/Cargo.toml +++ b/programs/thread/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-thread-program" -version = "1.3.2" +version = "1.3.3" description = "Clockwork thread program" edition = "2021" license = "AGPL-3.0-or-later" @@ -24,7 +24,7 @@ default = [] [dependencies] anchor-lang = "0.25.0" chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } -clockwork-cron = { path = "../../cron", version = "1.3.2" } -clockwork-network-program = { path = "../network", features = ["cpi"], version = "1.3.2" } -clockwork-utils = { path = "../../utils", version = "1.3.2" } +clockwork-cron = { path = "../../cron", version = "1.3.3" } +clockwork-network-program = { path = "../network", features = ["cpi"], version = "1.3.3" } +clockwork-utils = { path = "../../utils", version = "1.3.3" } static-pubkey = "1.0.3" diff --git a/programs/webhook/Cargo.toml b/programs/webhook/Cargo.toml index 41bc6def1..349477419 100644 --- a/programs/webhook/Cargo.toml +++ b/programs/webhook/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-webhook-program" -version = "1.3.2" +version = "1.3.3" description = "Clockwork webhook program" edition = "2021" license = "AGPL-3.0-or-later" @@ -23,4 +23,4 @@ default = [] [dependencies] anchor-lang = { features = ["init-if-needed"], version = "0.25.0" } -clockwork-network-program = { path = "../network", features = ["cpi"], version = "1.3.2" } \ No newline at end of file +clockwork-network-program = { path = "../network", features = ["cpi"], version = "1.3.3" } \ No newline at end of file diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 3a635d2b8..8d9e363cb 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-sdk" -version = "1.3.2" +version = "1.3.3" description = "An SDK for building dapps with the Clockwork automation engine" edition = "2021" license = "AGPL-3.0-or-later" @@ -15,8 +15,8 @@ name = "clockwork_sdk" [dependencies] chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } -clockwork-client = { path = "../client", version = "1.3.2", optional = true } -clockwork-thread-program = { path = "../programs/thread", features = ["cpi"], version = "1.3.2" } +clockwork-client = { path = "../client", version = "1.3.3", optional = true } +clockwork-thread-program = { path = "../programs/thread", features = ["cpi"], version = "1.3.3" } nom = "~7" once_cell = "1.5.2" diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 6447fdc65..d20c0b603 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-utils" -version = "1.3.2" +version = "1.3.3" description = "Tools for building blocks on Solana" edition = "2021" license = "AGPL-3.0-or-later"