Debugging

.buildkite/steps/build-image.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-set REVISION=$(git rev-parse HEAD)
+REVISION=$(git rev-parse HEAD)
 set ${SOLANA_REVISION:=v1.7.9-resources}
 set ${EVM_LOADER_REVISION:=latest}
 

Dockerfile

@@ -1,12 +1,12 @@
 ARG SOLANA_REVISION=v1.7.9-resources
 ARG EVM_LOADER_REVISION=latest
-ARG PROXY_REVISION=unknown
 
 FROM neonlabsorg/solana:${SOLANA_REVISION} AS cli
 
 FROM neonlabsorg/evm_loader:${EVM_LOADER_REVISION} AS spl
 
 FROM ubuntu:20.04
+ARG PROXY_REVISION
 
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt -y install \
@@ -42,9 +42,7 @@ COPY --from=spl /opt/solana_utils.py \
 COPY --from=spl /opt/neon-cli /spl/bin/emulator
 
 COPY . /opt
-RUN echo "${PROXY_REVISION}="${PROXY_REVISION}
-RUN sed -i 's/NEON_PROXY_REVISION_TO_BE_REPLACED/'"${PROXY_REVISION}"'/g' /opt/proxy/plugin/solana_rest_api.py
-RUN head -50 /opt/proxy/plugin/solana_rest_api.py | tail -2
+RUN sed -i 's/NEON_PROXY_REVISION_TO_BE_REPLACED/'"$PROXY_REVISION"'/g' /opt/proxy/plugin/solana_rest_api.py
 COPY proxy/operator-keypair.json /root/.config/solana/id.json
 RUN cd /usr/local/lib/python3.8/dist-packages/ && patch -p0 </opt/solana-py.patch
 

proxy/testing/test_neon_proxy_version.py

@@ -4,11 +4,10 @@
 import json
 import inspect
 
-from proxy.plugin.solana_rest_api import NEON_PROXY_PKG_VERSION
+from proxy.plugin.solana_rest_api import NEON_PROXY_PKG_VERSION, NEON_PROXY_REVISION
 
 proxy_url = os.environ.get('PROXY_URL', 'http://localhost:9090/solana')
 headers = {'Content-type': 'application/json'}
-NEON_PROXY_REVISION = 'NEON_PROXY_REVISION_TO_BE_REPLACED'
 
 def get_line_number():
     cf = inspect.currentframe()