Skip to content

upgrade to Anchor 0.29.0 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cryptorrivem wants to merge 2 commits into
base: main
Choose a base branch
from
Open

upgrade to Anchor 0.29.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dce7fc
remove unnecessary fixed versions
cryptorrivem Oct 23, 2023
9c5f831
migrate to anchor 0.29.0
cryptorrivem Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
491 changes: 356 additions & 135 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ keywords = ["solana"]
build = "build.rs"

[dependencies]
anchor-lang = "0.28.0"
anchor-spl = { features = ["mint", "token"], version = "0.28.0" }
anchor-lang = "0.29.0"
anchor-spl = { features = ["mint", "token"], version = "0.29.0" }
anyhow = "1.0.61"
bincode = "1.3.3"
bzip2 = "0.4"
Expand All @@ -32,11 +32,11 @@ reqwest = "0.11.14"
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.79"
serde_yaml = "0.9.4"
solana-account-decoder = "=1.16.12"
solana-client = "=1.16.12"
solana-clap-utils = "=1.16.12"
solana-cli-config = "=1.16.12"
solana-sdk = "=1.16.12"
solana-account-decoder = "^1.16.13"
solana-client = "^1.16.13"
solana-clap-utils = "^1.16.13"
solana-cli-config = "^1.16.13"
solana-sdk = "^1.16.13"
spl-associated-token-account = "1.1.1"
spl-memo = "4.0.0"
spl-token = "~4.0.0"
Expand Down
16 changes: 8 additions & 8 deletions plugin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ crate-type = ["cdylib", "rlib"]
name = "clockwork_plugin"

[dependencies]
anchor-lang = "0.28.0"
anchor-lang = "0.29.0"
async_once = "0.2.6"
async-trait = "0.1.64"
bincode = "1.3.3"
Expand All @@ -42,13 +42,13 @@ reqwest = "0.11.11"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
simple-error = "0.2.3"
solana-account-decoder = "=1.16.12"
solana-client = "=1.16.12"
solana-geyser-plugin-interface = "=1.16.12"
solana-logger = "=1.16.12"
solana-program = "=1.16.12"
solana-sdk = "=1.16.12"
solana-transaction-status = "=1.16.12"
solana-account-decoder = "^1.16.13"
solana-client = "^1.16.13"
solana-geyser-plugin-interface = "^1.16.13"
solana-logger = "^1.16.13"
solana-program = "^1.16.13"
solana-sdk = "^1.16.13"
solana-transaction-status = "^1.16.13"
thiserror = "1.0.30"
tokio = "1.18.4"
futures = "0.3.26"
Expand Down
2 changes: 1 addition & 1 deletion plugin/utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ name = "clockwork_plugin_utils"
[dependencies]
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
solana-geyser-plugin-interface = "=1.16.12"
solana-geyser-plugin-interface = "^1.16.13"
6 changes: 2 additions & 4 deletions programs/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
anchor-lang = "0.28.0"
anchor-spl = { features = ["mint", "token"], version = "0.28.0" }
anchor-lang = "0.29.0"
anchor-spl = { features = ["mint", "token"], version = "0.29.0" }
clockwork-utils = { path = "../../utils", version = "=2.0.19" }
winnow = "=0.4.1"
toml_datetime = "=0.6.1"
2 changes: 1 addition & 1 deletion programs/network/src/instructions/delegation_withdraw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub fn handler(ctx: Context<DelegationWithdraw>, amount: u64) -> Result<()> {
let token_program = &ctx.accounts.token_program;

// Transfer tokens from authority tokens to delegation
let bump = *ctx.bumps.get("delegation").unwrap();
let bump = ctx.bumps.delegation;
transfer(
CpiContext::new_with_signer(
token_program.to_account_info(),
Expand Down
2 changes: 1 addition & 1 deletion programs/network/src/jobs/stake_delegations/process_delegation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub fn handler(ctx: Context<StakeDelegationsProcessDelegation>) -> Result<Thread

// Transfer tokens from delegation to worker account.
let amount = delegation_stake.amount;
let bump = *ctx.bumps.get("delegation").unwrap();
let bump = ctx.bumps.delegation;
transfer(
CpiContext::new_with_signer(
token_program.to_account_info(),
Expand Down
2 changes: 1 addition & 1 deletion programs/network/src/state/fee.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use anchor_lang::{prelude::*, AnchorDeserialize};
use anchor_lang::prelude::*;

pub const SEED_FEE: &[u8] = b"fee";

Expand Down
2 changes: 1 addition & 1 deletion programs/thread/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
anchor-lang = "0.28.0"
anchor-lang = "0.29.0"
chrono = { version = "0.4.19", default-features = false, features = ["alloc"] }
clockwork-cron = { path = "../../cron", version = "=2.0.19" }
clockwork-network-program = { path = "../network", features = ["cpi"], version = "=2.0.19" }
Expand Down
2 changes: 1 addition & 1 deletion programs/thread/src/instructions/thread_create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub fn handler(ctx: Context<ThreadCreate>, amount: u64, id: Vec<u8>, instruction
let thread = &mut ctx.accounts.thread;

// Initialize the thread
let bump = *ctx.bumps.get("thread").unwrap();
let bump = ctx.bumps.thread;
thread.authority = authority.key();
thread.bump = bump;
thread.created_at = Clock::get().unwrap().into();
Expand Down
2 changes: 1 addition & 1 deletion programs/thread/v1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ no-log-ix-name = []
cpi = ["no-entrypoint"]

[dependencies]
anchor-lang = "0.28.0"
anchor-lang = "0.29.0"
clockwork-anchor-gen = { version = "0.3.2", features = ["compat-program-result"] }
2 changes: 1 addition & 1 deletion programs/webhook/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
anchor-lang = { features = ["init-if-needed"], version = "0.28.0" }
anchor-lang = { features = ["init-if-needed"], version = "0.29.0" }
clockwork-network-program = { path = "../network", features = ["cpi"], version = "=2.0.19" }
clockwork-utils = { path = "../../utils", version = "=2.0.19" }
serde = "1.0.152"
8 changes: 4 additions & 4 deletions relayer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ publish = false
[dependencies]
actix-cors = "0.6.4"
actix-web = "4.3.1"
anchor-lang = "0.28.0"
anchor-lang = "0.29.0"
byte-unit = "4.0.18"
clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.19" }
clockwork-relayer-api = { path = "api", version = "=2.0.19" }
Expand All @@ -25,9 +25,9 @@ lazy_static = "1.4.0"
reqwest = "0.11.14"
serde = "1.0.152"
serde_json = "1.0.94"
solana-client = "=1.16.12"
solana-zk-token-sdk = "=1.16.12"
solana-sdk = "=1.16.12"
solana-client = "^1.16.13"
solana-zk-token-sdk = "^1.16.13"
solana-sdk = "^1.16.13"
tokio = "1.26.0"
bincode = "1.3.3"
rayon = "1.7.0"
Expand Down
4 changes: 2 additions & 2 deletions relayer/api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ name = "clockwork_relayer_api"
# lazy_static = "1.4.0"
serde = "1.0.152"
# shadow-drive-sdk = "0.6.1"
# solana-zk-token-sdk = "=1.16.12"
solana-sdk = "=1.16.12"
# solana-zk-token-sdk = "^1.16.13"
solana-sdk = "^1.16.13"
# tokio = "1.26.0"
bincode = "1.3.3"
2 changes: 1 addition & 1 deletion sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords = ["solana"]
name = "clockwork_sdk"

[dependencies]
anchor-lang = "0.28.0"
anchor-lang = "0.29.0"
chrono = { version = "0.4.19", default-features = false, features = ["alloc"] }
clockwork-thread-program = { path = "../programs/thread", features = ["cpi"], version = "=2.0.19" }
nom = "~7"
Expand Down
2 changes: 1 addition & 1 deletion utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords = ["solana"]
name = "clockwork_utils"

[dependencies]
anchor-lang = "0.28.0"
anchor-lang = "0.29.0"
base64 = "~0.13"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down