From ada1830f5a621653ba3e0e56a6b6cf485a08cd26 Mon Sep 17 00:00:00 2001 From: Will Hickey Date: Tue, 11 Jun 2024 00:17:38 -0500 Subject: [PATCH] Update patch paths for tokio, crossbeam, and curve25519-dalek (#1681) Update patch paths after moving the forks of tokio, crossbeam, and curve25519-dalek to anza-xyz --- Cargo.lock | 8 ++++---- Cargo.toml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4b512e41332e27..30757f132ffe69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1615,7 +1615,7 @@ dependencies = [ [[package]] name = "crossbeam-epoch" version = "0.9.5" -source = "git+https://github.com/solana-labs/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" +source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1703,7 +1703,7 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "3.2.1" -source = "git+https://github.com/solana-labs/curve25519-dalek.git?rev=b500cdc2a920cd5bff9e2dd974d7b97349d61464#b500cdc2a920cd5bff9e2dd974d7b97349d61464" +source = "git+https://github.com/anza-xyz/curve25519-dalek.git?rev=b500cdc2a920cd5bff9e2dd974d7b97349d61464#b500cdc2a920cd5bff9e2dd974d7b97349d61464" dependencies = [ "byteorder", "digest 0.9.0", @@ -8507,7 +8507,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" version = "1.29.1" -source = "git+https://github.com/solana-labs/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21" +source = "git+https://github.com/anza-xyz/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21" dependencies = [ "autocfg", "backtrace", @@ -8536,7 +8536,7 @@ dependencies = [ [[package]] name = "tokio-macros" version = "2.1.0" -source = "git+https://github.com/solana-labs/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21" +source = "git+https://github.com/anza-xyz/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 1f481511eba4ad..0fd2a183da8079 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -450,8 +450,8 @@ zeroize = { version = "1.3", default-features = false } zstd = "0.11.2" [patch.crates-io] -# for details, see https://github.com/solana-labs/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf -crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } +# for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf +crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } # We include the following crates as our dependencies above from crates.io: # @@ -519,7 +519,7 @@ solana-zk-token-sdk = { path = "zk-token-sdk" } # https://github.com/dalek-cryptography/curve25519-dalek/compare/3.2.1...solana-labs:curve25519-dalek:3.2.1-unpin-zeroize # [patch.crates-io.curve25519-dalek] -git = "https://github.com/solana-labs/curve25519-dalek.git" +git = "https://github.com/anza-xyz/curve25519-dalek.git" rev = "b500cdc2a920cd5bff9e2dd974d7b97349d61464" # Solana RPC nodes experience stalls when running with `tokio` containing this @@ -537,5 +537,5 @@ rev = "b500cdc2a920cd5bff9e2dd974d7b97349d61464" # https://github.com/tokio-rs/tokio/compare/tokio-1.29.1...solana-labs:solana-tokio:tokio-1.29.1-revert-4eed411 # [patch.crates-io.tokio] -git = "https://github.com/solana-labs/solana-tokio.git" +git = "https://github.com/anza-xyz/solana-tokio.git" rev = "7cf47705faacf7bf0e43e4131a5377b3291fce21"