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.

Sign up for GitHub

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

Ndev 3414 update solana to v2.0 #579

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Ndev 3414 update solana to v2.0 #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions .github/workflows/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
IMAGE_NAME = os.environ.get("IMAGE_NAME", "evm_loader")
RUN_LINK_REPO = os.environ.get("RUN_LINK_REPO")
DOCKERHUB_ORG_NAME = os.environ.get("DOCKERHUB_ORG_NAME")
SOLANA_NODE_VERSION = 'v1.18.18'
SOLANA_BPF_VERSION = 'v1.18.18'
SOLANA_NODE_VERSION = 'v2.0.15'
SOLANA_BPF_VERSION = 'v2.0.15'

VERSION_BRANCH_TEMPLATE = r"[vt]{1}\d{1,2}\.\d{1,2}\.x.*"
RELEASE_TAG_TEMPLATE = r"[vt]{1}\d{1,2}\.\d{1,2}\.\d{1,2}"
Expand Down Expand Up @@ -120,11 +120,8 @@ def specify_image_tags(git_ref,
@cli.command(name="build_docker_image")
@click.option('--evm_sha_tag')
def build_docker_image(evm_sha_tag):
solana_image = f'solanalabs/solana:{SOLANA_NODE_VERSION}'
docker_client.pull(solana_image)
docker_client.pull(f"{DOCKERHUB_ORG_NAME}/neon_test_programs:latest")
buildargs = {"REVISION": evm_sha_tag,
"SOLANA_IMAGE": solana_image,
"SOLANA_BPF_VERSION": SOLANA_BPF_VERSION,
"DOCKERHUB_ORG_NAME": DOCKERHUB_ORG_NAME}

Expand Down
15 changes: 10 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG SOLANA_IMAGE
ARG DOCKERHUB_ORG_NAME
# Install BPF SDK
FROM solanalabs/rust:1.75.0 AS builder
FROM anzaxyz/ci:rust_1.78.0_nightly-2024-03-26 AS builder
RUN cargo install rustfilt
WORKDIR /opt
ARG SOLANA_BPF_VERSION
RUN sh -c "$(curl -sSfL https://release.solana.com/"${SOLANA_BPF_VERSION}"/install)" && \
RUN sh -c "$(curl -sSfL https://release.anza.xyz/${SOLANA_BPF_VERSION}/install)" && \
/root/.local/share/solana/install/active_release/bin/sdk/sbf/scripts/install.sh

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


Expand All @@ -17,9 +17,14 @@ COPY evm_loader /opt/neon-evm/evm_loader
WORKDIR /opt/neon-evm/evm_loader
ARG REVISION
ENV NEON_REVISION=${REVISION}

RUN cargo fmt --check && \
cargo clippy --release && \
cargo build --release && \
cargo clippy --release \
--config 'patch.crates-io.ethnum.git="https://github.com/neonlabsorg/ethnum.git"'\
--config 'patch.crates-io.ethnum.branch="NDEV-3414-u256-in-u64-4-implementation"' && \
cargo build --release \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please create PR into neonlabsorg/ethnum.git to merge branch into main

--config 'patch.crates-io.ethnum.git="https://github.com/neonlabsorg/ethnum.git"'\
--config 'patch.crates-io.ethnum.branch="NDEV-3414-u256-in-u64-4-implementation"' && \
cargo test --release && \
cargo build-sbf --manifest-path program/Cargo.toml --features devnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-devnet.so && \
cargo build-sbf --manifest-path program/Cargo.toml --features testnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-testnet.so && \
Expand Down
Loading
Loading