diff --git a/Tiltfile b/Tiltfile index 34dde9ff..7f36e917 100644 --- a/Tiltfile +++ b/Tiltfile @@ -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", diff --git a/third_party/solana/Dockerfile b/third_party/solana/Dockerfile index cf65ca3d..54eb8878 100644 --- a/third_party/solana/Dockerfile +++ b/third_party/solana/Dockerfile @@ -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 \