Skip to content
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

Chore / update dependencies #102

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

Chore / update dependencies #102

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
fc9990d
chore : upgrade anchor-lang to 0.30.1 and solana-program to 2.0.2
XuananLe Jul 16, 2024
56af0dc
Update Cargo.toml
XuananLe Jul 16, 2024
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
458 changes: 355 additions & 103 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ members = [
"basics/create-account/anchor/programs/create-system-account",
"basics/cross-program-invocation/native/programs/*",
"basics/cross-program-invocation/anchor/programs/*",
"basics/favorites/anchor/programs/favorites",
"basics/hello-solana/native/program",
"basics/hello-solana/anchor/programs/*",
"basics/pda-rent-payer/native/program",
Expand All @@ -30,11 +31,12 @@ members = [
"basics/repository-layout/anchor/programs/*",
"basics/transfer-sol/native/program",
"basics/transfer-sol/anchor/programs/*",
"oracles/pyth/anchor/programs/pythexample",
"tokens/token-2022/mint-close-authority/native/program",
"tokens/token-2022/non-transferable/native/program",
"tokens/token-2022/default-account-state/native/program",
"tokens/token-2022/transfer-fee/native/program",
"tokens/token-2022/multiple-extensions/native/program"
"tokens/token-2022/multiple-extensions/native/program",
]
resolver = "2"

Expand Down
2 changes: 1 addition & 1 deletion basics/account-data/anchor/programs/anchor-program-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
2 changes: 1 addition & 1 deletion basics/account-data/native/program/src/instructions/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub fn create_address_info(
let payer = next_account_info(accounts_iter)?;
let system_program = next_account_info(accounts_iter)?;

let account_span = (address_info.try_to_vec()?).len();
let account_span = std::mem::size_of_val(&address_info);
let lamports_required = (Rent::get()?).minimum_balance(account_span);

invoke(
Expand Down
2 changes: 1 addition & 1 deletion basics/checking-accounts/anchor/programs/anchor-program-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
2 changes: 1 addition & 1 deletion basics/checking-accounts/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
solana-program = "=1.17.25"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/close-account/anchor/programs/close-account/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/close-account/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
borsh = "0.9.3"
borsh-derive = "0.9.1"
solana-program = "=1.17.25"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/close-account/native/program/src/instructions/create_user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub fn create_user(program_id: &Pubkey, accounts: &[AccountInfo], data: User) ->
let payer = next_account_info(accounts_iter)?;
let system_program = next_account_info(accounts_iter)?;

let account_span = (data.try_to_vec()?).len();
let account_span = std::mem::size_of_val(&data);
let lamports_required = (Rent::get()?).minimum_balance(account_span);

let (_, bump) = Pubkey::find_program_address(
Expand Down
2 changes: 1 addition & 1 deletion basics/counter/anchor/programs/counter_anchor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/counter/mpl-stack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
borsh = "0.9"
shank = "0.0.8"
solana-program = "=1.17.25"
borsh = "1.5.1"
shank = "0.4.2"
solana-program = "=2.0.2"
4 changes: 2 additions & 2 deletions basics/counter/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
borsh = "0.9.3"
solana-program = "=1.17.25"
borsh = "1.5.1"
solana-program = "=2.0.2"
2 changes: 1 addition & 1 deletion basics/create-account/anchor/programs/create-system-account/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
2 changes: 1 addition & 1 deletion basics/create-account/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
solana-program = "=1.17.25"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/cross-program-invocation/anchor/programs/hand/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
2 changes: 1 addition & 1 deletion basics/cross-program-invocation/anchor/programs/lever/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/cross-program-invocation/native/programs/hand/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ no-entrypoint = []
cpi = ["no-entrypoint"]

[dependencies]
borsh = "0.10"
borsh-derive = "0.10"
solana-program = "=1.17.25"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"
cross-program-invocatio-native-lever = { path = "../lever", features = ["cpi"] }

[lib]
Expand Down
6 changes: 3 additions & 3 deletions basics/cross-program-invocation/native/programs/lever/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ no-entrypoint = []
cpi = ["no-entrypoint"]

[dependencies]
borsh = "0.10"
borsh-derive = "0.10"
solana-program = "=1.17.25"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/cross-program-invocation/native/programs/lever/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub fn initialize(
let user = next_account_info(accounts_iter)?;
let system_program = next_account_info(accounts_iter)?;

let account_span = (power_status.try_to_vec()?).len();
let account_span = std::mem::size_of_val(&power_status);
let lamports_required = (Rent::get()?).minimum_balance(account_span);

invoke(
Expand Down
4 changes: 2 additions & 2 deletions basics/favorites/anchor/programs/favorites/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ default = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = {version = "0.30.0", features = ["init-if-needed"]}
solana-program = "=1.18.5"
anchor-lang = {version = "0.30.1", features = ["init-if-needed"]}
solana-program = "=2.0.2"
2 changes: 1 addition & 1 deletion basics/hello-solana/anchor/Anchor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ hello_solana = "2phbC62wekpw95XuBk4i1KX4uA8zBUWmYbiTMhicSuBV"
url = "https://api.apr.dev"

[provider]
cluster = "Localnet"
cluster = "Devnet"
wallet = "~/.config/solana/id.json"

[scripts]
Expand Down
1 change: 1 addition & 0 deletions basics/hello-solana/anchor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ codegen-units = 1
opt-level = 3
incremental = false
codegen-units = 1

2 changes: 1 addition & 1 deletion basics/hello-solana/anchor/programs/hello-solana/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
2 changes: 1 addition & 1 deletion basics/hello-solana/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
solana-program = "=1.17.25"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/pda-rent-payer/anchor/programs/anchor-program-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/pda-rent-payer/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
solana-program = "=1.17.25"
borsh = "0.9.3"
borsh-derive = "0.9.1"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/processing-instructions/anchor/programs/processing-instructions/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/processing-instructions/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
borsh = "0.9.3"
borsh-derive = "0.9.1"
solana-program = "=1.17.25"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/realloc/anchor/programs/anchor-realloc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/realloc/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
borsh = "0.9.3"
borsh-derive = "0.9.1"
solana-program = "=1.17.25"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/realloc/native/program/src/instructions/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub fn create_address_info(
let payer = next_account_info(accounts_iter)?;
let system_program = next_account_info(accounts_iter)?;

let account_span = (data.try_to_vec()?).len();
let account_span = std::mem::size_of_val(&data);
let lamports_required = (Rent::get()?).minimum_balance(account_span);

invoke(
Expand Down
4 changes: 2 additions & 2 deletions basics/realloc/native/program/src/instructions/reallocate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub fn reallocate_without_zero_init(
let enhanced_address_info_data =
EnhancedAddressInfo::from_address_info(address_info_data, args.state, args.zip);

let account_span = (enhanced_address_info_data.try_to_vec()?).len();
let account_span = std::mem::size_of_val(&enhanced_address_info_data);
let lamports_required = (Rent::get()?).minimum_balance(account_span);

let diff = lamports_required - target_account.lamports();
Expand All @@ -47,7 +47,7 @@ pub fn reallocate_zero_init(accounts: &[AccountInfo], data: WorkInfo) -> Program
let accounts_iter = &mut accounts.iter();
let target_account = next_account_info(accounts_iter)?;

let account_span = (data.try_to_vec()?).len();
let account_span = std::mem::size_of_val(&data);

target_account.realloc(account_span, true)?;

Expand Down
2 changes: 1 addition & 1 deletion basics/rent/anchor/programs/rent-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/rent/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
borsh = "0.9.3"
borsh-derive = "0.9.1"
solana-program = "=1.17.25"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/repository-layout/anchor/programs/carnival/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/repository-layout/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
borsh = "0.9.3"
borsh-derive = "0.9.1"
solana-program = "=1.17.25"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion basics/transfer-sol/anchor/programs/transfer-sol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
anchor-lang = "0.30.1"
6 changes: 3 additions & 3 deletions basics/transfer-sol/native/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
borsh = "0.9.3"
borsh-derive = "0.9.1"
solana-program = "=1.17.25"
borsh = "1.5.1"
borsh-derive = "1.5.1"
solana-program = "=2.0.2"

[lib]
crate-type = ["cdylib", "lib"]
6 changes: 3 additions & 3 deletions compression/cnft-burn/anchor/programs/cnft-burn/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ no-log-ix-name = []
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30.0"
mpl-bubblegum = "1.3.0"
anchor-lang = "0.30.1"
mpl-bubblegum = "1.4.0"
spl-account-compression = { version="0.3.0",features = ["no-entrypoint","cpi"] }
ahash = "=0.8.7"
ahash = "=0.8.11"
4 changes: 2 additions & 2 deletions compression/cnft-vault/anchor/programs/cnft-vault/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
anchor-lang = "0.26.0"
solana-program = "1.14"
anchor-lang = "0.30.1"
solana-program = "=2.0.2"
spl-account-compression = { version="0.1.8", features = ["cpi"] }
mpl-bubblegum = { version = "0.7.0", features = ["no-entrypoint", "cpi"] }
4 changes: 2 additions & 2 deletions compression/cutils/anchor/programs/cutils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
anchor-lang = "0.26.0"
solana-program = "1.14.18"
anchor-lang = "0.30.1"
solana-program = "2.0.2"
spl-account-compression = { version="0.1.8", features = ["cpi"] }
mpl-bubblegum = { version = "0.7.0", features = ["no-entrypoint", "cpi"] }

Expand Down
4 changes: 2 additions & 2 deletions oracles/pyth/anchor/programs/pythexample/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ no-idl = []
no-log-ix-name = []

[dependencies]
anchor-lang = "0.28.0"
pyth-sdk-solana = "0.8.0"
anchor-lang = "0.30.1"
pyth-sdk-solana = "0.10.1"
pyth-sdk = "0.8.0"
Loading