From a4fecd36f04ee5658c6ea2775d1427747ba12de9 Mon Sep 17 00:00:00 2001
From: Hendrik Hofstadt <hendrik@nexantic.com>
Date: Thu, 20 Aug 2020 20:12:44 +0200
Subject: [PATCH] solana: build token program using latest solana version

---
 solana/Cargo.lock             | 6 +++---
 solana/Dockerfile             | 6 +++++-
 third_party/solana/Dockerfile | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/solana/Cargo.lock b/solana/Cargo.lock
index f873a579..fa458c42 100644
--- a/solana/Cargo.lock
+++ b/solana/Cargo.lock
@@ -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",
diff --git a/solana/Dockerfile b/solana/Dockerfile
index e62a206c..e66de6ff 100644
--- a/solana/Dockerfile
+++ b/solana/Dockerfile
@@ -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
diff --git a/third_party/solana/Dockerfile b/third_party/solana/Dockerfile
index 9c8b4281..bb988b7b 100644
--- a/third_party/solana/Dockerfile
+++ b/third_party/solana/Dockerfile
@@ -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 .