solana: rebase onto master and cherry pick CreateProgram PR

This commit is contained in:
Leo 2020-08-16 10:12:55 +02:00
parent f8b313cab8
commit 487de66f40
2 changed files with 4 additions and 2 deletions

View File

@ -42,7 +42,7 @@ k8s_resource("solana-devnet")
# eth devnet
# TODO: Slow - takes ~30s to rebuild on a no-op, even with caching, because npm sucks.
# We might wamt to add excludes here and use file sync for smart contract developmeent.
# We might want to add excludes here and use file sync for smart contract developmeent.
docker_build(
ref = "eth-node",
context = "ethereum",

View File

@ -6,9 +6,11 @@ RUN rustup component add rustfmt
WORKDIR /usr/src/solana
RUN git clone https://github.com/solana-labs/solana --depth=1 --branch v1.3.3
RUN git clone https://github.com/solana-labs/solana --depth=1 --branch master && \
cd solana && git checkout 6c5b8f324a6e668c4bf7555747fdb499974f0ac3
RUN cd solana && patch -p1 ../Add_crypto_syscalls.patch
RUN cd solana && curl -L https://patch-diff.githubusercontent.com/raw/solana-labs/solana/pull/11649.patch | patch -p1
RUN --mount=type=cache,target=/usr/local/cargo,from=rust,source=/usr/local/cargo \
--mount=type=cache,target=solana/target \