NDEV-779 remove proxy_program

.buildkite/pipeline.yml

@@ -29,7 +29,7 @@ steps:
       - "faucet.log"
       - "airdropper.log"
       - "indexer.log"
-      - "proxy_program_loader.log"
+      - "neon_test_invoke_program_loader.log"
 
   - label: ":coverage: full test suite (FTS)"
     key: "full_test_suite"

.buildkite/steps/build-image.sh

@@ -6,6 +6,7 @@ source .buildkite/steps/revision.sh
 if [ "${SKIP_DOCKER_PULL}" != "YES" ]; then
     # Refreshing neonlabsorg/evm_loader:latest image is required to run .buildkite/steps/build-image.sh locally
     docker pull neonlabsorg/evm_loader:${NEON_EVM_COMMIT}
+    docker pull neonlabsorg/neon_test_invoke_program:develop
 fi
 
 docker build -t neonlabsorg/proxy:${REVISION} \

.buildkite/steps/deploy-test.sh

@@ -29,12 +29,11 @@ function cleanup_docker {
 function dump_docker_logs {
     if docker logs proxy >proxy.log 2>&1; then echo "proxy logs saved"; fi
     if docker logs solana >solana.log 2>&1; then echo "solana logs saved"; fi
-    if docker logs proxy_program_loader >proxy_program_loader.log 2>&1; then echo "proxy_program_loader logs saved"; fi
+    if docker logs neon_test_invoke_program_loader >neon_test_invoke_program_loader.log 2>&1; then echo "neon_test_invoke_program_loader logs saved"; fi
     if docker logs dbcreation >dbcreation.log 2>&1; then echo "dbcreation logs saved"; fi
     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
     cleanup_docker
 }
 

.buildkite/steps/full_test_suite/proxy_init.sh

@@ -50,13 +50,13 @@ services:
   indexer:
     environment:
       - SOLANA_URL=$SOLANA_URL
-  proxy_program_loader:
+  neon_test_invoke_program_loader:
     command: bash -c "echo done"
 EOF
 
 
 # Get list of services
-SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -vP "solana|airdropper|prometheus|proxy_program_loader")
+SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -vP "solana|airdropper|prometheus|neon_test_invoke_program_loader")
 
 
 # Pull latest versions

.dockerignore

@@ -16,7 +16,6 @@
 !health_check_proxy.sh
 !health_check_faucet.sh
 !neon_py
-!proxy_program
 
 # Ignore __pycache__ directory
 proxy/__pycache__

.gitignore

@@ -26,4 +26,3 @@ htmlcov
 dist
 build
 proxy/public
-proxy_program/target

Dockerfile

@@ -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 neon_test_invoke_program
 
 FROM ubuntu:20.04
 
@@ -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=neon_test_invoke_program /opt/neon_test_invoke_program-keypair.json /spl/bin/
 
 COPY proxy/operator-keypairs/id.json /root/.config/solana/
 

proxy/docker-compose-test.yml

@@ -25,18 +25,17 @@ services:
       start_period: 5s
     entrypoint: /opt/solana/bin/solana-run-neon.sh
 
-  proxy_program_loader:
-    container_name: proxy_program_loader
-    image: neonlabsorg/proxy:${REVISION}
-#    image: neonlabsorg/evm_loader:ci-proxy-caller-program
+  neon_test_invoke_program_loader:
+    container_name: neon_test_invoke_program_loader
+    image: neonlabsorg/neon_test_invoke_program:develop
     environment:
       SOLANA_URL: http://solana:8899
     networks:
       - net
     depends_on:
       solana:
         condition: service_healthy
-    entrypoint: bash -c "/opt/deploy-proxy_program.sh"
+    entrypoint: /opt/neon-test-invoke-program.sh
 
   postgres:
     container_name: postgres

proxy/prepare-deploy-test.sh

@@ -11,7 +11,7 @@ solana airdrop 1000
 solana balance
 
 neon-cli --commitment confirmed --url "${SOLANA_URL}" --evm_loader "${EVM_LOADER}" neon-elf-params > .test-env
-echo "TEST_PROGRAM=$(solana address -k /spl/bin/proxy_program-keypair.json)" >> .test-env
+echo "TEST_PROGRAM=$(solana address -k /spl/bin/neon_test_invoke_program-keypair.json)" >> .test-env
 
 export $(cat .test-env | xargs)
 echo "ETH_TOKEN_MINT=${NEON_TOKEN_MINT}" >> .test-env