project-serum
/
anchor
mirror of https://github.com/project-serum/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow wider range of dependency versions to reduce dependency issues (#2524)

This commit is contained in:
acheron 2023-06-08 18:59:44 +02:00 committed by GitHub
parent 6df34e7678
commit c7c73194d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 563 additions and 1936 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@ The minor version will be incremented upon a breaking change and the patch versi
- cli: Fix incorrect `metadata.address` generation in IDL after deploying with a custom keypair ([#2485](https://github.com/coral-xyz/anchor/pull/2485))
- cli: IDL commands no longer hang when the payer doesn't have funds to pay for the transaction fee ([#2492](https://github.com/coral-xyz/anchor/pull/2492))
- cli: Fix `anchor new` not updating `Anchor.toml` ([#2516](https://github.com/coral-xyz/anchor/pull/2516)).
- client, lang, spl: Allow wider range of dependency versions to reduce dependency issues ([#2524](https://github.com/coral-xyz/anchor/pull/2524)).
### Breaking

1046
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

1
Cargo.toml
View File

@ -6,6 +6,7 @@ codegen-units = 1
[workspace]
members = [
"avm",
"cli",
"client",
"lang",

1259
avm/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
avm/Cargo.toml
View File

@ -13,16 +13,14 @@ name = "anchor"
path = "src/anchor/main.rs"
[dependencies]
clap = { version = "4.2.4", features = ["derive"]}
cfg-if = "1.0.0"
anyhow = "1.0.32"
cfg-if = "1.0.0"
clap = { version = "4.2.4", features = ["derive"]}
dirs = "4.0.0"
once_cell = { version = "1.8.0" }
reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "json", "rustls-tls"] }
semver = "1.0.4"
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.78"
thiserror = "1.0.30"
once_cell = { version = "1.8.0" }
reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "json", "rustls-tls"] }
tempfile = "3.3.0"
[workspace]
thiserror = "1.0.30"

46
cli/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "anchor-cli"
version = "0.27.0"
authors = ["armaniferrante <armaniferrante@gmail.com>"]
authors = ["Anchor Maintainers <accounts@200ms.io>"]
rust-version = "1.60"
edition = "2021"
repository = "https://github.com/coral-xyz/anchor"
@ -17,34 +17,34 @@ dev = []
default = []
[dependencies]
clap = { version = "4.2.4", features = ["derive"] }
anchor-client = { path = "../client", version = "0.27.0" }
anchor-lang = { path = "../lang", version = "0.27.0" }
anchor-syn = { path = "../lang/syn", features = ["event-cpi", "idl", "init-if-needed"], version = "0.27.0" }
anyhow = "1.0.32"
base64 = "0.13.1"
bincode = "1.3.3"
syn = { version = "1.0.60", features = ["full", "extra-traits"] }
anchor-lang = { path = "../lang", version = "0.27.0" }
anchor-client = { path = "../client", version = "0.27.0" }
anchor-syn = { path = "../lang/syn", features = ["event-cpi", "idl", "init-if-needed"], version = "0.27.0" }
serde_json = "1.0"
shellexpand = "2.1.0"
toml = "0.5.8"
solang-parser = "=0.2.3"
semver = "1.0.4"
serde = { version = "1.0.122", features = ["derive"] }
solana-sdk = "<1.17.0"
solana-program = "<1.17.0"
solana-client = "<1.17.0"
solana-cli-config = "<1.17.0"
solana-faucet = "<1.17.0"
cargo_toml = "0.13.0"
chrono = "0.4.19"
clap = { version = "4.2.4", features = ["derive"] }
dirs = "4.0"
heck = "0.4.0"
flate2 = "1.0.19"
tar = "0.4.35"
heck = "0.4.0"
pathdiff = "0.2.0"
portpicker = "0.1.1"
regex = "1.8.3"
reqwest = { version = "0.11.4", default-features = false, features = ["multipart", "blocking", "rustls-tls"] }
semver = "1.0.4"
serde = { version = "1.0.122", features = ["derive"] }
serde_json = "1.0"
shellexpand = "2.1.0"
solana-client = ">=1.13, <1.17"
solana-cli-config = ">=1.13, <1.17"
solana-faucet = ">=1.13, <1.17"
solana-program = ">=1.13, <1.17"
solana-sdk = ">=1.13, <1.17"
solang-parser = "=0.2.3"
syn = { version = "1.0.60", features = ["full", "extra-traits"] }
tar = "0.4.35"
tokio = "~1.14.1"
pathdiff = "0.2.0"
cargo_toml = "0.13.0"
toml = "0.5.8"
walkdir = "2.3.2"
chrono = "0.4.19"
portpicker = "0.1.1"

18
client/Cargo.toml
View File

@ -13,13 +13,13 @@ async = []
[dependencies]
anchor-lang = { path = "../lang", version = "0.27.0" }
anyhow = "1.0.32"
regex = "1.4.5"
serde = { version = "1.0.122", features = ["derive"] }
solana-client = "1.14.7"
solana-sdk = "<1.17.0"
solana-account-decoder = "<1.17.0"
thiserror = "1.0.20"
url = "2.2.2"
anyhow = "1"
futures = { version = "0.3" }
regex = "1"
serde = { version = "1", features = ["derive"] }
solana-client = ">=1.13, <1.17"
solana-sdk = ">=1.13, <1.17"
solana-account-decoder = ">=1.13, <1.17"
thiserror = "1"
tokio = { version = "1", features = ["rt", "sync"] }
futures = { version = "0.3.28" }
url = "2"

2
client/example/Cargo.toml
View File

@ -21,4 +21,4 @@ shellexpand = "2.1.0"
anyhow = "1.0.32"
clap = { version = "4.2.4", features = ["derive"] }
tokio = { version = "1", features = ["full"] }
solana-sdk = "<1.17.0"
solana-sdk = ">=1.13, <1.17"

2
docker/Makefile
View File

@ -6,7 +6,7 @@ ANCHOR_CLI=v0.27.0
#
# Solana toolchain.
#
SOLANA_CLI=v1.14.16
SOLANA_CLI=v1.16.0
#
# Build version should match the Anchor cli version.
#

16
lang/Cargo.toml
View File

@ -34,11 +34,13 @@ anchor-attribute-event = { path = "./attribute/event", version = "0.27.0" }
anchor-attribute-program = { path = "./attribute/program", version = "0.27.0" }
anchor-derive-accounts = { path = "./derive/accounts", version = "0.27.0" }
anchor-derive-space = { path = "./derive/space", version = "0.27.0" }
arrayref = "0.3.6"
base64 = "0.13.0"
bincode = "1.3.3"
borsh = "<0.11.0"
bytemuck = "1.4.0"
arrayref = "0.3"
base64 = "0.13"
bincode = "1"
borsh = ">=0.9, <0.11"
bytemuck = "1"
solana-program = ">=1.13, <1.17"
thiserror = "1"
# TODO: Remove. This crate has been added to fix a build error with the 1.16.0 release.
getrandom = { version = "0.2", features = ["custom"] }
solana-program = "<1.17.0"
thiserror = "1.0.20"

10
lang/attribute/access-control/Cargo.toml
View File

@ -15,9 +15,9 @@ proc-macro = true
anchor-debug = ["anchor-syn/anchor-debug"]
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.27.0" }
regex = "1.0"
anyhow = "1"
proc-macro2 = "1"
quote = "1"
regex = "1"
syn = { version = "1", features = ["full"] }

12
lang/attribute/account/Cargo.toml
View File

@ -15,10 +15,10 @@ proc-macro = true
anchor-debug = ["anchor-syn/anchor-debug"]
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.27.0", features = ["hash"] }
rustversion = "1.0.3"
bs58 = "0.4.0"
anyhow = "1"
bs58 = "0.5"
proc-macro2 = "1"
quote = "1"
rustversion = "1"
syn = { version = "1", features = ["full"] }

4
lang/attribute/constant/Cargo.toml
View File

@ -15,6 +15,6 @@ proc-macro = true
anchor-debug = ["anchor-syn/anchor-debug"]
[dependencies]
proc-macro2 = "1.0"
syn = { version = "1.0.60", features = ["full"] }
anchor-syn = { path = "../../syn", version = "0.27.0" }
proc-macro2 = "1"
syn = { version = "1", features = ["full"] }

6
lang/attribute/error/Cargo.toml
View File

@ -15,7 +15,7 @@ proc-macro = true
anchor-debug = ["anchor-syn/anchor-debug"]
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0.60", features = ["full"] }
anchor-syn = { path = "../../syn", version = "0.27.0" }
proc-macro2 = "1"
quote = "1"
syn = { version = "1", features = ["full"] }

8
lang/attribute/event/Cargo.toml
View File

@ -16,8 +16,8 @@ anchor-debug = ["anchor-syn/anchor-debug"]
event-cpi = ["anchor-syn/event-cpi"]
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.27.0", features = ["hash"] }
anyhow = "1"
proc-macro2 = "1"
quote = "1"
syn = { version = "1", features = ["full"] }

8
lang/attribute/program/Cargo.toml
View File

@ -15,8 +15,8 @@ proc-macro = true
anchor-debug = ["anchor-syn/anchor-debug"]
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.27.0" }
anyhow = "1"
proc-macro2 = "1"
quote = "1"
syn = { version = "1", features = ["full"] }

8
lang/derive/accounts/Cargo.toml
View File

@ -18,8 +18,8 @@ default = []
anchor-debug = ["anchor-syn/anchor-debug"]
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32"
anyhow = "1"
proc-macro2 = "1"
quote = "1"
syn = { version = "1", features = ["full"] }
anchor-syn = { path = "../../syn", version = "0.27.0" }

6
lang/derive/space/Cargo.toml
View File

@ -12,6 +12,6 @@ edition = "2021"
proc-macro = true
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0", features = ["extra-traits"]}
proc-macro2 = "1"
quote = "1"
syn = { version = "1", features = ["extra-traits"]}

20
lang/syn/Cargo.toml
View File

@ -19,13 +19,13 @@ seeds = []
event-cpi = []
[dependencies]
proc-macro2 = { version = "1.0", features=["span-locations"]}
quote = "1.0"
syn = { version = "1.0.60", features = ["full", "extra-traits", "parsing"] }
anyhow = "1.0.32"
heck = "0.3.1"
serde = { version = "1.0.122", features = ["derive"] }
serde_json = "1.0"
sha2 = "0.9.2"
thiserror = "1.0"
bs58 = "0.3.1"
anyhow = "1"
bs58 = "0.5"
heck = "0.3"
proc-macro2 = { version = "1", features=["span-locations"]}
quote = "1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = "0.10"
syn = { version = "1", features = ["full", "extra-traits", "parsing"] }
thiserror = "1"

12
spl/Cargo.toml
View File

@ -22,10 +22,10 @@ dex = ["serum_dex"]
[dependencies]
anchor-lang = { path = "../lang", version = "0.27.0", features = ["derive"] }
borsh = { version = "<0.11.0", optional = true }
borsh = { version = ">=0.9, <0.11", optional = true }
mpl-token-metadata = { version = "1.11", optional = true, features = ["no-entrypoint"] }
serum_dex = { git = "https://github.com/openbook-dex/program/", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
solana-program = "<1.17.0"
spl-token = { version = "3.5.0", features = ["no-entrypoint"], optional = true }
spl-token-2022 = { version = "0.6.1", features = ["no-entrypoint"], optional = true }
spl-associated-token-account = { version = "1.1.1", features = ["no-entrypoint"], optional = true }
mpl-token-metadata = { version = "^1.11.0", optional = true, features = ["no-entrypoint"] }
solana-program = ">=1.13, <1.17"
spl-associated-token-account = { version = "1", features = ["no-entrypoint"], optional = true }
spl-token = { version = "3.5", features = ["no-entrypoint"], optional = true }
spl-token-2022 = { version = "0.6", features = ["no-entrypoint"], optional = true }

2
tests/zero-copy/programs/zero-copy/Cargo.toml
View File

@ -22,4 +22,4 @@ bytemuck = {version = "1.4.0", features = ["derive", "min_const_generics"]}
[dev-dependencies]
anchor-client = { path = "../../../../client", features = ["debug", "async"] }
solana-program-test = "<1.17.0"
solana-program-test = ">=1.13, <1.17"