change ScriptFunction to EntryFunction

starcoinorg · Sep 29, 2024 · e5d8420 · e5d8420
1 parent 3042818
commit e5d8420
Show file tree

Hide file tree

Showing 47 changed files with 225 additions and 270 deletions.
diff --git a/abi/decoder/src/lib.rs b/abi/decoder/src/lib.rs
@@ -13,7 +13,7 @@ use starcoin_vm_types::account_address::AccountAddress;
 use starcoin_vm_types::identifier::Identifier;
 use starcoin_vm_types::language_storage::{ModuleId, TypeTag};
 use starcoin_vm_types::state_store::StateView;
-use starcoin_vm_types::transaction::{Module, Package, Script, ScriptFunction, TransactionPayload};
+use starcoin_vm_types::transaction::{EntryFunction, Module, Package, Script, TransactionPayload};
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum DecodedTransactionPayload {
     /// A transaction that executes code.
@@ -123,7 +123,7 @@ pub fn decode_txn_payload(
     match payload {
         TransactionPayload::Script(s) => decode_script(state, s).map(Into::into),
         TransactionPayload::Package(pkg) => decode_package(state, pkg).map(Into::into),
-        TransactionPayload::ScriptFunction(sf) => decode_script_function(state, sf).map(Into::into),
+        TransactionPayload::EntryFunction(sf) => decode_script_function(state, sf).map(Into::into),
     }
 }
 
@@ -190,15 +190,15 @@ pub fn decode_package(state: &dyn StateView, pkg: &Package) -> Result<DecodedPac
 }
 pub fn decode_script_function(
     state: &dyn StateView,
-    sf: &ScriptFunction,
+    sf: &EntryFunction,
 ) -> Result<DecodedScriptFunction> {
     let resolver = ABIResolver::new(state);
     decode_script_function_inner(&resolver, sf)
 }
 
 fn decode_script_function_inner(
     resolver: &ABIResolver,
-    sf: &ScriptFunction,
+    sf: &EntryFunction,
 ) -> Result<DecodedScriptFunction> {
     let func_abi =
         resolver.resolve_function_instantiation(sf.module(), sf.function(), sf.ty_args())?;

diff --git a/chain/force-upgrade/src/lib.rs b/chain/force-upgrade/src/lib.rs
@@ -10,7 +10,7 @@ use starcoin_types::{
     transaction::SignedUserTransaction,
 };
 use starcoin_vm_types::account_config::core_code_address;
-use starcoin_vm_types::transaction::ScriptFunction;
+use starcoin_vm_types::transaction::EntryFunction;
 use starcoin_vm_types::{
     account_config::STC_TOKEN_CODE_STR,
     genesis_config::ChainId,
@@ -37,7 +37,7 @@ impl ForceUpgrade {
             })
             .ok_or_else(|| format_err!("Can not find upgrade package {}", package_file))?;
 
-        let init_script = ScriptFunction::new(
+        let init_script = EntryFunction::new(
             ModuleId::new(
                 core_code_address(),
                 Identifier::new("StdlibUpgradeScripts").unwrap(),

diff --git a/chain/tests/block_test_utils.rs b/chain/tests/block_test_utils.rs
@@ -86,7 +86,7 @@ fn gen_header(
 }
 
 fn gen_script_payload() -> TransactionPayload {
-    TransactionPayload::ScriptFunction(build_empty_script())
+    TransactionPayload::EntryFunction(build_empty_script())
 }
 
 fn txn_transfer(

diff --git a/cmd/airdrop/src/main.rs b/cmd/airdrop/src/main.rs
@@ -18,7 +18,7 @@ use starcoin_types::genesis_config::ChainId;
 use starcoin_types::identifier::Identifier;
 use starcoin_types::language_storage::ModuleId;
 use starcoin_types::transaction::authenticator::AccountPrivateKey;
-use starcoin_types::transaction::{RawUserTransaction, ScriptFunction};
+use starcoin_types::transaction::{EntryFunction, RawUserTransaction};
 use starcoin_vm_types::account_config::auto_accept_token::AutoAcceptToken;
 use starcoin_vm_types::account_config::{stc_type_tag, BalanceResource, G_STC_TOKEN_CODE};
 use starcoin_vm_types::language_storage::{StructTag, TypeTag};
@@ -242,7 +242,7 @@ async fn main() -> Result<()> {
                 .collect(),
         );
 
-        let script_function = ScriptFunction::new(
+        let script_function = EntryFunction::new(
             ModuleId::new(
                 genesis_address(),
                 Identifier::new("TransferScripts").unwrap(),

diff --git a/cmd/db-exporter/src/main.rs b/cmd/db-exporter/src/main.rs
@@ -58,7 +58,7 @@ use starcoin_vm_types::{
     identifier::Identifier,
     language_storage::{ModuleId, StructTag},
     parser::parse_struct_tag,
-    transaction::{ScriptFunction, SignedUserTransaction, TransactionPayload},
+    transaction::{EntryFunction, SignedUserTransaction, TransactionPayload},
 };
 use std::{
     collections::{HashMap, HashSet},
@@ -1083,7 +1083,7 @@ pub fn create_account_txn_sent_as_association(
     ];
 
     create_signed_txn_with_association_account(
-        TransactionPayload::ScriptFunction(ScriptFunction::new(
+        TransactionPayload::EntryFunction(EntryFunction::new(
             ModuleId::new(
                 starcoin_vm_types::account_config::core_code_address(),
                 Identifier::new("Account").unwrap(),

diff --git a/cmd/db-exporter/src/verify_module.rs b/cmd/db-exporter/src/verify_module.rs
@@ -69,7 +69,7 @@ impl BatchCmdExec<VerifyModulesType, Self, VerifyModuleError> for Block {
                 TransactionPayload::Script(_) => {
                     //TODO
                 }
-                TransactionPayload::ScriptFunction(_) => {
+                TransactionPayload::EntryFunction(_) => {
                     //continue
                 }
             }

diff --git a/cmd/genesis-nft-miner/src/main.rs b/cmd/genesis-nft-miner/src/main.rs
@@ -13,7 +13,7 @@ use starcoin_types::genesis_config::ChainId;
 use starcoin_types::identifier::Identifier;
 use starcoin_types::language_storage::ModuleId;
 use starcoin_types::transaction::authenticator::AccountPrivateKey;
-use starcoin_types::transaction::{RawUserTransaction, ScriptFunction, SignedUserTransaction};
+use starcoin_types::transaction::{EntryFunction, RawUserTransaction, SignedUserTransaction};
 use starcoin_vm_types::value::MoveValue;
 use std::str::FromStr;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
@@ -96,7 +96,7 @@ async fn main() -> Result<()> {
             .unwrap_or_default()
     };
     let (index, proofs) = get_index_proofs(sender)?;
-    let script_function = ScriptFunction::new(
+    let script_function = EntryFunction::new(
         ModuleId::new(
             genesis_address(),
             Identifier::new("GenesisNFTScripts").unwrap(),

diff --git a/cmd/starcoin/src/account/accept_token_cmd.rs b/cmd/starcoin/src/account/accept_token_cmd.rs
@@ -11,7 +11,7 @@ use starcoin_vm_types::account_config::core_code_address;
 use starcoin_vm_types::identifier::Identifier;
 use starcoin_vm_types::language_storage::{ModuleId, TypeTag};
 use starcoin_vm_types::token::token_code::TokenCode;
-use starcoin_vm_types::transaction::{ScriptFunction, TransactionPayload};
+use starcoin_vm_types::transaction::{EntryFunction, TransactionPayload};
 use std::convert::TryInto;
 
 /// Accept a new token, this operator will call 0x1::Account::accept_token function.
@@ -43,7 +43,7 @@ impl CommandAction for AcceptTokenCommand {
         let opt = ctx.opt();
         ctx.state().build_and_execute_transaction(
             opt.transaction_opts.clone(),
-            TransactionPayload::ScriptFunction(ScriptFunction::new(
+            TransactionPayload::EntryFunction(EntryFunction::new(
                 ModuleId::new(core_code_address(), Identifier::new("Account").unwrap()),
                 Identifier::new("accept_token").unwrap(),
                 vec![TypeTag::Struct(Box::new(

diff --git a/cmd/starcoin/src/account/execute_script_function_cmd.rs b/cmd/starcoin/src/account/execute_script_function_cmd.rs
@@ -9,7 +9,7 @@ use clap::Parser;
 use scmd::{CommandAction, ExecContext};
 use starcoin_rpc_api::types::FunctionIdView;
 use starcoin_types::transaction::{parse_transaction_argument_advance, TransactionArgument};
-use starcoin_vm_types::transaction::{ScriptFunction, TransactionPayload};
+use starcoin_vm_types::transaction::{EntryFunction, TransactionPayload};
 use starcoin_vm_types::transaction_argument::convert_txn_args;
 use starcoin_vm_types::{language_storage::TypeTag, parser::parse_type_tag};
 
@@ -56,7 +56,7 @@ impl CommandAction for ExecuteScriptFunctionCmd {
         let script_function = opt.script_function.clone().0;
         ctx.state().build_and_execute_transaction(
             opt.transaction_opts.clone(),
-            TransactionPayload::ScriptFunction(ScriptFunction::new(
+            TransactionPayload::EntryFunction(EntryFunction::new(
                 script_function.module,
                 script_function.function,
                 type_tags,

diff --git a/cmd/starcoin/src/account/nft_cmd.rs b/cmd/starcoin/src/account/nft_cmd.rs
@@ -158,7 +158,7 @@ impl CommandAction for NFTCommand {
                 println!("{:?}", script_function);
                 let result = ctx.state().build_and_execute_transaction(
                     transaction_opts.clone(),
-                    TransactionPayload::ScriptFunction(script_function),
+                    TransactionPayload::EntryFunction(script_function),
                 );
                 println!("{:?}", result);
                 NFTResult::Transfer(result?)

diff --git a/cmd/starcoin/src/account/rotate_auth_key_cmd.rs b/cmd/starcoin/src/account/rotate_auth_key_cmd.rs
@@ -15,7 +15,7 @@ use starcoin_types::language_storage::ModuleId;
 use starcoin_vm_types::account_address::AccountAddress;
 use starcoin_vm_types::account_config::core_code_address;
 use starcoin_vm_types::transaction::authenticator::{AccountPrivateKey, AccountPublicKey};
-use starcoin_vm_types::transaction::{ScriptFunction, TransactionArgument, TransactionPayload};
+use starcoin_vm_types::transaction::{EntryFunction, TransactionArgument, TransactionPayload};
 use starcoin_vm_types::value::MoveValue;
 
 use crate::cli_state::CliState;
@@ -95,7 +95,7 @@ impl CommandAction for RotateAuthenticationKeyCommand {
         txn_opt.sender = Option::from(opt.account_address);
         let result = ctx.state().build_and_execute_transaction(
             txn_opt,
-            TransactionPayload::ScriptFunction(ScriptFunction::new(
+            TransactionPayload::EntryFunction(EntryFunction::new(
                 ModuleId::new(core_code_address(), Identifier::new("Account").unwrap()),
                 Identifier::new("rotate_authentication_key").unwrap(),
                 vec![],

diff --git a/cmd/starcoin/src/account/sign_multisig_txn_cmd.rs b/cmd/starcoin/src/account/sign_multisig_txn_cmd.rs
@@ -18,7 +18,7 @@ use starcoin_types::transaction::{
 };
 use starcoin_vm_types::account_address::AccountAddress;
 use starcoin_vm_types::token::stc::STC_TOKEN_CODE_STR;
-use starcoin_vm_types::transaction::{ScriptFunction, TransactionPayload};
+use starcoin_vm_types::transaction::{EntryFunction, TransactionPayload};
 use starcoin_vm_types::transaction_argument::convert_txn_args;
 use starcoin_vm_types::{language_storage::TypeTag, parser::parse_type_tag};
 
@@ -111,13 +111,13 @@ impl CommandAction for GenerateMultisigTxnCommand {
         let (raw_txn, existing_signatures) =
             if let Some(function_id) = opt.script_function.clone().map(|t| t.0) {
                 let sender = ctx.opt().sender.expect("sender address should be provided");
-                let script_function = ScriptFunction::new(
+                let script_function = EntryFunction::new(
                     function_id.module,
                     function_id.function,
                     type_tags,
                     convert_txn_args(&args),
                 );
-                let payload = TransactionPayload::ScriptFunction(script_function);
+                let payload = TransactionPayload::EntryFunction(script_function);
 
                 let node_info = rpc_client.node_info()?;
                 let chain_state_reader = rpc_client.state_reader(StateRootOption::Latest)?;

diff --git a/cmd/starcoin/src/account/transfer_cmd.rs b/cmd/starcoin/src/account/transfer_cmd.rs
@@ -64,7 +64,7 @@ impl CommandAction for TransferCommand {
             encode_transfer_script_by_token_code(receiver_address, opt.amount, token_code);
         ctx.state().build_and_execute_transaction(
             opt.transaction_opts.clone(),
-            TransactionPayload::ScriptFunction(script_function),
+            TransactionPayload::EntryFunction(script_function),
         )
     }
 }
diff --git a/cmd/starcoin/src/dev/gen_block_cmd.rs b/cmd/starcoin/src/dev/gen_block_cmd.rs
@@ -37,6 +37,6 @@ impl CommandAction for GenBlockCommand {
             ..Default::default()
         };
         ctx.state()
-            .build_and_execute_transaction(txn_opts, TransactionPayload::ScriptFunction(empty))
+            .build_and_execute_transaction(txn_opts, TransactionPayload::EntryFunction(empty))
     }
 }
diff --git a/cmd/starcoin/src/dev/get_coin_cmd.rs b/cmd/starcoin/src/dev/get_coin_cmd.rs
@@ -70,7 +70,7 @@ impl CommandAction for GetCoinCommand {
             state
                 .build_and_execute_transaction(
                     txn_opt,
-                    TransactionPayload::ScriptFunction(encode_transfer_script_by_token_code(
+                    TransactionPayload::EntryFunction(encode_transfer_script_by_token_code(
                         to,
                         opt.amount.scaling(),
                         G_STC_TOKEN_CODE.clone(),

diff --git a/cmd/starcoin/src/dev/package_cmd.rs b/cmd/starcoin/src/dev/package_cmd.rs
@@ -13,7 +13,7 @@ use starcoin_move_compiler::dependency_order::sort_by_dependency_order;
 use starcoin_rpc_api::types::FunctionIdView;
 use starcoin_types::transaction::{parse_transaction_argument_advance, TransactionArgument};
 use starcoin_vm_types::file_format::CompiledModule;
-use starcoin_vm_types::transaction::ScriptFunction;
+use starcoin_vm_types::transaction::EntryFunction;
 use starcoin_vm_types::transaction::{Module, Package};
 use starcoin_vm_types::transaction_argument::convert_txn_args;
 use starcoin_vm_types::{language_storage::TypeTag, parser::parse_type_tag};
@@ -113,7 +113,7 @@ impl CommandAction for PackageCmd {
                 let type_tags = opt.type_tags.clone().unwrap_or_default();
                 let args = opt.args.clone().unwrap_or_default();
                 let script_function = script.clone().0;
-                Some(ScriptFunction::new(
+                Some(EntryFunction::new(
                     script_function.module,
                     script_function.function,
                     type_tags,

diff --git a/cmd/starcoin/src/dev/upgrade_module_plan_cmd.rs b/cmd/starcoin/src/dev/upgrade_module_plan_cmd.rs
@@ -64,7 +64,7 @@ impl CommandAction for UpgradeModulePlanCommand {
             build_module_upgrade_plan(proposer_address, opt.proposal_id, opt.dao_token.clone());
         ctx.state().build_and_execute_transaction(
             opt.transaction_opts.clone(),
-            TransactionPayload::ScriptFunction(module_upgrade_plan),
+            TransactionPayload::EntryFunction(module_upgrade_plan),
         )
     }
 }
diff --git a/cmd/starcoin/src/dev/upgrade_module_proposal_cmd.rs b/cmd/starcoin/src/dev/upgrade_module_proposal_cmd.rs
@@ -99,7 +99,7 @@ impl CommandAction for UpgradeModuleProposalCommand {
         eprintln!("package_hash {:?}", package_hash);
         ctx.state().build_and_execute_transaction(
             opt.transaction_opts.clone(),
-            TransactionPayload::ScriptFunction(module_upgrade_proposal),
+            TransactionPayload::EntryFunction(module_upgrade_proposal),
         )
     }
 }
diff --git a/cmd/starcoin/src/dev/upgrade_module_queue_cmd.rs b/cmd/starcoin/src/dev/upgrade_module_queue_cmd.rs
@@ -79,7 +79,7 @@ impl CommandAction for UpgradeModuleQueueCommand {
         );
         ctx.state().build_and_execute_transaction(
             opt.transaction_opts.clone(),
-            TransactionPayload::ScriptFunction(module_upgrade_queue),
+            TransactionPayload::EntryFunction(module_upgrade_queue),
         )
     }
 }
diff --git a/cmd/starcoin/src/dev/upgrade_vm_config_proposal_cmd.rs b/cmd/starcoin/src/dev/upgrade_vm_config_proposal_cmd.rs
@@ -65,7 +65,7 @@ impl CommandAction for UpgradeVMConfigProposalCommand {
             build_vm_config_upgrade_proposal(genesis_config.vm_config, min_action_delay);
         ctx.state().build_and_execute_transaction(
             opt.transaction_opts.clone(),
-            TransactionPayload::ScriptFunction(vm_config_upgrade_proposal),
+            TransactionPayload::EntryFunction(vm_config_upgrade_proposal),
         )
     }
 }
diff --git a/contrib-contracts/src/merkle_distributor_test.rs b/contrib-contracts/src/merkle_distributor_test.rs
@@ -7,7 +7,7 @@ use starcoin_types::identifier::Identifier;
 use starcoin_types::language_storage::ModuleId;
 use starcoin_vm_types::account_config::association_address;
 use starcoin_vm_types::token::stc::stc_type_tag;
-use starcoin_vm_types::transaction::{Package, ScriptFunction, TransactionPayload};
+use starcoin_vm_types::transaction::{EntryFunction, Package, TransactionPayload};
 use starcoin_vm_types::value::MoveValue;
 use test_helper::executor::{
     association_execute, association_execute_should_success, compile_modules_with_address,
@@ -54,7 +54,7 @@ fn test_merkle_distributor() -> Result<()> {
         let rewards_total = MoveValue::U128(proofs.iter().map(|p| p.amount).sum());
         let leaves = MoveValue::U64(proofs.len() as u64);
 
-        let script_function = ScriptFunction::new(
+        let script_function = EntryFunction::new(
             ModuleId::new(
                 association_address(),
                 Identifier::new("MerkleDistributorScripts").unwrap(),
@@ -71,7 +71,7 @@ fn test_merkle_distributor() -> Result<()> {
         association_execute_should_success(
             &net,
             &chain_state,
-            TransactionPayload::ScriptFunction(script_function),
+            TransactionPayload::EntryFunction(script_function),
         )?;
     }
 
@@ -117,7 +117,7 @@ fn test_merkle_distributor() -> Result<()> {
                 .map(MoveValue::vector_u8)
                 .collect(),
         );
-        let script_function = ScriptFunction::new(
+        let script_function = EntryFunction::new(
             ModuleId::new(
                 association_address(),
                 Identifier::new("MerkleDistributorScripts").unwrap(),
@@ -136,7 +136,7 @@ fn test_merkle_distributor() -> Result<()> {
         let result = association_execute(
             &net,
             &chain_state,
-            TransactionPayload::ScriptFunction(script_function),
+            TransactionPayload::EntryFunction(script_function),
         )?;
         let status = result.status().status().unwrap();
         // INVALID_PROOF
@@ -162,7 +162,7 @@ fn test_merkle_distributor() -> Result<()> {
                 .map(MoveValue::vector_u8)
                 .collect(),
         );
-        let script_function = ScriptFunction::new(
+        let script_function = EntryFunction::new(
             ModuleId::new(
                 association_address(),
                 Identifier::new("MerkleDistributorScripts").unwrap(),
@@ -180,7 +180,7 @@ fn test_merkle_distributor() -> Result<()> {
         association_execute_should_success(
             &net,
             &chain_state,
-            TransactionPayload::ScriptFunction(script_function),
+            TransactionPayload::EntryFunction(script_function),
         )?;
     }
 

diff --git a/contrib-contracts/src/starcoin_merkle_test.rs b/contrib-contracts/src/starcoin_merkle_test.rs
@@ -7,7 +7,7 @@ use starcoin_types::identifier::Identifier;
 use starcoin_types::language_storage::ModuleId;
 use starcoin_vm_types::access_path::AccessPath;
 use starcoin_vm_types::account_config::association_address;
-use starcoin_vm_types::transaction::{Package, ScriptFunction, TransactionPayload};
+use starcoin_vm_types::transaction::{EntryFunction, Package, TransactionPayload};
 use starcoin_vm_types::value::MoveValue;
 use test_helper::executor::{
     association_execute_should_success, compile_modules_with_address, prepare_genesis,
@@ -40,7 +40,7 @@ fn test_starcoin_merkle() -> Result<()> {
     let state_root = chain_state.state_root();
 
     {
-        let script_function = ScriptFunction::new(
+        let script_function = EntryFunction::new(
             ModuleId::new(
                 association_address(),
                 Identifier::new("StarcoinVerifierScripts").unwrap(),
@@ -54,7 +54,7 @@ fn test_starcoin_merkle() -> Result<()> {
         association_execute_should_success(
             &net,
             &chain_state,
-            TransactionPayload::ScriptFunction(script_function),
+            TransactionPayload::EntryFunction(script_function),
         )?;
         chain_state.commit()?;
         chain_state.flush()?;