use flat vm fee (MystenLabs#4607)

* use flat vm fee

Author: oxade

Cargo.lock

@@ -19,11 +19,11 @@ import type {
 
 const COIN_TYPE = '0x2::coin::Coin';
 const COIN_TYPE_ARG_REGEX = /^0x2::coin::Coin<(.+)>$/;
-export const DEFAULT_GAS_BUDGET_FOR_SPLIT = 1000;
-export const DEFAULT_GAS_BUDGET_FOR_MERGE = 500;
+export const DEFAULT_GAS_BUDGET_FOR_SPLIT = 10000;
+export const DEFAULT_GAS_BUDGET_FOR_MERGE = 10000;
 export const DEFAULT_GAS_BUDGET_FOR_TRANSFER = 100;
 export const DEFAULT_GAS_BUDGET_FOR_TRANSFER_SUI = 100;
-export const DEFAULT_GAS_BUDGET_FOR_STAKE = 1000;
+export const DEFAULT_GAS_BUDGET_FOR_STAKE = 10000;
 export const GAS_TYPE_ARG = '0x2::sui::SUI';
 export const GAS_SYMBOL = 'SUI';
 export const DEFAULT_NFT_TRANSFER_GAS_FEE = 450;

apps/wallet/src/ui/app/redux/slices/sui-objects/Coin.ts

@@ -6,7 +6,7 @@ A: object(100), B: object(101), C: object(102)
 task 1 'view-object'. lines 8-8:
 Owner: Account Address ( A )
 Version: 0
-Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 100000u64}}
+Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 1000000u64}}
 
 task 2 'run'. lines 10-10:
 created: object(106)
@@ -15,7 +15,7 @@ written: object(100), object(105)
 task 3 'view-object'. lines 12-12:
 Owner: Account Address ( A )
 Version: 1
-Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 99990u64}}
+Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 999990u64}}
 
 task 4 'view-object'. lines 14-14:
 Owner: Account Address ( B )
@@ -29,4 +29,4 @@ written: object(100), object(107)
 task 6 'view-object'. lines 18-18:
 Owner: Account Address ( A )
 Version: 2
-Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 99990u64}}
+Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 999990u64}}

crates/sui-adapter-transactional-tests/tests/sui/coin_transfer.exp

@@ -6,12 +6,12 @@ A: object(100), B: object(101)
 task 1 'view-object'. lines 8-8:
 Owner: Account Address ( A )
 Version: 0
-Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 100000u64}}
+Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 1000000u64}}
 
 task 2 'transfer-object'. lines 10-10:
 written: object(100), object(104)
 
 task 3 'view-object'. lines 12-12:
 Owner: Account Address ( B )
 Version: 1
-Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 100000u64}}
+Contents: sui::coin::Coin<sui::sui::SUI> {id: sui::object::UID {id: sui::object::ID {bytes: fake(100)}}, balance: sui::balance::Balance<sui::sui::SUI> {value: 1000000u64}}

crates/sui-adapter-transactional-tests/tests/transfer_object/transfer_coin.exp

@@ -22,6 +22,7 @@ sui-framework = { path = "../sui-framework" }
 sui-json = { path = "../sui-json" }
 sui-verifier = { path = "../sui-verifier" }
 sui-types = { path = "../sui-types" }
+sui-cost-tables = { path = "../sui-cost-tables"}
 workspace-hack.workspace = true
 
 [dev-dependencies]

crates/sui-adapter/Cargo.toml

@@ -18,6 +18,9 @@ use move_core_types::{
     value::{MoveStruct, MoveTypeLayout, MoveValue},
 };
 pub use move_vm_runtime::move_vm::MoveVM;
+
+use sui_cost_tables::bytecode_tables::GasStatus;
+
 use move_vm_runtime::{
     native_extensions::NativeContextExtensions,
     native_functions::NativeFunctionTable,
@@ -37,7 +40,6 @@ use sui_types::{
     error::ExecutionError,
     error::{ExecutionErrorKind, SuiError},
     event::{Event, TransferType},
-    gas::SuiGasStatus,
     messages::{CallArg, EntryArgumentErrorKind, InputObjectKind, ObjectArg},
     object::{self, Data, MoveObject, Object, Owner, ID_END_INDEX},
     storage::{DeleteKind, ObjectChange, ParentSync, Storage, WriteKind},
@@ -100,7 +102,7 @@ pub fn execute<
     function: &Identifier,
     type_args: Vec<TypeTag>,
     args: Vec<CallArg>,
-    gas_status: &mut SuiGasStatus,
+    gas_status: &mut GasStatus,
     ctx: &mut TxContext,
 ) -> Result<(), ExecutionError> {
     let objects = args
@@ -176,7 +178,7 @@ fn execute_internal<
     object_data: BTreeMap<ObjectID, (object::Owner, SequenceNumber)>,
     by_value_objects: BTreeSet<ObjectID>,
     mut mutable_ref_objects: BTreeMap<LocalIndex, ObjectID>,
-    gas_status: &mut SuiGasStatus, // gas status for the current call operation
+    gas_status: &mut GasStatus, // gas status for the current call operation
     ctx: &mut TxContext,
 ) -> Result<(), ExecutionError> {
     let input_objects = object_data
@@ -192,13 +194,7 @@ fn execute_internal<
         },
         (change_set, events, mut native_context_extensions),
     ) = session
-        .execute_function_bypass_visibility(
-            module_id,
-            function,
-            type_args,
-            args,
-            gas_status.get_move_gas_status(),
-        )
+        .execute_function_bypass_visibility(module_id, function, type_args, args, gas_status)
         .and_then(|ret| Ok((ret, session.finish_with_extensions()?)))?;
     assert_invariant!(return_values.is_empty(), "Return values must be empty");
     let object_runtime: ObjectRuntime = native_context_extensions.remove();
@@ -296,9 +292,8 @@ pub fn publish<
     natives: NativeFunctionTable,
     module_bytes: Vec<Vec<u8>>,
     ctx: &mut TxContext,
-    gas_status: &mut SuiGasStatus,
+    gas_status: &mut GasStatus,
 ) -> Result<(), ExecutionError> {
-    gas_status.charge_publish_package(module_bytes.iter().map(|v| v.len()).sum())?;
     let mut modules = module_bytes
         .iter()
         .map(|b| {
@@ -329,7 +324,7 @@ pub fn store_package_and_init_modules<
     vm: &MoveVM,
     modules: Vec<CompiledModule>,
     ctx: &mut TxContext,
-    gas_status: &mut SuiGasStatus,
+    gas_status: &mut GasStatus,
 ) -> Result<(), ExecutionError> {
     let modules_to_init = modules
         .iter()
@@ -367,7 +362,7 @@ fn init_modules<
     vm: &MoveVM,
     module_ids_to_init: Vec<(ModuleId, usize)>,
     ctx: &mut TxContext,
-    gas_status: &mut SuiGasStatus,
+    gas_status: &mut GasStatus,
 ) -> Result<(), ExecutionError> {
     let init_ident = Identifier::new(INIT_FN_NAME.as_str()).unwrap();
     for (module_id, num_args) in module_ids_to_init {
@@ -413,7 +408,7 @@ pub fn verify_and_link<
     modules: &[CompiledModule],
     package_id: ObjectID,
     natives: NativeFunctionTable,
-    gas_status: &mut SuiGasStatus,
+    gas_status: &mut GasStatus,
 ) -> Result<MoveVM, ExecutionError> {
     // Run the Move bytecode verifier and linker.
     // It is important to do this before running the Sui verifier, since the sui
@@ -435,7 +430,7 @@ pub fn verify_and_link<
         AccountAddress::from(package_id),
         // TODO: publish_module_bundle() currently doesn't charge gas.
         // Do we want to charge there?
-        gas_status.get_move_gas_status(),
+        gas_status,
     )?;
 
     // run the Sui verifier

crates/sui-adapter/src/adapter.rs

@@ -101,7 +101,7 @@ impl FaucetClient for LocalFaucetClient {
     async fn request_sui_coins(&self, request_address: SuiAddress) -> FaucetResponse {
         let receipt = self
             .simple_faucet
-            .send(Uuid::new_v4(), request_address, &[50000; 5])
+            .send(Uuid::new_v4(), request_address, &[100000; 5])
             .await
             .unwrap_or_else(|err| panic!("Failed to get gas tokens with error: {}", err));
 

crates/sui-cluster-test/src/faucet.rs

@@ -502,14 +502,14 @@ fn process_package(
         &modules,
         package_id,
         natives,
-        &mut gas_status,
+        &mut gas_status.create_move_gas_status(),
     )?;
     adapter::store_package_and_init_modules(
         &mut temporary_store,
         &vm,
         modules,
         ctx,
-        &mut gas_status,
+        &mut gas_status.create_move_gas_status(),
     )?;
 
     let (
@@ -574,7 +574,7 @@ pub fn generate_genesis_system_object(
             CallArg::Pure(bcs::to_bytes(&stakes).unwrap()),
             CallArg::Pure(bcs::to_bytes(&gas_prices).unwrap()),
         ],
-        &mut SuiGasStatus::new_unmetered(),
+        &mut SuiGasStatus::new_unmetered().create_move_gas_status(),
         genesis_ctx,
     )?;
 

crates/sui-config/src/genesis.rs

@@ -158,6 +158,12 @@ fn execute_transaction<S: BackingPackageStore + ParentSync>(
                     type_arguments,
                     arguments,
                 }) => {
+                    // Charge gas for this VM execution
+                    if let Err(e) = gas_status.charge_vm_gas() {
+                        result = Err(e);
+                        break;
+                    }
+
                     let module_id = ModuleId::new(package.0.into(), module);
                     adapter::execute(
                         move_vm,
@@ -166,8 +172,29 @@ fn execute_transaction<S: BackingPackageStore + ParentSync>(
                         &function,
                         type_arguments,
                         arguments,
-                        &mut gas_status,
+                        &mut gas_status.create_move_gas_status(),
+                        tx_ctx,
+                    )
+                }
+                SingleTransactionKind::Publish(MoveModulePublish { modules }) => {
+                    // Charge gas for this VM execution
+                    if let Err(e) = gas_status.charge_vm_gas() {
+                        result = Err(e);
+                        break;
+                    }
+                    // Charge gas for this publish
+                    if let Err(e) =
+                        gas_status.charge_publish_package(modules.iter().map(|v| v.len()).sum())
+                    {
+                        result = Err(e);
+                        break;
+                    }
+                    adapter::publish(
+                        temporary_store,
+                        native_functions.clone(),
+                        modules,
                         tx_ctx,
+                        &mut gas_status.create_move_gas_status(),
                     )
                 }
                 SingleTransactionKind::Pay(Pay {
@@ -185,13 +212,6 @@ fn execute_transaction<S: BackingPackageStore + ParentSync>(
                     ).collect();
                     pay(temporary_store, coin_objects, recipients, amounts, tx_ctx)
                 }
-                SingleTransactionKind::Publish(MoveModulePublish { modules }) => adapter::publish(
-                    temporary_store,
-                    native_functions.clone(),
-                    modules,
-                    tx_ctx,
-                    &mut gas_status,
-                ),
                 SingleTransactionKind::ChangeEpoch(ChangeEpoch {
                     epoch,
                     storage_charge,
@@ -212,7 +232,7 @@ fn execute_transaction<S: BackingPackageStore + ParentSync>(
                             CallArg::Pure(bcs::to_bytes(&storage_charge).unwrap()),
                             CallArg::Pure(bcs::to_bytes(&computation_charge).unwrap()),
                         ],
-                        &mut gas_status,
+                        &mut gas_status.create_move_gas_status(),
                         tx_ctx,
                     )
                 }

crates/sui-core/src/execution_engine.rs

@@ -23,7 +23,7 @@ async fn test_batch_transaction_ok() -> anyhow::Result<()> {
     // This batch transaction contains 100 transfers, and 100 Move calls.
     let (sender, sender_key): (_, AccountKeyPair) = get_key_pair();
     let (recipient, _): (_, AccountKeyPair) = get_key_pair();
-    const N: usize = 100;
+    const N: usize = 10;
     const TOTAL: usize = N + 1;
     let all_ids = (0..TOTAL).map(|_| ObjectID::random()).collect::<Vec<_>>();
     let (authority_state, package) = init_state_with_ids_and_object_basics(
@@ -61,7 +61,7 @@ async fn test_batch_transaction_ok() -> anyhow::Result<()> {
             .await?
             .unwrap()
             .compute_object_reference(),
-        100000,
+        1000000,
     );
 
     let tx = to_sender_signed_transaction(data, &sender_key);