diff --git a/.github/workflows/run_long_integration_tests.yml b/.github/workflows/run_long_integration_tests.yml index 13f1198..c6ba981 100644 --- a/.github/workflows/run_long_integration_tests.yml +++ b/.github/workflows/run_long_integration_tests.yml @@ -22,7 +22,7 @@ jobs: - name: Build run: | export PYTHONPATH=. - python ./integration_tests/test_previous_builds_are_reproducible.py --selected-builds "a.1" "a.2" "a.3" "a.4" + python ./integration_tests/test_previous_builds_are_reproducible.py --selected-builds "a.1" "a.2" "a.3" "a.4" "a.5" "a.6" "a.7" "a.8" "a.9" "a.10" "a.11" "a.12" "a.13" - name: Save artifacts uses: actions/upload-artifact@v3 diff --git a/Dockerfile b/Dockerfile index 66922b1..11464e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 # Constants -ARG BUILDER_NAME="multiversx/sdk-rust-contract-builder:v4.2.1" +ARG BUILDER_NAME="multiversx/sdk-rust-contract-builder:v4.3.0" ARG VERSION_RUST="nightly-2022-10-16" ARG VERSION_BINARYEN="version_105" ARG DOWNLOAD_URL_BINARYEN="https://github.com/WebAssembly/binaryen/releases/download/${VERSION_BINARYEN}/binaryen-${VERSION_BINARYEN}-x86_64-linux.tar.gz" diff --git a/build_with_docker.py b/build_with_docker.py index e56da1d..b639fc8 100644 --- a/build_with_docker.py +++ b/build_with_docker.py @@ -20,7 +20,7 @@ def main(cli_args: List[str]): parser.add_argument("--packaged-src", type=str, help="source code packaged in a JSON file") parser.add_argument("--contract", type=str) parser.add_argument("--output", type=str, default=Path(os.getcwd()) / "output") - parser.add_argument("--package-whole-project-src", action="store_true", default=False, help="include all project files in *.source.json (default: %(default)s)") + parser.add_argument("--package-whole-project-src", action="store_true", default=False, help="deprecated parameter, not used anymore") parser.add_argument("--cargo-target-dir", help="deprecated parameter, not used anymore") parser.add_argument("--no-wasm-opt", action="store_true", default=False, help="do not optimize wasm files after the build (default: %(default)s)") parser.add_argument("--build-root", type=str, required=False, help="root path (within container) for the build (default: %(default)s)") @@ -35,7 +35,6 @@ def main(cli_args: List[str]): packaged_src_path = Path(parsed_args.packaged_src).expanduser().resolve() if parsed_args.packaged_src else None contract_path = parsed_args.contract output_path = Path(parsed_args.output).expanduser().resolve() - package_whole_project_src = parsed_args.package_whole_project_src no_wasm_opt = parsed_args.no_wasm_opt build_root = Path(parsed_args.build_root) if parsed_args.build_root else None cargo_verbose = parsed_args.cargo_verbose @@ -97,9 +96,6 @@ def main(cli_args: List[str]): if build_root: entrypoint_args.extend(["--build-root", str(build_root)]) - if package_whole_project_src: - entrypoint_args.append("--package-whole-project-src") - # Run docker container args = docker_general_args + docker_mount_args + docker_env_args + [image] + entrypoint_args logger.info(f"Running docker: {args}") diff --git a/integration_tests/previous_builds.py b/integration_tests/previous_builds.py index 6106521..bd9ae70 100644 --- a/integration_tests/previous_builds.py +++ b/integration_tests/previous_builds.py @@ -22,57 +22,159 @@ def __init__(self, name: str, previous_builds: List[PreviousBuild] = [ PreviousBuild( name="a.1", - project_archive_url="https://github.com/multiversx/mx-reproducible-contract-build-example-sc/archive/refs/tags/v0.4.0.zip", - project_relative_path_in_archive="mx-reproducible-contract-build-example-sc-0.4.0", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v2.4.1-pair-safe-price-v2.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v2.4.1-pair-safe-price-v2", packaged_src_url=None, contract_name=None, expected_code_hashes={ - "adder": "9fd12f88f9474ba115fb75e9d18a8fdbc4f42147de005445048442d49c3aa725", - "multisig": "2101bc2a7a31ea42e5ffaadd86c1640009690e93b1cb46c3566ba5eac2984e36", - "multisig-full": "ef468403354b6d3a728f86101354359fe6864187d216f674d99b31fc05313a39", - "multisig-view": "3690af76be10c0520e3c3545cde8d9ef6a15c2d0af74dbd8704b4909644049c9" + "pair": "e9f117971963cb3c24b14e2a7698d48c170335af2f5c8167774c48c3c1c654e3", + "pair-full": "f1af2b2bb42a9f035745777e4b2d4f72478569224f204d0d0103801faff9663a", + "safe-price-view": "b5a657445ae74423c60210c88a6fa89b0bd4bdd00d5f06e788e14495bccc34c9" }, - docker_image="multiversx/sdk-rust-contract-builder:v5.1.0" + docker_image="sdk-rust-contract-builder:next" ), PreviousBuild( name="a.2", - project_archive_url="https://github.com/multiversx/mx-reproducible-contract-build-example-sc/archive/refs/tags/v0.4.3.zip", - project_relative_path_in_archive="mx-reproducible-contract-build-example-sc-0.4.3", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v2.5.2-governance-merkle-tree.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v2.5.2-governance-merkle-tree", packaged_src_url=None, contract_name=None, expected_code_hashes={ - "adder": "9fd12f88f9474ba115fb75e9d18a8fdbc4f42147de005445048442d49c3aa725", - "multisig": "b73050629c11b1f1a20ca6232abcef07897624195691552e3f2e2fce47822166", - "multisig-full": "37c3b90bdaa7d8d203385c91b0b5cb4d3c444ab9ec5263351978046a545854e3", - "multisig-view": "ebaf987b041fcda297da71291d76736e4e98a1e449e5ec37908cdc0198e8be37" + "lkmex-transfer": "49809df9f07839f965f8197721083cf403c3db969ddc47b5940b4ee8b464af92", + "router": "3257d57945736298c96aa23f99ea0fba3b6da01f9d2103d81230d05cff62cb5a", + "pair": "e9f117971963cb3c24b14e2a7698d48c170335af2f5c8167774c48c3c1c654e3", + "locked-token-wrapper": "1d317cfa2bbe22ea1f878f8a32f90712d49f68a01665b86657d36910b430522f", + "safe-price-view": "b5a657445ae74423c60210c88a6fa89b0bd4bdd00d5f06e788e14495bccc34c9" }, - docker_image="multiversx/sdk-rust-contract-builder:v5.3.0" + docker_image="sdk-rust-contract-builder:next" ), PreviousBuild( name="a.3", - project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v2.4.1-pair-safe-price-v2.zip", - project_relative_path_in_archive="mx-exchange-sc-reproducible-v2.4.1-pair-safe-price-v2", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v1.10.4-backwards-comp-proxy-dex.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v1.10.4-backwards-comp-proxy-dex", packaged_src_url=None, contract_name=None, expected_code_hashes={ - "pair": "e9f117971963cb3c24b14e2a7698d48c170335af2f5c8167774c48c3c1c654e3", - "pair-full": "f1af2b2bb42a9f035745777e4b2d4f72478569224f204d0d0103801faff9663a", - "safe-price-view": "b5a657445ae74423c60210c88a6fa89b0bd4bdd00d5f06e788e14495bccc34c9" + "farm-staking-proxy": "ee61abb8e639df4696900c5efdac6bec747679c149be26476ee7e384e35b1ff2", + "proxy_dex": "8bab3716a1a92bad1b5cb77b97a09cce1ffabd56b954d881b93e1b480984c3d2", + "factory": "b75f481df42c076f51cd7af04b914bc581e51784b31136ae27db368b37bd87b1", + "farm_with_lock": "6b9d9a0f6bba6004c7c1163890ea0794cc61ab16c967e1c5c2cd2b8a7c19ebbf", }, docker_image="sdk-rust-contract-builder:next" ), PreviousBuild( name="a.4", - project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v2.5.2-governance-merkle-tree.zip", - project_relative_path_in_archive="mx-exchange-sc-reproducible-v2.5.2-governance-merkle-tree", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v2.1.1-staking-upgrade.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v2.1.1-staking-upgrade", packaged_src_url=None, contract_name=None, expected_code_hashes={ - "lkmex-transfer": "49809df9f07839f965f8197721083cf403c3db969ddc47b5940b4ee8b464af92", - "router": "3257d57945736298c96aa23f99ea0fba3b6da01f9d2103d81230d05cff62cb5a", - "pair": "e9f117971963cb3c24b14e2a7698d48c170335af2f5c8167774c48c3c1c654e3", - "locked-token-wrapper": "1d317cfa2bbe22ea1f878f8a32f90712d49f68a01665b86657d36910b430522f", - "safe-price-view": "b5a657445ae74423c60210c88a6fa89b0bd4bdd00d5f06e788e14495bccc34c9" + "farm-staking": "6dc7c587b2cc4b177a192b709c092f3752b3dcf9ce1b484e69fe64dc333a9e0a", + "farm": "931ca233826ff9dacd889967365db1cde9ed8402eb553de2a3b9d58b6ff1098d", + "factory": "df06465b651594605466e817bfe9d8d7c68eef0f87df4a8d3266bcfb1bef6d83", + "pair": "f3f08ebd758fada871c113c18017d9761f157d00b19c4d3beaba530e6c53afc2", + "energy-factory": "241600c055df605cafd85b75d40b21316a6b35713485201b156d695b23c66a2f" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.5", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v2.0-rc6-reproducible.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v2.0-rc6-reproducible", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "pair": "23ce1e8910c105410b4a417153e4b38c550ab78b38b899ea786f0c78500caf21", + "simple-lock": "303290b7a08b091c29315dd6979c1f745fc05467467d7de64e252592074890a7", + "farm-staking-proxy": "56468a6ae726693a71edcf96cf44673466dd980412388e1e4b073a0b4ee592d7" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.6", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v1.10.2-legacy-farm-stripdown.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v1.10.2-legacy-farm-stripdown", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "farm": "bac43c58b865f55f303ae2d4100c5fe2d4492bc50cfb131d8206200039808242" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.7", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v1.10.3-backwards-comp-contracts.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v1.10.3-backwards-comp-contracts", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "factory": "70ef785d7574746cadfb7eec0e52cc68d6807ddbb54cb1365b3942cf903c12d2" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.8", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v2.1.3-price-discovery-comp-upgrade.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v2.1.3-price-discovery-comp-upgrade", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "price-discovery": "96b51ec9df3eb7a8e72f297aac2c8e4e609e39ac5a5f6d861c0819d010b87fde" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.9", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v1.9.1-governance-lkmex.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v1.9.1-governance-lkmex", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "governance-v2": "7c9c92d914542939c611aaabf21f17e9f71a29e196da319bcfdddd33c409f91d" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.10", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v1.5.4-metabonding-unbond.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v1.5.4-metabonding-unbond", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "metabonding-staking": "4a9b2afa13eca738b1804c48b82a961afd67adcbbf2aa518052fa124ac060bea" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.11", + project_archive_url="https://github.com/multiversx/mx-metabonding-sc/archive/refs/heads/reproducible-v1.1.1.zip", + project_relative_path_in_archive="mx-metabonding-sc-reproducible-v1.1.1", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "metabonding": "897b19e1990f7c487c99c12f50722febe1ee4468bcd3a7405641966dfff2791d" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.12", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v1.8.1-simple-lock-role.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v1.8.1-simple-lock-role", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "simple-lock": "90d7206ba3866d2e17433faead5b76d345d60c4b311f7c030ebddc0fd5677a00" + }, + docker_image="sdk-rust-contract-builder:next" + ), + PreviousBuild( + name="a.13", + project_archive_url="https://github.com/multiversx/mx-exchange-sc/archive/refs/heads/reproducible-v1.8.2-simple-lock-whitelist-old-farms.zip", + project_relative_path_in_archive="mx-exchange-sc-reproducible-v1.8.2-simple-lock-whitelist-old-farms", + packaged_src_url=None, + contract_name=None, + expected_code_hashes={ + "simple-lock-whitelist": "c8868cf7599a94191ac327a81803eb9cee6e35ffddb007374a2bbbf6258d378f" }, docker_image="sdk-rust-contract-builder:next" ) diff --git a/integration_tests/shared.py b/integration_tests/shared.py index 678d143..54dcd0e 100644 --- a/integration_tests/shared.py +++ b/integration_tests/shared.py @@ -31,7 +31,6 @@ def download_packaged_src(json_url: str, name: str) -> Path: def run_docker( project_path: Optional[Path], - package_whole_project_src: bool, packaged_src_path: Optional[Path], contract_name: Optional[str], image: str, @@ -66,9 +65,6 @@ def run_docker( if project_path: entrypoint_args.extend(["--project", "project"]) - if package_whole_project_src: - entrypoint_args.append("--package-whole-project-src") - if packaged_src_path: entrypoint_args.extend(["--packaged-src", "packaged-src.json"]) diff --git a/integration_tests/test_previous_builds_are_reproducible.py b/integration_tests/test_previous_builds_are_reproducible.py index 020b730..5d142a3 100644 --- a/integration_tests/test_previous_builds_are_reproducible.py +++ b/integration_tests/test_previous_builds_are_reproducible.py @@ -41,7 +41,6 @@ def main(cli_args: List[str]): run_docker( project_path=project_path, - package_whole_project_src=False, packaged_src_path=packaged_src_path, contract_name=build.contract_name, image=build.docker_image, diff --git a/integration_tests/test_project_folder_and_packaged_src_are_equivalent.py b/integration_tests/test_project_folder_and_packaged_src_are_equivalent.py index 2e5fc48..c084c9a 100644 --- a/integration_tests/test_project_folder_and_packaged_src_are_equivalent.py +++ b/integration_tests/test_project_folder_and_packaged_src_are_equivalent.py @@ -17,7 +17,6 @@ def main(cli_args: List[str]): check_project_folder_and_packaged_src_are_equivalent( project_path=project_path, - package_whole_project_src=True, parent_output_folder=PARENT_OUTPUT_FOLDER, contracts=["pair", "farm"], ) @@ -25,12 +24,11 @@ def main(cli_args: List[str]): def check_project_folder_and_packaged_src_are_equivalent( project_path: Path, - package_whole_project_src: bool, parent_output_folder: Path, contracts: List[str]): for contract in contracts: - output_using_project = parent_output_folder / "using-project" / contract / ("whole" if package_whole_project_src else "truncated") - output_using_packaged_src = parent_output_folder / "using-packaged-src" / contract / ("whole" if package_whole_project_src else "truncated") + output_using_project = parent_output_folder / "using-project" / contract + output_using_packaged_src = parent_output_folder / "using-packaged-src" / contract shutil.rmtree(output_using_project, ignore_errors=True) shutil.rmtree(output_using_packaged_src, ignore_errors=True) @@ -40,18 +38,16 @@ def check_project_folder_and_packaged_src_are_equivalent( run_docker( project_path=project_path, - package_whole_project_src=package_whole_project_src, packaged_src_path=None, contract_name=contract, image="sdk-rust-contract-builder:next", output_folder=output_using_project ) - packaged_src_path = output_using_project / f"{contract}/{contract}-0.0.0.source.json" + packaged_src_path = next((output_using_project / contract).glob("*.source.json")) run_docker( project_path=None, - package_whole_project_src=package_whole_project_src, packaged_src_path=packaged_src_path, contract_name=contract, image="sdk-rust-contract-builder:next", @@ -64,14 +60,21 @@ def check_project_folder_and_packaged_src_are_equivalent( assert len(using_project_output_files) == len(using_packaged_src_output_files) - for index, file in enumerate(using_project_output_files): - if not file.is_file() or file.suffix == ".zip": - continue - using_project_file_content = file.read_bytes() - using_packaged_src_file_content = using_packaged_src_output_files[index].read_bytes() + for index, file_using_project in enumerate(using_project_output_files): + file_using_packaged_src = using_packaged_src_output_files[index] - if using_project_file_content != using_packaged_src_file_content: - raise Exception(f"Files differ ({contract}): {file.name}") + if not file_using_project.is_file() or file_using_project.suffix == ".zip": + continue + file_content_using_project = file_using_project.read_bytes() + file_content_using_packaged_src = file_using_packaged_src.read_bytes() + + if file_content_using_project == file_content_using_packaged_src: + print(f"Files are identical ({contract}): {file_using_project.name}") + else: + print(f"Files differ ({contract}):") + print(f" {file_using_project}") + print(f" {file_using_packaged_src}") + raise Exception(f"Files differ ({contract}): {file_using_project.name}") if __name__ == "__main__": diff --git a/multiversx_sdk_rust_contract_builder/build_options.py b/multiversx_sdk_rust_contract_builder/build_options.py index 8455ef4..63a9624 100644 --- a/multiversx_sdk_rust_contract_builder/build_options.py +++ b/multiversx_sdk_rust_contract_builder/build_options.py @@ -6,13 +6,11 @@ class BuildOptions: def __init__( self, - package_whole_project_src: bool, specific_contract: str, cargo_target_dir: Path, no_wasm_opt: bool, build_root_folder: Path, ) -> None: - self.package_whole_project_src = package_whole_project_src self.specific_contract = specific_contract self.cargo_target_dir = cargo_target_dir self.no_wasm_opt = no_wasm_opt @@ -20,7 +18,8 @@ def __init__( def to_dict(self) -> Dict[str, Any]: return { - "packageWholeProjectSrc": self.package_whole_project_src, + # "packageWholeProjectSrc" is kept due to compatibility reasons. + "packageWholeProjectSrc": True, "specificContract": self.specific_contract, "cargoTargetDir": str(self.cargo_target_dir), "noWasmOpt": self.no_wasm_opt, diff --git a/multiversx_sdk_rust_contract_builder/build_outcome.py b/multiversx_sdk_rust_contract_builder/build_outcome.py index 8c7be03..7f7450b 100644 --- a/multiversx_sdk_rust_contract_builder/build_outcome.py +++ b/multiversx_sdk_rust_contract_builder/build_outcome.py @@ -70,6 +70,7 @@ def many_from_folders(cls, build_folder: Path, output_folder: Path) -> Dict[str, entry.codehash = find_file_in_folder(output_folder, f"{contract_name}.codehash.txt").read_text() entry.bytecode_path = BuildArtifact.find_in_output(f"{contract_name}.wasm", output_folder) entry.abi_path = BuildArtifact.find_in_output(f"{contract_name}.abi.json", output_folder) + # This is the whole project source code. The file *.partial-source.json is not listed here - so that it's advertised as little as possible. entry.src_package_path = BuildArtifact.find_in_output("*.source.json", output_folder) result[contract_name] = entry diff --git a/multiversx_sdk_rust_contract_builder/builder.py b/multiversx_sdk_rust_contract_builder/builder.py index 0ff3cc8..6915b32 100644 --- a/multiversx_sdk_rust_contract_builder/builder.py +++ b/multiversx_sdk_rust_contract_builder/builder.py @@ -5,7 +5,7 @@ from pathlib import Path from typing import Any, Dict, List, Set -from multiversx_sdk_rust_contract_builder import cargo_toml, source_code +from multiversx_sdk_rust_contract_builder import source_code from multiversx_sdk_rust_contract_builder.build_metadata import BuildMetadata from multiversx_sdk_rust_contract_builder.build_options import BuildOptions from multiversx_sdk_rust_contract_builder.build_outcome import BuildOutcome @@ -31,7 +31,6 @@ def build_project( project_folder = project_folder.expanduser().resolve() parent_output_folder = parent_output_folder.expanduser().resolve() cargo_target_dir = options.cargo_target_dir.expanduser().resolve() - package_whole_project_src = options.package_whole_project_src no_wasm_opt = options.no_wasm_opt specific_contract = options.specific_contract build_root_folder = options.build_root_folder @@ -45,9 +44,6 @@ def build_project( # We copy the whole project folder to the build path, to ensure that all local dependencies are available. project_within_build_folder = copy_project_folder_to_build_folder(project_folder, build_root_folder) - if not package_whole_project_src: - cargo_toml.remove_dev_dependencies_sections_from_all(project_within_build_folder) - for contract_folder in sorted(contracts_folders): contract_name, contract_version = get_contract_name_and_version(contract_folder) logging.info(f"Contract = {contract_name}, version = {contract_version}") @@ -75,13 +71,23 @@ def build_project( # The bundle (packaged source code) is created after build, so that Cargo.lock files are included (if previously missing). create_packaged_source_code( parent_project_folder=project_within_build_folder, - package_whole_project_src=package_whole_project_src, + package_whole_project_src=True, contract_folder=contract_build_subfolder, output_folder=output_subfolder, build_metadata=metadata.to_dict(), build_options=options.to_dict(), + package_filename=f"{contract_name}-{contract_version}.source.json" ) + create_packaged_source_code( + parent_project_folder=project_within_build_folder, + package_whole_project_src=False, + contract_folder=contract_build_subfolder, + output_folder=output_subfolder, + build_metadata=metadata.to_dict(), + build_options=options.to_dict(), + package_filename=f"{contract_name}-{contract_version}.partial-source.json" + ) outcome.gather_artifacts(contract_build_subfolder, output_subfolder) return outcome @@ -168,7 +174,8 @@ def create_packaged_source_code( contract_folder: Path, output_folder: Path, build_metadata: Dict[str, Any], - build_options: Dict[str, Any] + build_options: Dict[str, Any], + package_filename: str ): source_code_files = source_code.get_source_code_files( project_folder=parent_project_folder, @@ -185,7 +192,7 @@ def create_packaged_source_code( ) package = PackagedSourceCode.from_filesystem(metadata, parent_project_folder, source_code_files) - package_path = output_folder / f"{contract_name}-{contract_version}.source.json" + package_path = output_folder / package_filename package.save_to_file(package_path) size_of_file = package_path.stat().st_size diff --git a/multiversx_sdk_rust_contract_builder/cargo_toml.py b/multiversx_sdk_rust_contract_builder/cargo_toml.py index 6cd4f16..27ae161 100644 --- a/multiversx_sdk_rust_contract_builder/cargo_toml.py +++ b/multiversx_sdk_rust_contract_builder/cargo_toml.py @@ -1,12 +1,9 @@ -import logging import shutil from pathlib import Path from typing import Tuple import toml -from multiversx_sdk_rust_contract_builder.filesystem import get_all_files - def get_contract_name_and_version(contract_folder: Path) -> Tuple[str, str]: file = contract_folder / "Cargo.toml" @@ -21,19 +18,3 @@ def promote_cargo_lock_to_contract_folder(build_folder: Path, contract_folder: P from_path = build_folder / "wasm" / "Cargo.lock" to_path = contract_folder / "wasm" / "Cargo.lock" shutil.copy(from_path, to_path) - - -def remove_dev_dependencies_sections_from_all(folder: Path): - logging.info(f"remove_dev_dependencies_sections_from_all({folder})") - - all_files = get_all_files(folder, lambda file: file.name == "Cargo.toml") - for file in all_files: - remove_dev_dependencies_sections(file) - - -def remove_dev_dependencies_sections(file: Path): - data = toml.loads(file.read_text()) - - if "dev-dependencies" in data: - del data["dev-dependencies"] - file.write_text(toml.dumps(data)) diff --git a/multiversx_sdk_rust_contract_builder/main.py b/multiversx_sdk_rust_contract_builder/main.py index 08d0dbe..abe76e1 100644 --- a/multiversx_sdk_rust_contract_builder/main.py +++ b/multiversx_sdk_rust_contract_builder/main.py @@ -24,7 +24,7 @@ def main(cli_args: List[str]): parser = ArgumentParser() parser.add_argument("--project", type=str, required=False, help="source code folder (project)") - parser.add_argument("--package-whole-project-src", action="store_true", default=False, help="include all project files in *.source.json (default: %(default)s)") + parser.add_argument("--package-whole-project-src", action="store_true", default=False, help="deprecated parameter, not used anymore") parser.add_argument("--packaged-src", type=str, required=False, help="source code packaged in a JSON file") parser.add_argument("--contract", type=str, required=False, help="contract to build from within the source code folder; should be relative to the project path") parser.add_argument("--output", type=str, required=True) @@ -34,7 +34,6 @@ def main(cli_args: List[str]): parsed_args = parser.parse_args(cli_args) project_path = Path(parsed_args.project).expanduser().resolve() if parsed_args.project else None - package_whole_project_src = parsed_args.package_whole_project_src packaged_src_path = Path(parsed_args.packaged_src).expanduser().resolve() if parsed_args.packaged_src else None parent_output_folder = Path(parsed_args.output) specific_contract = parsed_args.contract @@ -58,7 +57,6 @@ def main(cli_args: List[str]): metadata = BuildMetadata.from_env() options = BuildOptions( - package_whole_project_src=package_whole_project_src, specific_contract=specific_contract, cargo_target_dir=cargo_target_dir, no_wasm_opt=no_wasm_opt, diff --git a/multiversx_sdk_rust_contract_builder/source_code.py b/multiversx_sdk_rust_contract_builder/source_code.py index 6157b94..99433e6 100644 --- a/multiversx_sdk_rust_contract_builder/source_code.py +++ b/multiversx_sdk_rust_contract_builder/source_code.py @@ -61,8 +61,6 @@ def get_source_code_files( def _is_source_code_file(path: Path) -> bool: if path.suffix == ".rs": return True - if path.parent.name == "meta" and path.name == "Cargo.lock": - return False if path.name in ["Cargo.toml", "Cargo.lock", "multicontract.toml", CONTRACT_CONFIG_FILENAME]: return True return False