From b22a94b63d75f20d27c9ad30a6e9a8c74039f0aa Mon Sep 17 00:00:00 2001 From: mwrites <20499416+mwrites@users.noreply.github.com> Date: Tue, 2 May 2023 05:03:33 +0700 Subject: [PATCH] exact matching =2.0.15 for dependencies --- .github/workflows/bump-release.yaml | 4 +- Cargo.lock | 422 ++++++++++++++-------------- VERSION | 2 +- app/Cargo.toml | 10 +- cli/Cargo.toml | 22 +- client/Cargo.toml | 18 +- cron/Cargo.toml | 10 +- plugin/Cargo.toml | 24 +- plugin/utils/Cargo.toml | 10 +- programs/network/Cargo.toml | 12 +- programs/thread/Cargo.toml | 18 +- programs/thread/v1/Cargo.toml | 2 +- programs/webhook/Cargo.toml | 14 +- relayer/Cargo.toml | 14 +- relayer/api/Cargo.toml | 10 +- scripts/ci/bump-version.sh | 4 +- scripts/install | 34 --- sdk/Cargo.toml | 12 +- utils/Cargo.toml | 10 +- 19 files changed, 309 insertions(+), 343 deletions(-) delete mode 100755 scripts/install diff --git a/.github/workflows/bump-release.yaml b/.github/workflows/bump-release.yaml index 0d352f6ae..3dac860a3 100644 --- a/.github/workflows/bump-release.yaml +++ b/.github/workflows/bump-release.yaml @@ -18,12 +18,12 @@ on: extra_args: description: 'Extra args to pass to bump-version.sh, e.g: --dry-run.' required: false - default: '--exclude mat-clockwork-thread-program-v1' + default: '--exclude clockwork-thread-program-v1' env: CARGO_TERM_COLOR: always ANCHOR_VERSION: v0.27.0 - PUBLISH_PREFIX: mat + PUBLISH_PREFIX: clockwork jobs: build-all: diff --git a/Cargo.lock b/Cargo.lock index db2805968..55c526180 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1090,6 +1090,217 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "clockwork-cli" +version = "2.0.15" +dependencies = [ + "anchor-lang", + "anyhow", + "bincode", + "bzip2", + "cargo_metadata", + "chrono", + "clap 3.2.23", + "clockwork-client", + "clockwork-cron", + "clockwork-plugin-utils", + "clockwork-relayer-api", + "clockwork-utils", + "clockwork-webhook-program", + "dirs-next", + "indicatif", + "reqwest", + "serde", + "serde_json", + "serde_yaml 0.9.21", + "solana-account-decoder", + "solana-clap-utils", + "solana-cli-config", + "solana-client", + "solana-sdk", + "spl-associated-token-account", + "spl-memo", + "spl-token", + "tar", + "termcolor", + "thiserror", +] + +[[package]] +name = "clockwork-client" +version = "2.0.15" +dependencies = [ + "anchor-lang", + "anchor-spl", + "bincode", + "borsh", + "clockwork-network-program", + "clockwork-thread-program", + "clockwork-utils", + "clockwork-webhook-program", + "solana-client", + "solana-sdk", + "spl-associated-token-account", + "thiserror", +] + +[[package]] +name = "clockwork-cron" +version = "2.0.15" +dependencies = [ + "chrono", + "nom", + "once_cell", +] + +[[package]] +name = "clockwork-network-program" +version = "2.0.15" +dependencies = [ + "anchor-lang", + "anchor-spl", + "clockwork-utils", + "winnow", +] + +[[package]] +name = "clockwork-plugin-utils" +version = "2.0.15" +dependencies = [ + "serde", + "serde_json", + "solana-geyser-plugin-interface", +] + +[[package]] +name = "clockwork-relayer" +version = "2.0.15" +dependencies = [ + "actix-cors", + "actix-web", + "anchor-lang", + "bincode", + "byte-unit", + "clockwork-relayer-api", + "clockwork-webhook-program", + "curve25519-dalek", + "lazy_static", + "rayon", + "regex", + "reqwest", + "serde", + "serde_json", + "solana-client", + "solana-sdk", + "solana-zk-token-sdk", + "tokio", +] + +[[package]] +name = "clockwork-relayer-api" +version = "2.0.15" +dependencies = [ + "bincode", + "serde", + "solana-sdk", +] + +[[package]] +name = "clockwork-sdk" +version = "2.0.15" +dependencies = [ + "anchor-lang", + "chrono", + "clockwork-thread-program", + "nom", + "once_cell", +] + +[[package]] +name = "clockwork-thread-program" +version = "2.0.15" +dependencies = [ + "anchor-lang", + "chrono", + "clockwork-cron", + "clockwork-network-program", + "clockwork-thread-program-v1", + "clockwork-utils", + "pyth-sdk-solana", + "static-pubkey", + "version", +] + +[[package]] +name = "clockwork-thread-program-v1" +version = "1.4.4" +dependencies = [ + "anchor-lang", + "clockwork-anchor-gen", +] + +[[package]] +name = "clockwork-utils" +version = "2.0.15" +dependencies = [ + "anchor-lang", + "base64 0.13.1", + "serde", + "serde_json", + "static-pubkey", +] + +[[package]] +name = "clockwork-webhook-program" +version = "2.0.15" +dependencies = [ + "anchor-lang", + "clockwork-network-program", + "clockwork-utils", + "serde", +] + +[[package]] +name = "clockwork_plugin" +version = "2.0.15" +dependencies = [ + "anchor-lang", + "async-trait", + "async_once", + "bincode", + "bs58 0.4.0", + "bugsnag", + "cargo_metadata", + "chrono", + "clockwork-client", + "clockwork-cron", + "clockwork-plugin-utils", + "clockwork-relayer-api", + "clockwork-thread-program", + "clockwork-thread-program-v1", + "clockwork-utils", + "futures", + "lazy_static", + "log 0.4.17", + "prost", + "pyth-sdk-solana", + "reqwest", + "rustc_version", + "serde", + "serde_json", + "simple-error", + "solana-account-decoder", + "solana-client", + "solana-geyser-plugin-interface", + "solana-logger", + "solana-program", + "solana-sdk", + "solana-transaction-status", + "static-pubkey", + "thiserror", + "tokio", +] + [[package]] name = "codespan-reporting" version = "0.11.1" @@ -2420,217 +2631,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "mat-clockwork-cli" -version = "2.0.42" -dependencies = [ - "anchor-lang", - "anyhow", - "bincode", - "bzip2", - "cargo_metadata", - "chrono", - "clap 3.2.23", - "dirs-next", - "indicatif", - "mat-clockwork-client", - "mat-clockwork-cron", - "mat-clockwork-plugin-utils", - "mat-clockwork-relayer-api", - "mat-clockwork-utils", - "mat-clockwork-webhook-program", - "reqwest", - "serde", - "serde_json", - "serde_yaml 0.9.21", - "solana-account-decoder", - "solana-clap-utils", - "solana-cli-config", - "solana-client", - "solana-sdk", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "tar", - "termcolor", - "thiserror", -] - -[[package]] -name = "mat-clockwork-client" -version = "2.0.42" -dependencies = [ - "anchor-lang", - "anchor-spl", - "bincode", - "borsh", - "mat-clockwork-network-program", - "mat-clockwork-thread-program", - "mat-clockwork-utils", - "mat-clockwork-webhook-program", - "solana-client", - "solana-sdk", - "spl-associated-token-account", - "thiserror", -] - -[[package]] -name = "mat-clockwork-cron" -version = "2.0.42" -dependencies = [ - "chrono", - "nom", - "once_cell", -] - -[[package]] -name = "mat-clockwork-network-program" -version = "2.0.42" -dependencies = [ - "anchor-lang", - "anchor-spl", - "mat-clockwork-utils", - "winnow", -] - -[[package]] -name = "mat-clockwork-plugin-utils" -version = "2.0.42" -dependencies = [ - "serde", - "serde_json", - "solana-geyser-plugin-interface", -] - -[[package]] -name = "mat-clockwork-relayer" -version = "2.0.42" -dependencies = [ - "actix-cors", - "actix-web", - "anchor-lang", - "bincode", - "byte-unit", - "curve25519-dalek", - "lazy_static", - "mat-clockwork-relayer-api", - "mat-clockwork-webhook-program", - "rayon", - "regex", - "reqwest", - "serde", - "serde_json", - "solana-client", - "solana-sdk", - "solana-zk-token-sdk", - "tokio", -] - -[[package]] -name = "mat-clockwork-relayer-api" -version = "2.0.42" -dependencies = [ - "bincode", - "serde", - "solana-sdk", -] - -[[package]] -name = "mat-clockwork-sdk" -version = "2.0.42" -dependencies = [ - "anchor-lang", - "chrono", - "mat-clockwork-thread-program", - "nom", - "once_cell", -] - -[[package]] -name = "mat-clockwork-thread-program" -version = "2.0.42" -dependencies = [ - "anchor-lang", - "chrono", - "mat-clockwork-cron", - "mat-clockwork-network-program", - "mat-clockwork-thread-program-v1", - "mat-clockwork-utils", - "pyth-sdk-solana", - "static-pubkey", - "version", -] - -[[package]] -name = "mat-clockwork-thread-program-v1" -version = "1.4.4" -dependencies = [ - "anchor-lang", - "clockwork-anchor-gen", -] - -[[package]] -name = "mat-clockwork-utils" -version = "2.0.42" -dependencies = [ - "anchor-lang", - "base64 0.13.1", - "serde", - "serde_json", - "static-pubkey", -] - -[[package]] -name = "mat-clockwork-webhook-program" -version = "2.0.42" -dependencies = [ - "anchor-lang", - "mat-clockwork-network-program", - "mat-clockwork-utils", - "serde", -] - -[[package]] -name = "mat_clockwork_plugin" -version = "2.0.42" -dependencies = [ - "anchor-lang", - "async-trait", - "async_once", - "bincode", - "bs58 0.4.0", - "bugsnag", - "cargo_metadata", - "chrono", - "futures", - "lazy_static", - "log 0.4.17", - "mat-clockwork-client", - "mat-clockwork-cron", - "mat-clockwork-plugin-utils", - "mat-clockwork-relayer-api", - "mat-clockwork-thread-program", - "mat-clockwork-thread-program-v1", - "mat-clockwork-utils", - "prost", - "pyth-sdk-solana", - "reqwest", - "rustc_version", - "serde", - "serde_json", - "simple-error", - "solana-account-decoder", - "solana-client", - "solana-geyser-plugin-interface", - "solana-logger", - "solana-program", - "solana-sdk", - "solana-transaction-status", - "static-pubkey", - "thiserror", - "tokio", -] - [[package]] name = "matches" version = "0.1.10" diff --git a/VERSION b/VERSION index a31ecb10a..b8061b50d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.42 +2.0.15 diff --git a/app/Cargo.toml b/app/Cargo.toml index 82e2afac8..551605c88 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -17,11 +17,11 @@ bincode = "1.3.3" bytemuck = "1.13.0" chrono = "0.4.23" clockwork-thread-program-v1 = { package = "clockwork-thread-program-v1", path = "../programs/thread/v1", version = "1.4.5", features = ["no-entrypoint"] } -clockwork-thread-program-v2 = { package = "clockwork-thread-program", path = "../programs/thread", version = "2.0.15", features = ["no-entrypoint"] } -clockwork-network-program = { package = "clockwork-network-program", path = "../programs/network", version = "2.0.15", features = ["no-entrypoint"] } -clockwork-relayer-api = { path = "../relayer/api", version = "2.0.15" } -clockwork-cron = { path = "../cron", version = "2.0.15" } -clockwork-utils = { path = "../utils", version = "2.0.15" } +clockwork-thread-program-v2 = { package = "clockwork-thread-program", path = "../programs/thread", version = "=2.0.15", features = ["no-entrypoint"] } +clockwork-network-program = { package = "clockwork-network-program", path = "../programs/network", version = "=2.0.15", features = ["no-entrypoint"] } +clockwork-relayer-api = { path = "../relayer/api", version = "=2.0.15" } +clockwork-cron = { path = "../cron", version = "=2.0.15" } +clockwork-utils = { path = "../utils", version = "=2.0.15" } dioxus = "0.3.1" dioxus-router = { version = "0.3.0", features = ["web"] } dioxus-web = "0.3.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index fd66162fb..8d65973bb 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-cli" -version = "2.0.42" +name = "clockwork-cli" +version = "2.0.15" description = "Command line interface for Clockwork" edition = "2021" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/cli" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/cli" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] build = "build.rs" @@ -17,12 +17,12 @@ anyhow = "1.0.61" bincode = "1.3.3" bzip2 = "0.4" clap = { version = "3.1.2", features = ["derive"] } -mat-clockwork-client = { path = "../client", version = "2.0.42" } -mat-clockwork-cron = { path = "../cron", version = "2.0.42" } -mat-clockwork-relayer-api = { path = "../relayer/api", version = "2.0.42" } -mat-clockwork-plugin-utils= { path = "../plugin/utils", version = "2.0.42" } -mat-clockwork-utils = { path = "../utils", version = "2.0.42" } -mat-clockwork-webhook-program = { path = "../programs/webhook", version = "2.0.42" } +clockwork-client = { path = "../client", version = "=2.0.15" } +clockwork-cron = { path = "../cron", version = "=2.0.15" } +clockwork-relayer-api = { path = "../relayer/api", version = "=2.0.15" } +clockwork-plugin-utils= { path = "../plugin/utils", version = "=2.0.15" } +clockwork-utils = { path = "../utils", version = "=2.0.15" } +clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.15" } chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } dirs-next = "2.0.0" indicatif = "0.16" diff --git a/client/Cargo.toml b/client/Cargo.toml index bb2d2ce35..db29bfcc9 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-client" -version = "2.0.42" +name = "clockwork-client" +version = "2.0.15" edition = "2021" description = "Clockwork client" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/client" -documentation = "https://docs.rs/mat-clockwork-client" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/client" +documentation = "https://docs.rs/clockwork-client" readme = "./README.md" keywords = ["solana"] @@ -19,10 +19,10 @@ anchor-lang = "0.27.0" anchor-spl = { features = ["mint", "token"], version = "0.27.0" } bincode = "1.3.3" borsh = "0.9.3" -mat-clockwork-network-program = { path = "../programs/network", features = ["no-entrypoint"], version = "2.0.42" } -mat-clockwork-thread-program = { path = "../programs/thread", features = ["no-entrypoint"], version = "2.0.42" } -mat-clockwork-utils = { path = "../utils", version = "2.0.42" } -mat-clockwork-webhook-program = { path = "../programs/webhook", features = ["no-entrypoint"], version = "2.0.42" } +clockwork-network-program = { path = "../programs/network", features = ["no-entrypoint"], version = "=2.0.15" } +clockwork-thread-program = { path = "../programs/thread", features = ["no-entrypoint"], version = "=2.0.15" } +clockwork-utils = { path = "../utils", version = "=2.0.15" } +clockwork-webhook-program = { path = "../programs/webhook", features = ["no-entrypoint"], version = "=2.0.15" } solana-client = "=1.14.16" solana-sdk = "=1.14.16" spl-associated-token-account = { version = "1.1.1", features = ["no-entrypoint"] } diff --git a/cron/Cargo.toml b/cron/Cargo.toml index 07fb4eeed..436c5b5f9 100644 --- a/cron/Cargo.toml +++ b/cron/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-cron" -version = "2.0.42" +name = "clockwork-cron" +version = "2.0.15" description = "A cron expression parser that's safe to use in the Solana runtime" edition = "2021" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/mat-clockwork" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/clockwork" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] diff --git a/plugin/Cargo.toml b/plugin/Cargo.toml index 56ab8dfac..a6dd0dac8 100644 --- a/plugin/Cargo.toml +++ b/plugin/Cargo.toml @@ -1,14 +1,14 @@ [package] -name = "mat_clockwork_plugin" -version = "2.0.42" +name = "clockwork_plugin" +version = "2.0.15" # this needs to match whatever solana uses! rust-version = "1.60.0" edition = "2021" description = "Clockwork plugin for Solana validators" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/plugin" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/plugin" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] build = "build.rs" @@ -26,13 +26,13 @@ bincode = "1.3.3" bs58 = "0.4.0" bugsnag = "0.2.1" chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } -mat-clockwork-client = { path = "../client", version = "2.0.42" } -mat-clockwork-cron = { path = "../cron", version = "2.0.42" } -mat-clockwork-plugin-utils = { path = "utils", version = "2.0.42" } -mat-clockwork-relayer-api = { path = "../relayer/api", version = "2.0.42" } -clockwork-thread-program = { package = "mat-clockwork-thread-program", path = "../programs/thread", version = "2.0.42" } -clockwork-thread-program-v1 = { package = "mat-clockwork-thread-program-v1", path = "../programs/thread/v1", version = "1.4.4" } -mat-clockwork-utils = { path = "../utils", version = "2.0.42" } +clockwork-client = { path = "../client", version = "=2.0.15" } +clockwork-cron = { path = "../cron", version = "=2.0.15" } +clockwork-plugin-utils = { path = "utils", version = "=2.0.15" } +clockwork-relayer-api = { path = "../relayer/api", version = "=2.0.15" } +clockwork-thread-program = { package = "clockwork-thread-program", path = "../programs/thread", version = "=2.0.15" } +clockwork-thread-program-v1 = { package = "clockwork-thread-program-v1", path = "../programs/thread/v1", version = "=1.4.4" } +clockwork-utils = { path = "../utils", version = "=2.0.15" } lazy_static = "1.4.0" log = "0.4" prost = "0.10.0" diff --git a/plugin/utils/Cargo.toml b/plugin/utils/Cargo.toml index 28f5768f0..083d74bc3 100644 --- a/plugin/utils/Cargo.toml +++ b/plugin/utils/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-plugin-utils" -version = "2.0.42" +name = "clockwork-plugin-utils" +version = "2.0.15" edition = "2021" description = "Clockwork Plugin Utils" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/plugin/utils" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/plugin/utils" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] diff --git a/programs/network/Cargo.toml b/programs/network/Cargo.toml index af0b9caf6..dba4236e3 100644 --- a/programs/network/Cargo.toml +++ b/programs/network/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-network-program" -version = "2.0.42" +name = "clockwork-network-program" +version = "2.0.15" description = "Clockwork networking protocol" edition = "2021" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/mat-clockwork" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/clockwork" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] @@ -24,5 +24,5 @@ default = [] [dependencies] anchor-lang = "0.27.0" anchor-spl = { features = ["mint", "token"], version = "0.27.0" } -mat-clockwork-utils = { path = "../../utils", version = "2.0.42" } +clockwork-utils = { path = "../../utils", version = "=2.0.15" } winnow = "=0.4.1" diff --git a/programs/thread/Cargo.toml b/programs/thread/Cargo.toml index d022fcf36..d4806c61a 100644 --- a/programs/thread/Cargo.toml +++ b/programs/thread/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-thread-program" -version = "2.0.42" +name = "clockwork-thread-program" +version = "2.0.15" description = "Clockwork thread program" edition = "2021" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/mat-clockwork" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/clockwork" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] @@ -24,10 +24,10 @@ default = [] [dependencies] anchor-lang = "0.27.0" chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } -mat-clockwork-cron = { path = "../../cron", version = "2.0.42" } -mat-clockwork-network-program = { path = "../network", features = ["cpi"], version = "2.0.42" } -mat-clockwork-thread-program-v1 = { path = "v1", version = "1.4.4" } -mat-clockwork-utils = { path = "../../utils", version = "2.0.42" } +clockwork-cron = { path = "../../cron", version = "=2.0.15" } +clockwork-network-program = { path = "../network", features = ["cpi"], version = "=2.0.15" } +clockwork-thread-program-v1 = { path = "v1", version = "=1.4.4" } +clockwork-utils = { path = "../../utils", version = "=2.0.15" } pyth-sdk-solana = "0.7.1" static-pubkey = "1.0.3" version = "3.0.0" diff --git a/programs/thread/v1/Cargo.toml b/programs/thread/v1/Cargo.toml index d4cb8bce6..9285a3093 100644 --- a/programs/thread/v1/Cargo.toml +++ b/programs/thread/v1/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mat-clockwork-thread-program-v1" +name = "clockwork-thread-program-v1" version = "1.4.4" edition = "2021" readme = "./README.md" diff --git a/programs/webhook/Cargo.toml b/programs/webhook/Cargo.toml index 92959dbbe..25e4d79bc 100644 --- a/programs/webhook/Cargo.toml +++ b/programs/webhook/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-webhook-program" -version = "2.0.42" +name = "clockwork-webhook-program" +version = "2.0.15" description = "Clockwork webhook program" edition = "2021" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/mat-clockwork" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/clockwork" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] @@ -23,6 +23,6 @@ default = [] [dependencies] anchor-lang = { features = ["init-if-needed"], version = "0.27.0" } -mat-clockwork-network-program = { path = "../network", features = ["cpi"], version = "2.0.42" } -mat-clockwork-utils = { path = "../../utils", version = "2.0.42" } +clockwork-network-program = { path = "../network", features = ["cpi"], version = "=2.0.15" } +clockwork-utils = { path = "../../utils", version = "=2.0.15" } serde = "1.0.152" diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index d8502bdc2..f3f463601 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-relayer" -version = "2.0.42" +name = "clockwork-relayer" +version = "2.0.15" edition = "2021" description = "Clockwork relayer for webhook requests" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/relayer" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/relayer" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] publish = false @@ -18,8 +18,8 @@ actix-cors = "0.6.4" actix-web = "4.3.1" anchor-lang = "0.27.0" byte-unit = "4.0.18" -mat-clockwork-webhook-program = { path = "../programs/webhook", version = "2.0.42" } -mat-clockwork-relayer-api = { path = "api", version = "2.0.42" } +clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.15" } +clockwork-relayer-api = { path = "api", version = "=2.0.15" } curve25519-dalek = "3.2.1" lazy_static = "1.4.0" reqwest = "0.11.14" diff --git a/relayer/api/Cargo.toml b/relayer/api/Cargo.toml index 806fdd874..8fb7672a3 100644 --- a/relayer/api/Cargo.toml +++ b/relayer/api/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-relayer-api" -version = "2.0.42" +name = "clockwork-relayer-api" +version = "2.0.15" edition = "2021" description = "Clockwork relayer for webhook requests" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/relayer" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/relayer" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] diff --git a/scripts/ci/bump-version.sh b/scripts/ci/bump-version.sh index c64dbfa2e..93ea14199 100755 --- a/scripts/ci/bump-version.sh +++ b/scripts/ci/bump-version.sh @@ -27,14 +27,14 @@ current_version=$(cat ./VERSION) echo "Current version: $current_version" # Run cargo set-version -cargo set-version --locked --workspace --bump $bump $dry_run "${args[@]}" +cargo set-version --locked --workspace --bump "$bump" $dry_run "${args[@]}" if [ -n "$dry_run" ]; then echo "Dry run, exiting..." exit 0 fi # We need to retrieve the actual semver version from the Cargo.toml files -actual_version=$(cargo metadata --format-version=1 | jq -r '.packages[] | select(.name == "mat-clockwork-sdk") | .version') +actual_version=$(cargo metadata --format-version=1 | jq -r '.packages[] | select(.name == "clockwork-sdk") | .version') echo $actual_version >VERSION echo "New version: $actual_version" diff --git a/scripts/install b/scripts/install deleted file mode 100755 index 1bf25805a..000000000 --- a/scripts/install +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -{ # this ensures the entire script is downloaded # - -set -xe - -toolchain=1.60.0 -crate=mat-clockwork-cli - -main() { - need_cmd rustup - need_cmd cargo - - rustup install $toolchain --profile minimal - cargo +$toolchain install -f --locked $crate - - clockwork localnet --help -} - - -need_cmd() { - if ! check_cmd "$1"; then - ┆ err "need '$1' (command not found)" - fi -} - -check_cmd() { - command -v "$1" > /dev/null 2>&1 -} - - -main "$@" - -} diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index ef1e4650c..4213dc024 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-sdk" -version = "2.0.42" +name = "clockwork-sdk" +version = "2.0.15" description = "An SDK for building automated programs on Solana" edition = "2021" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/mat-clockwork" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/clockwork" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"] @@ -16,7 +16,7 @@ name = "clockwork_sdk" [dependencies] anchor-lang = "0.27.0" chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } -mat-clockwork-thread-program = { path = "../programs/thread", features = ["cpi"], version = "2.0.42" } +clockwork-thread-program = { path = "../programs/thread", features = ["cpi"], version = "=2.0.15" } nom = "~7" once_cell = "1.5.2" diff --git a/utils/Cargo.toml b/utils/Cargo.toml index a715b5375..11d47bffb 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "mat-clockwork-utils" -version = "2.0.42" +name = "clockwork-utils" +version = "2.0.15" description = "Tools for building blocks on Solana" edition = "2021" license = "AGPL-3.0-or-later" -homepage = "https://mat-clockwork.xyz" -repository = "https://github.com/mat-clockwork-xyz/mat-clockwork" -documentation = "https://docs.mat-clockwork.xyz" +homepage = "https://clockwork.xyz" +repository = "https://github.com/clockwork-xyz/clockwork" +documentation = "https://docs.clockwork.xyz" readme = "./README.md" keywords = ["solana"]