fix (Runtime): Pass code_hash to ContractCode::new when available

core/primitives/src/contract.rs

@@ -1,13 +1,13 @@
-use crate::hash::{hash, CryptoHash};
+use crate::hash::{hash as sha256, CryptoHash};
 
 pub struct ContractCode {
     pub code: Vec<u8>,
     pub hash: CryptoHash,
 }
 
 impl ContractCode {
-    pub fn new(code: Vec<u8>) -> ContractCode {
-        let hash = hash(&code);
+    pub fn new(code: Vec<u8>, hash: Option<CryptoHash>) -> ContractCode {
+        let hash = hash.unwrap_or_else(|| sha256(&code));
         ContractCode { code, hash }
     }
 

core/store/src/lib.rs

@@ -386,10 +386,11 @@ pub fn set_code(state_update: &mut TrieUpdate, account_id: AccountId, code: &Con
 pub fn get_code(
     state_update: &TrieUpdate,
     account_id: &AccountId,
+    code_hash: Option<CryptoHash>,
 ) -> Result<Option<ContractCode>, StorageError> {
     state_update
         .get(&TrieKey::ContractCode { account_id: account_id.clone() })
-        .map(|opt| opt.map(|code| ContractCode::new(code.to_vec())))
+        .map(|opt| opt.map(|code| ContractCode::new(code, code_hash)))
 }
 
 /// Removes account, code and all access keys associated to it.

genesis-tools/genesis-populate/src/lib.rs

@@ -260,7 +260,7 @@ impl GenesisBuilder {
         );
         records.push(access_key_record);
         if let Some(wasm_binary) = self.additional_accounts_code.as_ref() {
-            let code = ContractCode::new(wasm_binary.clone());
+            let code = ContractCode::new(wasm_binary.clone(), None);
             set_code(&mut state_update, account_id.clone(), &code);
             let contract_record = StateRecord::Contract { account_id, code: wasm_binary.clone() };
             records.push(contract_record);

runtime/runtime/src/actions.rs

@@ -70,7 +70,7 @@ pub(crate) fn get_code_with_cache(
 ) -> Result<Option<Arc<ContractCode>>, StorageError> {
     debug!(target:"runtime", "Calling the contract at account {}", account_id);
     let code_hash = account.code_hash;
-    let code = || get_code(state_update, account_id);
+    let code = || get_code(state_update, account_id, Some(code_hash));
     crate::cache::get_code(code_hash, code)
 }
 
@@ -343,8 +343,8 @@ pub(crate) fn action_deploy_contract(
     account_id: &AccountId,
     deploy_contract: &DeployContractAction,
 ) -> Result<(), StorageError> {
-    let code = ContractCode::new(deploy_contract.code.clone());
-    let prev_code = get_code(state_update, account_id)?;
+    let code = ContractCode::new(deploy_contract.code.clone(), None);
+    let prev_code = get_code(state_update, account_id, Some(account.code_hash))?;
     let prev_code_length = prev_code.map(|code| code.code.len() as u64).unwrap_or_default();
     account.storage_usage =
         account.storage_usage.checked_sub(prev_code_length).ok_or_else(|| {

runtime/runtime/src/lib.rs

@@ -1264,7 +1264,8 @@ impl Runtime {
                 }
                 StateRecord::Contract { account_id, code } => {
                     let acc = get_account(&state_update, &account_id).expect("Failed to read state").expect("Code state record should be preceded by the corresponding account record");
-                    let code = ContractCode::new(code);
+                    // Recompute contract code hash.
+                    let code = ContractCode::new(code, None);
                     set_code(&mut state_update, account_id, &code);
                     assert_eq!(code.get_hash(), acc.code_hash);
                 }

runtime/runtime/tests/test_regression.rs

@@ -117,7 +117,7 @@ fn template_test(transaction_type: TransactionType, db_type: DataBaseType, expec
                 &AccessKey::full_access(),
             );
             records.push(access_key_record);
-            let code = ContractCode::new(wasm_binary.to_vec());
+            let code = ContractCode::new(wasm_binary.to_vec(), Some(code_hash));
             set_code(&mut state_update, account_id.clone(), &code);
             let contract_record = StateRecord::Contract {
                 account_id: account_id.clone(),

test-utils/testlib/src/node/mod.rs

@@ -164,7 +164,7 @@ pub fn create_nodes_from_seeds(seeds: Vec<String>) -> Vec<NodeConfig> {
             {
                 if *record_account_id == seed {
                     is_account_record_found = true;
-                    account.code_hash = ContractCode::new(code.clone()).get_hash();
+                    account.code_hash = ContractCode::new(code.clone(), None).get_hash();
                 }
             }
         }