From 0476964cb7ba5d533e7c2a9a808cfdce3f906107 Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Tue, 15 Mar 2022 18:16:55 -0500 Subject: [PATCH] Use spl-token v3 in dependencies --- Cargo.lock | 1 - flake.nix | 3 ++- fuzz/Cargo.toml | 2 +- stable-swap-client/Cargo.toml | 1 - stable-swap-program/program/Cargo.toml | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d029c41b..03edfffd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1591,7 +1591,6 @@ dependencies = [ "num-derive", "num-traits", "solana-program", - "spl-token", "thiserror", ] diff --git a/flake.nix b/flake.nix index e1e00d15..14871dc4 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,8 @@ }; in { packages.ci = ci; - devShell = pkgs.mkShell { + devShell = pkgs.stdenvNoCC.mkDerivation { + name = "devshell"; buildInputs = with pkgs; [ ci rustup diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index d809b4a4..874ce49a 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -22,7 +22,7 @@ lazy_static = "1.4.0" libfuzzer-sys = "0.4.0" rand = "0.8.4" solana-program = "^1.9" -spl-token = { version = "3.3.0", features = ["no-entrypoint"] } +spl-token = { version = "^3", features = ["no-entrypoint"] } stable-swap = { path = "../stable-swap-program/program", features = [ "fuzz", "program", diff --git a/stable-swap-client/Cargo.toml b/stable-swap-client/Cargo.toml index b16e3f2c..b155e72e 100644 --- a/stable-swap-client/Cargo.toml +++ b/stable-swap-client/Cargo.toml @@ -18,5 +18,4 @@ arrayref = "0.3.6" num-derive = "0.3" num-traits = "0.2" solana-program = "^1.7" -spl-token = { version = "3.3.0", features = ["no-entrypoint"] } thiserror = "1.0" diff --git a/stable-swap-program/program/Cargo.toml b/stable-swap-program/program/Cargo.toml index 4f36687a..d3ee78f4 100644 --- a/stable-swap-program/program/Cargo.toml +++ b/stable-swap-program/program/Cargo.toml @@ -16,7 +16,7 @@ fuzz = ["stable-swap-client/fuzz"] [dependencies] solana-program = "^1.6.10" -spl-token = { version = "3.3.0", features = ["no-entrypoint"] } +spl-token = { version = "^3", features = ["no-entrypoint"] } stable-swap-client = { path = "../../stable-swap-client", version = "^1" } stable-swap-math = { path = "../../stable-swap-math", version = "^1" }