feat(params-estimator): Increase deployment cost

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [unreleased]
 * increasing max_gas_burnt from 200TGas to 300Tgas, allowing larger transactions.
+* increasing `action_creation_config.deploy_contract_cost_per_byte.execution`
 
 ### Protocol Changes
 

chain/chain/src/tests/simple_chain.rs

@@ -27,7 +27,7 @@ fn empty_chain() {
     #[cfg(feature = "nightly_protocol")]
     assert_eq!(hash, CryptoHash::from_str("2VFkBfWwcTqyVJ83zy78n5WUNadwGuJbLc2KEp9SJ8dV").unwrap());
     #[cfg(not(feature = "nightly_protocol"))]
-    assert_eq!(hash, CryptoHash::from_str("8UF2TCELQ2sSqorskN5myyC7h1XfgxYm68JHJMKo5n8X").unwrap());
+    assert_eq!(hash, CryptoHash::from_str("8t6f63ezCoqS2nNxT7KivhvHH5tvNND4dj7RY3Hwhn64").unwrap());
     assert_eq!(count_utc, 1);
 }
 
@@ -59,7 +59,7 @@ fn build_chain() {
     #[cfg(not(feature = "nightly_protocol"))]
     assert_eq!(
         prev_hash,
-        CryptoHash::from_str("BkRwcuuVjS86zNvP8DDC9FzsJfWQLV92YyX7NCAz3TNu").unwrap()
+        CryptoHash::from_str("DcfBcEHCh9Jd3gbgU8KNuP9kcN4WxyfonpMAq7jAmgaC").unwrap()
     );
 
     for i in 0..4 {
@@ -82,7 +82,7 @@ fn build_chain() {
     #[cfg(not(feature = "nightly_protocol"))]
     assert_eq!(
         chain.head().unwrap().last_block_hash,
-        CryptoHash::from_str("8FkFyWKsnAvAEVAwR41GFTY9i9eQnvGCm52FCYR7qEhy").unwrap()
+        CryptoHash::from_str("5DDPykKCvGKTpSi5YSgzw8UY5BB18JaxNs5218hWwfN7").unwrap()
     );
 }
 

core/primitives/res/runtime_configs/53.json

@@ -0,0 +1,193 @@
+{
+  "storage_amount_per_byte": "10000000000000000000",
+  "transaction_costs": {
+    "action_receipt_creation_config": {
+      "send_sir": 108059500000,
+      "send_not_sir": 108059500000,
+      "execution": 108059500000
+    },
+    "data_receipt_creation_config": {
+      "base_cost": {
+        "send_sir": 36486732312,
+        "send_not_sir": 36486732312,
+        "execution": 36486732312
+      },
+      "cost_per_byte": {
+        "send_sir": 17212011,
+        "send_not_sir": 17212011,
+        "execution": 17212011
+      }
+    },
+    "action_creation_config": {
+      "create_account_cost": {
+        "send_sir": 99607375000,
+        "send_not_sir": 99607375000,
+        "execution": 99607375000
+      },
+      "deploy_contract_cost": {
+        "send_sir": 184765750000,
+        "send_not_sir": 184765750000,
+        "execution": 184765750000
+      },
+      "deploy_contract_cost_per_byte": {
+        "send_sir": 6812999,
+        "send_not_sir": 6812999,
+        "execution": 64572944
+      },
+      "function_call_cost": {
+        "send_sir": 2319861500000,
+        "send_not_sir": 2319861500000,
+        "execution": 2319861500000
+      },
+      "function_call_cost_per_byte": {
+        "send_sir": 2235934,
+        "send_not_sir": 2235934,
+        "execution": 2235934
+      },
+      "transfer_cost": {
+        "send_sir": 115123062500,
+        "send_not_sir": 115123062500,
+        "execution": 115123062500
+      },
+      "stake_cost": {
+        "send_sir": 141715687500,
+        "send_not_sir": 141715687500,
+        "execution": 102217625000
+      },
+      "add_key_cost": {
+        "full_access_cost": {
+          "send_sir": 101765125000,
+          "send_not_sir": 101765125000,
+          "execution": 101765125000
+        },
+        "function_call_cost": {
+          "send_sir": 102217625000,
+          "send_not_sir": 102217625000,
+          "execution": 102217625000
+        },
+        "function_call_cost_per_byte": {
+          "send_sir": 1925331,
+          "send_not_sir": 1925331,
+          "execution": 1925331
+        }
+      },
+      "delete_key_cost": {
+        "send_sir": 94946625000,
+        "send_not_sir": 94946625000,
+        "execution": 94946625000
+      },
+      "delete_account_cost": {
+        "send_sir": 147489000000,
+        "send_not_sir": 147489000000,
+        "execution": 147489000000
+      }
+    },
+    "storage_usage_config": {
+      "num_bytes_account": 100,
+      "num_extra_bytes_record": 40
+    },
+    "burnt_gas_reward": [
+      3,
+      10
+    ],
+    "pessimistic_gas_price_inflation_ratio": [
+      103,
+      100
+    ]
+  },
+  "wasm_config": {
+    "ext_costs": {
+      "base": 264768111,
+      "contract_compile_base": 35445963,
+      "contract_compile_bytes": 216750,
+      "read_memory_base": 2609863200,
+      "read_memory_byte": 3801333,
+      "write_memory_base": 2803794861,
+      "write_memory_byte": 2723772,
+      "read_register_base": 2517165186,
+      "read_register_byte": 98562,
+      "write_register_base": 2865522486,
+      "write_register_byte": 3801564,
+      "utf8_decoding_base": 3111779061,
+      "utf8_decoding_byte": 291580479,
+      "utf16_decoding_base": 3543313050,
+      "utf16_decoding_byte": 163577493,
+      "sha256_base": 4540970250,
+      "sha256_byte": 24117351,
+      "keccak256_base": 5879491275,
+      "keccak256_byte": 21471105,
+      "keccak512_base": 5811388236,
+      "keccak512_byte": 36649701,
+      "ripemd160_base": 853675086,
+      "ripemd160_block": 680107584,
+      "ecrecover_base": 278821988457,
+      "log_base": 3543313050,
+      "log_byte": 13198791,
+      "storage_write_base": 64196736000,
+      "storage_write_key_byte": 70482867,
+      "storage_write_value_byte": 31018539,
+      "storage_write_evicted_byte": 32117307,
+      "storage_read_base": 56356845750,
+      "storage_read_key_byte": 30952533,
+      "storage_read_value_byte": 5611005,
+      "storage_remove_base": 53473030500,
+      "storage_remove_key_byte": 38220384,
+      "storage_remove_ret_value_byte": 11531556,
+      "storage_has_key_base": 54039896625,
+      "storage_has_key_byte": 30790845,
+      "storage_iter_create_prefix_base": 0,
+      "storage_iter_create_prefix_byte": 0,
+      "storage_iter_create_range_base": 0,
+      "storage_iter_create_from_byte": 0,
+      "storage_iter_create_to_byte": 0,
+      "storage_iter_next_base": 0,
+      "storage_iter_next_key_byte": 0,
+      "storage_iter_next_value_byte": 0,
+      "touching_trie_node": 16101955926,
+      "promise_and_base": 1465013400,
+      "promise_and_per_promise": 5452176,
+      "promise_return": 560152386,
+      "validator_stake_base": 911834726400,
+      "validator_total_stake_base": 911834726400,
+      "alt_bn128_g1_multiexp_base": 713006929500,
+      "alt_bn128_g1_multiexp_byte": 3335092461,
+      "alt_bn128_g1_multiexp_sublinear": 4325094,
+      "alt_bn128_pairing_check_base": 9685508901000,
+      "alt_bn128_pairing_check_byte": 26575188546,
+      "alt_bn128_g1_sum_base": 3175314375,
+      "alt_bn128_g1_sum_byte": 76218543
+    },
+    "grow_mem_cost": 1,
+    "regular_op_cost": 822756,
+    "limit_config": {
+      "max_gas_burnt": 300000000000000,
+      "max_gas_burnt_view": 300000000000000,
+      "max_stack_height": 16384,
+      "stack_limiter_version": 1,
+      "initial_memory_pages": 1024,
+      "max_memory_pages": 2048,
+      "registers_memory_limit": 1073741824,
+      "max_register_size": 104857600,
+      "max_number_registers": 100,
+      "max_number_logs": 100,
+      "max_total_log_length": 16384,
+      "max_total_prepaid_gas": 300000000000000,
+      "max_actions_per_receipt": 100,
+      "max_number_bytes_method_names": 2000,
+      "max_length_method_name": 256,
+      "max_arguments_length": 4194304,
+      "max_length_returned_data": 4194304,
+      "max_contract_size": 4194304,
+      "max_transaction_size": 4194304,
+      "max_length_storage_key": 4194304,
+      "max_length_storage_value": 4194304,
+      "max_promises_per_function_call_action": 1024,
+      "max_number_input_data_dependencies": 128,
+      "max_functions_number_per_contract": 10000
+    }
+  },
+  "account_creation_config": {
+    "min_allowed_top_level_account_length": 32,
+    "registrar_account_id": "registrar"
+  }
+}

core/primitives/src/version.rs

@@ -161,7 +161,7 @@ pub const PEER_MIN_ALLOWED_PROTOCOL_VERSION: ProtocolVersion = STABLE_PROTOCOL_V
 /// Current protocol version used on the mainnet.
 /// Some features (e. g. FixStorageUsage) require that there is at least one epoch with exactly
 /// the corresponding version
-const STABLE_PROTOCOL_VERSION: ProtocolVersion = 52;
+const STABLE_PROTOCOL_VERSION: ProtocolVersion = 53;
 
 /// Version used by this binary.
 #[cfg(not(feature = "nightly_protocol"))]

integration-tests/src/tests/runtime/deployment.rs

@@ -0,0 +1,70 @@
+use crate::node::{Node, RuntimeNode};
+use near_chain_configs::Genesis;
+use near_primitives::runtime::config_store::RuntimeConfigStore;
+use near_primitives::transaction::{Action, DeployContractAction};
+use near_primitives::types::AccountId;
+use near_primitives::version::PROTOCOL_VERSION;
+use near_primitives::{
+    serialize::to_base64, transaction::SignedTransaction, views::FinalExecutionStatus,
+};
+use nearcore::config::GenesisExt;
+
+const ONE_NEAR: u128 = 10u128.pow(24);
+
+/// Tests if the maximum allowed contract can be deployed with current gas limits
+#[test]
+fn test_deploy_max_size_contract() {
+    let account_id: AccountId = "alice.near".parse().unwrap();
+    let test_contract_id: AccountId = "test_contract.alice.near".parse().unwrap();
+    let runtime_config_store = RuntimeConfigStore::new(None);
+    let config = runtime_config_store.get_config(PROTOCOL_VERSION);
+
+    let genesis = Genesis::test(vec![account_id.clone()], 1);
+    let node =
+        RuntimeNode::new_from_genesis_and_config(&account_id, genesis, config.as_ref().clone());
+    let node_user = node.user();
+
+    // Compute size of a deployment transaction with an almost empty contract payload
+    let block_hash = node_user.get_best_block_hash().unwrap_or_default();
+    let signed_transaction = SignedTransaction::from_actions(
+        node_user.get_access_key_nonce_for_signer(&account_id).unwrap_or_default() + 1,
+        test_contract_id.clone(),
+        test_contract_id.clone(),
+        &*node_user.signer(),
+        vec![Action::DeployContract(DeployContractAction { code: vec![0u8] })],
+        block_hash,
+    );
+    let tx_overhead = signed_transaction.get_size();
+
+    // Testable max contract size is limited by both `max_contract_size` and by `max_transaction_size`
+    let max_contract_size = config.wasm_config.limit_config.max_contract_size;
+    let max_transaction_size = config.wasm_config.limit_config.max_transaction_size;
+    let contract_size = max_contract_size.min(max_transaction_size - tx_overhead);
+    // Enough token to store contract + 1 NEAR for account
+    let token_balance = config.storage_amount_per_byte * contract_size as u128 + ONE_NEAR;
+
+    // Create test account
+    let transaction_result = node_user
+        .create_account(
+            account_id.clone(),
+            test_contract_id.clone(),
+            node.signer().public_key(),
+            token_balance,
+        )
+        .unwrap();
+    assert_eq!(transaction_result.status, FinalExecutionStatus::SuccessValue(to_base64(&[])));
+    assert_eq!(transaction_result.receipts_outcome.len(), 2);
+
+    // Deploy contract
+    let wasm_binary = near_test_contracts::sized_contract(contract_size as usize);
+    let transaction_result =
+        node_user.deploy_contract(test_contract_id, wasm_binary.to_vec()).unwrap();
+    assert_eq!(transaction_result.status, FinalExecutionStatus::SuccessValue(to_base64(&[])));
+    assert_eq!(transaction_result.receipts_outcome.len(), 1);
+
+    // Check total TX gas is in limit
+    let tx_conversion_gas_burnt = transaction_result.transaction_outcome.outcome.gas_burnt;
+    let deployment_gas_burnt = transaction_result.receipts_outcome[0].outcome.gas_burnt;
+    let total_gas_burnt = tx_conversion_gas_burnt + deployment_gas_burnt;
+    assert!(total_gas_burnt <= config.wasm_config.limit_config.max_gas_burnt,);
+}

integration-tests/src/tests/runtime/mod.rs

@@ -1,2 +1,3 @@
+mod deployment;
 mod state_viewer;
 mod test_evil_contracts;

nearcore/res/genesis_config.json

@@ -1,5 +1,5 @@
 {
-  "protocol_version": 52,
+  "protocol_version": 53,
   "genesis_time": "1970-01-01T00:00:00.000000000Z",
   "chain_id": "sample",
   "genesis_height": 0,

runtime/near-test-contracts/src/lib.rs

@@ -12,6 +12,21 @@ pub fn trivial_contract() -> &'static [u8] {
         .as_slice()
 }
 
+/// Contract with exact size in bytes.
+pub fn sized_contract(size: usize) -> Vec<u8> {
+    let payload = "x".repeat(size);
+    let base_size =
+        wat::parse_str(format!("(module (data \"{payload}\") (func (export \"main\")))"))
+            .unwrap()
+            .len();
+    let adjusted_size = size as i64 - (base_size as i64 - size as i64);
+    let payload = "x".repeat(adjusted_size as usize);
+    let code = format!("(module (data \"{payload}\") (func (export \"main\")))");
+    let contract = wat::parse_str(code).unwrap();
+    assert_eq!(contract.len(), size);
+    contract
+}
+
 /// Standard test contract which can call various host functions.
 ///
 /// Note: the contract relies on the latest protocol version, and