Browse Source

solana: build token program using latest solana version

Hendrik Hofstadt 5 years ago
parent
commit
a4fecd36f0
3 changed files with 10 additions and 6 deletions
  1. 3 3
      solana/Cargo.lock
  2. 5 1
      solana/Dockerfile
  3. 2 2
      third_party/solana/Dockerfile

+ 3 - 3
solana/Cargo.lock

@@ -2569,7 +2569,8 @@ dependencies = [
 [[package]]
 [[package]]
 name = "spl-token"
 name = "spl-token"
 version = "1.0.8"
 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 = [
 dependencies = [
  "cbindgen",
  "cbindgen",
  "num-derive 0.3.1",
  "num-derive 0.3.1",
@@ -2582,8 +2583,7 @@ dependencies = [
 [[package]]
 [[package]]
 name = "spl-token"
 name = "spl-token"
 version = "1.0.8"
 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 = [
 dependencies = [
  "cbindgen",
  "cbindgen",
  "num-derive 0.3.1",
  "num-derive 0.3.1",

+ 5 - 1
solana/Dockerfile

@@ -12,6 +12,10 @@ COPY do.sh .
 RUN ./do.sh update
 RUN ./do.sh update
 
 
 COPY bridge bridge
 COPY bridge bridge
+COPY agent agent
+COPY cli cli
+COPY Cargo.toml .
+COPY Cargo.lock .
 
 
 RUN ./do.sh build bridge
 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 \
     --mount=type=cache,target=bridge/target \
     ./do.sh build bridge && \
     ./do.sh build bridge && \
     mkdir -p /opt/solana/deps && \
     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

+ 2 - 2
third_party/solana/Dockerfile

@@ -5,8 +5,8 @@ FROM solana-contract
 
 
 WORKDIR /usr/src/solana
 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 .
 ADD *.patch .