solana: build token program using latest solana version

This commit is contained in:
Hendrik Hofstadt 2020-08-20 20:12:44 +02:00
parent 9b3f7999ba
commit a4fecd36f0
3 changed files with 10 additions and 6 deletions

6
solana/Cargo.lock generated
View File

@ -2569,7 +2569,8 @@ dependencies = [
[[package]]
name = "spl-token"
version = "1.0.8"
source = "git+https://github.com/solana-labs/solana-program-library#b619da32aea7b2898d1fe2faf4cdc7dba99df164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e8bee8b59279b46d0627490b544c3bc38e440ff4da9851a34a26ab0a24bfe7d"
dependencies = [
"cbindgen",
"num-derive 0.3.1",
@ -2582,8 +2583,7 @@ dependencies = [
[[package]]
name = "spl-token"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e8bee8b59279b46d0627490b544c3bc38e440ff4da9851a34a26ab0a24bfe7d"
source = "git+https://github.com/solana-labs/solana-program-library#b619da32aea7b2898d1fe2faf4cdc7dba99df164"
dependencies = [
"cbindgen",
"num-derive 0.3.1",

View File

@ -12,6 +12,10 @@ COPY do.sh .
RUN ./do.sh update
COPY bridge bridge
COPY agent agent
COPY cli cli
COPY Cargo.toml .
COPY Cargo.lock .
RUN ./do.sh build bridge
@ -20,4 +24,4 @@ RUN --mount=type=cache,target=/usr/local/cargo,from=rust,source=/usr/local/cargo
--mount=type=cache,target=bridge/target \
./do.sh build bridge && \
mkdir -p /opt/solana/deps && \
cp bridge/target/bpfel-unknown-unknown/release/spl_bridge.so /opt/solana/deps
cp target/bpfel-unknown-unknown/release/spl_bridge.so /opt/solana/deps

View File

@ -5,8 +5,8 @@ FROM solana-contract
WORKDIR /usr/src/solana
RUN git clone https://github.com/solana-labs/solana --depth=1 --branch master && \
cd solana
RUN git clone https://github.com/solana-labs/solana --branch master && \
cd solana && git checkout e2d66cf7
ADD *.patch .