feat: global contract usage

chain/chain/src/runtime/mod.rs

@@ -336,6 +336,9 @@ impl NightshadeRuntime {
                 // TODO(#2152): process gracefully
                 RuntimeError::ReceiptValidationError(e) => panic!("{}", e),
                 RuntimeError::ValidatorError(e) => e.into(),
+                RuntimeError::GlobalContractError(_e) => {
+                    todo!()
+                }
             })?;
         let elapsed = instant.elapsed();
 

chain/chain/src/test_utils/kv_runtime.rs

@@ -14,7 +14,7 @@ use near_crypto::{KeyType, PublicKey, SecretKey};
 use near_epoch_manager::EpochManagerAdapter;
 use near_parameters::RuntimeConfig;
 use near_pool::types::TransactionGroupIterator;
-use near_primitives::account::{AccessKey, Account};
+use near_primitives::account::{AccessKey, Account, AccountContract};
 use near_primitives::apply::ApplyChunkReason;
 use near_primitives::bandwidth_scheduler::BandwidthRequests;
 use near_primitives::block::Tip;
@@ -1214,7 +1214,7 @@ impl RuntimeAdapter for KeyValueRuntime {
                             |state| *state.amounts.get(account_id).unwrap_or(&0),
                         ),
                         0,
-                        CryptoHash::default(),
+                        AccountContract::None,
                         0,
                     )
                     .into(),

chain/jsonrpc/jsonrpc-tests/Cargo.toml

@@ -33,6 +33,7 @@ near-jsonrpc-primitives.workspace = true
 
 [dev-dependencies]
 near-actix-test-utils.workspace = true
+near-primitives-core.workspace = true
 
 [features]
 test_features = ["near-jsonrpc/test_features"]
@@ -45,6 +46,7 @@ nightly = [
   "near-jsonrpc/nightly",
   "near-network/nightly",
   "near-o11y/nightly",
+  "near-primitives-core/nightly",
   "near-primitives/nightly",
   "near-store/nightly",
   "nightly_protocol",
@@ -58,6 +60,7 @@ nightly_protocol = [
   "near-jsonrpc/nightly_protocol",
   "near-network/nightly_protocol",
   "near-o11y/nightly_protocol",
+  "near-primitives-core/nightly_protocol",
   "near-primitives/nightly_protocol",
   "near-store/nightly_protocol",
 ]

chain/jsonrpc/jsonrpc-tests/tests/rpc_query.rs

@@ -147,10 +147,12 @@ fn test_query_by_path_account() {
             panic!("queried account, but received something else: {:?}", query_response.kind);
         };
         assert_eq!(account_info.amount, 0);
-        assert_eq!(account_info.code_hash.as_ref(), &[0; 32]);
+        assert_eq!(account_info.code_hash, CryptoHash::default());
         assert_eq!(account_info.locked, 0);
         assert_eq!(account_info.storage_paid_at, 0);
         assert_eq!(account_info.storage_usage, 0);
+        assert_eq!(account_info.global_contract_hash, None);
+        assert_eq!(account_info.global_contract_account_id, None);
     });
 }
 
@@ -192,10 +194,12 @@ fn test_query_account() {
                 panic!("queried account, but received something else: {:?}", query_response.kind);
             };
             assert_eq!(account_info.amount, 0);
-            assert_eq!(account_info.code_hash.as_ref(), &[0; 32]);
+            assert_eq!(account_info.code_hash, CryptoHash::default());
             assert_eq!(account_info.locked, 0);
             assert_eq!(account_info.storage_paid_at, 0);
             assert_eq!(account_info.storage_usage, 0);
+            assert_eq!(account_info.global_contract_hash, None);
+            assert_eq!(account_info.global_contract_account_id, None);
         }
     });
 }

chain/rosetta-rpc/src/adapters/mod.rs

@@ -839,6 +839,7 @@ mod tests {
     use near_crypto::{KeyType, SecretKey};
     use near_parameters::{RuntimeConfig, RuntimeConfigView};
     use near_primitives::action::delegate::{DelegateAction, SignedDelegateAction};
+    use near_primitives::hash::CryptoHash;
     use near_primitives::transaction::{Action, TransferAction};
     use near_time::Clock;
 
@@ -865,10 +866,12 @@ mod tests {
                         account_id: "nfvalidator1.near".parse().unwrap(),
                         account: near_primitives::views::AccountView {
                             amount: 5000000000000000000,
-                            code_hash: near_primitives::hash::CryptoHash::default(),
+                            code_hash: CryptoHash::default(),
                             locked: 400000000000000000000000000000,
                             storage_paid_at: 0,
                             storage_usage: 200000,
+                            global_contract_hash: None,
+                            global_contract_account_id: None,
                         },
                     },
                 },
@@ -880,10 +883,12 @@ mod tests {
                         account_id: "nfvalidator1.near".parse().unwrap(),
                         account: near_primitives::views::AccountView {
                             amount: 4000000000000000000,
-                            code_hash: near_primitives::hash::CryptoHash::default(),
+                            code_hash: CryptoHash::default(),
                             locked: 400000000000000000000000000000,
                             storage_paid_at: 0,
                             storage_usage: 200000,
+                            global_contract_hash: None,
+                            global_contract_account_id: None,
                         },
                     },
                 },
@@ -893,10 +898,12 @@ mod tests {
                         account_id: "nfvalidator2.near".parse().unwrap(),
                         account: near_primitives::views::AccountView {
                             amount: 7000000000000000000,
-                            code_hash: near_primitives::hash::CryptoHash::default(),
+                            code_hash: CryptoHash::default(),
                             locked: 400000000000000000000000000000,
                             storage_paid_at: 0,
                             storage_usage: 200000,
+                            global_contract_hash: None,
+                            global_contract_account_id: None,
                         },
                     },
                 },
@@ -908,10 +915,12 @@ mod tests {
                         account_id: "nfvalidator2.near".parse().unwrap(),
                         account: near_primitives::views::AccountView {
                             amount: 8000000000000000000,
-                            code_hash: near_primitives::hash::CryptoHash::default(),
+                            code_hash: CryptoHash::default(),
                             locked: 400000000000000000000000000000,
                             storage_paid_at: 0,
                             storage_usage: 200000,
+                            global_contract_hash: None,
+                            global_contract_account_id: None,
                         },
                     },
                 },
@@ -921,20 +930,24 @@ mod tests {
                 "nfvalidator1.near".parse().unwrap(),
                 near_primitives::views::AccountView {
                     amount: 4000000000000000000,
-                    code_hash: near_primitives::hash::CryptoHash::default(),
+                    code_hash: CryptoHash::default(),
                     locked: 400000000000000000000000000000,
                     storage_paid_at: 0,
                     storage_usage: 200000,
+                    global_contract_hash: None,
+                    global_contract_account_id: None,
                 },
             );
             accounts_previous_state.insert(
                 "nfvalidator2.near".parse().unwrap(),
                 near_primitives::views::AccountView {
                     amount: 6000000000000000000,
-                    code_hash: near_primitives::hash::CryptoHash::default(),
+                    code_hash: CryptoHash::default(),
                     locked: 400000000000000000000000000000,
                     storage_paid_at: 0,
                     storage_usage: 200000,
+                    global_contract_hash: None,
+                    global_contract_account_id: None,
                 },
             );
             let transactions = super::transactions::convert_block_changes_to_transactions(

chain/rosetta-rpc/src/lib.rs

@@ -17,7 +17,7 @@ pub use config::RosettaRpcConfig;
 use near_chain_configs::Genesis;
 use near_client::{ClientActor, ViewClientActor};
 use near_o11y::WithSpanContextExt;
-use near_primitives::borsh::BorshDeserialize;
+use near_primitives::{account::AccountContract, borsh::BorshDeserialize};
 
 mod adapters;
 mod config;
@@ -369,7 +369,7 @@ async fn account_balance(
             Err(crate::errors::ErrorKind::NotFound(_)) => (
                 block.header.hash,
                 block.header.height,
-                near_primitives::account::Account::new(0, 0, Default::default(), 0).into(),
+                near_primitives::account::Account::new(0, 0, AccountContract::None, 0).into(),
             ),
             Err(err) => return Err(err.into()),
         };

core/chain-configs/src/genesis_validate.rs

@@ -198,13 +198,13 @@ mod test {
 
     use crate::GenesisRecords;
     use near_crypto::{KeyType, PublicKey};
-    use near_primitives::account::{AccessKey, Account};
+    use near_primitives::account::{AccessKey, Account, AccountContract};
     use near_primitives::types::AccountInfo;
 
     const VALID_ED25519_RISTRETTO_KEY: &str = "ed25519:KuTCtARNzxZQ3YvXDeLjx83FDqxv2SdQTSbiq876zR7";
 
     fn create_account() -> Account {
-        Account::new(100, 10, Default::default(), 0)
+        Account::new(100, 10, AccountContract::None, 0)
     }
 
     #[test]

core/chain-configs/src/test_genesis.rs

@@ -2,9 +2,8 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 use std::sync::Arc;
 
 use near_crypto::PublicKey;
-use near_primitives::account::{AccessKey, Account};
+use near_primitives::account::{AccessKey, Account, AccountContract};
 use near_primitives::epoch_manager::{EpochConfig, EpochConfigStore};
-use near_primitives::hash::CryptoHash;
 use near_primitives::shard_layout::ShardLayout;
 use near_primitives::state_record::StateRecord;
 use near_primitives::test_utils::{create_test_signer, create_user_test_signer};
@@ -447,7 +446,7 @@ impl TestGenesisBuilder {
                 account: Account::new(
                     user_account.balance,
                     validator_stake.remove(&user_account.account_id).unwrap_or(0),
-                    CryptoHash::default(),
+                    AccountContract::None,
                     0,
                 ),
             });
@@ -465,7 +464,7 @@ impl TestGenesisBuilder {
         for (account_id, balance) in validator_stake {
             records.push(StateRecord::Account {
                 account_id,
-                account: Account::new(0, balance, CryptoHash::default(), 0),
+                account: Account::new(0, balance, AccountContract::None, 0),
             });
         }
 

core/chain-configs/src/test_utils.rs

@@ -1,5 +1,5 @@
 use near_crypto::{InMemorySigner, PublicKey};
-use near_primitives::account::{AccessKey, Account};
+use near_primitives::account::{AccessKey, Account, AccountContract};
 use near_primitives::hash::CryptoHash;
 use near_primitives::shard_layout::ShardLayout;
 use near_primitives::state_record::StateRecord;
@@ -185,7 +185,7 @@ pub fn add_account_with_key(
 ) {
     records.push(StateRecord::Account {
         account_id: account_id.clone(),
-        account: Account::new(amount, staked, code_hash, 0),
+        account: Account::new(amount, staked, AccountContract::from_local_code_hash(code_hash), 0),
     });
     records.push(StateRecord::AccessKey {
         account_id,