Merge branch 'nkysg/compiler-v2-update' into bob/compiler-v2-framewor…

…k-18

cmd/merkle-generator/README.md

@@ -36,15 +36,15 @@ The generated json file should be same as `examples/merkle-exmaple.json`.
 2. Then create a distribution onchain.
 
 ``` move
-public(script) fun create<T: store>(signer: signer, merkle_root: vector<u8>, token_amounts: u128, leafs: u64);
+public entry fun create<T: store>(signer: signer, merkle_root: vector<u8>, token_amounts: u128, leafs: u64);
 ```
 
 3. User claim
 
 ``` move
 // claim from myslef.
-public(script) fun claim<T: store>(signer: signer, distribution_address: address, index: u64, amount: u128, merkle_proof: vector<vector<u8>>);
+public entry fun claim<T: store>(signer: signer, distribution_address: address, index: u64, amount: u128, merkle_proof: vector<vector<u8>>);
 
 // claim for someone else.
-public(script) fun claim_for_address<T: store>(distribution_address: address, index: u64, account: address, amount: u128, merkle_proof: vector<vector<u8>>);
+public entry fun claim_for_address<T: store>(distribution_address: address, index: u64, account: address, amount: u128, merkle_proof: vector<vector<u8>>);
 ```

cmd/starcoin/src/state/get_cmd.rs

@@ -21,7 +21,7 @@ use starcoin_vm_types::language_storage::{ModuleId, StructTag};
 #[clap(name = "get")]
 pub enum GetOpt {
     Code {
-        #[clap(help = "module id like: 0x1::Account")]
+        #[clap(help = "module id like: 0x1::account")]
         module_id: StrView<ModuleId>,
         #[clap(long, short = 'n')]
         /// Get state at a special block height.
@@ -30,7 +30,7 @@ pub enum GetOpt {
     Resource {
         #[clap(help = "account address")]
         address: AccountAddress,
-        #[clap(help = "resource struct tag,", default_value = "0x1::Account::Account")]
+        #[clap(help = "resource struct tag,", default_value = "0x1::account::Account")]
         resource_type: StrView<StructTag>,
         #[clap(long, short = 'n')]
         /// Get state at a special block height.

contrib-contracts/Cargo.toml

@@ -17,6 +17,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 stdlib = { workspace = true }
 stest = { workspace = true }
+starcoin-move-stdlib = { workspace = true }
 tempfile = { workspace = true }
 
 [package]

contrib-contracts/modules/EthStateVerifier.move

@@ -1,6 +1,6 @@
 address StarcoinAssociation {
 module Bytes {
-    use StarcoinFramework::Vector;
+    use std::vector;
 
     public fun slice(data: &vector<u8>, start: u64, end: u64): vector<u8> {
         let i = start;
@@ -19,7 +19,7 @@ module Bytes {
     }
 }
 module RLP {
-    use StarcoinFramework::Vector;
+    use std::vector;
     use StarcoinAssociation::Bytes;
     const INVALID_RLP_DATA: u64 = 100;
     const DATA_TOO_SHORT: u64 = 101;
@@ -91,8 +91,8 @@ module RLP {
 }
 module EthStateVerifier {
     use StarcoinAssociation::RLP;
-    use StarcoinFramework::Vector;
-    use StarcoinFramework::Hash;
+    use std::vector;
+    use starcoin_std::starcoin_hash;
     use StarcoinAssociation::Bytes;
 
     const INVALID_PROOF: u64 = 400;
@@ -132,7 +132,7 @@ module EthStateVerifier {
         let dec = RLP::decode_list(node);
         // trie root is always a hash
         if (key_index == 0 || vector::length(node) >= 32u64) {
-            if (Hash::keccak_256(*node) != expected_root) {
+            if (starcoin_hash::keccak256(*node) != expected_root) {
                 return false
             }
         } else {
@@ -210,7 +210,7 @@ module EthStateVerifier {
         proof: vector<vector<u8>>,
         expected_value: vector<u8>,
     ): bool {
-        let hashed_key = Hash::keccak_256(key);
+        let hashed_key = starcoin_hash::keccak256(key);
         let key = to_nibbles(&hashed_key);
         return verify_inner(expected_root, key, proof, expected_value, 0, 0)
     }

contrib-contracts/modules/StarcoinVerifier.move

@@ -1,15 +1,15 @@
 address StarcoinAssociation {
     module StarcoinVerifierScripts {
         use StarcoinAssociation::StarcoinVerifier;
-        public(script) fun create(signer: signer, merkle_root: vector<u8>) {
+        public entry fun create(signer: signer, merkle_root: vector<u8>) {
             StarcoinVerifier::create(&signer, merkle_root);
         }
     }
     module StarcoinVerifier {
-        use StarcoinFramework::Vector;
+        use std::vector;
         use StarcoinAssociation::Bit;
         use StarcoinAssociation::StructuredHash;
-        use StarcoinFramework::Hash;
+        use std::hash;
 
         struct StarcoinMerkle has key {
             merkle_root: vector<u8>,
@@ -38,7 +38,7 @@ address StarcoinAssociation {
         }
 
         public fun verify(expected_root: vector<u8>, account_address: vector<u8>, account_state_root_hash: vector<u8>, proofs: vector<vector<u8>>): bool {
-            let address_hash = Hash::sha3_256(account_address);
+            let address_hash = hash::sha3_256(account_address);
             let leaf_node = Node { hash1: copy address_hash, hash2: account_state_root_hash};
             let current_hash = StructuredHash::hash(SPARSE_MERKLE_LEAF_NODE, &leaf_node);
             let i = 0;
@@ -59,14 +59,14 @@ address StarcoinAssociation {
     }
 
     module StructuredHash {
-        use StarcoinFramework::Hash;
-        use StarcoinFramework::Vector;
-        use StarcoinFramework::BCS;
+        use std::hash;
+        use std::vector;
+        use std::bcs;
         const STARCOIN_HASH_PREFIX: vector<u8> = b"STARCOIN::";
         public fun hash<MoveValue: store>(structure: vector<u8>, data: &MoveValue): vector<u8> {
-            let prefix_hash = Hash::sha3_256(concat(&STARCOIN_HASH_PREFIX, structure));
-            let bcs_bytes = BCS::to_bytes(data);
-            Hash::sha3_256(concat(&prefix_hash, bcs_bytes))
+            let prefix_hash = hash::sha3_256(concat(&STARCOIN_HASH_PREFIX, structure));
+            let bcs_bytes = bcs::to_bytes(data);
+            hash::sha3_256(concat(&prefix_hash, bcs_bytes))
         }
 
         fun concat(v1: &vector<u8>, v2: vector<u8>): vector<u8> {
@@ -77,7 +77,7 @@ address StarcoinAssociation {
 
     }
     module Bit {
-        use StarcoinFramework::Vector;
+        use std::vector;
         public fun get_bit(data: &vector<u8>, index: u64): bool {
             let pos = index / 8;
             let bit = (7 - index % 8);

contrib-contracts/src/eth_state_verifier_test/mod.rs

@@ -11,7 +11,7 @@ use starcoin_types::transaction::TransactionPayload;
 use starcoin_vm_types::transaction::Package;
 use starcoin_vm_types::value::MoveValue;
 use test_helper::executor::{
-    association_execute_should_success, compile_modules_with_address, prepare_genesis,
+    association_execute_should_success, compile_modules_with_address_ext, prepare_genesis,
 };
 
 /// Basic account type.
@@ -66,7 +66,10 @@ fn test_eth_state_proof_verify() -> Result<()> {
     // deploy the module
     {
         let source = include_str!("../../modules/EthStateVerifier.move");
-        let modules = compile_modules_with_address(association_address(), source);
+        let mut dep_libs = starcoin_move_stdlib::move_stdlib_files();
+        let starcoin_stdlib_files = starcoin_move_stdlib::starcoin_stdlib_files();
+        dep_libs.extend(starcoin_stdlib_files);
+        let modules = compile_modules_with_address_ext(association_address(), source, &dep_libs);
 
         let package = Package::new(modules, None)?;
         association_execute_should_success(

contrib-contracts/src/genesis_nft_test.rs

@@ -15,6 +15,8 @@ struct DataProof {
     proof: Vec<String>,
 }
 
+// XXX FIXME BOB wait nft
+#[ignore]
 #[stest::test]
 fn test_genesis_nft_verify() -> Result<()> {
     assert!(verify_genesis_nft_address(genesis_address())?);

contrib-contracts/src/merkle_distributor_test.rs

@@ -10,7 +10,7 @@ use starcoin_vm_types::token::stc::stc_type_tag;
 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,
+    association_execute, association_execute_should_success, compile_modules_with_address_ext,
     move_abort_code, prepare_genesis,
 };
 
@@ -23,6 +23,8 @@ struct DataProof {
     proof: Vec<String>,
 }
 
+// XXX FIXME YSG next pr
+#[ignore]
 #[stest::test]
 fn test_merkle_distributor() -> Result<()> {
     let association = Account::new_association();
@@ -37,7 +39,10 @@ fn test_merkle_distributor() -> Result<()> {
     // deploy the module
     {
         let source = include_str!("../modules/MerkleDistributor.move");
-        let modules = compile_modules_with_address(association_address(), source);
+        let mut dep_libs = starcoin_move_stdlib::move_stdlib_files();
+        let starcoin_stdlib_files = starcoin_move_stdlib::starcoin_stdlib_files();
+        dep_libs.extend(starcoin_stdlib_files);
+        let modules = compile_modules_with_address_ext(association_address(), source, &dep_libs);
 
         let package = Package::new(modules, None)?;
         association_execute_should_success(

contrib-contracts/src/starcoin_merkle_test.rs

@@ -11,7 +11,7 @@ use starcoin_vm_types::state_store::state_key::StateKey;
 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,
+    association_execute_should_success, compile_modules_with_address_ext, prepare_genesis,
 };
 #[stest::test]
 fn test_starcoin_merkle() -> Result<()> {
@@ -27,7 +27,11 @@ fn test_starcoin_merkle() -> Result<()> {
 
     {
         let source = include_str!("../modules/StarcoinVerifier.move");
-        let modules = compile_modules_with_address(association_address(), source);
+        let modules = compile_modules_with_address_ext(
+            association_address(),
+            source,
+            &starcoin_move_stdlib::move_stdlib_files(),
+        );
 
         let package = Package::new(modules, None)?;
         association_execute_should_success(

scripts/nextest.sh

@@ -23,7 +23,6 @@ cargo nextest -V >/dev/null 2>&1 || cargo install cargo-nextest --version "0.9.5
 # --build-jobs 8, a little (~20s) faster than 5 or 10 build jobs 
 cargo nextest run --workspace \
 --exclude starcoin-transactional-test-harness \
---exclude contrib-contracts \
 --exclude starcoin-consensus \
 --retries 2 --build-jobs 8 --test-threads 12 --no-fail-fast --failure-output immediate-final
 

test-helper/src/executor.rs

@@ -109,9 +109,16 @@ pub fn get_balance<S: ChainStateReader>(address: AccountAddress, chain_state: &S
 }
 
 pub fn compile_modules_with_address(address: AccountAddress, code: &str) -> Vec<Module> {
+    compile_modules_with_address_ext(address, code, &stdlib_files())
+}
+
+pub fn compile_modules_with_address_ext(
+    address: AccountAddress,
+    code: &str,
+    libs: &[String],
+) -> Vec<Module> {
     let (_, compiled_result) =
-        starcoin_move_compiler::compile_source_string(code, &stdlib_files(), address)
-            .expect("compile fail");
+        starcoin_move_compiler::compile_source_string(code, libs, address).expect("compile fail");
 
     compiled_result
         .into_iter()

test-helper/src/txpool.rs

@@ -73,7 +73,7 @@ pub async fn start_txpool_with_miner(
     }
     //registry.register::<MinerService>().await.unwrap();
     let pool_actor = registry.register::<TxPoolActorService>().await.unwrap();
-    Delay::new(Duration::from_millis(300)).await;
+    Delay::new(Duration::from_millis(1000)).await;
     let txpool_service = registry.get_shared::<TxPoolService>().await.unwrap();
 
     (

vm/compiler/Cargo.toml

@@ -11,6 +11,7 @@ starcoin-logger = { workspace = true }
 starcoin-vm-types = { workspace = true }
 tempfile = { workspace = true }
 walkdir = { workspace = true }
+starcoin-framework = { workspace = true }
 
 [dev-dependencies]
 stest = { workspace = true }

vm/compiler/src/lib.rs

@@ -12,7 +12,6 @@ use anyhow::{bail, ensure, Result};
 use move_binary_format::errors::PartialVMResult;
 use move_compiler::compiled_unit::AnnotatedCompiledUnit;
 use move_compiler::diagnostics::{unwrap_or_report_diagnostics, Diagnostics, FilesSourceText};
-use move_compiler::shared::known_attributes::KnownAttribute;
 use move_compiler::shared::{Flags, NumericalAddress};
 use once_cell::sync::Lazy;
 use regex::{Captures, Regex};
@@ -55,6 +54,15 @@ pub fn starcoin_framework_named_addresses() -> BTreeMap<String, NumericalAddress
         ("Genesis", "0x1"),
         ("StarcoinFramework", "0x1"),
         ("StarcoinAssociation", "0xA550C18"),
+        ("vm", "0x0"),
+        ("vm_reserved", "0x0"),
+        ("std", "0x1"),
+        ("starcoin_std", "0x1"),
+        ("starcoin_framework", "0x1"),
+        ("starcoin_fungible_asset", "0x1"),
+        ("starcoin_token", "0x1"),
+        ("starcoin_token_objects", "0x1"),
+        ("core_resources", "0xA550C18"),
     ];
     mapping
         .iter()
@@ -189,13 +197,12 @@ pub fn compile_source_string_no_report(
     for dep in deps {
         windows_line_ending_to_unix_in_file(dep)?;
     }
-    let flags = Flags::empty().set_sources_shadow_deps(true);
     let compiler = move_compiler::Compiler::from_files(
         targets,
         deps.to_vec(),
         starcoin_framework_named_addresses(),
-        flags,
-        KnownAttribute::get_all_attribute_names(),
+        Flags::empty().set_sources_shadow_deps(false),
+        starcoin_framework::extended_checks::get_all_attribute_names(),
     );
     compiler.build()
 }

vm/framework/move-stdlib/Cargo.toml

@@ -11,14 +11,19 @@ publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-starcoin-gas-schedule = { workspace = true }
-starcoin-native-interface = { workspace = true }
+anyhow = { workspace = true }
+include_dir = { workspace = true }
 move-core-types = { workspace = true }
 move-vm-runtime = { workspace = true }
 move-vm-types = { workspace = true }
-sha2 = "0.9.3"
-sha3 = "0.9.1"
-smallvec = "1.6.1"
+once_cell = { workspace = true }
+sha2 = {  workspace = true }
+sha3 = {  workspace = true }
+smallvec = { workspace = true }
+starcoin-gas-schedule = { workspace = true }
+starcoin-logger = { workspace = true }
+starcoin-native-interface = { workspace = true }
+tempfile = { workspace = true }
 
 [dev-dependencies]
 dir-diff = "0.3.2"