From f6414290566e2c25ce3bc34f67bd3d4ee587544e Mon Sep 17 00:00:00 2001
From: Justin Starry <justin@solana.com>
Date: Tue, 13 Apr 2021 18:06:05 +0800
Subject: [PATCH] Remove blake3 from bpf program dependencies (#16506)

---
 core/Cargo.toml            | 2 +-
 runtime/Cargo.toml         | 2 +-
 sdk/program/Cargo.toml     | 3 +--
 sdk/program/src/message.rs | 8 +++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 3b761977ec8d20..ba3b435f9152cb 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -17,7 +17,7 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git
 ahash = "0.6.1"
 base64 = "0.12.3"
 bincode = "1.3.1"
-blake3 = "0.3.6"
+blake3 = "0.3.7"
 bv = { version = "0.11.1", features = ["serde"] }
 bs58 = "0.3.1"
 byteorder = "1.3.4"
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 58d2bf8490b145..8c97c19b2f4d0e 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 arrayref = "0.3.6"
 bincode = "1.3.1"
-blake3 = "0.3.6"
+blake3 = "0.3.7"
 bv = { version = "0.11.1", features = ["serde"] }
 byteorder = "1.3.4"
 bzip2 = "0.3.3"
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
index e54a7b8c93e1aa..c246a0761db4b4 100644
--- a/sdk/program/Cargo.toml
+++ b/sdk/program/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.3.1"
-blake3 = "0.3.7"
 borsh = "0.8.1"
 borsh-derive = "0.8.1"
 bs58 = "0.3.1"
@@ -33,7 +32,7 @@ solana-sdk-macro = { path = "../macro", version = "=1.7.0" }
 thiserror = "1.0"
 
 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
-blake3 = "0.3.6"
+blake3 = "0.3.7"
 curve25519-dalek = "2.1.0"
 rand = "0.7.0"
 solana-logger = { path = "../../logger", version = "=1.7.0" }
diff --git a/sdk/program/src/message.rs b/sdk/program/src/message.rs
index f070f6596572eb..a18921bb4103c1 100644
--- a/sdk/program/src/message.rs
+++ b/sdk/program/src/message.rs
@@ -7,12 +7,11 @@ use crate::serialize_utils::{
 };
 use crate::{
     bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
-    hash::{Hash, HASH_BYTES},
+    hash::Hash,
     instruction::{AccountMeta, CompiledInstruction, Instruction},
     pubkey::Pubkey,
     short_vec, system_instruction, system_program, sysvar,
 };
-use blake3::traits::digest::Digest;
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use std::{convert::TryFrom, str::FromStr};
@@ -298,17 +297,20 @@ impl Message {
     }
 
     /// Compute the blake3 hash of this transaction's message
+    #[cfg(not(target_arch = "bpf"))]
     pub fn hash(&self) -> Hash {
         let message_bytes = self.serialize();
         Self::hash_raw_message(&message_bytes)
     }
 
     /// Compute the blake3 hash of a raw transaction message
+    #[cfg(not(target_arch = "bpf"))]
     pub fn hash_raw_message(message_bytes: &[u8]) -> Hash {
+        use blake3::traits::digest::Digest;
         let mut hasher = blake3::Hasher::new();
         hasher.update(b"solana-tx-message-v1");
         hasher.update(message_bytes);
-        Hash(<[u8; HASH_BYTES]>::try_from(hasher.finalize().as_slice()).unwrap())
+        Hash(<[u8; crate::hash::HASH_BYTES]>::try_from(hasher.finalize().as_slice()).unwrap())
     }
 
     pub fn compile_instruction(&self, ix: &Instruction) -> CompiledInstruction {