From 256439b7669374971c941c4c1b12ac755b9a587a Mon Sep 17 00:00:00 2001
From: Hendrik Hofstadt <hendrik@nexantic.com>
Date: Wed, 19 Aug 2020 15:14:39 +0200
Subject: [PATCH] Fix solana agent

---
 solana/Cargo.lock        | 23 +++++------------------
 solana/agent/src/main.rs |  2 +-
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/solana/Cargo.lock b/solana/Cargo.lock
index 46c5c00a..f873a579 100644
--- a/solana/Cargo.lock
+++ b/solana/Cargo.lock
@@ -2277,7 +2277,7 @@ dependencies = [
 [[package]]
 name = "solana-crate-features"
 version = "1.4.0"
-source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
+source = "git+https://github.com/solana-labs/solana?branch=master#e2d66cf796484301668c2b45804e31610373a0e9"
 dependencies = [
  "backtrace",
  "bytes 0.4.12",
@@ -2334,7 +2334,7 @@ dependencies = [
 [[package]]
 name = "solana-logger"
 version = "1.4.0"
-source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
+source = "git+https://github.com/solana-labs/solana?branch=master#e2d66cf796484301668c2b45804e31610373a0e9"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -2401,7 +2401,7 @@ dependencies = [
 [[package]]
 name = "solana-sdk"
 version = "1.4.0"
-source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
+source = "git+https://github.com/solana-labs/solana?branch=master#e2d66cf796484301668c2b45804e31610373a0e9"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -2439,7 +2439,7 @@ dependencies = [
 [[package]]
 name = "solana-sdk-macro"
 version = "1.4.0"
-source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
+source = "git+https://github.com/solana-labs/solana?branch=master#e2d66cf796484301668c2b45804e31610373a0e9"
 dependencies = [
  "bs58",
  "proc-macro2 1.0.19",
@@ -2464,7 +2464,7 @@ dependencies = [
 [[package]]
 name = "solana-sdk-macro-frozen-abi"
 version = "1.4.0"
-source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
+source = "git+https://github.com/solana-labs/solana?branch=master#e2d66cf796484301668c2b45804e31610373a0e9"
 dependencies = [
  "lazy_static",
  "proc-macro2 1.0.19",
@@ -2579,19 +2579,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "spl-token"
-version = "1.0.8"
-dependencies = [
- "cbindgen",
- "num-derive 0.3.1",
- "num-traits",
- "rand",
- "remove_dir_all",
- "solana-sdk",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token"
 version = "1.0.8"
diff --git a/solana/agent/src/main.rs b/solana/agent/src/main.rs
index 3c8dcbd8..d3f3bbac 100644
--- a/solana/agent/src/main.rs
+++ b/solana/agent/src/main.rs
@@ -53,7 +53,7 @@ impl Agent for AgentImpl {
         let b = self.key.to_bytes();
         let key = Keypair::from_bytes(&b).unwrap();
 
-        let ix = match post_vaa(&self.bridge, &key.pubkey(), &request.get_ref().vaa) {
+        let ix = match post_vaa(&self.bridge, &key.pubkey(), request.get_ref().vaa.clone()) {
             Ok(v) => v,
             Err(e) => {
                 return Err(Status::new(