Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Anchor 0.30 upgrade #117

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches:
- master
env:
SOLANA_CLI_VERSION: 1.16.16
SOLANA_CLI_VERSION: 1.18.9
jobs:
build-and-test:
name: Build and test programs
Expand All @@ -29,18 +29,18 @@ jobs:
~/.cargo/git/db/
./mev-programs/target/
key: cargo-${{ runner.os }}-anchor-${{ hashFiles('**/Cargo.lock') }}
- run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.28.0 anchor-cli --locked --force
- run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.30.0 anchor-cli --locked --force
- name: Install yarn dependencies
working-directory: ./mev-programs
run: yarn
- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-04-19-x86_64-unknown-linux-gnu
toolchain: nightly-2024-04-23-x86_64-unknown-linux-gnu
components: rustfmt, clippy
- name: clippy
working-directory: ./mev-programs
run: cargo +nightly-2023-04-19 clippy
run: cargo +nightly-2024-04-23 clippy
shell: bash

# Build IDLs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Release
on:
push:
tags:
- 'v*'
- "v*"

env:
SOLANA_CLI_VERSION: 1.16.17
SOLANA_CLI_VERSION: 1.18.9
jobs:
release:
name: Create the jito programs release
Expand All @@ -27,7 +27,7 @@ jobs:
~/.cargo/git/db/
./mev-programs/target/
key: cargo-${{ runner.os }}-anchor-${{ hashFiles('**/Cargo.lock') }}
- run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.28.0 anchor-cli --locked --force
- run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.30.0 anchor-cli --locked --force
- name: Install yarn dependencies
working-directory: ./mev-programs
run: yarn
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.4.0
FROM rust:1.72.1-slim-bullseye as builder
FROM rust:1.75.0-slim-bullseye as builder

RUN set -x \
&& apt-get -qq update \
Expand All @@ -13,11 +13,11 @@ RUN set -x \
zlib1g-dev \
curl

RUN sh -c "$(curl -sSfL https://release.solana.com/v1.16.17/install)"
RUN sh -c "$(curl -sSfL https://release.solana.com/v1.18.9/install)"

ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"

RUN cargo install --git https://github.com/coral-xyz/anchor --tag v0.28.0 anchor-cli --locked
RUN cargo install --git https://github.com/coral-xyz/anchor --tag v0.30.0 anchor-cli --locked

WORKDIR /jito-programs
COPY . .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
anchor-lang = { version = "0.27.0", features = ["init-if-needed"] }
anchor-spl = {version = "0.27.0", features = ["token"]}
anchor-lang = { version = "0.30.0", features = ["init-if-needed"] }
anchor-spl = {version = "0.30.0", features = ["token"]}
3 changes: 3 additions & 0 deletions mev-programs/Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ test = "yarn ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.{ts,js}"

[test.validator]
slots_per_epoch = "32"

[features]
resolution = false
Loading
Loading