Cannot add Ahcor to a soalan-sdk 2.14.0

[popconst]

My Cargo.toml

[dependencies]
anchor-client = "0.30.1"
anchor-lang = "0.30.1"
anyhow = "1.0.62"
async-trait = { version = "0.1.73", optional = true }
borsh = "1.5.3"
bs58 = "0.5.1"
bytemuck = "1.20.0"
clap = { version = "4.3.0", features = ["derive"], optional = true }
const-hex = { version = "1.6.2", optional = true }
futures = "0.3.24"
http = { version = "1.1.0", optional = true }
http-body-util = { version = "0.1.2", optional = true }
hyper = { version = "1.4.1", optional = true }
hyper-util = { version = "0.1.7", optional = true }
json5 = "0.4.1"
lazy_static = { version = "1.4.0", optional = true }
prometheus = { version = "0.13.2", optional = true }
serde = "1.0.145"
serde_json = "1.0.86"
serde_yaml = "0.9.25"
sha2 = { version = "0.10.7", optional = true }
solana-account-decoder = "2.1.4"
solana-client = "2.1.4"
solana-program = "2.1.4"
solana-sdk = "2.1.4"
solana-transaction-status = "2.1.4"
spl-associated-token-account = "6.0.0"
spl-token = "7.0.0"
spl-token-2022 = "6.0.0"
tokio = { version = "1.21.2", features = ["rt-multi-thread", "fs", "signal", "time", "macros"] }
tokio-stream = { version = "0.1.11", optional = true }
tonic = { version = "0.12.1", features = ["gzip", "zstd", "tls", "tls-roots"], optional = true }
tonic-health = { version = "0.12.1", optional = true }
tracing = { version = "0.1.37", optional = true }
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
yellowstone-grpc-client = { version = "4.0.0", optional = true }
yellowstone-grpc-proto = "4.0.0"

error: failed to select a version for `solana-derivation-path`.
    ... required by package `solana-zk-sdk v2.1.0`
    ... which satisfies dependency `solana-zk-sdk = "^2.1.0"` of package `spl-token-2022 v6.0.0`
    ... which satisfies dependency `spl-token-2022 = "^6.0.0"` of package `solana-streamer v0.1.0 (/Users/0xconst/Documents/projects/solana/solana-streamer/solana-streamer)`
versions that meet the requirements `=2.1.0` are: 2.1.0

all possible versions conflict with previously selected packages.

  previously selected package `solana-derivation-path v2.1.4`
    ... which satisfies dependency `solana-derivation-path = "=2.1.4"` of package `solana-sdk v2.1.4`
    ... which satisfies dependency `solana-sdk = "^2.1.4"` of package `solana-streamer v0.1.0 (/Users/0xconst/Documents/projects/solana/solana-streamer/solana-streamer)`

failed to select a version for `solana-derivation-path` which could resolve this conflict

[acheroncrypto]

Anchor v0.30 is incompatible with Solana v2. They will be compatible once Anchor v0.31 is out (#3259), but in the meantime, you can either use solana-* = "1" or use the latest Anchor version from git:

anchor-lang = { git = "https://github.com/coral-xyz/anchor", rev = "0453672" }

Note that you'll need to do this for all Anchor crates if you choose this path.

[popconst]

got it! Thanks for pointing me to a rev that is in progress and support v2 :)

[juchiast]

@acheroncrypto I got several errors when trying the latest commit

error: `zero` constraint requires the type to implement the `Discriminator` trait
  --> program/src/instructions/initialize.rs:68:9
   |
68 |         zero,
   |         ^^^^

error[E0432]: unresolved import `crate`
  --> program/src/lib.rs:18:1
   |
18 | #[program]
   | ^^^^^^^^^^ could not find `__client_accounts_initialize` in the crate root

error[E0277]: the trait bound `instructions::initialize::Initialize<'_>: Bumps` is not satisfied
  --> program/src/instructions/initialize.rs:12:24
   |
12 | pub fn initialize(ctx: Context<Initialize>, data: CandyMachineData) -> Result<()> {
   |                        ^^^^^^^^^^^^^^^^^^^ the trait `Bumps` is not implemented for `instructions::initialize::Initialize<'_>`
   |

error[E0599]: no function or associated item named `discriminator` found for struct `candy_machine::CandyMachine` in the current scope
  --> program/src/instructions/initialize.rs:32:41
   |
32 |     let mut struct_data = CandyMachine::discriminator().try_to_vec().unwrap();
   |                                         ^^^^^^^^^^^^^ function or associated item not found in `CandyMachine`

Do I need to change the code when upgrading, I've read the release docs but didn't see any suggestions.