From 8d85e680cb0069e2e2acaa6390a07e8b2e7d073d Mon Sep 17 00:00:00 2001 From: jolestar Date: Mon, 8 Apr 2024 13:42:54 +0800 Subject: [PATCH] [framework] Migrate all stdlib and framework to frameworks dir (#1528) --- .github/workflows/check_build_test.yml | 2 +- Cargo.lock | 124 +++++++++--------- Cargo.toml | 16 ++- README.md | 7 +- crates/rooch-genesis-builder/Cargo.toml | 2 +- crates/rooch-genesis-builder/src/lib.rs | 10 +- crates/rooch-genesis/Cargo.toml | 4 +- crates/rooch-genesis/build.rs | 12 +- crates/rooch-genesis/src/lib.rs | 4 +- .../rooch-integration-test-runner/Cargo.toml | 2 +- .../rooch-integration-test-runner/src/lib.rs | 6 +- .../rooch-test-transaction-builder/Cargo.toml | 2 +- .../rooch-test-transaction-builder/src/lib.rs | 2 +- crates/rooch/Cargo.toml | 2 +- .../move_cli/commands/framework_upgrade.rs | 2 +- .../src/commands/move_cli/commands/new.rs | 6 +- .../pages/blog/release-231018.en-US.mdx | 4 +- .../pages/blog/release-231018.zh-CN.mdx | 4 +- .../first-blog-system.en-US.mdx | 6 +- .../first-blog-system.zh-CN.mdx | 6 +- .../create-rooch-move-contract.en-US.mdx | 6 +- .../create-rooch-move-contract.zh-CN.mdx | 6 +- .../cryptographic-primitives/hash.en-US.mdx | 2 +- .../cryptographic-primitives/hash.zh-CN.mdx | 2 +- .../private-generics.en-US.mdx | 8 +- .../private-generics.zh-CN.mdx | 8 +- .../build/rooch-framework/timestamp.en-US.mdx | 2 +- .../build/rooch-framework/timestamp.zh-CN.mdx | 2 +- ...count-abstraction-implementation.en-US.mdx | 4 +- ...count-abstraction-implementation.zh-CN.mdx | 4 +- .../move-contracts/built-in-library.en-US.mdx | 6 +- .../move-contracts/built-in-library.zh-CN.mdx | 6 +- .../move-contracts/move-on-rooch.en-US.mdx | 10 +- .../move-contracts/move-on-rooch.zh-CN.mdx | 10 +- .../core-concepts/objects/object.en-US.mdx | 4 +- .../core-concepts/objects/object.zh-CN.mdx | 4 +- .../objects/storage-abstraction.en-US.mdx | 8 +- .../objects/storage-abstraction.zh-CN.mdx | 8 +- .../pages/learn/in-depth-tech/hash.en-US.mdx | 2 +- .../pages/learn/in-depth-tech/hash.zh-CN.mdx | 2 +- examples/basic_object/Move.toml | 2 +- .../basic_object/sources/basic_object.move | 5 +- .../basic_object/sources/child_object.move | 3 + examples/bitseed_runner/Move.toml | 2 +- examples/blog/Move.toml | 4 +- examples/btc_holder_coin/Move.toml | 4 +- examples/btc_holder_farmer/Move.toml | 6 +- examples/coins/Move.toml | 12 +- examples/complex_struct/Move.toml | 2 +- examples/counter/Move.toml | 2 +- examples/data_struct/Move.toml | 2 +- examples/data_struct/sources/data_struct.move | 3 + examples/display/Move.toml | 6 +- examples/entry_function_arguments/Move.toml | 6 +- .../entry_function_arguments_old/Move.toml | 6 +- examples/event/Move.toml | 2 +- examples/gas_free/Move.toml | 2 +- examples/gas_free/sources/gas_free.move | 3 + examples/kv_store/Move.toml | 2 +- examples/module_init/Move.toml | 2 +- examples/module_template/Move.toml | 12 +- examples/module_template/template/Move.toml | 12 +- examples/nft/Move.toml | 6 +- examples/noop_auth_validator/Move.toml | 6 +- examples/private_generics/Move.toml | 2 +- examples/publish_modules/Move.toml | 6 +- examples/quick_start_counter/Move.toml | 12 +- .../quick_start_counter/sources/counter.move | 5 +- examples/quick_start_object_counter/Move.toml | 12 +- .../sources/counter.move | 5 +- examples/simple_blog/Move.toml | 12 +- examples/steal_split/Move.toml | 2 +- examples/wasm_execution/Move.toml | 2 +- frameworks/bitcoin-move/Cargo.toml | 2 +- frameworks/bitcoin-move/Move.toml | 6 +- frameworks/bitcoin-move/doc/README.md | 6 +- .../bitcoin-move/doc_template/README.md | 6 +- .../sources/data_import_config.move | 5 +- .../framework-builder}/Cargo.toml | 2 +- .../src/dependency_order.rs | 0 .../framework-builder}/src/lib.rs | 0 .../framework-release}/Cargo.toml | 4 +- .../framework-release}/README.md | 4 +- .../framework-release}/src/main.rs | 9 +- .../move-stdlib/Move.toml | 0 .../move-stdlib/README.md | 0 .../move-stdlib/doc/README.md | 4 +- .../move-stdlib/doc/acl.md | 0 .../move-stdlib/doc/ascii.md | 0 .../move-stdlib/doc/bcs.md | 0 .../move-stdlib/doc/bit_vector.md | 0 .../move-stdlib/doc/compare.md | 0 .../move-stdlib/doc/debug.md | 0 .../move-stdlib/doc/error.md | 0 .../move-stdlib/doc/fixed_point32.md | 0 .../move-stdlib/doc/hash.md | 0 .../move-stdlib/doc/option.md | 0 .../move-stdlib/doc/signer.md | 0 .../move-stdlib/doc/string.md | 0 .../move-stdlib/doc/type_name.md | 0 .../move-stdlib/doc/vector.md | 0 .../move-stdlib/doc_template/README.md | 4 +- .../move-stdlib/error_description.errmap | Bin .../move-stdlib/sources/acl.move | 0 .../move-stdlib/sources/acl.spec.move | 0 .../move-stdlib/sources/ascii.move | 0 .../move-stdlib/sources/bcs.move | 0 .../move-stdlib/sources/bit_vector.move | 0 .../move-stdlib/sources/compare.move | 0 .../move-stdlib/sources/debug.move | 0 .../move-stdlib/sources/error.move | 0 .../move-stdlib/sources/fixed_point32.move | 0 .../move-stdlib/sources/hash.move | 0 .../move-stdlib/sources/option.move | 0 .../move-stdlib/sources/signer.move | 0 .../move-stdlib/sources/string.move | 0 .../move-stdlib/sources/string.spec.move | 0 .../move-stdlib/sources/type_name.move | 0 .../move-stdlib/sources/unit_test.move | 0 .../move-stdlib/sources/vector.move | 0 .../moveos-stdlib/Cargo.toml | 2 +- .../moveos-stdlib/Move.toml | 0 .../moveos-stdlib/doc/README.md | 4 +- .../moveos-stdlib/doc/account.md | 0 .../moveos-stdlib/doc/address.md | 0 .../moveos-stdlib/doc/any.md | 0 .../moveos-stdlib/doc/bag.md | 0 .../moveos-stdlib/doc/bcs.md | 0 .../moveos-stdlib/doc/big_vector.md | 0 .../moveos-stdlib/doc/copyable_any.md | 0 .../moveos-stdlib/doc/core_addresses.md | 0 .../moveos-stdlib/doc/display.md | 0 .../moveos-stdlib/doc/event.md | 0 .../moveos-stdlib/doc/genesis.md | 0 .../moveos-stdlib/doc/hex.md | 0 .../moveos-stdlib/doc/json.md | 0 .../moveos-stdlib/doc/move_module.md | 0 .../moveos-stdlib/doc/object.md | 0 .../moveos-stdlib/doc/rlp.md | 0 .../moveos-stdlib/doc/signer.md | 0 .../moveos-stdlib/doc/simple_map.md | 0 .../moveos-stdlib/doc/simple_multimap.md | 0 .../moveos-stdlib/doc/string_utils.md | 0 .../moveos-stdlib/doc/table.md | 0 .../moveos-stdlib/doc/table_vec.md | 0 .../moveos-stdlib/doc/tx_context.md | 0 .../moveos-stdlib/doc/tx_meta.md | 0 .../moveos-stdlib/doc/tx_result.md | 0 .../moveos-stdlib/doc/type_info.md | 0 .../moveos-stdlib/doc/type_table.md | 0 .../moveos-stdlib/doc/wasm.md | 0 .../moveos-stdlib/doc_template/README.md | 4 +- .../moveos-stdlib/error_description.errmap | Bin .../moveos-stdlib/sources/account.move | 0 .../moveos-stdlib/sources/address.move | 0 .../moveos-stdlib/sources/any.move | 0 .../moveos-stdlib/sources/bag.move | 0 .../moveos-stdlib/sources/bcs.move | 0 .../moveos-stdlib/sources/big_vector.move | 0 .../moveos-stdlib/sources/copyable_any.move | 0 .../moveos-stdlib/sources/core_addresses.move | 0 .../moveos-stdlib/sources/display.move | 0 .../moveos-stdlib/sources/event.move | 0 .../moveos-stdlib/sources/genesis.move | 0 .../moveos-stdlib/sources/hex.move | 0 .../moveos-stdlib/sources/json.move | 0 .../moveos-stdlib/sources/move_module.move | 0 .../moveos-stdlib/sources/object.move | 0 .../moveos-stdlib/sources/rlp.move | 0 .../moveos-stdlib/sources/signer.move | 0 .../moveos-stdlib/sources/simple_map.move | 0 .../sources/simple_multimap.move | 0 .../moveos-stdlib/sources/string_utils.move | 0 .../moveos-stdlib/sources/table.move | 0 .../moveos-stdlib/sources/table_vec.move | 0 .../moveos-stdlib/sources/test_helper.move | 0 .../moveos-stdlib/sources/tx_context.move | 0 .../moveos-stdlib/sources/tx_meta.move | 0 .../moveos-stdlib/sources/tx_result.move | 0 .../moveos-stdlib/sources/type_info.move | 0 .../moveos-stdlib/sources/type_info.spec.move | 0 .../moveos-stdlib/sources/type_table.move | 0 .../moveos-stdlib/sources/wasm.move | 3 + .../moveos-stdlib/src/lib.rs | 0 .../moveos-stdlib/src/natives/helpers.rs | 0 .../moveos-stdlib/src/natives/mod.rs | 0 .../src/natives/moveos_stdlib/account.rs | 0 .../src/natives/moveos_stdlib}/bcs.rs | 0 .../src/natives/moveos_stdlib/event.rs | 0 .../src/natives/moveos_stdlib/json.rs | 0 .../src/natives/moveos_stdlib/mod.rs | 0 .../src/natives/moveos_stdlib/move_module.rs | 2 +- .../src/natives/moveos_stdlib/object.rs | 0 .../natives/moveos_stdlib/raw_table/mod.rs | 0 .../src/natives/moveos_stdlib/rlp.rs | 0 .../src/natives/moveos_stdlib/signer.rs | 0 .../src/natives/moveos_stdlib/test_helper.rs | 0 .../src/natives/moveos_stdlib/tx_context.rs | 0 .../src/natives/moveos_stdlib/type_info.rs | 0 .../src/natives/moveos_stdlib/wasm.rs | 0 .../moveos-stdlib/tests/bag_tests.move | 0 .../moveos-stdlib/tests/rlp_tests.move | 0 .../rooch-framework/Cargo.toml | 2 +- .../rooch-framework/Move.toml | 4 +- .../rooch-framework/doc/README.md | 4 +- .../rooch-framework/doc/account.md | 0 .../doc/account_authentication.md | 0 .../rooch-framework/doc/account_coin_store.md | 0 .../rooch-framework/doc/address_mapping.md | 0 .../rooch-framework/doc/auth_payload.md | 0 .../rooch-framework/doc/auth_validator.md | 0 .../doc/auth_validator_registry.md | 0 .../rooch-framework/doc/bitcoin_address.md | 0 .../rooch-framework/doc/bitcoin_validator.md | 0 .../rooch-framework/doc/builtin_validators.md | 0 .../rooch-framework/doc/chain_id.md | 0 .../rooch-framework/doc/coin.md | 0 .../rooch-framework/doc/coin_store.md | 0 .../rooch-framework/doc/core_addresses.md | 0 .../rooch-framework/doc/decoding.md | 0 .../rooch-framework/doc/ecdsa_k1.md | 0 .../rooch-framework/doc/ed25519.md | 0 .../rooch-framework/doc/empty.md | 0 .../rooch-framework/doc/encoding.md | 0 .../rooch-framework/doc/ethereum_address.md | 0 .../doc/ethereum_light_client.md | 0 .../rooch-framework/doc/ethereum_validator.md | 0 .../rooch-framework/doc/gas_coin.md | 0 .../rooch-framework/doc/genesis.md | 0 .../rooch-framework/doc/hash.md | 0 .../rooch-framework/doc/multichain_address.md | 0 .../rooch-framework/doc/native_validator.md | 0 .../rooch-framework/doc/onchain_config.md | 0 .../rooch-framework/doc/session_key.md | 0 .../rooch-framework/doc/timestamp.md | 0 .../rooch-framework/doc/transaction_fee.md | 0 .../doc/transaction_validator.md | 0 .../rooch-framework/doc/transfer.md | 0 .../rooch-framework/doc/upgrade.md | 0 .../rooch-framework/doc_template/README.md | 4 +- .../rooch-framework/sources/account.move | 0 .../sources/account_authentication.move | 0 .../sources/account_coin_store.move | 0 .../sources/address_mapping.move | 0 .../sources/address_type/bitcoin_address.move | 0 .../address_type/ethereum_address.move | 0 .../address_type/multichain_address.move | 0 .../sources/auth_validator/auth_payload.move | 0 .../auth_validator/auth_validator.move | 0 .../auth_validator_registry.move | 0 .../auth_validator/bitcoin_validator.move | 0 .../auth_validator/builtin_validators.move | 0 .../auth_validator/ethereum_validator.move | 0 .../auth_validator/native_validator.move | 0 .../rooch-framework/sources/chain_id.move | 0 .../rooch-framework/sources/coin.move | 0 .../rooch-framework/sources/coin_store.move | 0 .../sources/core_addresses.move | 0 .../sources/crypto/decoding.move | 0 .../sources/crypto/ecdsa_k1.move | 0 .../sources/crypto/ed25519.move | 0 .../sources/crypto/encoding.move | 0 .../rooch-framework/sources/crypto/hash.move | 0 .../rooch-framework/sources/empty.move | 0 .../sources/ethereum_light_client.move | 0 .../rooch-framework/sources/gas_coin.move | 0 .../rooch-framework/sources/genesis.move | 0 .../sources/onchain_config.move | 0 .../rooch-framework/sources/session_key.move | 0 .../tests/account_authentication_test.move | 0 .../tests/account_coin_store_test.move | 5 +- .../sources/tests/address_maping_test.move | 0 .../sources/tests/chain_id_test.move | 0 .../sources/tests/coin_store_test.move | 5 +- .../sources/tests/coin_test.move | 0 .../sources/tests/gas_coin_test.move | 0 .../sources/tests/session_key_test.move | 0 .../sources/tests/transfer_test.move | 0 .../rooch-framework/sources/timestamp.move | 0 .../sources/transaction_fee.move | 0 .../sources/transaction_validator.move | 0 .../rooch-framework/sources/transfer.move | 0 .../rooch-framework/sources/upgrade.move | 0 .../rooch-framework/src/lib.rs | 0 .../src/natives/gas_parameter/account.rs | 0 .../src/natives/gas_parameter/bcd.rs | 0 .../src/natives/gas_parameter/decoding.rs | 0 .../src/natives/gas_parameter/ecdsa_k1.rs | 0 .../src/natives/gas_parameter/ed25519.rs | 0 .../src/natives/gas_parameter/encoding.rs | 0 .../src/natives/gas_parameter/events.rs | 0 .../src/natives/gas_parameter/gas_member.rs | 0 .../src/natives/gas_parameter/hash.rs | 0 .../src/natives/gas_parameter/json.rs | 0 .../src/natives/gas_parameter/mod.rs | 0 .../src/natives/gas_parameter/move_module.rs | 0 .../src/natives/gas_parameter/move_std.rs | 0 .../src/natives/gas_parameter/native.rs | 0 .../src/natives/gas_parameter/nursery.rs | 0 .../src/natives/gas_parameter/object.rs | 0 .../src/natives/gas_parameter/ord.rs | 0 .../src/natives/gas_parameter/rlp.rs | 0 .../src/natives/gas_parameter/signer.rs | 0 .../src/natives/gas_parameter/test_helper.rs | 0 .../src/natives/gas_parameter/tx_context.rs | 0 .../src/natives/gas_parameter/type_info.rs | 0 .../src/natives/gas_parameter/wasm.rs | 0 .../rooch-framework/src/natives/mod.rs | 0 .../src/natives/rooch_framework}/bcs.rs | 0 .../rooch_framework/crypto/decoding.rs | 0 .../rooch_framework/crypto/ecdsa_k1.rs | 0 .../natives/rooch_framework/crypto/ed25519.rs | 0 .../rooch_framework/crypto/encoding.rs | 0 .../natives/rooch_framework/crypto/hash.rs | 0 .../src/natives/rooch_framework/crypto/mod.rs | 0 .../src/natives/rooch_framework/mod.rs | 0 .../rooch-framework/tests/timestamp_test.move | 5 +- lychee.toml | 10 +- moveos/moveos/Cargo.toml | 2 +- moveos/moveos/src/vm/mod.rs | 2 +- scripts/check_move_constant_errors.sh | 7 +- scripts/pr.sh | 4 +- scripts/update_license.sh | 5 +- .../rooch-create/scripts/copy-templates.sh | 4 + 324 files changed, 333 insertions(+), 294 deletions(-) rename {moveos/moveos-stdlib-builder => frameworks/framework-builder}/Cargo.toml (98%) rename {moveos/moveos-stdlib-builder => frameworks/framework-builder}/src/dependency_order.rs (100%) rename {moveos/moveos-stdlib-builder => frameworks/framework-builder}/src/lib.rs (100%) rename {crates/rooch-framework-release => frameworks/framework-release}/Cargo.toml (90%) rename {crates/rooch-framework-release => frameworks/framework-release}/README.md (81%) rename {crates/rooch-framework-release => frameworks/framework-release}/src/main.rs (96%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/Move.toml (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/README.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/README.md (92%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/acl.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/ascii.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/bcs.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/bit_vector.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/compare.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/debug.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/error.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/fixed_point32.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/hash.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/option.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/signer.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/string.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/type_name.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc/vector.md (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/doc_template/README.md (78%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/error_description.errmap (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/acl.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/acl.spec.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/ascii.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/bcs.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/bit_vector.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/compare.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/debug.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/error.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/fixed_point32.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/hash.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/option.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/signer.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/string.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/string.spec.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/type_name.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/unit_test.move (100%) rename {moveos/moveos-stdlib => frameworks}/move-stdlib/sources/vector.move (100%) rename {moveos => frameworks}/moveos-stdlib/Cargo.toml (97%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/Move.toml (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/README.md (95%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/account.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/address.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/any.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/bag.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/bcs.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/big_vector.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/copyable_any.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/core_addresses.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/display.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/event.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/genesis.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/hex.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/json.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/move_module.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/object.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/rlp.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/signer.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/simple_map.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/simple_multimap.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/string_utils.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/table.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/table_vec.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/tx_context.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/tx_meta.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/tx_result.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/type_info.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/type_table.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc/wasm.md (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/doc_template/README.md (79%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/error_description.errmap (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/account.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/address.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/any.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/bag.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/bcs.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/big_vector.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/copyable_any.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/core_addresses.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/display.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/event.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/genesis.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/hex.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/json.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/move_module.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/object.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/rlp.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/signer.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/simple_map.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/simple_multimap.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/string_utils.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/table.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/table_vec.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/test_helper.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/tx_context.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/tx_meta.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/tx_result.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/type_info.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/type_info.spec.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/type_table.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/sources/wasm.move (96%) rename {moveos => frameworks}/moveos-stdlib/src/lib.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/helpers.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/mod.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/account.rs (100%) rename {crates/rooch-framework/src/natives/rooch_framework => frameworks/moveos-stdlib/src/natives/moveos_stdlib}/bcs.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/event.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/json.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/mod.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs (99%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/object.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/raw_table/mod.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/rlp.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/signer.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/test_helper.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/tx_context.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/type_info.rs (100%) rename {moveos => frameworks}/moveos-stdlib/src/natives/moveos_stdlib/wasm.rs (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/tests/bag_tests.move (100%) rename {moveos/moveos-stdlib => frameworks}/moveos-stdlib/tests/rlp_tests.move (100%) rename {crates => frameworks}/rooch-framework/Cargo.toml (97%) rename {crates => frameworks}/rooch-framework/Move.toml (53%) rename {crates => frameworks}/rooch-framework/doc/README.md (96%) rename {crates => frameworks}/rooch-framework/doc/account.md (100%) rename {crates => frameworks}/rooch-framework/doc/account_authentication.md (100%) rename {crates => frameworks}/rooch-framework/doc/account_coin_store.md (100%) rename {crates => frameworks}/rooch-framework/doc/address_mapping.md (100%) rename {crates => frameworks}/rooch-framework/doc/auth_payload.md (100%) rename {crates => frameworks}/rooch-framework/doc/auth_validator.md (100%) rename {crates => frameworks}/rooch-framework/doc/auth_validator_registry.md (100%) rename {crates => frameworks}/rooch-framework/doc/bitcoin_address.md (100%) rename {crates => frameworks}/rooch-framework/doc/bitcoin_validator.md (100%) rename {crates => frameworks}/rooch-framework/doc/builtin_validators.md (100%) rename {crates => frameworks}/rooch-framework/doc/chain_id.md (100%) rename {crates => frameworks}/rooch-framework/doc/coin.md (100%) rename {crates => frameworks}/rooch-framework/doc/coin_store.md (100%) rename {crates => frameworks}/rooch-framework/doc/core_addresses.md (100%) rename {crates => frameworks}/rooch-framework/doc/decoding.md (100%) rename {crates => frameworks}/rooch-framework/doc/ecdsa_k1.md (100%) rename {crates => frameworks}/rooch-framework/doc/ed25519.md (100%) rename {crates => frameworks}/rooch-framework/doc/empty.md (100%) rename {crates => frameworks}/rooch-framework/doc/encoding.md (100%) rename {crates => frameworks}/rooch-framework/doc/ethereum_address.md (100%) rename {crates => frameworks}/rooch-framework/doc/ethereum_light_client.md (100%) rename {crates => frameworks}/rooch-framework/doc/ethereum_validator.md (100%) rename {crates => frameworks}/rooch-framework/doc/gas_coin.md (100%) rename {crates => frameworks}/rooch-framework/doc/genesis.md (100%) rename {crates => frameworks}/rooch-framework/doc/hash.md (100%) rename {crates => frameworks}/rooch-framework/doc/multichain_address.md (100%) rename {crates => frameworks}/rooch-framework/doc/native_validator.md (100%) rename {crates => frameworks}/rooch-framework/doc/onchain_config.md (100%) rename {crates => frameworks}/rooch-framework/doc/session_key.md (100%) rename {crates => frameworks}/rooch-framework/doc/timestamp.md (100%) rename {crates => frameworks}/rooch-framework/doc/transaction_fee.md (100%) rename {crates => frameworks}/rooch-framework/doc/transaction_validator.md (100%) rename {crates => frameworks}/rooch-framework/doc/transfer.md (100%) rename {crates => frameworks}/rooch-framework/doc/upgrade.md (100%) rename {crates => frameworks}/rooch-framework/doc_template/README.md (75%) rename {crates => frameworks}/rooch-framework/sources/account.move (100%) rename {crates => frameworks}/rooch-framework/sources/account_authentication.move (100%) rename {crates => frameworks}/rooch-framework/sources/account_coin_store.move (100%) rename {crates => frameworks}/rooch-framework/sources/address_mapping.move (100%) rename {crates => frameworks}/rooch-framework/sources/address_type/bitcoin_address.move (100%) rename {crates => frameworks}/rooch-framework/sources/address_type/ethereum_address.move (100%) rename {crates => frameworks}/rooch-framework/sources/address_type/multichain_address.move (100%) rename {crates => frameworks}/rooch-framework/sources/auth_validator/auth_payload.move (100%) rename {crates => frameworks}/rooch-framework/sources/auth_validator/auth_validator.move (100%) rename {crates => frameworks}/rooch-framework/sources/auth_validator/auth_validator_registry.move (100%) rename {crates => frameworks}/rooch-framework/sources/auth_validator/bitcoin_validator.move (100%) rename {crates => frameworks}/rooch-framework/sources/auth_validator/builtin_validators.move (100%) rename {crates => frameworks}/rooch-framework/sources/auth_validator/ethereum_validator.move (100%) rename {crates => frameworks}/rooch-framework/sources/auth_validator/native_validator.move (100%) rename {crates => frameworks}/rooch-framework/sources/chain_id.move (100%) rename {crates => frameworks}/rooch-framework/sources/coin.move (100%) rename {crates => frameworks}/rooch-framework/sources/coin_store.move (100%) rename {crates => frameworks}/rooch-framework/sources/core_addresses.move (100%) rename {crates => frameworks}/rooch-framework/sources/crypto/decoding.move (100%) rename {crates => frameworks}/rooch-framework/sources/crypto/ecdsa_k1.move (100%) rename {crates => frameworks}/rooch-framework/sources/crypto/ed25519.move (100%) rename {crates => frameworks}/rooch-framework/sources/crypto/encoding.move (100%) rename {crates => frameworks}/rooch-framework/sources/crypto/hash.move (100%) rename {crates => frameworks}/rooch-framework/sources/empty.move (100%) rename {crates => frameworks}/rooch-framework/sources/ethereum_light_client.move (100%) rename {crates => frameworks}/rooch-framework/sources/gas_coin.move (100%) rename {crates => frameworks}/rooch-framework/sources/genesis.move (100%) rename {crates => frameworks}/rooch-framework/sources/onchain_config.move (100%) rename {crates => frameworks}/rooch-framework/sources/session_key.move (100%) rename {crates => frameworks}/rooch-framework/sources/tests/account_authentication_test.move (100%) rename {crates => frameworks}/rooch-framework/sources/tests/account_coin_store_test.move (98%) rename {crates => frameworks}/rooch-framework/sources/tests/address_maping_test.move (100%) rename {crates => frameworks}/rooch-framework/sources/tests/chain_id_test.move (100%) rename {crates => frameworks}/rooch-framework/sources/tests/coin_store_test.move (98%) rename {crates => frameworks}/rooch-framework/sources/tests/coin_test.move (100%) rename {crates => frameworks}/rooch-framework/sources/tests/gas_coin_test.move (100%) rename {crates => frameworks}/rooch-framework/sources/tests/session_key_test.move (100%) rename {crates => frameworks}/rooch-framework/sources/tests/transfer_test.move (100%) rename {crates => frameworks}/rooch-framework/sources/timestamp.move (100%) rename {crates => frameworks}/rooch-framework/sources/transaction_fee.move (100%) rename {crates => frameworks}/rooch-framework/sources/transaction_validator.move (100%) rename {crates => frameworks}/rooch-framework/sources/transfer.move (100%) rename {crates => frameworks}/rooch-framework/sources/upgrade.move (100%) rename {crates => frameworks}/rooch-framework/src/lib.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/account.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/bcd.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/decoding.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/ecdsa_k1.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/ed25519.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/encoding.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/events.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/gas_member.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/hash.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/json.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/mod.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/move_module.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/move_std.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/native.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/nursery.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/object.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/ord.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/rlp.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/signer.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/test_helper.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/tx_context.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/type_info.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/gas_parameter/wasm.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/mod.rs (100%) rename {moveos/moveos-stdlib/src/natives/moveos_stdlib => frameworks/rooch-framework/src/natives/rooch_framework}/bcs.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/rooch_framework/crypto/decoding.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/rooch_framework/crypto/ecdsa_k1.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/rooch_framework/crypto/ed25519.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/rooch_framework/crypto/encoding.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/rooch_framework/crypto/hash.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/rooch_framework/crypto/mod.rs (100%) rename {crates => frameworks}/rooch-framework/src/natives/rooch_framework/mod.rs (100%) rename {crates => frameworks}/rooch-framework/tests/timestamp_test.move (91%) diff --git a/.github/workflows/check_build_test.yml b/.github/workflows/check_build_test.yml index 61119b828a..5ffbb39825 100644 --- a/.github/workflows/check_build_test.yml +++ b/.github/workflows/check_build_test.yml @@ -36,7 +36,7 @@ jobs: - name: Build run: cargo build - name: Framework compatibiliy - run: cargo run --package rooch-framework-release --bin rooch-framework-release + run: cargo run --package framework-release --bin framework-release - name: Execute rust tests run: cargo nextest run --workspace --all-features --exclude rooch-framework-tests --exclude rooch-integration-test-runner -v - name: Execute the framework test with 1 thread diff --git a/Cargo.lock b/Cargo.lock index 177000ebce..00a8e1d99e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -901,6 +901,7 @@ dependencies = [ "bs58 0.5.0", "ciborium", "fastcrypto", + "framework-builder", "hex", "http", "linked-hash-map", @@ -918,7 +919,6 @@ dependencies = [ "move-vm-types", "moveos", "moveos-stdlib", - "moveos-stdlib-builder", "moveos-types", "moveos-verifier", "once_cell", @@ -3602,6 +3602,59 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "framework-builder" +version = "0.1.0" +dependencies = [ + "anyhow", + "bcs", + "better_any", + "codespan-reporting", + "fastcrypto", + "hex", + "linked-hash-map", + "move-binary-format", + "move-bytecode-utils", + "move-bytecode-verifier", + "move-cli", + "move-command-line-common", + "move-core-types", + "move-docgen", + "move-errmapgen", + "move-model", + "move-package", + "move-prover", + "move-stdlib", + "move-unit-test", + "move-vm-runtime", + "move-vm-test-utils", + "move-vm-types", + "moveos-types", + "moveos-verifier", + "once_cell", + "pathdiff", + "petgraph 0.5.1", + "serde 1.0.195", + "serde_bytes", + "sha3 0.9.1", + "smallvec 1.11.0", +] + +[[package]] +name = "framework-release" +version = "0.1.0" +dependencies = [ + "clap 4.4.1", + "framework-builder", + "itertools", + "move-binary-format", + "move-core-types", + "moveos-types", + "rooch-genesis-builder", + "rooch-types", + "rpassword", +] + [[package]] name = "fs2" version = "0.4.3" @@ -5964,6 +6017,7 @@ dependencies = [ "clap 4.4.1", "codespan", "codespan-reporting", + "framework-builder", "itertools", "log", "move-binary-format", @@ -5988,7 +6042,6 @@ dependencies = [ "move-vm-types", "moveos-object-runtime", "moveos-stdlib", - "moveos-stdlib-builder", "moveos-store", "moveos-types", "moveos-verifier", @@ -6079,6 +6132,7 @@ dependencies = [ "better_any", "ciborium", "fastcrypto", + "framework-builder", "hex", "itertools", "linked-hash-map", @@ -6096,7 +6150,6 @@ dependencies = [ "move-vm-test-utils", "move-vm-types", "moveos-object-runtime", - "moveos-stdlib-builder", "moveos-types", "moveos-verifier", "moveos-wasm", @@ -6114,44 +6167,6 @@ dependencies = [ "wasmer", ] -[[package]] -name = "moveos-stdlib-builder" -version = "0.1.0" -dependencies = [ - "anyhow", - "bcs", - "better_any", - "codespan-reporting", - "fastcrypto", - "hex", - "linked-hash-map", - "move-binary-format", - "move-bytecode-utils", - "move-bytecode-verifier", - "move-cli", - "move-command-line-common", - "move-core-types", - "move-docgen", - "move-errmapgen", - "move-model", - "move-package", - "move-prover", - "move-stdlib", - "move-unit-test", - "move-vm-runtime", - "move-vm-test-utils", - "move-vm-types", - "moveos-types", - "moveos-verifier", - "once_cell", - "pathdiff", - "petgraph 0.5.1", - "serde 1.0.195", - "serde_bytes", - "sha3 0.9.1", - "smallvec 1.11.0", -] - [[package]] name = "moveos-store" version = "0.1.0" @@ -8325,6 +8340,7 @@ dependencies = [ "datatest-stable 0.1.1", "dirs 4.0.0", "fastcrypto", + "framework-builder", "hex", "itertools", "move-binary-format", @@ -8346,7 +8362,6 @@ dependencies = [ "moveos", "moveos-common", "moveos-stdlib", - "moveos-stdlib-builder", "moveos-store", "moveos-types", "moveos-verifier", @@ -8542,6 +8557,7 @@ dependencies = [ "brotli", "bs58 0.5.0", "fastcrypto", + "framework-builder", "hex", "http", "linked-hash-map", @@ -8559,7 +8575,6 @@ dependencies = [ "move-vm-types", "moveos", "moveos-stdlib", - "moveos-stdlib-builder", "moveos-types", "moveos-verifier", "once_cell", @@ -8571,21 +8586,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "rooch-framework-release" -version = "0.1.0" -dependencies = [ - "clap 4.4.1", - "itertools", - "move-binary-format", - "move-core-types", - "moveos-stdlib-builder", - "moveos-types", - "rooch-genesis-builder", - "rooch-types", - "rpassword", -] - [[package]] name = "rooch-framework-tests" version = "0.1.0" @@ -8646,6 +8646,7 @@ dependencies = [ "better_any", "bitcoin-move", "fastcrypto", + "framework-builder", "hex", "linked-hash-map", "move-binary-format", @@ -8662,7 +8663,6 @@ dependencies = [ "move-vm-types", "moveos", "moveos-stdlib", - "moveos-stdlib-builder", "moveos-store", "moveos-types", "moveos-verifier", @@ -8686,6 +8686,7 @@ dependencies = [ "bcs", "better_any", "fastcrypto", + "framework-builder", "hex", "linked-hash-map", "move-binary-format", @@ -8702,7 +8703,6 @@ dependencies = [ "move-vm-types", "moveos", "moveos-stdlib", - "moveos-stdlib-builder", "moveos-store", "moveos-types", "moveos-verifier", @@ -8770,6 +8770,7 @@ dependencies = [ "clap 4.4.1", "codespan-reporting", "datatest-stable 0.1.3", + "framework-builder", "move-binary-format", "move-bytecode-utils", "move-bytecode-verifier", @@ -8786,7 +8787,6 @@ dependencies = [ "move-vm-types", "moveos", "moveos-stdlib", - "moveos-stdlib-builder", "moveos-store", "moveos-types", "moveos-verifier", @@ -9213,6 +9213,7 @@ dependencies = [ "anyhow", "bcs", "fastcrypto", + "framework-builder", "log", "move-binary-format", "move-bytecode-utils", @@ -9224,7 +9225,6 @@ dependencies = [ "moveos", "moveos-config", "moveos-stdlib", - "moveos-stdlib-builder", "moveos-store", "moveos-types", "moveos-verifier", diff --git a/Cargo.toml b/Cargo.toml index 871fbfa8e8..2d3ea7fa20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,6 @@ members = [ "moveos/smt", "moveos/moveos-types", "moveos/moveos-store", - "moveos/moveos-stdlib", - "moveos/moveos-stdlib-builder", "moveos/moveos", "moveos/moveos-commons/moveos-common", "moveos/moveos-commons/timeout-join-handler", @@ -18,9 +16,7 @@ members = [ "moveos/moveos-object-runtime", "crates/rooch-key", "crates/rooch-types", - "crates/rooch-framework", "crates/rooch-framework-tests", - "crates/rooch-framework-release", "crates/rooch-genesis", "crates/rooch-genesis-builder", "crates/rooch-integration-test-runner", @@ -45,6 +41,10 @@ members = [ "crates/rooch-benchmarks", "crates/rooch-test-transaction-builder", "crates/data_verify", + "frameworks/framework-builder", + "frameworks/framework-release", + "frameworks/moveos-stdlib", + "frameworks/rooch-framework", "frameworks/bitcoin-move" ] @@ -72,8 +72,6 @@ rust-version = "1.70" smt = { path = "moveos/smt" } moveos-types = { path = "moveos/moveos-types" } moveos-store = { path = "moveos/moveos-store" } -moveos-stdlib = { path = "moveos/moveos-stdlib" } -moveos-stdlib-builder = { path = "moveos/moveos-stdlib-builder" } moveos = { path = "moveos/moveos" } moveos-cli = { path = "moveos/moveos-cli" } moveos-common = { path = "moveos/moveos-commons/moveos-common" } @@ -89,7 +87,6 @@ moveos-object-runtime = { path = "moveos/moveos-object-runtime" } rooch = { path = "crates/rooch" } rooch-key = { path = "crates/rooch-key" } rooch-types = { path = "crates/rooch-types" } -rooch-framework = { path = "crates/rooch-framework" } rooch-framework-tests = { path = "crates/rooch-framework-tests" } rooch-integration-test-runner = { path = "crates/rooch-integration-test-runner" } rooch-genesis = { path = "crates/rooch-genesis" } @@ -116,8 +113,13 @@ rooch-test-transaction-builder = { path = "crates/rooch-test-transaction-builder data-verify = { path = "crates/data_verify" } # frameworks +framework-builder = { path = "frameworks/framework-builder" } +framework-release = { path = "frameworks/framework-release" } +moveos-stdlib = { path = "frameworks/moveos-stdlib" } +rooch-framework = { path = "frameworks/rooch-framework" } bitcoin-move = { path = "frameworks/bitcoin-move" } + # External crate dependencies. # Please do not add any test features here: they should be declared by the individual crate. again = "0.1.2" diff --git a/README.md b/README.md index 118118f9ea..83196d8e2d 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,10 @@ Please refer to [Connect to Developer Test Network](https://rooch.network/build/ ## MoveStd & MoveosStd & RoochFramework documentation -* std: 0x1 [MoveStdlib](./moveos/moveos-stdlib/move-stdlib/doc) -* moveos_std: 0x2 [MoveosStdlib](./moveos/moveos-stdlib/moveos-stdlib/doc) -* rooch_framework: 0x3 [RoochFramework](./crates/rooch-framework/doc/) +* std: 0x1 [MoveStdlib](./frameworks/move-stdlib/doc) +* moveos_std: 0x2 [MoveosStdlib](./frameworks/moveos-stdlib/doc) +* rooch_framework: 0x3 [RoochFramework](./frameworks/rooch-framework/doc/) +* bitcoin_move: 0x4 [BitcoinMove](./frameworks/bitcoin-move/doc/) Please refer to [Rooch's built-in library](https://rooch.network/learn/core-concepts/move-contracts/built-in-library) for more information. diff --git a/crates/rooch-genesis-builder/Cargo.toml b/crates/rooch-genesis-builder/Cargo.toml index 1b1537ea85..ea6494dfbf 100644 --- a/crates/rooch-genesis-builder/Cargo.toml +++ b/crates/rooch-genesis-builder/Cargo.toml @@ -43,7 +43,7 @@ move-prover = { workspace = true } moveos-types = { workspace = true } moveos-verifier = { workspace = true } moveos-stdlib = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos = { workspace = true } moveos-store = { workspace = true } diff --git a/crates/rooch-genesis-builder/src/lib.rs b/crates/rooch-genesis-builder/src/lib.rs index d4d3fc4f08..a6efb24abf 100644 --- a/crates/rooch-genesis-builder/src/lib.rs +++ b/crates/rooch-genesis-builder/src/lib.rs @@ -4,18 +4,18 @@ use std::path::{Path, PathBuf}; use anyhow::Result; +use framework_builder::{Stdlib, StdlibBuildConfig}; use move_package::BuildConfig; -use moveos_stdlib_builder::{Stdlib, StdlibBuildConfig}; use once_cell::sync::Lazy; static STDLIB_BUILD_CONFIGS: Lazy> = Lazy::new(|| { - let move_stdlib_path = path_in_crate("../../moveos/moveos-stdlib/move-stdlib") + let move_stdlib_path = path_in_crate("../../frameworks/move-stdlib") .canonicalize() .expect("canonicalize path failed"); - let moveos_stdlib_path = path_in_crate("../../moveos/moveos-stdlib/moveos-stdlib") + let moveos_stdlib_path = path_in_crate("../../frameworks/moveos-stdlib") .canonicalize() .expect("canonicalize path failed"); - let rooch_framework_path = path_in_crate("../rooch-framework") + let rooch_framework_path = path_in_crate("../../frameworks/rooch-framework") .canonicalize() .expect("canonicalize path failed"); @@ -62,7 +62,7 @@ static STDLIB_BUILD_CONFIGS: Lazy> = Lazy::new(|| { }); pub fn build_stdlib() -> Result { - moveos_stdlib_builder::Stdlib::build(STDLIB_BUILD_CONFIGS.clone()) + framework_builder::Stdlib::build(STDLIB_BUILD_CONFIGS.clone()) } pub fn build_and_save_stdlib() -> Result<()> { diff --git a/crates/rooch-genesis/Cargo.toml b/crates/rooch-genesis/Cargo.toml index 43edaa8090..08292b6f03 100644 --- a/crates/rooch-genesis/Cargo.toml +++ b/crates/rooch-genesis/Cargo.toml @@ -45,7 +45,7 @@ move-prover = { workspace = true } moveos-types = { workspace = true } moveos-verifier = { workspace = true } moveos-stdlib = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos = { workspace = true } moveos-store = { workspace = true } @@ -56,4 +56,4 @@ bitcoin-move = { workspace = true } [build-dependencies] rooch-genesis-builder = { workspace = true } -moveos-stdlib-builder = { workspace = true } \ No newline at end of file +framework-builder = { workspace = true } \ No newline at end of file diff --git a/crates/rooch-genesis/build.rs b/crates/rooch-genesis/build.rs index 88a0eb2363..f393d8070b 100644 --- a/crates/rooch-genesis/build.rs +++ b/crates/rooch-genesis/build.rs @@ -14,14 +14,14 @@ fn main() { println!( "cargo:rerun-if-changed={}", root_dir - .join("moveos/moveos-stdlib/move-stdlib") + .join("frameworks/move-stdlib") .join("Move.toml") .display() ); println!( "cargo:rerun-if-changed={}", root_dir - .join("moveos/moveos-stdlib/move-stdlib") + .join("frameworks/move-stdlib") .join("sources") .display() ); @@ -29,14 +29,14 @@ fn main() { println!( "cargo:rerun-if-changed={}", root_dir - .join("moveos/moveos-stdlib/moveos-stdlib") + .join("frameworks/moveos-stdlib") .join("Move.toml") .display() ); println!( "cargo:rerun-if-changed={}", root_dir - .join("moveos/moveos-stdlib/moveos-stdlib") + .join("frameworks/moveos-stdlib") .join("sources") .display() ); @@ -44,7 +44,7 @@ fn main() { println!( "cargo:rerun-if-changed={}", root_dir - .join("crates/rooch-framework") + .join("frameworks/rooch-framework") .join("Move.toml") .display() ); @@ -52,7 +52,7 @@ fn main() { println!( "cargo:rerun-if-changed={}", root_dir - .join("crates/rooch-framework") + .join("frameworks/rooch-framework") .join("sources") .display() ); diff --git a/crates/rooch-genesis/src/lib.rs b/crates/rooch-genesis/src/lib.rs index d66bb68801..145b6389a5 100644 --- a/crates/rooch-genesis/src/lib.rs +++ b/crates/rooch-genesis/src/lib.rs @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; +use framework_builder::Stdlib; use move_binary_format::{errors::Location, CompiledModule}; use move_core_types::{account_address::AccountAddress, identifier::Identifier}; use move_vm_runtime::{config::VMConfig, native_functions::NativeFunction}; use moveos::moveos::{MoveOS, MoveOSConfig}; -use moveos_stdlib_builder::Stdlib; use moveos_store::{config_store::ConfigDBStore, MoveOSStore}; use moveos_types::genesis_info::GenesisInfo; use moveos_types::h256; @@ -244,7 +244,7 @@ impl GenesisPackage { } pub fn load_stdlib() -> Result { - moveos_stdlib_builder::Stdlib::decode(GENESIS_STDLIB_BYTES) + framework_builder::Stdlib::decode(GENESIS_STDLIB_BYTES) } pub fn load_from>(genesis_file: P) -> Result { diff --git a/crates/rooch-integration-test-runner/Cargo.toml b/crates/rooch-integration-test-runner/Cargo.toml index 23b3a5bc3e..28e5a5f059 100644 --- a/crates/rooch-integration-test-runner/Cargo.toml +++ b/crates/rooch-integration-test-runner/Cargo.toml @@ -45,7 +45,7 @@ move-package = { workspace = true } moveos-store = { workspace = true } moveos-stdlib = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos = { workspace = true } moveos-types = { workspace = true } moveos-verifier = { workspace = true } diff --git a/crates/rooch-integration-test-runner/src/lib.rs b/crates/rooch-integration-test-runner/src/lib.rs index 5d778c8558..6e7affa3cd 100644 --- a/crates/rooch-integration-test-runner/src/lib.rs +++ b/crates/rooch-integration-test-runner/src/lib.rs @@ -394,7 +394,7 @@ pub fn resolve_package_named_addresses(root_path: PathBuf) -> BTreeMap (Vec, BTreeMap) { - let move_std_path = PathBuf::from("../../moveos/moveos-stdlib/move-stdlib/"); + let move_std_path = PathBuf::from("../../frameworks/move-stdlib/"); let named_addresses = resolve_package_named_addresses(move_std_path.clone()); let binding = PathBuf::from(env!("CARGO_MANIFEST_DIR")) @@ -407,7 +407,7 @@ pub fn move_std_info() -> (Vec, BTreeMap) { } pub fn moveos_std_info() -> (Vec, BTreeMap) { - let moveos_std_path = PathBuf::from("../../moveos/moveos-stdlib/moveos-stdlib/"); + let moveos_std_path = PathBuf::from("../../frameworks/moveos-stdlib/"); let named_addresses = resolve_package_named_addresses(moveos_std_path.clone()); let binding = PathBuf::from(env!("CARGO_MANIFEST_DIR")) @@ -431,7 +431,7 @@ pub fn moveos_std_info() -> (Vec, BTreeMap) { // } pub fn rooch_framework_info() -> (Vec, BTreeMap) { - let rooch_framework_path = PathBuf::from("../rooch-framework/"); + let rooch_framework_path = PathBuf::from("../../frameworks/rooch-framework/"); let named_addresses = resolve_package_named_addresses(rooch_framework_path.clone()); let binding = PathBuf::from(env!("CARGO_MANIFEST_DIR")) diff --git a/crates/rooch-test-transaction-builder/Cargo.toml b/crates/rooch-test-transaction-builder/Cargo.toml index 2c5d123485..d23eaeedec 100644 --- a/crates/rooch-test-transaction-builder/Cargo.toml +++ b/crates/rooch-test-transaction-builder/Cargo.toml @@ -34,7 +34,7 @@ move-package = { workspace = true } moveos-store = { workspace = true } moveos-stdlib = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos = { workspace = true } moveos-types = { workspace = true } moveos-verifier = { workspace = true } diff --git a/crates/rooch-test-transaction-builder/src/lib.rs b/crates/rooch-test-transaction-builder/src/lib.rs index a84aed61b0..a408beb795 100644 --- a/crates/rooch-test-transaction-builder/src/lib.rs +++ b/crates/rooch-test-transaction-builder/src/lib.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; +use framework_builder::dependency_order::sort_by_dependency_order; use move_core_types::account_address::AccountAddress; use move_core_types::identifier::Identifier; use move_core_types::language_storage::{ModuleId, TypeTag}; use move_core_types::u256::U256; use move_package::BuildConfig; -use moveos_stdlib_builder::dependency_order::sort_by_dependency_order; use moveos_types::move_types::FunctionId; use moveos_types::state::MoveStructType; use moveos_types::transaction::{FunctionCall, MoveAction}; diff --git a/crates/rooch/Cargo.toml b/crates/rooch/Cargo.toml index f4b4c6e569..f04c84a913 100644 --- a/crates/rooch/Cargo.toml +++ b/crates/rooch/Cargo.toml @@ -63,7 +63,7 @@ moveos-store = { workspace = true } moveos-common = { workspace = true } moveos = { workspace = true } moveos-verifier = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } rooch-key = { workspace = true } rooch-types = { workspace = true } diff --git a/crates/rooch/src/commands/move_cli/commands/framework_upgrade.rs b/crates/rooch/src/commands/move_cli/commands/framework_upgrade.rs index 742e5d3a43..cc6ad728c4 100644 --- a/crates/rooch/src/commands/move_cli/commands/framework_upgrade.rs +++ b/crates/rooch/src/commands/move_cli/commands/framework_upgrade.rs @@ -11,7 +11,7 @@ use rooch_types::transaction::rooch::RoochTransaction; use rpassword::prompt_password; use crate::cli_types::{CommandAction, TransactionOptions, WalletContextOptions}; -use moveos_stdlib_builder::Stdlib; +use framework_builder::Stdlib; use moveos_types::addresses::{MOVEOS_STD_ADDRESS, MOVE_STD_ADDRESS}; use moveos_types::{move_types::FunctionId, transaction::MoveAction}; use rooch_key::keystore::account_keystore::AccountKeystore; diff --git a/crates/rooch/src/commands/move_cli/commands/new.rs b/crates/rooch/src/commands/move_cli/commands/new.rs index 163eb2ce6a..57b9de1297 100644 --- a/crates/rooch/src/commands/move_cli/commands/new.rs +++ b/crates/rooch/src/commands/move_cli/commands/new.rs @@ -16,13 +16,13 @@ use std::path::PathBuf; use crate::cli_types::WalletContextOptions; const MOVE_STDLIB_PKG_NAME: &str = "MoveStdlib"; -const MOVE_STDLIB_PKG_PATH: &str = "{ git = \"https://github.com/rooch-network/rooch.git\", subdir = \"moveos/moveos-stdlib/move-stdlib\", rev = \"main\" }"; +const MOVE_STDLIB_PKG_PATH: &str = "{ git = \"https://github.com/rooch-network/rooch.git\", subdir = \"frameworks/move-stdlib\", rev = \"main\" }"; const MOVEOS_STDLIB_PKG_NAME: &str = "MoveosStdlib"; -const MOVEOS_STDLIB_PKG_PATH: &str = "{ git = \"https://github.com/rooch-network/rooch.git\", subdir = \"moveos/moveos-stdlib/moveos-stdlib\", rev = \"main\" }"; +const MOVEOS_STDLIB_PKG_PATH: &str = "{ git = \"https://github.com/rooch-network/rooch.git\", subdir = \"frameworks/moveos-stdlib\", rev = \"main\" }"; const ROOCH_FRAMEWORK_PKG_NAME: &str = "RoochFramework"; -const ROOCH_FRAMEWORK_PKG_PATH: &str = "{ git = \"https://github.com/rooch-network/rooch.git\", subdir = \"crates/rooch-framework\", rev = \"main\" }"; +const ROOCH_FRAMEWORK_PKG_PATH: &str = "{ git = \"https://github.com/rooch-network/rooch.git\", subdir = \"frameworks/rooch-framework\", rev = \"main\" }"; #[derive(Parser)] pub struct New { diff --git a/docs/website/pages/blog/release-231018.en-US.mdx b/docs/website/pages/blog/release-231018.en-US.mdx index c64e3f3ca9..a02a5bd924 100644 --- a/docs/website/pages/blog/release-231018.en-US.mdx +++ b/docs/website/pages/blog/release-231018.en-US.mdx @@ -47,9 +47,9 @@ For a detailed design on Rooch AccountAbstraction, refer to: [Design and Impleme ### Move Standard Library, Framework and Virtual Machine * Enabled publishing Move modules in Move: [account_storage::publish_modules_entry](https://github.com/rooch-network/rooch/blob/7fd6418dff1aa7e40cae9e8eede375b776bbb771/moveos/moveos-stdlib/moveos-stdlib/sources/account_storage.move#L224). -* Implemented [Coin](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/coin.move), [CoinStore](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/coin_store.move), and [account_coin_store](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/account_coin_store.move). To further understand Rooch's Coin standards, refer to [examples/coins](https://github.com/rooch-network/rooch/tree/main/examples/coins). +* Implemented [Coin](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/coin.move), [CoinStore](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/coin_store.move), and [account_coin_store](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/account_coin_store.move). To further understand Rooch's Coin standards, refer to [examples/coins](https://github.com/rooch-network/rooch/tree/main/examples/coins). * Introduced Gas billing and GasToken. -* Introduced [Event](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/event.move) standards. +* Introduced [Event](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/event.move) standards. * Improved [Object](../learn/core-concepts/objects/object.en-US.mdx) and [StorageAbstraction](../learn/core-concepts/objects/storage-abstraction.en-US.mdx) designs. ### JSON RPC and SDK diff --git a/docs/website/pages/blog/release-231018.zh-CN.mdx b/docs/website/pages/blog/release-231018.zh-CN.mdx index fa18d9cfcf..b1c1968521 100644 --- a/docs/website/pages/blog/release-231018.zh-CN.mdx +++ b/docs/website/pages/blog/release-231018.zh-CN.mdx @@ -47,9 +47,9 @@ Rooch v0.2 发布，实现账户抽象，提供 Dashboard，启动开发者测 ### Move 标准库以及虚拟机 * 实现了在 Move 中发布 Move 模块：[account_storage::publish_modules_entry](https://github.com/rooch-network/rooch/blob/7fd6418dff1aa7e40cae9e8eede375b776bbb771/moveos/moveos-stdlib/moveos-stdlib/sources/account_storage.move#L224)。 -* 实现了 [Coin](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/coin.move)， [CoinStore](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/coin_store.move) 以及 [account_coin_store](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/account_coin_store.move)。想进一步了解 Rooch 的 Coin 标准，可以参考 [examples/coins](https://github.com/rooch-network/rooch/tree/main/examples/coins)。 +* 实现了 [Coin](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/coin.move)， [CoinStore](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/coin_store.move) 以及 [account_coin_store](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/account_coin_store.move)。想进一步了解 Rooch 的 Coin 标准，可以参考 [examples/coins](https://github.com/rooch-network/rooch/tree/main/examples/coins)。 * 实现了 Gas 计费以及 GasToken。 -* 实现了 [Event](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/event.move) 标准。 +* 实现了 [Event](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/event.move) 标准。 * 改进了 [Object](../learn/core-concepts/objects/object.zh-CN.mdx) 以及 [StorageAbstraction](../learn/core-concepts/objects/storage-abstraction.zh-CN.mdx) 的设计。 diff --git a/docs/website/pages/build/getting-started/first-blog-system.en-US.mdx b/docs/website/pages/build/getting-started/first-blog-system.en-US.mdx index 73a8a18053..b4fa1ae42b 100644 --- a/docs/website/pages/build/getting-started/first-blog-system.en-US.mdx +++ b/docs/website/pages/build/getting-started/first-blog-system.en-US.mdx @@ -123,9 +123,9 @@ name = "simple_blog" version = "0.0.1" [dependencies] -MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } [addresses] simple_blog = "_" diff --git a/docs/website/pages/build/getting-started/first-blog-system.zh-CN.mdx b/docs/website/pages/build/getting-started/first-blog-system.zh-CN.mdx index effed4e7c3..ffb0d15e93 100644 --- a/docs/website/pages/build/getting-started/first-blog-system.zh-CN.mdx +++ b/docs/website/pages/build/getting-started/first-blog-system.zh-CN.mdx @@ -123,9 +123,9 @@ name = "simple_blog" version = "0.0.1" [dependencies] -MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } [addresses] simple_blog = "_" diff --git a/docs/website/pages/build/getting-started/first-contract/create-rooch-move-contract.en-US.mdx b/docs/website/pages/build/getting-started/first-contract/create-rooch-move-contract.en-US.mdx index e1b1c9dd37..4f554d58c9 100644 --- a/docs/website/pages/build/getting-started/first-contract/create-rooch-move-contract.en-US.mdx +++ b/docs/website/pages/build/getting-started/first-contract/create-rooch-move-contract.en-US.mdx @@ -18,9 +18,9 @@ name = "hello_rooch" version = "0.0.1" [dependencies] -MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } [addresses] hello_rooch = "0xf5ecfc49f55e283119104978b60995b0ec84a5bd760a0305b24b9a4175deff7b" diff --git a/docs/website/pages/build/getting-started/first-contract/create-rooch-move-contract.zh-CN.mdx b/docs/website/pages/build/getting-started/first-contract/create-rooch-move-contract.zh-CN.mdx index 189fa6743c..f31e233738 100644 --- a/docs/website/pages/build/getting-started/first-contract/create-rooch-move-contract.zh-CN.mdx +++ b/docs/website/pages/build/getting-started/first-contract/create-rooch-move-contract.zh-CN.mdx @@ -18,9 +18,9 @@ name = "hello_rooch" version = "0.0.1" [dependencies] -MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } [addresses] hello_rooch = "0xf5ecfc49f55e283119104978b60995bcontext0ec84a5bd760a0305b24b9a4175deff7b" diff --git a/docs/website/pages/build/rooch-framework/cryptographic-primitives/hash.en-US.mdx b/docs/website/pages/build/rooch-framework/cryptographic-primitives/hash.en-US.mdx index 4510bad0e1..61fd8fbc93 100644 --- a/docs/website/pages/build/rooch-framework/cryptographic-primitives/hash.en-US.mdx +++ b/docs/website/pages/build/rooch-framework/cryptographic-primitives/hash.en-US.mdx @@ -67,4 +67,4 @@ These one-way hash functions provide the most basic and important guarantee for - ecdsa_k1 - ed25519 -For more details, please read the source code [https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/sources/crypto](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/sources/crypto). +For more details, please read the source code [https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/sources/crypto](https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/sources/crypto). diff --git a/docs/website/pages/build/rooch-framework/cryptographic-primitives/hash.zh-CN.mdx b/docs/website/pages/build/rooch-framework/cryptographic-primitives/hash.zh-CN.mdx index 40da32b153..c6ff7efde2 100644 --- a/docs/website/pages/build/rooch-framework/cryptographic-primitives/hash.zh-CN.mdx +++ b/docs/website/pages/build/rooch-framework/cryptographic-primitives/hash.zh-CN.mdx @@ -68,4 +68,4 @@ SHA2-256(hello_world.txt)= f590572de3c69705a0cad30159ab9f728d28f118d108f7a9b5d02 - ecdsa_k1 - ed25519 -更详细的内容，请参阅源码[https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/sources/crypto](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/sources/crypto)。 +更详细的内容，请参阅源码[https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/sources/crypto](https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/sources/crypto)。 diff --git a/docs/website/pages/build/rooch-framework/private-generics.en-US.mdx b/docs/website/pages/build/rooch-framework/private-generics.en-US.mdx index 23c0d27475..d37d35bbf0 100644 --- a/docs/website/pages/build/rooch-framework/private-generics.en-US.mdx +++ b/docs/website/pages/build/rooch-framework/private-generics.en-US.mdx @@ -28,8 +28,8 @@ TODO: This part of the document needs improvement. ### References 1. The `#[private_generics(T)]` annotation is used in the following modules, which can serve as references: - - [moveos_std::account_storage](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/account_storage.move) - - [moveos_std::storage_context](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/storage_context.move) - - [moveos_std::signer](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/signer.move) - - [rooch_framework::coin](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/coin.move) + - [moveos_std::account_storage](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/account_storage.move) + - [moveos_std::storage_context](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/storage_context.move) + - [moveos_std::signer](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/signer.move) + - [rooch_framework::coin](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/coin.move) 2. [Understanding Private Generics Functions in one article](../../blog/read-private-generics-in-one-article.en-US.mdx) diff --git a/docs/website/pages/build/rooch-framework/private-generics.zh-CN.mdx b/docs/website/pages/build/rooch-framework/private-generics.zh-CN.mdx index 4d223c170c..825d666de9 100644 --- a/docs/website/pages/build/rooch-framework/private-generics.zh-CN.mdx +++ b/docs/website/pages/build/rooch-framework/private-generics.zh-CN.mdx @@ -28,8 +28,8 @@ module moveos_std::account_storage{ ### 参考链接 1. 以下模块中使用了 `#[private_generics(T)]` 注解，可以作为参考： - - [moveos_std::account_storage](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/account_storage.move) - - [moveos_std::storage_context](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/storage_context.move) - - [moveos_std::signer](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/signer.move) - - [rooch_framework::coin](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/coin.move) + - [moveos_std::account_storage](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/account_storage.move) + - [moveos_std::storage_context](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/storage_context.move) + - [moveos_std::signer](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/signer.move) + - [rooch_framework::coin](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/coin.move) 2. [一文读懂私有泛型函数](../../blog/read-private-generics-in-one-article.zh-CN.mdx) diff --git a/docs/website/pages/build/rooch-framework/timestamp.en-US.mdx b/docs/website/pages/build/rooch-framework/timestamp.en-US.mdx index 186e5e091e..166888fcb2 100644 --- a/docs/website/pages/build/rooch-framework/timestamp.en-US.mdx +++ b/docs/website/pages/build/rooch-framework/timestamp.en-US.mdx @@ -1,6 +1,6 @@ # Timestamp -Rooch's Framework provides a timestamp function, located in `crates/rooch-framework/sources/timestamp.move`, which saves Unix time. UNIX time, or POSIX time, is the time representation used by UNIX or UNIX-like systems: the total number of seconds from 00:00:00 on January 1, 1970 UTC to the present. On most Unix systems, Unix time can be passed `date +%s` command to check. +Rooch's Framework provides a timestamp function, located in `frameworks/rooch-framework/sources/timestamp.move`, which saves Unix time. UNIX time, or POSIX time, is the time representation used by UNIX or UNIX-like systems: the total number of seconds from 00:00:00 on January 1, 1970 UTC to the present. On most Unix systems, Unix time can be passed `date +%s` command to check. This module maintains a global wall clock that stores the current Unix time in **milliseconds**. diff --git a/docs/website/pages/build/rooch-framework/timestamp.zh-CN.mdx b/docs/website/pages/build/rooch-framework/timestamp.zh-CN.mdx index 074b854dfe..ac3aef211c 100644 --- a/docs/website/pages/build/rooch-framework/timestamp.zh-CN.mdx +++ b/docs/website/pages/build/rooch-framework/timestamp.zh-CN.mdx @@ -1,6 +1,6 @@ # 时间戳 -Rooch 的 Framework 提供了一个时间戳功能，位于 `crates/rooch-framework/sources/timestamp.move`，它保存的是 Unix 时间。UNIX 时间，或称 POSIX 时间是 UNIX 或类 UNIX 系统使用的时间表示方式：从 UTC1970 年 1 月 1 日 0 时 0 分 0 秒起至现在的总秒数，在多数 Unix 系统上 Unix 时间可以透过 `date +%s` 命令来检查。 +Rooch 的 Framework 提供了一个时间戳功能，位于 `frameworks/rooch-framework/sources/timestamp.move`，它保存的是 Unix 时间。UNIX 时间，或称 POSIX 时间是 UNIX 或类 UNIX 系统使用的时间表示方式：从 UTC1970 年 1 月 1 日 0 时 0 分 0 秒起至现在的总秒数，在多数 Unix 系统上 Unix 时间可以透过 `date +%s` 命令来检查。 该模块保存一个全局挂钟，以**毫秒**为单位存储当前 Unix 时间。 diff --git a/docs/website/pages/learn/core-concepts/accounts/account-abstraction-implementation.en-US.mdx b/docs/website/pages/learn/core-concepts/accounts/account-abstraction-implementation.en-US.mdx index e10887c7e9..91e26fa8d3 100644 --- a/docs/website/pages/learn/core-concepts/accounts/account-abstraction-implementation.en-US.mdx +++ b/docs/website/pages/learn/core-concepts/accounts/account-abstraction-implementation.en-US.mdx @@ -92,8 +92,8 @@ sequenceDiagram Currently, Rooch includes the following built-in validators: -1. [Native Auth Validator](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/auth_validator/native_validator.move) : A Validator based on the Ed25519 algorithm. The validator’s `auth_validator_id` is 0, making it the default validator. -2. [Ethereum Auth Validator](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/auth_validator/ethereum_validator.move) : A Validator based on the Ethereum signature algorithm, with `auth_validator_id` being 1. +1. [Native Auth Validator](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/auth_validator/native_validator.move) : A Validator based on the Ed25519 algorithm. The validator’s `auth_validator_id` is 0, making it the default validator. +2. [Ethereum Auth Validator](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/auth_validator/ethereum_validator.move) : A Validator based on the Ethereum signature algorithm, with `auth_validator_id` being 1. A Web2 social login validator is currently under development. Please refer [Github issue #769 ](https://github.com/rooch-network/rooch/issues/769) for updates. To learn how to develop a custom validator, you can refer to [examples/noop_auth_validator](https://github.com/rooch-network/rooch/blob/main/examples/noop_auth_validator). diff --git a/docs/website/pages/learn/core-concepts/accounts/account-abstraction-implementation.zh-CN.mdx b/docs/website/pages/learn/core-concepts/accounts/account-abstraction-implementation.zh-CN.mdx index af73ed7f29..85577b34f1 100644 --- a/docs/website/pages/learn/core-concepts/accounts/account-abstraction-implementation.zh-CN.mdx +++ b/docs/website/pages/learn/core-concepts/accounts/account-abstraction-implementation.zh-CN.mdx @@ -91,8 +91,8 @@ sequenceDiagram 当前，Rooch 中内置了以下验证器： -1. [Native Auth Validator](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/auth_validator/native_validator.move) : 基于 Ed25519 算法的验证器，验证器的 `auth_validator_id` 为 0，是默认的验证器。 -2. [Ethereum Auth Validator](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/sources/auth_validator/ethereum_validator.move) : 基于 Ethereum 签名算法的验证器，验证器的 `auth_validator_id` 为 1。 +1. [Native Auth Validator](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/auth_validator/native_validator.move) : 基于 Ed25519 算法的验证器，验证器的 `auth_validator_id` 为 0，是默认的验证器。 +2. [Ethereum Auth Validator](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/sources/auth_validator/ethereum_validator.move) : 基于 Ethereum 签名算法的验证器，验证器的 `auth_validator_id` 为 1。 Web2 社交登陆的验证器正在开发中，可以关注 [Github issue #769 ](https://github.com/rooch-network/rooch/issues/769)。 如果想了解如何开发自定义的验证器，可以参考 [examples/noop_auth_validator](https://github.com/rooch-network/rooch/blob/main/examples/noop_auth_validator)。 diff --git a/docs/website/pages/learn/core-concepts/move-contracts/built-in-library.en-US.mdx b/docs/website/pages/learn/core-concepts/move-contracts/built-in-library.en-US.mdx index c6fb34e36b..49a39df9ff 100644 --- a/docs/website/pages/learn/core-concepts/move-contracts/built-in-library.en-US.mdx +++ b/docs/website/pages/learn/core-concepts/move-contracts/built-in-library.en-US.mdx @@ -10,6 +10,6 @@ The addresses of the three libraries in Move are: ## Documentation link -- [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/move-stdlib/doc) -- [MoveosStdlib](https://github.com/rooch-network/rooch/edit/main/moveos/moveos-stdlib/moveos-stdlib/doc) -- [RoochFramework](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/doc) +- [MoveStdlib](https://github.com/rooch-network/rooch/tree/frameworks/move-stdlib/doc) +- [MoveosStdlib](https://github.com/rooch-network/rooch/edit/frameworks/moveos-stdlib/doc) +- [RoochFramework](https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/doc) diff --git a/docs/website/pages/learn/core-concepts/move-contracts/built-in-library.zh-CN.mdx b/docs/website/pages/learn/core-concepts/move-contracts/built-in-library.zh-CN.mdx index eb7c97887c..e0b06c109e 100644 --- a/docs/website/pages/learn/core-concepts/move-contracts/built-in-library.zh-CN.mdx +++ b/docs/website/pages/learn/core-concepts/move-contracts/built-in-library.zh-CN.mdx @@ -10,6 +10,6 @@ Rooch 当前内置了三个标准库，分别是 `MoveStdlib`、`MoveosStdlib` ## 文档链接 -- [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/move-stdlib/doc) -- [MoveosStdlib](https://github.com/rooch-network/rooch/edit/main/moveos/moveos-stdlib/moveos-stdlib/doc) -- [RoochFramework](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/doc) +- [MoveStdlib](https://github.com/rooch-network/rooch/tree/frameworks/move-stdlib/doc) +- [MoveosStdlib](https://github.com/rooch-network/rooch/edit/frameworks/moveos-stdlib/doc) +- [RoochFramework](https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/doc) diff --git a/docs/website/pages/learn/core-concepts/move-contracts/move-on-rooch.en-US.mdx b/docs/website/pages/learn/core-concepts/move-contracts/move-on-rooch.en-US.mdx index 8475674b3b..b3aee30f6c 100644 --- a/docs/website/pages/learn/core-concepts/move-contracts/move-on-rooch.en-US.mdx +++ b/docs/website/pages/learn/core-concepts/move-contracts/move-on-rooch.en-US.mdx @@ -67,11 +67,11 @@ The function `moveos_std::signer::module_signer():signer` can be used to obta ### Crypto algorithm support -1. [ecdsa_k1](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/ecdsa_k1.md): Verify ecdsa_k1 signature -2. [ecdsa_k1_recoverable](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/ecdsa_k1_recoverable.md): Supports recovering public keys from signatures and verifying signatures -3. [ed25519](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/ed25519.md): Verify ed25519 signature -4. [schnorr](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/schnorr.md): Verify schnorr signature -5. [hash](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/hash.md) function: `sha2_256`, `sha3_256`, `blake2b256`, `keccak256`, `ripemd160` +1. [ecdsa_k1](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/ecdsa_k1.md): Verify ecdsa_k1 signature +2. [ecdsa_k1_recoverable](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/ecdsa_k1_recoverable.md): Supports recovering public keys from signatures and verifying signatures +3. [ed25519](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/ed25519.md): Verify ed25519 signature +4. [schnorr](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/schnorr.md): Verify schnorr signature +5. [hash](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/hash.md) function: `sha2_256`, `sha3_256`, `blake2b256`, `keccak256`, `ripemd160` ### More references diff --git a/docs/website/pages/learn/core-concepts/move-contracts/move-on-rooch.zh-CN.mdx b/docs/website/pages/learn/core-concepts/move-contracts/move-on-rooch.zh-CN.mdx index 23b861ea7c..a277df707c 100644 --- a/docs/website/pages/learn/core-concepts/move-contracts/move-on-rooch.zh-CN.mdx +++ b/docs/website/pages/learn/core-concepts/move-contracts/move-on-rooch.zh-CN.mdx @@ -67,11 +67,11 @@ module example::my_module{ ### Crypto 算法支持 -1. [ecdsa_k1](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/ecdsa_k1.md)：验证 ecdsa_k1 签名 -2. [ecdsa_k1_recoverable](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/ecdsa_k1_recoverable.md)：支持从签名中恢复公钥，并验证签名 -3. [ed25519](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/ed25519.md)：验证 ed25519 签名 -4. [schnorr](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/schnorr.md)：验证 schnorr 签名 -5. [hash](https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/hash.md) 函数：`sha2_256`、`sha3_256`、`blake2b256`、`keccak256`、`ripemd160` +1. [ecdsa_k1](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/ecdsa_k1.md)：验证 ecdsa_k1 签名 +2. [ecdsa_k1_recoverable](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/ecdsa_k1_recoverable.md)：支持从签名中恢复公钥，并验证签名 +3. [ed25519](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/ed25519.md)：验证 ed25519 签名 +4. [schnorr](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/schnorr.md)：验证 schnorr 签名 +5. [hash](https://github.com/rooch-network/rooch/blob/main/frameworks/rooch-framework/doc/hash.md) 函数：`sha2_256`、`sha3_256`、`blake2b256`、`keccak256`、`ripemd160` ## 更多参考资料 diff --git a/docs/website/pages/learn/core-concepts/objects/object.en-US.mdx b/docs/website/pages/learn/core-concepts/objects/object.en-US.mdx index c220c45b9f..df3e84fc1d 100644 --- a/docs/website/pages/learn/core-concepts/objects/object.en-US.mdx +++ b/docs/website/pages/learn/core-concepts/objects/object.en-US.mdx @@ -267,8 +267,8 @@ TODO: This part of this document needs to be improved ### References -1. [Rooch Object API document](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/object.md) -2. [Rooch Object Source code](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/object.move) +1. [Rooch Object API document](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/object.md) +2. [Rooch Object Source code](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/object.move) 3. [Sui Object](https://docs.sui.io/learn/objects) 4. [Aptos Object](https://aptos.dev/standards/aptos-object/) 5. [Storage Abstraction](./storage-abstraction.en-US.mdx) diff --git a/docs/website/pages/learn/core-concepts/objects/object.zh-CN.mdx b/docs/website/pages/learn/core-concepts/objects/object.zh-CN.mdx index 7ca42134fb..c6c63b6b30 100644 --- a/docs/website/pages/learn/core-concepts/objects/object.zh-CN.mdx +++ b/docs/website/pages/learn/core-concepts/objects/object.zh-CN.mdx @@ -267,8 +267,8 @@ TODO: This part of this document needs to be improved ### 参考链接 -1. [Rooch Object API document](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/object.md) -2. [Rooch Object Source code](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/object.move) +1. [Rooch Object API document](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/object.md) +2. [Rooch Object Source code](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/object.move) 3. [Sui Object](https://docs.sui.io/learn/objects) 4. [Aptos Object](https://aptos.dev/standards/aptos-object/) 5. [Storage Abstraction](./storage-abstraction.zh-CN.mdx) diff --git a/docs/website/pages/learn/core-concepts/objects/storage-abstraction.en-US.mdx b/docs/website/pages/learn/core-concepts/objects/storage-abstraction.en-US.mdx index f3f77b68c5..42ac5cc3ce 100644 --- a/docs/website/pages/learn/core-concepts/objects/storage-abstraction.en-US.mdx +++ b/docs/website/pages/learn/core-concepts/objects/storage-abstraction.en-US.mdx @@ -95,10 +95,10 @@ In Rooch, each Table in Move corresponds to an SMT, and the Table Object mainly ### The types in Move -1. [Context](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/context.md) represents the current transaction and storage context. It currently encapsulates the main methods related to state storage. In the future, when the `AppSpecific Storage` solution is provided, apps can switch the Context to store states in different storage spaces. -2. [raw_table](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/raw_table.md) provides the lowest level Key-Value storage interface. All contract state changes are ultimately unified as the Key-Value change set of `RawTable`. Each RawTable corresponds to a SMT in the StateDB. The ObjectID of the Global ObjectStore is a special ObjectID with all bytes being `0`. -3. [type_table](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/type_table.md) is a special type of Table that uses types as Keys and instances of types as Values. -4. [AccountStorage](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/account_storage.md) is the abstraction of user storage space in Move. It contains two Tables, the Resource Table and the Module Table. This allows direct operation on Resources and Modules in Move, without the need to use global storage instructions. +1. [Context](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/context.md) represents the current transaction and storage context. It currently encapsulates the main methods related to state storage. In the future, when the `AppSpecific Storage` solution is provided, apps can switch the Context to store states in different storage spaces. +2. [raw_table](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/raw_table.md) provides the lowest level Key-Value storage interface. All contract state changes are ultimately unified as the Key-Value change set of `RawTable`. Each RawTable corresponds to a SMT in the StateDB. The ObjectID of the Global ObjectStore is a special ObjectID with all bytes being `0`. +3. [type_table](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/type_table.md) is a special type of Table that uses types as Keys and instances of types as Values. +4. [AccountStorage](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/account_storage.md) is the abstraction of user storage space in Move. It contains two Tables, the Resource Table and the Module Table. This allows direct operation on Resources and Modules in Move, without the need to use global storage instructions. #### Object diff --git a/docs/website/pages/learn/core-concepts/objects/storage-abstraction.zh-CN.mdx b/docs/website/pages/learn/core-concepts/objects/storage-abstraction.zh-CN.mdx index 9038f6bad5..dff1ae3002 100644 --- a/docs/website/pages/learn/core-concepts/objects/storage-abstraction.zh-CN.mdx +++ b/docs/website/pages/learn/core-concepts/objects/storage-abstraction.zh-CN.mdx @@ -95,10 +95,10 @@ Rooch 的 StateDB 状态树整体架构如下图所示： ### Move 中的类型 -1. [Context](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/context.md) 代表当前交易以及存储的上下文，当前封装了和状态存储的主要方法。未来提供 `AppSpecific Storage` 方案的时候，应用可以切换 Context，从而将状态存储到不同的存储空间。 -2. [raw_table](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/raw_table.md) 提供最底层的 Key-Value 存储接口，合约状态变更最终都统一为 `RawTable` 的 Key-Value 变更集。每个 RawTable 对应 StateDB 中的一棵 SMT，Global ObjectStore 的 ObjectID 是所有字节都为 `0` 的一个特殊 ObjectID。 -3. [type_table](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/type_table.md) 是一种特殊的 Table，它以类型为 Key，类型的实例为 Value。 -4. [AccountStorage](https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/account_storage.md) 用户存储空间在 Move 中的抽象，它包含两个 Table，Resource Table 和 Module Table，这样可以在 Move 中直接操作 Resource 和 Module，而不需要通过全局存储指令。 +1. [Context](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/context.md) 代表当前交易以及存储的上下文，当前封装了和状态存储的主要方法。未来提供 `AppSpecific Storage` 方案的时候，应用可以切换 Context，从而将状态存储到不同的存储空间。 +2. [raw_table](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/raw_table.md) 提供最底层的 Key-Value 存储接口，合约状态变更最终都统一为 `RawTable` 的 Key-Value 变更集。每个 RawTable 对应 StateDB 中的一棵 SMT，Global ObjectStore 的 ObjectID 是所有字节都为 `0` 的一个特殊 ObjectID。 +3. [type_table](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/type_table.md) 是一种特殊的 Table，它以类型为 Key，类型的实例为 Value。 +4. [AccountStorage](https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/account_storage.md) 用户存储空间在 Move 中的抽象，它包含两个 Table，Resource Table 和 Module Table，这样可以在 Move 中直接操作 Resource 和 Module，而不需要通过全局存储指令。 #### Object diff --git a/docs/website/pages/learn/in-depth-tech/hash.en-US.mdx b/docs/website/pages/learn/in-depth-tech/hash.en-US.mdx index 4510bad0e1..61fd8fbc93 100644 --- a/docs/website/pages/learn/in-depth-tech/hash.en-US.mdx +++ b/docs/website/pages/learn/in-depth-tech/hash.en-US.mdx @@ -67,4 +67,4 @@ These one-way hash functions provide the most basic and important guarantee for - ecdsa_k1 - ed25519 -For more details, please read the source code [https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/sources/crypto](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/sources/crypto). +For more details, please read the source code [https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/sources/crypto](https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/sources/crypto). diff --git a/docs/website/pages/learn/in-depth-tech/hash.zh-CN.mdx b/docs/website/pages/learn/in-depth-tech/hash.zh-CN.mdx index 40da32b153..c6ff7efde2 100644 --- a/docs/website/pages/learn/in-depth-tech/hash.zh-CN.mdx +++ b/docs/website/pages/learn/in-depth-tech/hash.zh-CN.mdx @@ -68,4 +68,4 @@ SHA2-256(hello_world.txt)= f590572de3c69705a0cad30159ab9f728d28f118d108f7a9b5d02 - ecdsa_k1 - ed25519 -更详细的内容，请参阅源码[https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/sources/crypto](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/sources/crypto)。 +更详细的内容，请参阅源码[https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/sources/crypto](https://github.com/rooch-network/rooch/tree/frameworks/rooch-framework/sources/crypto)。 diff --git a/examples/basic_object/Move.toml b/examples/basic_object/Move.toml index f085f26af8..3607dd72e3 100644 --- a/examples/basic_object/Move.toml +++ b/examples/basic_object/Move.toml @@ -3,7 +3,7 @@ name = "basic_object" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] basic_object = "_" diff --git a/examples/basic_object/sources/basic_object.move b/examples/basic_object/sources/basic_object.move index aea9b48118..5df921b868 100644 --- a/examples/basic_object/sources/basic_object.move +++ b/examples/basic_object/sources/basic_object.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + module basic_object::pub_transfer{ use moveos_std::object::{Self, Object}; @@ -66,4 +69,4 @@ module basic_object::third_party_module{ fun test_transfer_fail(){ create_and_custom_transfer(5); } -} \ No newline at end of file +} diff --git a/examples/basic_object/sources/child_object.move b/examples/basic_object/sources/child_object.move index 69ae97cf1c..547fb73fe8 100644 --- a/examples/basic_object/sources/child_object.move +++ b/examples/basic_object/sources/child_object.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + module basic_object::child_object{ use std::string::String; use moveos_std::object::{Self, Object, ObjectID}; diff --git a/examples/bitseed_runner/Move.toml b/examples/bitseed_runner/Move.toml index e10012617c..3b24606dae 100644 --- a/examples/bitseed_runner/Move.toml +++ b/examples/bitseed_runner/Move.toml @@ -3,7 +3,7 @@ name = "bitseed_runner" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } BitcoinMove = { local = "../../frameworks/bitcoin-move" } [addresses] diff --git a/examples/blog/Move.toml b/examples/blog/Move.toml index d9f39f0489..7d13708091 100644 --- a/examples/blog/Move.toml +++ b/examples/blog/Move.toml @@ -3,8 +3,8 @@ name = "RoochBlogDemo" version = "0.0.1" [dependencies] -#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/btc_holder_coin/Move.toml b/examples/btc_holder_coin/Move.toml index 1a1f826eae..4c38045565 100644 --- a/examples/btc_holder_coin/Move.toml +++ b/examples/btc_holder_coin/Move.toml @@ -3,8 +3,8 @@ name = "btc_holder_coin" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } BitcoinMove = { local = "../../frameworks/bitcoin-move" } [addresses] diff --git a/examples/btc_holder_farmer/Move.toml b/examples/btc_holder_farmer/Move.toml index 8dfc67e10d..bf362d92cd 100644 --- a/examples/btc_holder_farmer/Move.toml +++ b/examples/btc_holder_farmer/Move.toml @@ -3,9 +3,9 @@ name = "btc_holder_farmer" version = "0.0.1" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } BitcoinMove = { local = "../../frameworks/bitcoin-move" } [addresses] diff --git a/examples/coins/Move.toml b/examples/coins/Move.toml index 8031243374..09b2b9cccb 100644 --- a/examples/coins/Move.toml +++ b/examples/coins/Move.toml @@ -3,13 +3,13 @@ name = "coins" version = "0.0.1" [dependencies] -#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] coins = "_" diff --git a/examples/complex_struct/Move.toml b/examples/complex_struct/Move.toml index ead222569c..e03c44db96 100644 --- a/examples/complex_struct/Move.toml +++ b/examples/complex_struct/Move.toml @@ -3,7 +3,7 @@ name = "complex_struct" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/counter/Move.toml b/examples/counter/Move.toml index a098b5e054..56f3a6f8a1 100644 --- a/examples/counter/Move.toml +++ b/examples/counter/Move.toml @@ -3,7 +3,7 @@ name = "counter" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/data_struct/Move.toml b/examples/data_struct/Move.toml index e92d53edca..29f4ac2fdf 100644 --- a/examples/data_struct/Move.toml +++ b/examples/data_struct/Move.toml @@ -3,7 +3,7 @@ name = "data_struct" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/data_struct/sources/data_struct.move b/examples/data_struct/sources/data_struct.move index 55f8bb4cc0..054643171f 100644 --- a/examples/data_struct/sources/data_struct.move +++ b/examples/data_struct/sources/data_struct.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + module rooch_examples::data_struct { diff --git a/examples/display/Move.toml b/examples/display/Move.toml index 2d31de7095..2ce6091c83 100644 --- a/examples/display/Move.toml +++ b/examples/display/Move.toml @@ -3,9 +3,9 @@ name = "display" version = "0.0.1" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] display = "_" diff --git a/examples/entry_function_arguments/Move.toml b/examples/entry_function_arguments/Move.toml index 225101e178..e016cda818 100644 --- a/examples/entry_function_arguments/Move.toml +++ b/examples/entry_function_arguments/Move.toml @@ -3,9 +3,9 @@ name = "entry_function_arguments" version = "0.0.1" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] rooch_examples = "_" diff --git a/examples/entry_function_arguments_old/Move.toml b/examples/entry_function_arguments_old/Move.toml index 225101e178..e016cda818 100644 --- a/examples/entry_function_arguments_old/Move.toml +++ b/examples/entry_function_arguments_old/Move.toml @@ -3,9 +3,9 @@ name = "entry_function_arguments" version = "0.0.1" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] rooch_examples = "_" diff --git a/examples/event/Move.toml b/examples/event/Move.toml index b9ee7ee420..a5f90fe39d 100644 --- a/examples/event/Move.toml +++ b/examples/event/Move.toml @@ -3,7 +3,7 @@ name = "event" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/gas_free/Move.toml b/examples/gas_free/Move.toml index 6b932b83a9..70031335be 100644 --- a/examples/gas_free/Move.toml +++ b/examples/gas_free/Move.toml @@ -3,7 +3,7 @@ name = "gas_payer" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/gas_free/sources/gas_free.move b/examples/gas_free/sources/gas_free.move index 0839d1dc37..564b879864 100644 --- a/examples/gas_free/sources/gas_free.move +++ b/examples/gas_free/sources/gas_free.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + module rooch_examples::gas_payer { diff --git a/examples/kv_store/Move.toml b/examples/kv_store/Move.toml index 1f2ca17213..7f19de5d9a 100644 --- a/examples/kv_store/Move.toml +++ b/examples/kv_store/Move.toml @@ -3,7 +3,7 @@ name = "kv_store" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/module_init/Move.toml b/examples/module_init/Move.toml index 6e60f74581..c779fc73e8 100644 --- a/examples/module_init/Move.toml +++ b/examples/module_init/Move.toml @@ -3,7 +3,7 @@ name = "module_init" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/module_template/Move.toml b/examples/module_template/Move.toml index c24a7255f2..585127044f 100644 --- a/examples/module_template/Move.toml +++ b/examples/module_template/Move.toml @@ -3,13 +3,13 @@ name = "module_template" version = "0.0.1" [dependencies] -#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] rooch_examples = "_" diff --git a/examples/module_template/template/Move.toml b/examples/module_template/template/Move.toml index 2b2024ce9c..aaeb57e3cf 100644 --- a/examples/module_template/template/Move.toml +++ b/examples/module_template/template/Move.toml @@ -3,13 +3,13 @@ name = "template" version = "0.0.1" [dependencies] -#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } -MoveStdlib = { local = "../../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../../crates/rooch-framework" } +MoveStdlib = { local = "../../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../../frameworks/rooch-framework" } [addresses] template = "0xdeadeadeadeadeadeadeadeadeadeadeadeadeadeadeadeadeadeadeadeadead" diff --git a/examples/nft/Move.toml b/examples/nft/Move.toml index 2142484e39..251fe3830e 100644 --- a/examples/nft/Move.toml +++ b/examples/nft/Move.toml @@ -3,9 +3,9 @@ name = "nft" version = "0.0.1" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] nft = "_" diff --git a/examples/noop_auth_validator/Move.toml b/examples/noop_auth_validator/Move.toml index 8d2c159708..fffc15c5ca 100644 --- a/examples/noop_auth_validator/Move.toml +++ b/examples/noop_auth_validator/Move.toml @@ -3,9 +3,9 @@ name = "noop_auth_validator" version = "0.0.1" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] noop_auth_validator = "_" diff --git a/examples/private_generics/Move.toml b/examples/private_generics/Move.toml index 2ca43e0391..9b96b13b95 100644 --- a/examples/private_generics/Move.toml +++ b/examples/private_generics/Move.toml @@ -3,7 +3,7 @@ name = "private_generics" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } [addresses] rooch_examples = "_" diff --git a/examples/publish_modules/Move.toml b/examples/publish_modules/Move.toml index 6b14ac306f..ff41a640f7 100644 --- a/examples/publish_modules/Move.toml +++ b/examples/publish_modules/Move.toml @@ -3,9 +3,9 @@ name = "publish_modules" version = "0.0.1" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] rooch_examples = "_" diff --git a/examples/quick_start_counter/Move.toml b/examples/quick_start_counter/Move.toml index edff10a096..d945a6c4eb 100644 --- a/examples/quick_start_counter/Move.toml +++ b/examples/quick_start_counter/Move.toml @@ -3,13 +3,13 @@ name = "quick_start_counter" version = "0.0.1" [dependencies] -#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] quick_start_counter = "_" diff --git a/examples/quick_start_counter/sources/counter.move b/examples/quick_start_counter/sources/counter.move index 9166a8515a..eb005f80ae 100644 --- a/examples/quick_start_counter/sources/counter.move +++ b/examples/quick_start_counter/sources/counter.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + module quick_start_counter::quick_start_counter { use moveos_std::account; @@ -14,4 +17,4 @@ module quick_start_counter::quick_start_counter { let counter = account::borrow_mut_resource(@quick_start_counter); counter.count_value = counter.count_value + 1; } -} \ No newline at end of file +} diff --git a/examples/quick_start_object_counter/Move.toml b/examples/quick_start_object_counter/Move.toml index df8685b323..477932170b 100644 --- a/examples/quick_start_object_counter/Move.toml +++ b/examples/quick_start_object_counter/Move.toml @@ -3,13 +3,13 @@ name = "quick_start_object_counter" version = "0.0.1" [dependencies] -#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] quick_start_object_counter = "_" diff --git a/examples/quick_start_object_counter/sources/counter.move b/examples/quick_start_object_counter/sources/counter.move index bf1e9415a3..b92fdc1510 100644 --- a/examples/quick_start_object_counter/sources/counter.move +++ b/examples/quick_start_object_counter/sources/counter.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + module quick_start_object_counter::quick_start_object_counter { use std::signer; use moveos_std::event; @@ -37,4 +40,4 @@ module quick_start_object_counter::quick_start_object_counter { let counter = object::borrow_mut(counter_obj); counter.count_value = counter.count_value + 1; } -} \ No newline at end of file +} diff --git a/examples/simple_blog/Move.toml b/examples/simple_blog/Move.toml index e92dcc869a..9a9ac66e9c 100644 --- a/examples/simple_blog/Move.toml +++ b/examples/simple_blog/Move.toml @@ -3,13 +3,13 @@ name = "simple_blog" version = "0.0.1" [dependencies] -#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/move-stdlib", rev = "main" } -#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "moveos/moveos-stdlib/moveos-stdlib", rev = "main" } -#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "crates/rooch-framework", rev = "main" } +#MoveStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/move-stdlib", rev = "main" } +#MoveosStdlib = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/moveos-stdlib", rev = "main" } +#RoochFramework = { git = "https://github.com/rooch-network/rooch.git", subdir = "frameworks/rooch-framework", rev = "main" } -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] std = "0x1" diff --git a/examples/steal_split/Move.toml b/examples/steal_split/Move.toml index dd14bde6c3..61e8eb4283 100644 --- a/examples/steal_split/Move.toml +++ b/examples/steal_split/Move.toml @@ -3,7 +3,7 @@ name = "examples/steal_split" version = "0.0.1" [dependencies] -RoochFramework = { local = "../../crates/rooch-framework" } +RoochFramework = { local = "../../frameworks/rooch-framework" } [addresses] rooch_examples = "_" diff --git a/examples/wasm_execution/Move.toml b/examples/wasm_execution/Move.toml index f3cc12eaf0..ad1afd9e80 100644 --- a/examples/wasm_execution/Move.toml +++ b/examples/wasm_execution/Move.toml @@ -3,7 +3,7 @@ name = "wasm_execution" version = "0.0.1" [dependencies] -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } BitcoinMove = { local = "../../frameworks/bitcoin-move" } [addresses] diff --git a/frameworks/bitcoin-move/Cargo.toml b/frameworks/bitcoin-move/Cargo.toml index a426c981e1..68e14b920f 100644 --- a/frameworks/bitcoin-move/Cargo.toml +++ b/frameworks/bitcoin-move/Cargo.toml @@ -51,7 +51,7 @@ move-prover = { workspace = true } moveos-types = { workspace = true } moveos-verifier = { workspace = true } moveos-stdlib = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos = { workspace = true } rooch-types = { workspace = true } diff --git a/frameworks/bitcoin-move/Move.toml b/frameworks/bitcoin-move/Move.toml index 23085f2a9a..d5cc456509 100644 --- a/frameworks/bitcoin-move/Move.toml +++ b/frameworks/bitcoin-move/Move.toml @@ -10,6 +10,6 @@ rooch_framework = "0x3" bitcoin_move = "0x4" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } -RoochFramework = { local = "../../crates/rooch-framework" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } +RoochFramework = { local = "../../frameworks/rooch-framework" } diff --git a/frameworks/bitcoin-move/doc/README.md b/frameworks/bitcoin-move/doc/README.md index f4c8fbf89a..ef594bcc35 100644 --- a/frameworks/bitcoin-move/doc/README.md +++ b/frameworks/bitcoin-move/doc/README.md @@ -31,6 +31,6 @@ This is the reference documentation of the Bitcoin Move Framework. ## Reference -* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/move-stdlib/doc) -* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/moveos-stdlib/doc) -* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/doc) +* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/move-stdlib/doc) +* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/moveos-stdlib/doc) +* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/frameworks/rooch-framework/doc) diff --git a/frameworks/bitcoin-move/doc_template/README.md b/frameworks/bitcoin-move/doc_template/README.md index 55fd08cd50..c90d2fbad1 100644 --- a/frameworks/bitcoin-move/doc_template/README.md +++ b/frameworks/bitcoin-move/doc_template/README.md @@ -8,6 +8,6 @@ This is the reference documentation of the Bitcoin Move Framework. ## Reference -* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/move-stdlib/doc) -* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/moveos-stdlib/doc) -* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/doc) \ No newline at end of file +* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/move-stdlib/doc) +* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/moveos-stdlib/doc) +* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/frameworks/rooch-framework/doc) \ No newline at end of file diff --git a/frameworks/bitcoin-move/sources/data_import_config.move b/frameworks/bitcoin-move/sources/data_import_config.move index 5dd961b58a..e41c2ff172 100644 --- a/frameworks/bitcoin-move/sources/data_import_config.move +++ b/frameworks/bitcoin-move/sources/data_import_config.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + // Copyright (c) RoochDataImportMode // SPDX-License-Identifier: Apache-2.0 @@ -50,4 +53,4 @@ module bitcoin_move::data_import_config{ public fun is_ord_mode(data_import_mode: u8): bool { data_import_mode == DATA_IMPORT_MODE_ORD } -} \ No newline at end of file +} diff --git a/moveos/moveos-stdlib-builder/Cargo.toml b/frameworks/framework-builder/Cargo.toml similarity index 98% rename from moveos/moveos-stdlib-builder/Cargo.toml rename to frameworks/framework-builder/Cargo.toml index eaffbfe504..76f11e75b3 100644 --- a/moveos/moveos-stdlib-builder/Cargo.toml +++ b/frameworks/framework-builder/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "moveos-stdlib-builder" +name = "framework-builder" version = "0.1.0" # Workspace inherited keys diff --git a/moveos/moveos-stdlib-builder/src/dependency_order.rs b/frameworks/framework-builder/src/dependency_order.rs similarity index 100% rename from moveos/moveos-stdlib-builder/src/dependency_order.rs rename to frameworks/framework-builder/src/dependency_order.rs diff --git a/moveos/moveos-stdlib-builder/src/lib.rs b/frameworks/framework-builder/src/lib.rs similarity index 100% rename from moveos/moveos-stdlib-builder/src/lib.rs rename to frameworks/framework-builder/src/lib.rs diff --git a/crates/rooch-framework-release/Cargo.toml b/frameworks/framework-release/Cargo.toml similarity index 90% rename from crates/rooch-framework-release/Cargo.toml rename to frameworks/framework-release/Cargo.toml index b42246ce51..929f00c304 100644 --- a/crates/rooch-framework-release/Cargo.toml +++ b/frameworks/framework-release/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rooch-framework-release" +name = "framework-release" version = "0.1.0" # Workspace inherited keys @@ -20,7 +20,7 @@ rpassword = { workspace = true } move-core-types = { workspace = true } move-binary-format = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos-types = { workspace = true } rooch-genesis-builder = { workspace = true } rooch-types = { workspace = true } \ No newline at end of file diff --git a/crates/rooch-framework-release/README.md b/frameworks/framework-release/README.md similarity index 81% rename from crates/rooch-framework-release/README.md rename to frameworks/framework-release/README.md index 52315b03b8..349a60b870 100644 --- a/crates/rooch-framework-release/README.md +++ b/frameworks/framework-release/README.md @@ -9,7 +9,7 @@ This crate is used to compile the moveos-stdlib and rooch-framework, and then ge 1. Compile ```bash -cargo run --package rooch-framework-release --bin rooch-framework-release +cargo run --package framework-release --bin framework-release ``` This command will compile the latest moveos-stdlib and rooch-framework, and then check the compatibility with previous one (if exists). @@ -21,7 +21,7 @@ This command will compile the latest moveos-stdlib and rooch-framework, and then The version number must start from 1 and increase continuously, or the command will abort. ```bash -cargo run --package rooch-framework-release --bin rooch-framework-release -- --version 1 +cargo run --package framework-release --bin framework-release -- --version 1 ``` All modified source files and generated files should be committed. \ No newline at end of file diff --git a/crates/rooch-framework-release/src/main.rs b/frameworks/framework-release/src/main.rs similarity index 96% rename from crates/rooch-framework-release/src/main.rs rename to frameworks/framework-release/src/main.rs index 21d27dbb73..0b37a85c27 100644 --- a/crates/rooch-framework-release/src/main.rs +++ b/frameworks/framework-release/src/main.rs @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use clap::Parser; +use framework_builder::Stdlib; use itertools::Itertools; use move_binary_format::{ compatibility::Compatibility, errors::PartialVMResult, normalized::Module, CompiledModule, }; -use moveos_stdlib_builder::Stdlib; use rooch_genesis_builder::build_stdlib; use rooch_types::stdlib_version::StdlibVersion; use std::collections::HashMap; @@ -14,10 +14,7 @@ use std::path::Path; use std::path::PathBuf; #[derive(Parser)] -#[clap( - name = "rooch-framework-release", - author = "The Rooch Core Contributors" -)] +#[clap(name = "framework-release", author = "The Rooch Core Contributors")] struct StdlibOpts { /// Version number for compiled stdlib, starting from 1 and increasing continuously. #[clap(short = 'v', long, value_name = "VERSION")] @@ -184,7 +181,7 @@ fn stdlib_output_file(version_str: &str) -> PathBuf { } fn release_dir() -> PathBuf { - path_in_crate(format!("../rooch-framework-release/compiled/",)) + path_in_crate(format!("../framework-release/compiled/",)) } fn path_in_crate(relative: S) -> PathBuf diff --git a/moveos/moveos-stdlib/move-stdlib/Move.toml b/frameworks/move-stdlib/Move.toml similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/Move.toml rename to frameworks/move-stdlib/Move.toml diff --git a/moveos/moveos-stdlib/move-stdlib/README.md b/frameworks/move-stdlib/README.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/README.md rename to frameworks/move-stdlib/README.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/README.md b/frameworks/move-stdlib/doc/README.md similarity index 92% rename from moveos/moveos-stdlib/move-stdlib/doc/README.md rename to frameworks/move-stdlib/doc/README.md index b6a7445eea..bf03635c34 100644 --- a/moveos/moveos-stdlib/move-stdlib/doc/README.md +++ b/frameworks/move-stdlib/doc/README.md @@ -34,5 +34,5 @@ This is the reference documentation of the Move standard library. ## Reference -* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/moveos-stdlib/doc) -* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/doc) +* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/moveos-stdlib/doc) +* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/frameworks/rooch-framework/doc) diff --git a/moveos/moveos-stdlib/move-stdlib/doc/acl.md b/frameworks/move-stdlib/doc/acl.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/acl.md rename to frameworks/move-stdlib/doc/acl.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/ascii.md b/frameworks/move-stdlib/doc/ascii.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/ascii.md rename to frameworks/move-stdlib/doc/ascii.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/bcs.md b/frameworks/move-stdlib/doc/bcs.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/bcs.md rename to frameworks/move-stdlib/doc/bcs.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/bit_vector.md b/frameworks/move-stdlib/doc/bit_vector.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/bit_vector.md rename to frameworks/move-stdlib/doc/bit_vector.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/compare.md b/frameworks/move-stdlib/doc/compare.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/compare.md rename to frameworks/move-stdlib/doc/compare.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/debug.md b/frameworks/move-stdlib/doc/debug.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/debug.md rename to frameworks/move-stdlib/doc/debug.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/error.md b/frameworks/move-stdlib/doc/error.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/error.md rename to frameworks/move-stdlib/doc/error.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/fixed_point32.md b/frameworks/move-stdlib/doc/fixed_point32.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/fixed_point32.md rename to frameworks/move-stdlib/doc/fixed_point32.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/hash.md b/frameworks/move-stdlib/doc/hash.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/hash.md rename to frameworks/move-stdlib/doc/hash.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/option.md b/frameworks/move-stdlib/doc/option.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/option.md rename to frameworks/move-stdlib/doc/option.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/signer.md b/frameworks/move-stdlib/doc/signer.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/signer.md rename to frameworks/move-stdlib/doc/signer.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/string.md b/frameworks/move-stdlib/doc/string.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/string.md rename to frameworks/move-stdlib/doc/string.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/type_name.md b/frameworks/move-stdlib/doc/type_name.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/type_name.md rename to frameworks/move-stdlib/doc/type_name.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc/vector.md b/frameworks/move-stdlib/doc/vector.md similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/doc/vector.md rename to frameworks/move-stdlib/doc/vector.md diff --git a/moveos/moveos-stdlib/move-stdlib/doc_template/README.md b/frameworks/move-stdlib/doc_template/README.md similarity index 78% rename from moveos/moveos-stdlib/move-stdlib/doc_template/README.md rename to frameworks/move-stdlib/doc_template/README.md index 757466ed0f..6198693dbf 100644 --- a/moveos/moveos-stdlib/move-stdlib/doc_template/README.md +++ b/frameworks/move-stdlib/doc_template/README.md @@ -8,5 +8,5 @@ This is the reference documentation of the Move standard library. ## Reference -* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/moveos-stdlib/doc) -* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/doc) \ No newline at end of file +* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/moveos-stdlib/doc) +* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/frameworks/rooch-framework/doc) \ No newline at end of file diff --git a/moveos/moveos-stdlib/move-stdlib/error_description.errmap b/frameworks/move-stdlib/error_description.errmap similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/error_description.errmap rename to frameworks/move-stdlib/error_description.errmap diff --git a/moveos/moveos-stdlib/move-stdlib/sources/acl.move b/frameworks/move-stdlib/sources/acl.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/acl.move rename to frameworks/move-stdlib/sources/acl.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/acl.spec.move b/frameworks/move-stdlib/sources/acl.spec.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/acl.spec.move rename to frameworks/move-stdlib/sources/acl.spec.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/ascii.move b/frameworks/move-stdlib/sources/ascii.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/ascii.move rename to frameworks/move-stdlib/sources/ascii.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/bcs.move b/frameworks/move-stdlib/sources/bcs.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/bcs.move rename to frameworks/move-stdlib/sources/bcs.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/bit_vector.move b/frameworks/move-stdlib/sources/bit_vector.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/bit_vector.move rename to frameworks/move-stdlib/sources/bit_vector.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/compare.move b/frameworks/move-stdlib/sources/compare.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/compare.move rename to frameworks/move-stdlib/sources/compare.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/debug.move b/frameworks/move-stdlib/sources/debug.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/debug.move rename to frameworks/move-stdlib/sources/debug.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/error.move b/frameworks/move-stdlib/sources/error.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/error.move rename to frameworks/move-stdlib/sources/error.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/fixed_point32.move b/frameworks/move-stdlib/sources/fixed_point32.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/fixed_point32.move rename to frameworks/move-stdlib/sources/fixed_point32.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/hash.move b/frameworks/move-stdlib/sources/hash.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/hash.move rename to frameworks/move-stdlib/sources/hash.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/option.move b/frameworks/move-stdlib/sources/option.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/option.move rename to frameworks/move-stdlib/sources/option.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/signer.move b/frameworks/move-stdlib/sources/signer.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/signer.move rename to frameworks/move-stdlib/sources/signer.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/string.move b/frameworks/move-stdlib/sources/string.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/string.move rename to frameworks/move-stdlib/sources/string.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/string.spec.move b/frameworks/move-stdlib/sources/string.spec.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/string.spec.move rename to frameworks/move-stdlib/sources/string.spec.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/type_name.move b/frameworks/move-stdlib/sources/type_name.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/type_name.move rename to frameworks/move-stdlib/sources/type_name.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/unit_test.move b/frameworks/move-stdlib/sources/unit_test.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/unit_test.move rename to frameworks/move-stdlib/sources/unit_test.move diff --git a/moveos/moveos-stdlib/move-stdlib/sources/vector.move b/frameworks/move-stdlib/sources/vector.move similarity index 100% rename from moveos/moveos-stdlib/move-stdlib/sources/vector.move rename to frameworks/move-stdlib/sources/vector.move diff --git a/moveos/moveos-stdlib/Cargo.toml b/frameworks/moveos-stdlib/Cargo.toml similarity index 97% rename from moveos/moveos-stdlib/Cargo.toml rename to frameworks/moveos-stdlib/Cargo.toml index 8c9bfb90fc..3398f321da 100644 --- a/moveos/moveos-stdlib/Cargo.toml +++ b/frameworks/moveos-stdlib/Cargo.toml @@ -48,7 +48,7 @@ move-prover = { workspace = true } moveos-types = { workspace = true } moveos-verifier = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos-wasm = { workspace = true } wasmer = { workspace = true } moveos-object-runtime = { workspace = true } diff --git a/moveos/moveos-stdlib/moveos-stdlib/Move.toml b/frameworks/moveos-stdlib/Move.toml similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/Move.toml rename to frameworks/moveos-stdlib/Move.toml diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/README.md b/frameworks/moveos-stdlib/doc/README.md similarity index 95% rename from moveos/moveos-stdlib/moveos-stdlib/doc/README.md rename to frameworks/moveos-stdlib/doc/README.md index 30798cc8a7..1c70622592 100644 --- a/moveos/moveos-stdlib/moveos-stdlib/doc/README.md +++ b/frameworks/moveos-stdlib/doc/README.md @@ -48,5 +48,5 @@ This is the reference documentation of the MoveOS standard library. ## Reference -* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/move-stdlib/doc) -* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/doc) +* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/move-stdlib/doc) +* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/frameworks/rooch-framework/doc) diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/account.md b/frameworks/moveos-stdlib/doc/account.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/account.md rename to frameworks/moveos-stdlib/doc/account.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/address.md b/frameworks/moveos-stdlib/doc/address.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/address.md rename to frameworks/moveos-stdlib/doc/address.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/any.md b/frameworks/moveos-stdlib/doc/any.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/any.md rename to frameworks/moveos-stdlib/doc/any.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/bag.md b/frameworks/moveos-stdlib/doc/bag.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/bag.md rename to frameworks/moveos-stdlib/doc/bag.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/bcs.md b/frameworks/moveos-stdlib/doc/bcs.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/bcs.md rename to frameworks/moveos-stdlib/doc/bcs.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/big_vector.md b/frameworks/moveos-stdlib/doc/big_vector.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/big_vector.md rename to frameworks/moveos-stdlib/doc/big_vector.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/copyable_any.md b/frameworks/moveos-stdlib/doc/copyable_any.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/copyable_any.md rename to frameworks/moveos-stdlib/doc/copyable_any.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/core_addresses.md b/frameworks/moveos-stdlib/doc/core_addresses.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/core_addresses.md rename to frameworks/moveos-stdlib/doc/core_addresses.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/display.md b/frameworks/moveos-stdlib/doc/display.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/display.md rename to frameworks/moveos-stdlib/doc/display.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/event.md b/frameworks/moveos-stdlib/doc/event.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/event.md rename to frameworks/moveos-stdlib/doc/event.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/genesis.md b/frameworks/moveos-stdlib/doc/genesis.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/genesis.md rename to frameworks/moveos-stdlib/doc/genesis.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/hex.md b/frameworks/moveos-stdlib/doc/hex.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/hex.md rename to frameworks/moveos-stdlib/doc/hex.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/json.md b/frameworks/moveos-stdlib/doc/json.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/json.md rename to frameworks/moveos-stdlib/doc/json.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/move_module.md b/frameworks/moveos-stdlib/doc/move_module.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/move_module.md rename to frameworks/moveos-stdlib/doc/move_module.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/object.md b/frameworks/moveos-stdlib/doc/object.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/object.md rename to frameworks/moveos-stdlib/doc/object.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/rlp.md b/frameworks/moveos-stdlib/doc/rlp.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/rlp.md rename to frameworks/moveos-stdlib/doc/rlp.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/signer.md b/frameworks/moveos-stdlib/doc/signer.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/signer.md rename to frameworks/moveos-stdlib/doc/signer.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/simple_map.md b/frameworks/moveos-stdlib/doc/simple_map.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/simple_map.md rename to frameworks/moveos-stdlib/doc/simple_map.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/simple_multimap.md b/frameworks/moveos-stdlib/doc/simple_multimap.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/simple_multimap.md rename to frameworks/moveos-stdlib/doc/simple_multimap.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/string_utils.md b/frameworks/moveos-stdlib/doc/string_utils.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/string_utils.md rename to frameworks/moveos-stdlib/doc/string_utils.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/table.md b/frameworks/moveos-stdlib/doc/table.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/table.md rename to frameworks/moveos-stdlib/doc/table.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/table_vec.md b/frameworks/moveos-stdlib/doc/table_vec.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/table_vec.md rename to frameworks/moveos-stdlib/doc/table_vec.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/tx_context.md b/frameworks/moveos-stdlib/doc/tx_context.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/tx_context.md rename to frameworks/moveos-stdlib/doc/tx_context.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/tx_meta.md b/frameworks/moveos-stdlib/doc/tx_meta.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/tx_meta.md rename to frameworks/moveos-stdlib/doc/tx_meta.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/tx_result.md b/frameworks/moveos-stdlib/doc/tx_result.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/tx_result.md rename to frameworks/moveos-stdlib/doc/tx_result.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/type_info.md b/frameworks/moveos-stdlib/doc/type_info.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/type_info.md rename to frameworks/moveos-stdlib/doc/type_info.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/type_table.md b/frameworks/moveos-stdlib/doc/type_table.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/type_table.md rename to frameworks/moveos-stdlib/doc/type_table.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/wasm.md b/frameworks/moveos-stdlib/doc/wasm.md similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/doc/wasm.md rename to frameworks/moveos-stdlib/doc/wasm.md diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc_template/README.md b/frameworks/moveos-stdlib/doc_template/README.md similarity index 79% rename from moveos/moveos-stdlib/moveos-stdlib/doc_template/README.md rename to frameworks/moveos-stdlib/doc_template/README.md index 1c8d4b4524..4c6617c316 100644 --- a/moveos/moveos-stdlib/moveos-stdlib/doc_template/README.md +++ b/frameworks/moveos-stdlib/doc_template/README.md @@ -8,5 +8,5 @@ This is the reference documentation of the MoveOS standard library. ## Reference -* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/move-stdlib/doc) -* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/crates/rooch-framework/doc) \ No newline at end of file +* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/move-stdlib/doc) +* [RoochFramework](https://github.com/rooch-network/rooch/tree/main/frameworks/rooch-framework/doc) \ No newline at end of file diff --git a/moveos/moveos-stdlib/moveos-stdlib/error_description.errmap b/frameworks/moveos-stdlib/error_description.errmap similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/error_description.errmap rename to frameworks/moveos-stdlib/error_description.errmap diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/account.move b/frameworks/moveos-stdlib/sources/account.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/account.move rename to frameworks/moveos-stdlib/sources/account.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/address.move b/frameworks/moveos-stdlib/sources/address.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/address.move rename to frameworks/moveos-stdlib/sources/address.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/any.move b/frameworks/moveos-stdlib/sources/any.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/any.move rename to frameworks/moveos-stdlib/sources/any.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/bag.move b/frameworks/moveos-stdlib/sources/bag.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/bag.move rename to frameworks/moveos-stdlib/sources/bag.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/bcs.move b/frameworks/moveos-stdlib/sources/bcs.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/bcs.move rename to frameworks/moveos-stdlib/sources/bcs.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/big_vector.move b/frameworks/moveos-stdlib/sources/big_vector.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/big_vector.move rename to frameworks/moveos-stdlib/sources/big_vector.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/copyable_any.move b/frameworks/moveos-stdlib/sources/copyable_any.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/copyable_any.move rename to frameworks/moveos-stdlib/sources/copyable_any.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/core_addresses.move b/frameworks/moveos-stdlib/sources/core_addresses.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/core_addresses.move rename to frameworks/moveos-stdlib/sources/core_addresses.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/display.move b/frameworks/moveos-stdlib/sources/display.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/display.move rename to frameworks/moveos-stdlib/sources/display.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/event.move b/frameworks/moveos-stdlib/sources/event.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/event.move rename to frameworks/moveos-stdlib/sources/event.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/genesis.move b/frameworks/moveos-stdlib/sources/genesis.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/genesis.move rename to frameworks/moveos-stdlib/sources/genesis.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/hex.move b/frameworks/moveos-stdlib/sources/hex.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/hex.move rename to frameworks/moveos-stdlib/sources/hex.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/json.move b/frameworks/moveos-stdlib/sources/json.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/json.move rename to frameworks/moveos-stdlib/sources/json.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/move_module.move b/frameworks/moveos-stdlib/sources/move_module.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/move_module.move rename to frameworks/moveos-stdlib/sources/move_module.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/object.move b/frameworks/moveos-stdlib/sources/object.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/object.move rename to frameworks/moveos-stdlib/sources/object.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/rlp.move b/frameworks/moveos-stdlib/sources/rlp.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/rlp.move rename to frameworks/moveos-stdlib/sources/rlp.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/signer.move b/frameworks/moveos-stdlib/sources/signer.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/signer.move rename to frameworks/moveos-stdlib/sources/signer.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/simple_map.move b/frameworks/moveos-stdlib/sources/simple_map.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/simple_map.move rename to frameworks/moveos-stdlib/sources/simple_map.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/simple_multimap.move b/frameworks/moveos-stdlib/sources/simple_multimap.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/simple_multimap.move rename to frameworks/moveos-stdlib/sources/simple_multimap.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/string_utils.move b/frameworks/moveos-stdlib/sources/string_utils.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/string_utils.move rename to frameworks/moveos-stdlib/sources/string_utils.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/table.move b/frameworks/moveos-stdlib/sources/table.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/table.move rename to frameworks/moveos-stdlib/sources/table.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/table_vec.move b/frameworks/moveos-stdlib/sources/table_vec.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/table_vec.move rename to frameworks/moveos-stdlib/sources/table_vec.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/test_helper.move b/frameworks/moveos-stdlib/sources/test_helper.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/test_helper.move rename to frameworks/moveos-stdlib/sources/test_helper.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/tx_context.move b/frameworks/moveos-stdlib/sources/tx_context.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/tx_context.move rename to frameworks/moveos-stdlib/sources/tx_context.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/tx_meta.move b/frameworks/moveos-stdlib/sources/tx_meta.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/tx_meta.move rename to frameworks/moveos-stdlib/sources/tx_meta.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/tx_result.move b/frameworks/moveos-stdlib/sources/tx_result.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/tx_result.move rename to frameworks/moveos-stdlib/sources/tx_result.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/type_info.move b/frameworks/moveos-stdlib/sources/type_info.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/type_info.move rename to frameworks/moveos-stdlib/sources/type_info.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/type_info.spec.move b/frameworks/moveos-stdlib/sources/type_info.spec.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/type_info.spec.move rename to frameworks/moveos-stdlib/sources/type_info.spec.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/type_table.move b/frameworks/moveos-stdlib/sources/type_table.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/sources/type_table.move rename to frameworks/moveos-stdlib/sources/type_table.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/wasm.move b/frameworks/moveos-stdlib/sources/wasm.move similarity index 96% rename from moveos/moveos-stdlib/moveos-stdlib/sources/wasm.move rename to frameworks/moveos-stdlib/sources/wasm.move index 3834f287b2..cf94c27c02 100644 --- a/moveos/moveos-stdlib/moveos-stdlib/sources/wasm.move +++ b/frameworks/moveos-stdlib/sources/wasm.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + module moveos_std::wasm { struct WASMInstance { id: u64 diff --git a/moveos/moveos-stdlib/src/lib.rs b/frameworks/moveos-stdlib/src/lib.rs similarity index 100% rename from moveos/moveos-stdlib/src/lib.rs rename to frameworks/moveos-stdlib/src/lib.rs diff --git a/moveos/moveos-stdlib/src/natives/helpers.rs b/frameworks/moveos-stdlib/src/natives/helpers.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/helpers.rs rename to frameworks/moveos-stdlib/src/natives/helpers.rs diff --git a/moveos/moveos-stdlib/src/natives/mod.rs b/frameworks/moveos-stdlib/src/natives/mod.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/mod.rs rename to frameworks/moveos-stdlib/src/natives/mod.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/account.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/account.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/account.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/account.rs diff --git a/crates/rooch-framework/src/natives/rooch_framework/bcs.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/bcs.rs similarity index 100% rename from crates/rooch-framework/src/natives/rooch_framework/bcs.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/bcs.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/event.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/event.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/event.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/event.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/json.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/json.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/json.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/json.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/mod.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/mod.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/mod.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/mod.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs similarity index 99% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs index 599d0305be..102b175b7e 100644 --- a/moveos/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs +++ b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs @@ -3,6 +3,7 @@ use crate::natives::helpers::{make_module_natives, make_native}; use better_any::{Tid, TidAble}; +use framework_builder::dependency_order::sort_by_dependency_order; use itertools::zip_eq; use move_binary_format::{ compatibility::Compatibility, @@ -26,7 +27,6 @@ use move_vm_types::{ pop_arg, values::{Struct, Value, Vector, VectorRef}, }; -use moveos_stdlib_builder::dependency_order::sort_by_dependency_order; use moveos_types::moveos_std::move_module::MoveModuleId; use smallvec::smallvec; use std::collections::{BTreeSet, HashMap, VecDeque}; diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/object.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/object.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/object.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/object.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/raw_table/mod.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/raw_table/mod.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/raw_table/mod.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/raw_table/mod.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/rlp.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/rlp.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/rlp.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/rlp.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/signer.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/signer.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/signer.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/signer.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/test_helper.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/test_helper.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/test_helper.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/test_helper.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/tx_context.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/tx_context.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/tx_context.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/tx_context.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/type_info.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/type_info.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/type_info.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/type_info.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/wasm.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/wasm.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/wasm.rs rename to frameworks/moveos-stdlib/src/natives/moveos_stdlib/wasm.rs diff --git a/moveos/moveos-stdlib/moveos-stdlib/tests/bag_tests.move b/frameworks/moveos-stdlib/tests/bag_tests.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/tests/bag_tests.move rename to frameworks/moveos-stdlib/tests/bag_tests.move diff --git a/moveos/moveos-stdlib/moveos-stdlib/tests/rlp_tests.move b/frameworks/moveos-stdlib/tests/rlp_tests.move similarity index 100% rename from moveos/moveos-stdlib/moveos-stdlib/tests/rlp_tests.move rename to frameworks/moveos-stdlib/tests/rlp_tests.move diff --git a/crates/rooch-framework/Cargo.toml b/frameworks/rooch-framework/Cargo.toml similarity index 97% rename from crates/rooch-framework/Cargo.toml rename to frameworks/rooch-framework/Cargo.toml index 9da554da13..c948bab8a2 100644 --- a/crates/rooch-framework/Cargo.toml +++ b/frameworks/rooch-framework/Cargo.toml @@ -48,7 +48,7 @@ move-prover = { workspace = true } moveos-types = { workspace = true } moveos-verifier = { workspace = true } moveos-stdlib = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos = { workspace = true } rooch-types = { workspace = true } \ No newline at end of file diff --git a/crates/rooch-framework/Move.toml b/frameworks/rooch-framework/Move.toml similarity index 53% rename from crates/rooch-framework/Move.toml rename to frameworks/rooch-framework/Move.toml index c120c68e10..f64dfade1e 100644 --- a/crates/rooch-framework/Move.toml +++ b/frameworks/rooch-framework/Move.toml @@ -9,5 +9,5 @@ rooch_framework = "0x3" vm_reserved = "0x0" [dependencies] -MoveStdlib = { local = "../../moveos/moveos-stdlib/move-stdlib" } -MoveosStdlib = { local = "../../moveos/moveos-stdlib/moveos-stdlib" } +MoveStdlib = { local = "../../frameworks/move-stdlib" } +MoveosStdlib = { local = "../../frameworks/moveos-stdlib" } diff --git a/crates/rooch-framework/doc/README.md b/frameworks/rooch-framework/doc/README.md similarity index 96% rename from crates/rooch-framework/doc/README.md rename to frameworks/rooch-framework/doc/README.md index 3b7faef873..bec10a2f2b 100644 --- a/crates/rooch-framework/doc/README.md +++ b/frameworks/rooch-framework/doc/README.md @@ -54,5 +54,5 @@ This is the reference documentation of the Rooch Framework. ## Reference -* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/move-stdlib/doc) -* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/moveos-stdlib/doc) +* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/move-stdlib/doc) +* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/moveos-stdlib/doc) diff --git a/crates/rooch-framework/doc/account.md b/frameworks/rooch-framework/doc/account.md similarity index 100% rename from crates/rooch-framework/doc/account.md rename to frameworks/rooch-framework/doc/account.md diff --git a/crates/rooch-framework/doc/account_authentication.md b/frameworks/rooch-framework/doc/account_authentication.md similarity index 100% rename from crates/rooch-framework/doc/account_authentication.md rename to frameworks/rooch-framework/doc/account_authentication.md diff --git a/crates/rooch-framework/doc/account_coin_store.md b/frameworks/rooch-framework/doc/account_coin_store.md similarity index 100% rename from crates/rooch-framework/doc/account_coin_store.md rename to frameworks/rooch-framework/doc/account_coin_store.md diff --git a/crates/rooch-framework/doc/address_mapping.md b/frameworks/rooch-framework/doc/address_mapping.md similarity index 100% rename from crates/rooch-framework/doc/address_mapping.md rename to frameworks/rooch-framework/doc/address_mapping.md diff --git a/crates/rooch-framework/doc/auth_payload.md b/frameworks/rooch-framework/doc/auth_payload.md similarity index 100% rename from crates/rooch-framework/doc/auth_payload.md rename to frameworks/rooch-framework/doc/auth_payload.md diff --git a/crates/rooch-framework/doc/auth_validator.md b/frameworks/rooch-framework/doc/auth_validator.md similarity index 100% rename from crates/rooch-framework/doc/auth_validator.md rename to frameworks/rooch-framework/doc/auth_validator.md diff --git a/crates/rooch-framework/doc/auth_validator_registry.md b/frameworks/rooch-framework/doc/auth_validator_registry.md similarity index 100% rename from crates/rooch-framework/doc/auth_validator_registry.md rename to frameworks/rooch-framework/doc/auth_validator_registry.md diff --git a/crates/rooch-framework/doc/bitcoin_address.md b/frameworks/rooch-framework/doc/bitcoin_address.md similarity index 100% rename from crates/rooch-framework/doc/bitcoin_address.md rename to frameworks/rooch-framework/doc/bitcoin_address.md diff --git a/crates/rooch-framework/doc/bitcoin_validator.md b/frameworks/rooch-framework/doc/bitcoin_validator.md similarity index 100% rename from crates/rooch-framework/doc/bitcoin_validator.md rename to frameworks/rooch-framework/doc/bitcoin_validator.md diff --git a/crates/rooch-framework/doc/builtin_validators.md b/frameworks/rooch-framework/doc/builtin_validators.md similarity index 100% rename from crates/rooch-framework/doc/builtin_validators.md rename to frameworks/rooch-framework/doc/builtin_validators.md diff --git a/crates/rooch-framework/doc/chain_id.md b/frameworks/rooch-framework/doc/chain_id.md similarity index 100% rename from crates/rooch-framework/doc/chain_id.md rename to frameworks/rooch-framework/doc/chain_id.md diff --git a/crates/rooch-framework/doc/coin.md b/frameworks/rooch-framework/doc/coin.md similarity index 100% rename from crates/rooch-framework/doc/coin.md rename to frameworks/rooch-framework/doc/coin.md diff --git a/crates/rooch-framework/doc/coin_store.md b/frameworks/rooch-framework/doc/coin_store.md similarity index 100% rename from crates/rooch-framework/doc/coin_store.md rename to frameworks/rooch-framework/doc/coin_store.md diff --git a/crates/rooch-framework/doc/core_addresses.md b/frameworks/rooch-framework/doc/core_addresses.md similarity index 100% rename from crates/rooch-framework/doc/core_addresses.md rename to frameworks/rooch-framework/doc/core_addresses.md diff --git a/crates/rooch-framework/doc/decoding.md b/frameworks/rooch-framework/doc/decoding.md similarity index 100% rename from crates/rooch-framework/doc/decoding.md rename to frameworks/rooch-framework/doc/decoding.md diff --git a/crates/rooch-framework/doc/ecdsa_k1.md b/frameworks/rooch-framework/doc/ecdsa_k1.md similarity index 100% rename from crates/rooch-framework/doc/ecdsa_k1.md rename to frameworks/rooch-framework/doc/ecdsa_k1.md diff --git a/crates/rooch-framework/doc/ed25519.md b/frameworks/rooch-framework/doc/ed25519.md similarity index 100% rename from crates/rooch-framework/doc/ed25519.md rename to frameworks/rooch-framework/doc/ed25519.md diff --git a/crates/rooch-framework/doc/empty.md b/frameworks/rooch-framework/doc/empty.md similarity index 100% rename from crates/rooch-framework/doc/empty.md rename to frameworks/rooch-framework/doc/empty.md diff --git a/crates/rooch-framework/doc/encoding.md b/frameworks/rooch-framework/doc/encoding.md similarity index 100% rename from crates/rooch-framework/doc/encoding.md rename to frameworks/rooch-framework/doc/encoding.md diff --git a/crates/rooch-framework/doc/ethereum_address.md b/frameworks/rooch-framework/doc/ethereum_address.md similarity index 100% rename from crates/rooch-framework/doc/ethereum_address.md rename to frameworks/rooch-framework/doc/ethereum_address.md diff --git a/crates/rooch-framework/doc/ethereum_light_client.md b/frameworks/rooch-framework/doc/ethereum_light_client.md similarity index 100% rename from crates/rooch-framework/doc/ethereum_light_client.md rename to frameworks/rooch-framework/doc/ethereum_light_client.md diff --git a/crates/rooch-framework/doc/ethereum_validator.md b/frameworks/rooch-framework/doc/ethereum_validator.md similarity index 100% rename from crates/rooch-framework/doc/ethereum_validator.md rename to frameworks/rooch-framework/doc/ethereum_validator.md diff --git a/crates/rooch-framework/doc/gas_coin.md b/frameworks/rooch-framework/doc/gas_coin.md similarity index 100% rename from crates/rooch-framework/doc/gas_coin.md rename to frameworks/rooch-framework/doc/gas_coin.md diff --git a/crates/rooch-framework/doc/genesis.md b/frameworks/rooch-framework/doc/genesis.md similarity index 100% rename from crates/rooch-framework/doc/genesis.md rename to frameworks/rooch-framework/doc/genesis.md diff --git a/crates/rooch-framework/doc/hash.md b/frameworks/rooch-framework/doc/hash.md similarity index 100% rename from crates/rooch-framework/doc/hash.md rename to frameworks/rooch-framework/doc/hash.md diff --git a/crates/rooch-framework/doc/multichain_address.md b/frameworks/rooch-framework/doc/multichain_address.md similarity index 100% rename from crates/rooch-framework/doc/multichain_address.md rename to frameworks/rooch-framework/doc/multichain_address.md diff --git a/crates/rooch-framework/doc/native_validator.md b/frameworks/rooch-framework/doc/native_validator.md similarity index 100% rename from crates/rooch-framework/doc/native_validator.md rename to frameworks/rooch-framework/doc/native_validator.md diff --git a/crates/rooch-framework/doc/onchain_config.md b/frameworks/rooch-framework/doc/onchain_config.md similarity index 100% rename from crates/rooch-framework/doc/onchain_config.md rename to frameworks/rooch-framework/doc/onchain_config.md diff --git a/crates/rooch-framework/doc/session_key.md b/frameworks/rooch-framework/doc/session_key.md similarity index 100% rename from crates/rooch-framework/doc/session_key.md rename to frameworks/rooch-framework/doc/session_key.md diff --git a/crates/rooch-framework/doc/timestamp.md b/frameworks/rooch-framework/doc/timestamp.md similarity index 100% rename from crates/rooch-framework/doc/timestamp.md rename to frameworks/rooch-framework/doc/timestamp.md diff --git a/crates/rooch-framework/doc/transaction_fee.md b/frameworks/rooch-framework/doc/transaction_fee.md similarity index 100% rename from crates/rooch-framework/doc/transaction_fee.md rename to frameworks/rooch-framework/doc/transaction_fee.md diff --git a/crates/rooch-framework/doc/transaction_validator.md b/frameworks/rooch-framework/doc/transaction_validator.md similarity index 100% rename from crates/rooch-framework/doc/transaction_validator.md rename to frameworks/rooch-framework/doc/transaction_validator.md diff --git a/crates/rooch-framework/doc/transfer.md b/frameworks/rooch-framework/doc/transfer.md similarity index 100% rename from crates/rooch-framework/doc/transfer.md rename to frameworks/rooch-framework/doc/transfer.md diff --git a/crates/rooch-framework/doc/upgrade.md b/frameworks/rooch-framework/doc/upgrade.md similarity index 100% rename from crates/rooch-framework/doc/upgrade.md rename to frameworks/rooch-framework/doc/upgrade.md diff --git a/crates/rooch-framework/doc_template/README.md b/frameworks/rooch-framework/doc_template/README.md similarity index 75% rename from crates/rooch-framework/doc_template/README.md rename to frameworks/rooch-framework/doc_template/README.md index fc6d20a253..40277ca472 100644 --- a/crates/rooch-framework/doc_template/README.md +++ b/frameworks/rooch-framework/doc_template/README.md @@ -8,5 +8,5 @@ This is the reference documentation of the Rooch Framework. ## Reference -* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/move-stdlib/doc) -* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/moveos/moveos-stdlib/moveos-stdlib/doc) \ No newline at end of file +* [MoveStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/move-stdlib/doc) +* [MoveosStdlib](https://github.com/rooch-network/rooch/tree/main/frameworks/moveos-stdlib/doc) \ No newline at end of file diff --git a/crates/rooch-framework/sources/account.move b/frameworks/rooch-framework/sources/account.move similarity index 100% rename from crates/rooch-framework/sources/account.move rename to frameworks/rooch-framework/sources/account.move diff --git a/crates/rooch-framework/sources/account_authentication.move b/frameworks/rooch-framework/sources/account_authentication.move similarity index 100% rename from crates/rooch-framework/sources/account_authentication.move rename to frameworks/rooch-framework/sources/account_authentication.move diff --git a/crates/rooch-framework/sources/account_coin_store.move b/frameworks/rooch-framework/sources/account_coin_store.move similarity index 100% rename from crates/rooch-framework/sources/account_coin_store.move rename to frameworks/rooch-framework/sources/account_coin_store.move diff --git a/crates/rooch-framework/sources/address_mapping.move b/frameworks/rooch-framework/sources/address_mapping.move similarity index 100% rename from crates/rooch-framework/sources/address_mapping.move rename to frameworks/rooch-framework/sources/address_mapping.move diff --git a/crates/rooch-framework/sources/address_type/bitcoin_address.move b/frameworks/rooch-framework/sources/address_type/bitcoin_address.move similarity index 100% rename from crates/rooch-framework/sources/address_type/bitcoin_address.move rename to frameworks/rooch-framework/sources/address_type/bitcoin_address.move diff --git a/crates/rooch-framework/sources/address_type/ethereum_address.move b/frameworks/rooch-framework/sources/address_type/ethereum_address.move similarity index 100% rename from crates/rooch-framework/sources/address_type/ethereum_address.move rename to frameworks/rooch-framework/sources/address_type/ethereum_address.move diff --git a/crates/rooch-framework/sources/address_type/multichain_address.move b/frameworks/rooch-framework/sources/address_type/multichain_address.move similarity index 100% rename from crates/rooch-framework/sources/address_type/multichain_address.move rename to frameworks/rooch-framework/sources/address_type/multichain_address.move diff --git a/crates/rooch-framework/sources/auth_validator/auth_payload.move b/frameworks/rooch-framework/sources/auth_validator/auth_payload.move similarity index 100% rename from crates/rooch-framework/sources/auth_validator/auth_payload.move rename to frameworks/rooch-framework/sources/auth_validator/auth_payload.move diff --git a/crates/rooch-framework/sources/auth_validator/auth_validator.move b/frameworks/rooch-framework/sources/auth_validator/auth_validator.move similarity index 100% rename from crates/rooch-framework/sources/auth_validator/auth_validator.move rename to frameworks/rooch-framework/sources/auth_validator/auth_validator.move diff --git a/crates/rooch-framework/sources/auth_validator/auth_validator_registry.move b/frameworks/rooch-framework/sources/auth_validator/auth_validator_registry.move similarity index 100% rename from crates/rooch-framework/sources/auth_validator/auth_validator_registry.move rename to frameworks/rooch-framework/sources/auth_validator/auth_validator_registry.move diff --git a/crates/rooch-framework/sources/auth_validator/bitcoin_validator.move b/frameworks/rooch-framework/sources/auth_validator/bitcoin_validator.move similarity index 100% rename from crates/rooch-framework/sources/auth_validator/bitcoin_validator.move rename to frameworks/rooch-framework/sources/auth_validator/bitcoin_validator.move diff --git a/crates/rooch-framework/sources/auth_validator/builtin_validators.move b/frameworks/rooch-framework/sources/auth_validator/builtin_validators.move similarity index 100% rename from crates/rooch-framework/sources/auth_validator/builtin_validators.move rename to frameworks/rooch-framework/sources/auth_validator/builtin_validators.move diff --git a/crates/rooch-framework/sources/auth_validator/ethereum_validator.move b/frameworks/rooch-framework/sources/auth_validator/ethereum_validator.move similarity index 100% rename from crates/rooch-framework/sources/auth_validator/ethereum_validator.move rename to frameworks/rooch-framework/sources/auth_validator/ethereum_validator.move diff --git a/crates/rooch-framework/sources/auth_validator/native_validator.move b/frameworks/rooch-framework/sources/auth_validator/native_validator.move similarity index 100% rename from crates/rooch-framework/sources/auth_validator/native_validator.move rename to frameworks/rooch-framework/sources/auth_validator/native_validator.move diff --git a/crates/rooch-framework/sources/chain_id.move b/frameworks/rooch-framework/sources/chain_id.move similarity index 100% rename from crates/rooch-framework/sources/chain_id.move rename to frameworks/rooch-framework/sources/chain_id.move diff --git a/crates/rooch-framework/sources/coin.move b/frameworks/rooch-framework/sources/coin.move similarity index 100% rename from crates/rooch-framework/sources/coin.move rename to frameworks/rooch-framework/sources/coin.move diff --git a/crates/rooch-framework/sources/coin_store.move b/frameworks/rooch-framework/sources/coin_store.move similarity index 100% rename from crates/rooch-framework/sources/coin_store.move rename to frameworks/rooch-framework/sources/coin_store.move diff --git a/crates/rooch-framework/sources/core_addresses.move b/frameworks/rooch-framework/sources/core_addresses.move similarity index 100% rename from crates/rooch-framework/sources/core_addresses.move rename to frameworks/rooch-framework/sources/core_addresses.move diff --git a/crates/rooch-framework/sources/crypto/decoding.move b/frameworks/rooch-framework/sources/crypto/decoding.move similarity index 100% rename from crates/rooch-framework/sources/crypto/decoding.move rename to frameworks/rooch-framework/sources/crypto/decoding.move diff --git a/crates/rooch-framework/sources/crypto/ecdsa_k1.move b/frameworks/rooch-framework/sources/crypto/ecdsa_k1.move similarity index 100% rename from crates/rooch-framework/sources/crypto/ecdsa_k1.move rename to frameworks/rooch-framework/sources/crypto/ecdsa_k1.move diff --git a/crates/rooch-framework/sources/crypto/ed25519.move b/frameworks/rooch-framework/sources/crypto/ed25519.move similarity index 100% rename from crates/rooch-framework/sources/crypto/ed25519.move rename to frameworks/rooch-framework/sources/crypto/ed25519.move diff --git a/crates/rooch-framework/sources/crypto/encoding.move b/frameworks/rooch-framework/sources/crypto/encoding.move similarity index 100% rename from crates/rooch-framework/sources/crypto/encoding.move rename to frameworks/rooch-framework/sources/crypto/encoding.move diff --git a/crates/rooch-framework/sources/crypto/hash.move b/frameworks/rooch-framework/sources/crypto/hash.move similarity index 100% rename from crates/rooch-framework/sources/crypto/hash.move rename to frameworks/rooch-framework/sources/crypto/hash.move diff --git a/crates/rooch-framework/sources/empty.move b/frameworks/rooch-framework/sources/empty.move similarity index 100% rename from crates/rooch-framework/sources/empty.move rename to frameworks/rooch-framework/sources/empty.move diff --git a/crates/rooch-framework/sources/ethereum_light_client.move b/frameworks/rooch-framework/sources/ethereum_light_client.move similarity index 100% rename from crates/rooch-framework/sources/ethereum_light_client.move rename to frameworks/rooch-framework/sources/ethereum_light_client.move diff --git a/crates/rooch-framework/sources/gas_coin.move b/frameworks/rooch-framework/sources/gas_coin.move similarity index 100% rename from crates/rooch-framework/sources/gas_coin.move rename to frameworks/rooch-framework/sources/gas_coin.move diff --git a/crates/rooch-framework/sources/genesis.move b/frameworks/rooch-framework/sources/genesis.move similarity index 100% rename from crates/rooch-framework/sources/genesis.move rename to frameworks/rooch-framework/sources/genesis.move diff --git a/crates/rooch-framework/sources/onchain_config.move b/frameworks/rooch-framework/sources/onchain_config.move similarity index 100% rename from crates/rooch-framework/sources/onchain_config.move rename to frameworks/rooch-framework/sources/onchain_config.move diff --git a/crates/rooch-framework/sources/session_key.move b/frameworks/rooch-framework/sources/session_key.move similarity index 100% rename from crates/rooch-framework/sources/session_key.move rename to frameworks/rooch-framework/sources/session_key.move diff --git a/crates/rooch-framework/sources/tests/account_authentication_test.move b/frameworks/rooch-framework/sources/tests/account_authentication_test.move similarity index 100% rename from crates/rooch-framework/sources/tests/account_authentication_test.move rename to frameworks/rooch-framework/sources/tests/account_authentication_test.move diff --git a/crates/rooch-framework/sources/tests/account_coin_store_test.move b/frameworks/rooch-framework/sources/tests/account_coin_store_test.move similarity index 98% rename from crates/rooch-framework/sources/tests/account_coin_store_test.move rename to frameworks/rooch-framework/sources/tests/account_coin_store_test.move index e1b8c6a3be..bd358d477f 100644 --- a/crates/rooch-framework/sources/tests/account_coin_store_test.move +++ b/frameworks/rooch-framework/sources/tests/account_coin_store_test.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + #[test_only] /// This test module is used to test the account_coin_store module. module rooch_framework::account_coin_store_test{ @@ -179,4 +182,4 @@ module rooch_framework::account_coin_store_test{ } -} \ No newline at end of file +} diff --git a/crates/rooch-framework/sources/tests/address_maping_test.move b/frameworks/rooch-framework/sources/tests/address_maping_test.move similarity index 100% rename from crates/rooch-framework/sources/tests/address_maping_test.move rename to frameworks/rooch-framework/sources/tests/address_maping_test.move diff --git a/crates/rooch-framework/sources/tests/chain_id_test.move b/frameworks/rooch-framework/sources/tests/chain_id_test.move similarity index 100% rename from crates/rooch-framework/sources/tests/chain_id_test.move rename to frameworks/rooch-framework/sources/tests/chain_id_test.move diff --git a/crates/rooch-framework/sources/tests/coin_store_test.move b/frameworks/rooch-framework/sources/tests/coin_store_test.move similarity index 98% rename from crates/rooch-framework/sources/tests/coin_store_test.move rename to frameworks/rooch-framework/sources/tests/coin_store_test.move index e37e8dadfe..9e4aa4f6f4 100644 --- a/crates/rooch-framework/sources/tests/coin_store_test.move +++ b/frameworks/rooch-framework/sources/tests/coin_store_test.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + #[test_only] /// This test module is used to test the coin store logic module rooch_framework::coin_store_test{ @@ -150,4 +153,4 @@ module rooch_framework::coin_store_test{ } -} \ No newline at end of file +} diff --git a/crates/rooch-framework/sources/tests/coin_test.move b/frameworks/rooch-framework/sources/tests/coin_test.move similarity index 100% rename from crates/rooch-framework/sources/tests/coin_test.move rename to frameworks/rooch-framework/sources/tests/coin_test.move diff --git a/crates/rooch-framework/sources/tests/gas_coin_test.move b/frameworks/rooch-framework/sources/tests/gas_coin_test.move similarity index 100% rename from crates/rooch-framework/sources/tests/gas_coin_test.move rename to frameworks/rooch-framework/sources/tests/gas_coin_test.move diff --git a/crates/rooch-framework/sources/tests/session_key_test.move b/frameworks/rooch-framework/sources/tests/session_key_test.move similarity index 100% rename from crates/rooch-framework/sources/tests/session_key_test.move rename to frameworks/rooch-framework/sources/tests/session_key_test.move diff --git a/crates/rooch-framework/sources/tests/transfer_test.move b/frameworks/rooch-framework/sources/tests/transfer_test.move similarity index 100% rename from crates/rooch-framework/sources/tests/transfer_test.move rename to frameworks/rooch-framework/sources/tests/transfer_test.move diff --git a/crates/rooch-framework/sources/timestamp.move b/frameworks/rooch-framework/sources/timestamp.move similarity index 100% rename from crates/rooch-framework/sources/timestamp.move rename to frameworks/rooch-framework/sources/timestamp.move diff --git a/crates/rooch-framework/sources/transaction_fee.move b/frameworks/rooch-framework/sources/transaction_fee.move similarity index 100% rename from crates/rooch-framework/sources/transaction_fee.move rename to frameworks/rooch-framework/sources/transaction_fee.move diff --git a/crates/rooch-framework/sources/transaction_validator.move b/frameworks/rooch-framework/sources/transaction_validator.move similarity index 100% rename from crates/rooch-framework/sources/transaction_validator.move rename to frameworks/rooch-framework/sources/transaction_validator.move diff --git a/crates/rooch-framework/sources/transfer.move b/frameworks/rooch-framework/sources/transfer.move similarity index 100% rename from crates/rooch-framework/sources/transfer.move rename to frameworks/rooch-framework/sources/transfer.move diff --git a/crates/rooch-framework/sources/upgrade.move b/frameworks/rooch-framework/sources/upgrade.move similarity index 100% rename from crates/rooch-framework/sources/upgrade.move rename to frameworks/rooch-framework/sources/upgrade.move diff --git a/crates/rooch-framework/src/lib.rs b/frameworks/rooch-framework/src/lib.rs similarity index 100% rename from crates/rooch-framework/src/lib.rs rename to frameworks/rooch-framework/src/lib.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/account.rs b/frameworks/rooch-framework/src/natives/gas_parameter/account.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/account.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/account.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/bcd.rs b/frameworks/rooch-framework/src/natives/gas_parameter/bcd.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/bcd.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/bcd.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/decoding.rs b/frameworks/rooch-framework/src/natives/gas_parameter/decoding.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/decoding.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/decoding.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/ecdsa_k1.rs b/frameworks/rooch-framework/src/natives/gas_parameter/ecdsa_k1.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/ecdsa_k1.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/ecdsa_k1.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/ed25519.rs b/frameworks/rooch-framework/src/natives/gas_parameter/ed25519.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/ed25519.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/ed25519.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/encoding.rs b/frameworks/rooch-framework/src/natives/gas_parameter/encoding.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/encoding.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/encoding.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/events.rs b/frameworks/rooch-framework/src/natives/gas_parameter/events.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/events.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/events.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/gas_member.rs b/frameworks/rooch-framework/src/natives/gas_parameter/gas_member.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/gas_member.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/gas_member.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/hash.rs b/frameworks/rooch-framework/src/natives/gas_parameter/hash.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/hash.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/hash.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/json.rs b/frameworks/rooch-framework/src/natives/gas_parameter/json.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/json.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/json.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/mod.rs b/frameworks/rooch-framework/src/natives/gas_parameter/mod.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/mod.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/mod.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/move_module.rs b/frameworks/rooch-framework/src/natives/gas_parameter/move_module.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/move_module.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/move_module.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/move_std.rs b/frameworks/rooch-framework/src/natives/gas_parameter/move_std.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/move_std.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/move_std.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/native.rs b/frameworks/rooch-framework/src/natives/gas_parameter/native.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/native.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/native.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/nursery.rs b/frameworks/rooch-framework/src/natives/gas_parameter/nursery.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/nursery.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/nursery.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/object.rs b/frameworks/rooch-framework/src/natives/gas_parameter/object.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/object.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/object.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/ord.rs b/frameworks/rooch-framework/src/natives/gas_parameter/ord.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/ord.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/ord.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/rlp.rs b/frameworks/rooch-framework/src/natives/gas_parameter/rlp.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/rlp.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/rlp.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/signer.rs b/frameworks/rooch-framework/src/natives/gas_parameter/signer.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/signer.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/signer.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/test_helper.rs b/frameworks/rooch-framework/src/natives/gas_parameter/test_helper.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/test_helper.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/test_helper.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/tx_context.rs b/frameworks/rooch-framework/src/natives/gas_parameter/tx_context.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/tx_context.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/tx_context.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/type_info.rs b/frameworks/rooch-framework/src/natives/gas_parameter/type_info.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/type_info.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/type_info.rs diff --git a/crates/rooch-framework/src/natives/gas_parameter/wasm.rs b/frameworks/rooch-framework/src/natives/gas_parameter/wasm.rs similarity index 100% rename from crates/rooch-framework/src/natives/gas_parameter/wasm.rs rename to frameworks/rooch-framework/src/natives/gas_parameter/wasm.rs diff --git a/crates/rooch-framework/src/natives/mod.rs b/frameworks/rooch-framework/src/natives/mod.rs similarity index 100% rename from crates/rooch-framework/src/natives/mod.rs rename to frameworks/rooch-framework/src/natives/mod.rs diff --git a/moveos/moveos-stdlib/src/natives/moveos_stdlib/bcs.rs b/frameworks/rooch-framework/src/natives/rooch_framework/bcs.rs similarity index 100% rename from moveos/moveos-stdlib/src/natives/moveos_stdlib/bcs.rs rename to frameworks/rooch-framework/src/natives/rooch_framework/bcs.rs diff --git a/crates/rooch-framework/src/natives/rooch_framework/crypto/decoding.rs b/frameworks/rooch-framework/src/natives/rooch_framework/crypto/decoding.rs similarity index 100% rename from crates/rooch-framework/src/natives/rooch_framework/crypto/decoding.rs rename to frameworks/rooch-framework/src/natives/rooch_framework/crypto/decoding.rs diff --git a/crates/rooch-framework/src/natives/rooch_framework/crypto/ecdsa_k1.rs b/frameworks/rooch-framework/src/natives/rooch_framework/crypto/ecdsa_k1.rs similarity index 100% rename from crates/rooch-framework/src/natives/rooch_framework/crypto/ecdsa_k1.rs rename to frameworks/rooch-framework/src/natives/rooch_framework/crypto/ecdsa_k1.rs diff --git a/crates/rooch-framework/src/natives/rooch_framework/crypto/ed25519.rs b/frameworks/rooch-framework/src/natives/rooch_framework/crypto/ed25519.rs similarity index 100% rename from crates/rooch-framework/src/natives/rooch_framework/crypto/ed25519.rs rename to frameworks/rooch-framework/src/natives/rooch_framework/crypto/ed25519.rs diff --git a/crates/rooch-framework/src/natives/rooch_framework/crypto/encoding.rs b/frameworks/rooch-framework/src/natives/rooch_framework/crypto/encoding.rs similarity index 100% rename from crates/rooch-framework/src/natives/rooch_framework/crypto/encoding.rs rename to frameworks/rooch-framework/src/natives/rooch_framework/crypto/encoding.rs diff --git a/crates/rooch-framework/src/natives/rooch_framework/crypto/hash.rs b/frameworks/rooch-framework/src/natives/rooch_framework/crypto/hash.rs similarity index 100% rename from crates/rooch-framework/src/natives/rooch_framework/crypto/hash.rs rename to frameworks/rooch-framework/src/natives/rooch_framework/crypto/hash.rs diff --git a/crates/rooch-framework/src/natives/rooch_framework/crypto/mod.rs b/frameworks/rooch-framework/src/natives/rooch_framework/crypto/mod.rs similarity index 100% rename from crates/rooch-framework/src/natives/rooch_framework/crypto/mod.rs rename to frameworks/rooch-framework/src/natives/rooch_framework/crypto/mod.rs diff --git a/crates/rooch-framework/src/natives/rooch_framework/mod.rs b/frameworks/rooch-framework/src/natives/rooch_framework/mod.rs similarity index 100% rename from crates/rooch-framework/src/natives/rooch_framework/mod.rs rename to frameworks/rooch-framework/src/natives/rooch_framework/mod.rs diff --git a/crates/rooch-framework/tests/timestamp_test.move b/frameworks/rooch-framework/tests/timestamp_test.move similarity index 91% rename from crates/rooch-framework/tests/timestamp_test.move rename to frameworks/rooch-framework/tests/timestamp_test.move index 5b3209a95c..f848e05a72 100644 --- a/crates/rooch-framework/tests/timestamp_test.move +++ b/frameworks/rooch-framework/tests/timestamp_test.move @@ -1,3 +1,6 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + #[test_only] module rooch_framework::timestamp_test{ @@ -19,4 +22,4 @@ module rooch_framework::timestamp_test{ assert!(timestamp::milliseconds(timestamp) == timestamp::seconds_to_milliseconds(seconds), 4); }; } -} \ No newline at end of file +} diff --git a/lychee.toml b/lychee.toml index f227722f4d..d83125aef6 100644 --- a/lychee.toml +++ b/lychee.toml @@ -8,13 +8,13 @@ exclude = [ 'conduct@rooch.network', 'https://tokei.rs/b1/github/rooch-network/rooch?category=lines', # Need to update - 'https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/storage_context.move', - 'https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/sources/account_storage.move', + 'https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/storage_context.move', + 'https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/sources/account_storage.move', 'https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/ecdsa_k1_recoverable.md', 'https://github.com/rooch-network/rooch/blob/main/crates/rooch-framework/doc/schnorr.md', - 'https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/raw_table.md', - 'https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/context.md', - 'https://github.com/rooch-network/rooch/blob/main/moveos/moveos-stdlib/moveos-stdlib/doc/account_storage.md', + 'https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/raw_table.md', + 'https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/context.md', + 'https://github.com/rooch-network/rooch/blob/main/frameworks/moveos-stdlib/doc/account_storage.md', # ./docs/website/pages/blog/bitcoin-l2.zh-CN.mdx 'https://bitcoinmagazine.com/press-releases/bitcoin-magazine-editorial-policy-on-bitcoin-layer-2s-l2s', ] diff --git a/moveos/moveos/Cargo.toml b/moveos/moveos/Cargo.toml index 95c0c01f77..d52e3f04ae 100644 --- a/moveos/moveos/Cargo.toml +++ b/moveos/moveos/Cargo.toml @@ -60,6 +60,6 @@ move-resource-viewer = { workspace = true } moveos-types = { workspace = true } moveos-store = { workspace = true } moveos-stdlib = { workspace = true } -moveos-stdlib-builder = { workspace = true } +framework-builder = { workspace = true } moveos-verifier = { workspace = true } moveos-object-runtime = { workspace = true } diff --git a/moveos/moveos/src/vm/mod.rs b/moveos/moveos/src/vm/mod.rs index cb6a3cf0bf..3509f1f66c 100644 --- a/moveos/moveos/src/vm/mod.rs +++ b/moveos/moveos/src/vm/mod.rs @@ -3,7 +3,7 @@ //TODO remove this after refactor the caller crates. pub mod dependency_order { - pub use moveos_stdlib_builder::dependency_order::*; + pub use framework_builder::dependency_order::*; } #[allow(dead_code)] pub mod data_cache; diff --git a/scripts/check_move_constant_errors.sh b/scripts/check_move_constant_errors.sh index 21e86e1c09..8ccfc55a50 100755 --- a/scripts/check_move_constant_errors.sh +++ b/scripts/check_move_constant_errors.sh @@ -44,11 +44,12 @@ check_constant_errors_for_error() { } # Check constant errors for E* prefix in move-stdlib -check_constant_errors_for_e "moveos/moveos-stdlib/move-stdlib/sources" || exit 1 +check_constant_errors_for_e "frameworks/move-stdlib/sources" || exit 1 # Check constant errors for Error* prefix in moveos-stdlib, rooch-framework, and examples -for dir in "moveos/moveos-stdlib/moveos-stdlib/sources" \ - "crates/rooch-framework/sources" \ +for dir in "frameworks/moveos-stdlib/sources" \ + "frameworks/rooch-framework/sources" \ + "frameworks/bitcoin-move/sources" \ "examples"; do check_constant_errors_for_error "$dir" || exit 1 done \ No newline at end of file diff --git a/scripts/pr.sh b/scripts/pr.sh index e1496bf2e9..ebc40fe0ea 100755 --- a/scripts/pr.sh +++ b/scripts/pr.sh @@ -83,8 +83,8 @@ EOF done MOVE_TEST_CRATES="\ - moveos/moveos-stdlib/moveos-stdlib\ - crates/rooch-framework\ + frameworks/moveos-stdlib\ + frameworks/rooch-framework\ frameworks/bitcoin-move\ " diff --git a/scripts/update_license.sh b/scripts/update_license.sh index 20a59b2cf1..3ba67740aa 100755 --- a/scripts/update_license.sh +++ b/scripts/update_license.sh @@ -84,8 +84,9 @@ process_rs_files "$parent_directory" # Process .move files process_move_files "${parent_directory}/examples/" -process_move_files "${parent_directory}/crates/rooch-framework/" -process_move_files "${parent_directory}/moveos/moveos-stdlib/" +process_move_files "${parent_directory}/frameworks/rooch-framework/" +process_move_files "${parent_directory}/frameworks/moveos-stdlib/" +process_move_files "${parent_directory}/frameworks/bitcoin-move/" # Process .sh files process_sh_files "$parent_directory" diff --git a/sdk/typescript/rooch-create/scripts/copy-templates.sh b/sdk/typescript/rooch-create/scripts/copy-templates.sh index 35cd760c64..48bce9b86f 100755 --- a/sdk/typescript/rooch-create/scripts/copy-templates.sh +++ b/sdk/typescript/rooch-create/scripts/copy-templates.sh @@ -1,3 +1,7 @@ +#!/bin/bash +# Copyright (c) RoochNetwork +# SPDX-License-Identifier: Apache-2.0 + #!/usr/bin/env bash # Copyright (c) RoochNetwork # SPDX-License-Identifier: Apache-2.0