From 94758a31ba30ec5bf06ce7a651e61af27acc6066 Mon Sep 17 00:00:00 2001 From: Guillermo Bescos Date: Fri, 20 Dec 2024 23:37:22 +0000 Subject: [PATCH] go --- Cargo.lock | 41 ++++++++++++++++++++------------------- Cargo.toml | 11 ++--------- auction-server/Cargo.toml | 2 +- contracts/svm/Cargo.lock | 34 ++++++++++++++++---------------- contracts/svm/Cargo.toml | 8 ++++---- 5 files changed, 45 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a125b9b4..904e0ad6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,7 +119,7 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anchor-attribute-access-control" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "proc-macro2", @@ -130,7 +130,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "bs58", @@ -142,7 +142,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "quote", @@ -152,7 +152,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "quote", @@ -162,7 +162,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "proc-macro2", @@ -173,9 +173,9 @@ dependencies = [ [[package]] name = "anchor-attribute-program" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ - "anchor-lang-idl 0.1.1 (git+https://github.com/coral-xyz/anchor?branch=master)", + "anchor-lang-idl 0.1.1 (git+https://github.com/coral-xyz/anchor?rev=6df05aa)", "anchor-syn", "anyhow", "bs58", @@ -189,7 +189,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "quote", @@ -199,7 +199,7 @@ dependencies = [ [[package]] name = "anchor-derive-serde" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "borsh-derive-internal", @@ -211,7 +211,7 @@ dependencies = [ [[package]] name = "anchor-derive-space" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "proc-macro2", "quote", @@ -221,7 +221,7 @@ dependencies = [ [[package]] name = "anchor-lang" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -257,9 +257,9 @@ dependencies = [ [[package]] name = "anchor-lang-idl" version = "0.1.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ - "anchor-lang-idl-spec 0.1.0 (git+https://github.com/coral-xyz/anchor?branch=master)", + "anchor-lang-idl-spec 0.1.0 (git+https://github.com/coral-xyz/anchor?rev=6df05aa)", "anyhow", "heck 0.3.3", "serde", @@ -280,7 +280,7 @@ dependencies = [ [[package]] name = "anchor-lang-idl-spec" version = "0.1.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anyhow", "serde", @@ -289,7 +289,7 @@ dependencies = [ [[package]] name = "anchor-spl" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-lang", "spl-associated-token-account 6.0.0", @@ -303,7 +303,7 @@ dependencies = [ [[package]] name = "anchor-syn" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anyhow", "bs58", @@ -1701,8 +1701,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.1" -source = "git+https://github.com/solana-labs/curve25519-dalek.git?rev=b500cdc2a920cd5bff9e2dd974d7b97349d61464#b500cdc2a920cd5bff9e2dd974d7b97349d61464" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", @@ -2030,7 +2031,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.2.1", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", @@ -3919,7 +3920,7 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "litesvm" version = "0.3.0" -source = "git+https://github.com/LiteSVM/litesvm?branch=master#5346e8611b38db5706df337519e0bd97fc5daf52" +source = "git+https://github.com/LiteSVM/litesvm?rev=5346e86#5346e8611b38db5706df337519e0bd97fc5daf52" dependencies = [ "bincode", "indexmap 2.7.0", diff --git a/Cargo.toml b/Cargo.toml index 5ed09ca8..4a289d8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,12 +38,5 @@ async-stream = "0.3.5" serde_yaml = "0.9.25" url = "2.5.4" rand = "0.8.5" -anchor-lang = { git = "https://github.com/coral-xyz/anchor", branch = "master" } - -# The curve25519-dalek crate is a dependency of solana-sdk. -# This crate relies on a specific version of zeroize that is incompatible with many other packages. -# You can find more details in this issue https://github.com/solana-labs/solana/issues/26688 -# Solana Labs has provided a solution for some of these package incompatibilities, which can be found here https://github.com/solana-labs/solana/blob/27eff8408b7223bb3c4ab70523f8a8dca3ca6645/Cargo.toml#L514 -[patch.crates-io.curve25519-dalek] -git = "https://github.com/solana-labs/curve25519-dalek.git" -rev = "b500cdc2a920cd5bff9e2dd974d7b97349d61464" +anchor-lang = { git = "https://github.com/coral-xyz/anchor", rev = "6df05aa" } +litesvm = { git = "https://github.com/LiteSVM/litesvm", rev = "5346e86" } diff --git a/auction-server/Cargo.toml b/auction-server/Cargo.toml index 76529292..f403cace 100644 --- a/auction-server/Cargo.toml +++ b/auction-server/Cargo.toml @@ -51,5 +51,5 @@ express-relay = { path = "../contracts/svm/programs/express_relay" } solana-rpc-client ={ workspace = true } solana-transaction-status = { workspace = true } borsh = "1.5.1" -litesvm = { git = "https://github.com/LiteSVM/litesvm", branch = "master" } +litesvm = { workspace = true } express-relay-api-types = { path = "api-types" } diff --git a/contracts/svm/Cargo.lock b/contracts/svm/Cargo.lock index 184e9824..a688239c 100644 --- a/contracts/svm/Cargo.lock +++ b/contracts/svm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "anchor-attribute-access-control" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "proc-macro2", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "bs58", @@ -136,7 +136,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "quote", @@ -146,7 +146,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "quote", @@ -156,7 +156,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "proc-macro2", @@ -167,7 +167,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-lang-idl", "anchor-syn", @@ -183,7 +183,7 @@ dependencies = [ [[package]] name = "anchor-client" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-lang", "anyhow", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "quote", @@ -211,7 +211,7 @@ dependencies = [ [[package]] name = "anchor-derive-serde" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-syn", "borsh-derive-internal", @@ -223,7 +223,7 @@ dependencies = [ [[package]] name = "anchor-derive-space" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "proc-macro2", "quote", @@ -233,7 +233,7 @@ dependencies = [ [[package]] name = "anchor-lang" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -256,7 +256,7 @@ dependencies = [ [[package]] name = "anchor-lang-idl" version = "0.1.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-lang-idl-spec", "anyhow", @@ -270,7 +270,7 @@ dependencies = [ [[package]] name = "anchor-lang-idl-spec" version = "0.1.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anyhow", "serde", @@ -279,7 +279,7 @@ dependencies = [ [[package]] name = "anchor-spl" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anchor-lang", "spl-associated-token-account 6.0.0", @@ -293,7 +293,7 @@ dependencies = [ [[package]] name = "anchor-syn" version = "0.30.1" -source = "git+https://github.com/coral-xyz/anchor?branch=master#6df05aa5b5d9971041e3d25a246d935252b6e576" +source = "git+https://github.com/coral-xyz/anchor?rev=6df05aa#6df05aa5b5d9971041e3d25a246d935252b6e576" dependencies = [ "anyhow", "bs58", @@ -2514,7 +2514,7 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "litesvm" version = "0.3.0" -source = "git+https://github.com/LiteSVM/litesvm?branch=master#5346e8611b38db5706df337519e0bd97fc5daf52" +source = "git+https://github.com/LiteSVM/litesvm?rev=5346e86#5346e8611b38db5706df337519e0bd97fc5daf52" dependencies = [ "bincode", "indexmap", diff --git a/contracts/svm/Cargo.toml b/contracts/svm/Cargo.toml index d950ff08..28dc6cc2 100644 --- a/contracts/svm/Cargo.toml +++ b/contracts/svm/Cargo.toml @@ -16,10 +16,10 @@ incremental = false codegen-units = 1 [workspace.dependencies] -anchor-lang = { git = "https://github.com/coral-xyz/anchor", branch = "master" } -anchor-spl = { git = "https://github.com/coral-xyz/anchor", branch = "master" } -anchor-client = { git = "https://github.com/coral-xyz/anchor", branch = "master" } -litesvm = { git = "https://github.com/LiteSVM/litesvm", branch = "master" } +anchor-lang = { git = "https://github.com/coral-xyz/anchor", rev = "6df05aa" } +anchor-spl = { git = "https://github.com/coral-xyz/anchor", rev = "6df05aa" } +anchor-client = { git = "https://github.com/coral-xyz/anchor", rev = "6df05aa" } +litesvm = { git = "https://github.com/LiteSVM/litesvm", rev = "5346e86" } solana-program = "=2.1.0" solana-program-test = "=2.1.0" solana-sdk = "=2.1.0"