From 5e879052e931c26866717ecd1ff601aa0ea16904 Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Tue, 15 Mar 2022 18:34:19 -0500 Subject: [PATCH] Upgrade to Solana v1.9.12 (#152) * Upgrade to Solana v1.9.12 * udev --- .github/workflows/libraries.yml | 2 +- .github/workflows/prebuild.yml | 2 +- .github/workflows/program.yml | 4 +-- .github/workflows/release.yml | 12 +-------- Anchor.toml | 4 +-- flake.lock | 45 ++++++++++++--------------------- flake.nix | 2 +- stable-swap-program/README.md | 2 +- 8 files changed, 25 insertions(+), 48 deletions(-) diff --git a/.github/workflows/libraries.yml b/.github/workflows/libraries.yml index 813eb1d0..e4c0611f 100644 --- a/.github/workflows/libraries.yml +++ b/.github/workflows/libraries.yml @@ -8,7 +8,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_TOOLCHAIN: "1.58.1" + RUST_TOOLCHAIN: "1.59.0" jobs: doc: diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml index fc4768bf..860a3753 100644 --- a/.github/workflows/prebuild.yml +++ b/.github/workflows/prebuild.yml @@ -8,7 +8,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_TOOLCHAIN: "1.58.1" + RUST_TOOLCHAIN: "1.59.0" jobs: lint: diff --git a/.github/workflows/program.yml b/.github/workflows/program.yml index cb2a470d..dcde0983 100644 --- a/.github/workflows/program.yml +++ b/.github/workflows/program.yml @@ -8,8 +8,8 @@ on: env: CARGO_TERM_COLOR: always - SOLANA_VERSION: "1.8.14" - RUST_TOOLCHAIN: "1.58.1" + SOLANA_VERSION: "1.9.12" + RUST_TOOLCHAIN: "1.59.0" jobs: unit-tests: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0888fd09..145b4968 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_TOOLCHAIN: nightly-2021-12-09 + RUST_TOOLCHAIN: "1.59.0" jobs: release-crate: @@ -17,11 +17,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install - install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" - extra_nix_config: | - experimental-features = nix-command flakes - name: Setup Cachix uses: cachix/cachix-action@v10 with: @@ -43,11 +38,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install - install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" - extra_nix_config: | - experimental-features = nix-command flakes - name: Setup Cachix uses: cachix/cachix-action@v10 with: diff --git a/Anchor.toml b/Anchor.toml index c13048e0..c046bcbd 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -1,5 +1,5 @@ -anchor_version = "0.22.0" -solana_version = "1.8.14" +anchor_version = "0.22.1" +solana_version = "1.9.12" [workspace] members = [ diff --git a/flake.lock b/flake.lock index 5335ac69..60cc614d 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1645623357, - "narHash": "sha256-vAaI91QFn/kY/uMiebW+kG2mPmxirMSJWYtkqkBKdDc=", + "lastModified": 1647350163, + "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9222ae36b208d1c6b55d88e10aa68f969b5b5244", + "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "type": "github" }, "original": { @@ -63,27 +63,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1645013224, - "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=", + "lastModified": 1646470760, + "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1645623357, - "narHash": "sha256-vAaI91QFn/kY/uMiebW+kG2mPmxirMSJWYtkqkBKdDc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9222ae36b208d1c6b55d88e10aa68f969b5b5244", + "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", "type": "github" }, "original": { @@ -103,14 +87,17 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "saber-overlay", + "nixpkgs" + ] }, "locked": { - "lastModified": 1645409726, - "narHash": "sha256-rji0+Ii6WpBB8VCPh3siV/MFfaSiksNbDHOE1DHcHCA=", + "lastModified": 1646706102, + "narHash": "sha256-zDAbxoLGzM5mhd9aYjXpeA9i9JU80OOq1FYynoYIugI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d12fa61b3991d332d3b18ccb20a27d5e473f876e", + "rev": "3950dc50f50fa2767f36281f3e61f06610707735", "type": "github" }, "original": { @@ -126,11 +113,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1645564574, - "narHash": "sha256-mAhxmgBKGM6Ip3hPcPY0o8BOVSEqAxXOaPJ3bKrE6i0=", + "lastModified": 1647229213, + "narHash": "sha256-F0DfBqX43EUAqkeu7WiPKm5CrdDpjOzmx6rXQ2YUFOs=", "owner": "saber-hq", "repo": "saber-overlay", - "rev": "070f62a47f5419077250c070fd4393adfbf50e3a", + "rev": "7dd10b6a456fda4ea669414482db4916d6ec8f50", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 14871dc4..6878560d 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ ci = pkgs.buildEnv { name = "ci"; paths = with pkgs; - (pkgs.lib.optionals pkgs.stdenv.isLinux ([ libudev ])) ++ [ + (pkgs.lib.optionals pkgs.stdenv.isLinux ([ udev ])) ++ [ anchor-0_22_0 cargo-workspaces cargo-fuzz diff --git a/stable-swap-program/README.md b/stable-swap-program/README.md index 4b3cfb2d..702d44e4 100644 --- a/stable-swap-program/README.md +++ b/stable-swap-program/README.md @@ -11,7 +11,7 @@ _We recommend using the included Nix flake to develop within this repo._ Download or update the Solana SDK by running: ```bash -solana-install init 1.8.11 +solana-install init 1.9.12 ``` To build the program, run: