patch anchor to work with solana v1.14.19

This commit is contained in:
Maximilian Schneider 2023-05-16 18:20:20 +00:00
parent 3b45144787
commit 2118a0e1d5
8 changed files with 1029 additions and 1318 deletions

2315
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -18,3 +18,9 @@ exclude = [
"tests/swap/deps/openbook-dex", "tests/swap/deps/openbook-dex",
"tests/cfo/deps/openbook-dex", "tests/cfo/deps/openbook-dex",
] ]
[patch.crates-io]
spl-token = { git = "https://github.com/solana-labs/solana-program-library", branch="master" }
spl-token-2022 = { git = "https://github.com/solana-labs/solana-program-library", tag="token-2022-v0.6.0" }
solana-program = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
solana-zk-token-sdk = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }

View File

@ -28,11 +28,11 @@ shellexpand = "2.1.0"
toml = "0.5.8" toml = "0.5.8"
semver = "1.0.4" semver = "1.0.4"
serde = { version = "1.0.122", features = ["derive"] } serde = { version = "1.0.122", features = ["derive"] }
solana-sdk = "1.14.16" solana-sdk = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
solana-program = "1.14.16" solana-program = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
solana-client = "1.14.16" solana-client = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
solana-cli-config = "1.14.16" solana-cli-config = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
solana-faucet = "1.14.16" solana-faucet = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
dirs = "4.0" dirs = "4.0"
heck = "0.4.0" heck = "0.4.0"
flate2 = "1.0.19" flate2 = "1.0.19"

View File

@ -15,8 +15,8 @@ anchor-lang = { path = "../lang", version = "0.27.0" }
anyhow = "1.0.32" anyhow = "1.0.32"
regex = "1.4.5" regex = "1.4.5"
serde = { version = "1.0.122", features = ["derive"] } serde = { version = "1.0.122", features = ["derive"] }
solana-client = "1.14.7" solana-client = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
solana-sdk = "1.14.16" solana-sdk = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
solana-account-decoder = "1.14.16" solana-account-decoder = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
thiserror = "1.0.20" thiserror = "1.0.20"
url = "2.2.2" url = "2.2.2"

View File

@ -37,6 +37,6 @@ arrayref = "0.3.6"
base64 = "0.13.0" base64 = "0.13.0"
borsh = "0.9" borsh = "0.9"
bytemuck = "1.4.0" bytemuck = "1.4.0"
solana-program = "1.14.16" solana-program = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
thiserror = "1.0.20" thiserror = "1.0.20"
bincode = "1.3.3" bincode = "1.3.3"

View File

@ -24,8 +24,8 @@ dex = ["serum_dex"]
anchor-lang = { path = "../lang", version = "0.27.0", features = ["derive"] } anchor-lang = { path = "../lang", version = "0.27.0", features = ["derive"] }
borsh = { version = "^0.9", optional = true } borsh = { version = "^0.9", optional = true }
serum_dex = { git = "https://github.com/openbook-dex/program/", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } serum_dex = { git = "https://github.com/openbook-dex/program/", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
solana-program = "1.14.16" solana-program = { git = "https://github.com/solana-labs/solana.git", branch = "mergify/bp/v1.14/pr-31637" }
spl-token = { version = "3.5.0", features = ["no-entrypoint"], optional = true } spl-token = { version = "3.5.0", features = ["no-entrypoint"], optional = true }
spl-token-2022 = { version = "0.5.0", features = ["no-entrypoint"], optional = true } spl-token-2022 = { version = "0.6.0", features = ["no-entrypoint"], optional = true }
spl-associated-token-account = { version = "1.1.1", features = ["no-entrypoint"], optional = true } spl-associated-token-account = { version = "1.1.1", features = ["no-entrypoint"], optional = true }
mpl-token-metadata = { version = "^1.4.3", optional = true, features = ["no-entrypoint"] } mpl-token-metadata = { version = "^1.4.3", optional = true, features = ["no-entrypoint"] }

View File

@ -18,4 +18,4 @@ default = []
[dependencies] [dependencies]
anchor-lang = { path = "../../../../lang" } anchor-lang = { path = "../../../../lang" }
anchor-spl = { path = "../../../../spl" } anchor-spl = { path = "../../../../spl" }
spl-token-2022 = { version = "0.5.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.6.0", features = ["no-entrypoint"] }

View File

@ -16,4 +16,4 @@ cpi = ["no-entrypoint"]
[dependencies] [dependencies]
anchor-lang = { path = "../../../../../lang" } anchor-lang = { path = "../../../../../lang" }
anchor-spl = { path = "../../../../../spl" } anchor-spl = { path = "../../../../../spl" }
spl-token-2022 = { version = "0.5.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.6.0", features = ["no-entrypoint"] }