Skip to content

NDEV-779 remove proxy_program #996

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

Merged
valiksinev merged 12 commits into from
Oct 25, 2022
Merged

NDEV-779 remove proxy_program #996

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d04e111
proxy_program removed
sinev-valentine Oct 21, 2022
d600f4b
fix last commit
sinev-valentine Oct 21, 2022
9a997df
rename files
sinev-valentine Oct 21, 2022
3336dc1
fix dockerfile
sinev-valentine Oct 21, 2022
358205b
Revert "fix dockerfile"
sinev-valentine Oct 21, 2022
e7398a0
add docker docker pull neonlabsorg/neon_test_invoke_program:develop
sinev-valentine Oct 21, 2022
16e4ed2
fix
sinev-valentine Oct 24, 2022
8c25a90
fix docker-compose-test.yml
sinev-valentine Oct 24, 2022
618fa61
ci update
sinev-valentine Oct 24, 2022
5eceefd
merge from develop
sinev-valentine Oct 24, 2022
2c4fe01
impl
sinev-valentine Oct 25, 2022
2e600fa
Merge branch 'develop' into NDEV-779_remove_proxy_program
sinev-valentine Oct 25, 2022
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
Next Next commit
proxy_program removed
  • Loading branch information
@sinev-valentine
sinev-valentine committed Oct 21, 2022
commit d04e111bf299a097960a18f10d642103e70b23f2
2 changes: 1 addition & 1 deletion .buildkite/steps/deploy-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function dump_docker_logs {
if docker logs faucet >faucet.log 2>&1; then echo "faucet logs saved"; fi
if docker logs airdropper >airdropper.log 2>&1; then echo "airdropper logs saved"; fi
if docker logs indexer >indexer.log 2>&1; then echo "indexer logs saved"; fi
# if docker logs proxy_program >proxy_program.log 2>&1; then echo "proxy_program.log logs saved"; fi
if docker logs proxy_program_loader >proxy_program_loader.log 2>&1; then echo "proxy_program_loader.log logs saved"; fi
cleanup_docker
}

Expand Down
19 changes: 2 additions & 17 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
ARG NEON_EVM_COMMIT

FROM neonlabsorg/evm_loader:${NEON_EVM_COMMIT} AS spl
# FROM neonlabsorg/evm_loader:ci-proxy-caller-program AS proxy_program

FROM solanalabs/rust:1.61.0 AS builder
RUN rustup toolchain install nightly
RUN rustup component add clippy --toolchain nightly
WORKDIR /opt
RUN sh -c "$(curl -sSfL https://release.solana.com/stable/install)" && \
/root/.local/share/solana/install/active_release/bin/sdk/bpf/scripts/install.sh
ENV PATH=/root/.local/share/solana/install/active_release/bin:/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

COPY ./proxy_program/ /opt/proxy_program/
WORKDIR /opt/proxy_program
RUN cargo +nightly clippy && cargo build-bpf
FROM neonlabsorg/neon_test_invoke_program:develop AS proxy_program

FROM ubuntu:20.04

Expand Down Expand Up @@ -46,10 +34,7 @@ COPY --from=spl /opt/spl-token \
COPY --from=spl /opt/contracts/contracts/ /opt/contracts/

COPY --from=spl /opt/neon-cli /spl/bin/emulator
COPY --from=builder /opt/proxy_program/proxy_program-keypair.json /spl/bin/
COPY --from=builder /opt/proxy_program/proxy_program-keypair.json /opt
COPY --from=builder /opt/proxy_program/target/deploy/proxy_program.so /opt
COPY --from=builder /opt/proxy_program/deploy-proxy_program.sh /opt
COPY --from=proxy_program /opt/proxy_program-keypair.json /spl/bin/

COPY proxy/operator-keypairs/id.json /root/.config/solana/

Expand Down
3 changes: 1 addition & 2 deletions proxy/docker-compose-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ services:

proxy_program_loader:
container_name: proxy_program_loader
image: neonlabsorg/proxy:${REVISION}
# image: neonlabsorg/evm_loader:ci-proxy-caller-program
image: neonlabsorg/neon_test_invoke_program:develop
environment:
SOLANA_URL: http://solana:8899
networks:
Expand Down
Loading