NDEV-3414. Update solana-sdk to 2.0.15 version

.github/workflows/deploy.py

@@ -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}"
@@ -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}
 

Dockerfile

@@ -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
 
 
@@ -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 \
+      --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 && \