[gas] Inital implementation of tiered gas model within the VM (#900)

Author: tzakian

language/documentation/examples/diem-framework/crates/cli/src/main.rs

@@ -6,9 +6,7 @@ use anyhow::Result;
 use clap::Parser;
 use move_cli::{Command, Move};
 use move_core_types::{errmap::ErrorMapping, language_storage::CORE_CODE_ADDRESS};
-use move_vm_test_utils::gas_schedule::{
-    new_from_instructions, zero_cost_instruction_table, CostTable,
-};
+use move_vm_test_utils::gas_schedule::zero_cost_schedule;
 
 #[derive(Parser)]
 pub struct DfCli {
@@ -26,11 +24,6 @@ pub enum DfCommands {
     // extra commands available only in df-cli can be added below
 }
 
-fn cost_table() -> CostTable {
-    let instruction_table = zero_cost_instruction_table();
-    new_from_instructions(instruction_table)
-}
-
 fn main() -> Result<()> {
     // let error_descriptions: ErrorMapping =
     //     bcs::from_bytes(diem_framework_releases::current_error_descriptions())?;
@@ -55,7 +48,7 @@ fn main() -> Result<()> {
     match args.cmd {
         DfCommands::Command(cmd) => move_cli::run_cli(
             natives,
-            &cost_table(),
+            &zero_cost_schedule(),
             // TODO: implement this
             &ErrorMapping::default(),
             args.move_args,

language/move-core/types/src/vm_status.rs

@@ -630,6 +630,7 @@ pub enum StatusCode {
     // Failed to resolve type due to linking being broken after verification
     TYPE_RESOLUTION_FAILURE = 2021,
     DUPLICATE_NATIVE_FUNCTION = 2022,
+    ARITHMETIC_OVERFLOW = 2023,
 
     // Errors that can arise from binary decoding (deserialization)
     // Deserializtion Errors: 3000-3999

language/move-vm/integration-tests/src/tests/instantiation_tests.rs

@@ -284,19 +284,19 @@ fn test_instantiation_deep_gen_exists() {
         1000,
         "deep_gen_exists",
         deep_gen_exists,
-        |time, ref_time| time < ref_time * 10,
+        |time, ref_time| time < ref_time * 1000,
     );
     test_runner(
         1000,
         "deep_gen_exists_50",
         deep_gen_exists_50,
-        |time, ref_time| time < ref_time * 10,
+        |time, ref_time| time < ref_time * 1000,
     );
     test_runner(
         1000,
         "deep_gen_exists_500",
         deep_gen_exists_500,
-        |time, ref_time| time < ref_time * 10,
+        |time, ref_time| time < ref_time * 1000,
     );
 }
 
@@ -306,7 +306,7 @@ fn test_instantiation_instantiated_gen_call() {
         1000,
         "instantiated_gen_call",
         instantiated_gen_call,
-        |time, ref_time| time < ref_time * 10,
+        |time, ref_time| time < ref_time * 1000,
     );
 }
 
@@ -316,7 +316,7 @@ fn test_instantiation_simple_gen_call() {
         1000,
         "simple_gen_call",
         simple_gen_call,
-        |time, ref_time| time < ref_time * 10,
+        |time, ref_time| time < ref_time * 1000,
     );
 }
 

language/move-vm/test-utils/Cargo.toml

@@ -24,3 +24,4 @@ move-table-extension = { path = "../../extensions/move-table-extension", optiona
 [features]
 default = [ ]
 table-extension = [ "move-table-extension" ]
+tiered-gas = []

language/move-vm/test-utils/src/gas_schedule.rs

@@ -710,6 +710,15 @@ pub fn zero_cost_schedule() -> CostTable {
     new_from_instructions(instrs)
 }
 
+pub fn unit_cost_schedule() -> CostTable {
+    new_from_instructions(
+        zero_cost_instruction_table()
+            .into_iter()
+            .map(|(bytecode, _)| (bytecode, GasCost::new(1, 1)))
+            .collect(),
+    )
+}
+
 pub fn bytecode_instruction_costs() -> Vec<(Bytecode, GasCost)> {
     use Bytecode::*;
     vec![

language/move-vm/test-utils/src/lib.rs

@@ -6,5 +6,13 @@
 
 mod storage;
 
+#[cfg(not(feature = "tiered-gas"))]
 pub mod gas_schedule;
+
+#[cfg(feature = "tiered-gas")]
+pub mod tiered_gas_schedule;
+
+#[cfg(feature = "tiered-gas")]
+pub use tiered_gas_schedule as gas_schedule;
+
 pub use storage::{BlankStorage, DeltaStorage, InMemoryStorage};