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.

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

Fix metaplex url #587

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

DOCKER_USER = os.environ.get("DHUBU")
DOCKER_PASSWORD = os.environ.get("DHUBP")
MAINNET_SOLANA_URL = os.environ.get("MAINNET_SOLANA_URL")
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")
Expand Down Expand Up @@ -126,7 +127,8 @@ def build_docker_image(evm_sha_tag):
buildargs = {"REVISION": evm_sha_tag,
"SOLANA_IMAGE": solana_image,
"SOLANA_BPF_VERSION": SOLANA_BPF_VERSION,
"DOCKERHUB_ORG_NAME": DOCKERHUB_ORG_NAME}
"DOCKERHUB_ORG_NAME": DOCKERHUB_ORG_NAME,
"MAINNET_SOLANA_URL": MAINNET_SOLANA_URL}

tag = f"{DOCKERHUB_ORG_NAME}/{IMAGE_NAME}:{evm_sha_tag}"
click.echo("start build")
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
env:
DHUBU: ${{secrets.DHUBU}}
DHUBP: ${{secrets.DHUBP}}
MAINNET_SOLANA_URL: ${{secrets.MAINNET_SOLANA_URL}}
PROXY_ENDPOINT: "https://api.github.com/repos/${{ github.repository_owner }}/neon-proxy.py"
NEON_TESTS_ENDPOINT: ${{vars.NEON_TESTS_ENDPOINT}}
DOCKERHUB_ORG_NAME: ${{vars.DOCKERHUB_ORG_NAME}}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ FROM ${DOCKERHUB_ORG_NAME}/neon_test_programs:latest AS neon_test_programs

# Define solana-image that contains utility
FROM builder AS base

RUN solana program dump metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s /opt/metaplex.so --url mainnet-beta
ARG MAINNET_SOLANA_URL
RUN solana program dump metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s /opt/metaplex.so --url ${MAINNET_SOLANA_URL}

COPY --from=evm-loader-builder /opt/neon-evm/evm_loader/target/deploy/evm_loader*.so /opt/
COPY --from=evm-loader-builder /opt/neon-evm/evm_loader/target/deploy/evm_loader-dump.txt /opt/
Expand Down
1 change: 0 additions & 1 deletion ci/solana-run-neon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ EVM_LOADER_PATH=${NEON_BIN}/evm_loader.so
METAPLEX=metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s
METAPLEX_PATH=${NEON_BIN}/metaplex.so


VALIDATOR_ARGS=(
--reset
--warp-slot 1
Expand Down
Loading