diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml index eaabdbfe..610574b2 100644 --- a/.github/workflows/on-pull-request.yaml +++ b/.github/workflows/on-pull-request.yaml @@ -43,7 +43,7 @@ jobs: - uses: codecov/codecov-action@v5.3.1 with: token: ${{ secrets.CODECOV_TOKEN }} - files: workspace/apps/staking/contracts/coverage/coverage.lcov + files: coverage/coverage.lcov fail_ci_if_error: true - name: Check formatting diff --git a/Scarb.toml b/Scarb.toml index 67d6020b..c26a0ab2 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -1,28 +1,46 @@ -[workspace] -members = ["workspace/apps/staking/contracts"] +[package] +name = "staking" +version = "1.14.5" +edition = "2024_07" -[workspace.dependencies] +[dependencies] starknet = "2.12.0" -assert_macros = "2.12.0" openzeppelin = "2.0.0" -snforge_std = "0.49.0" starkware_utils = { git = "https://github.com/starkware-libs/starkware-starknet-utils", rev = "e1955423808045de868987b8fb0b43f5cbdf5699" } + +[dev-dependencies] +assert_macros = "2.12.0" +snforge_std = "0.49.0" starkware_utils_testing = { git = "https://github.com/starkware-libs/starkware-starknet-utils", rev = "e1955423808045de868987b8fb0b43f5cbdf5699" } [scripts] test = "snforge test" +[lib] + +[[target.starknet-contract]] + [profile.dev.cairo] unstable-add-statements-code-locations-debug-info = true unstable-add-statements-functions-debug-info = true inlining-strategy = "avoid" -[[workspace.tool.snforge.fork]] +[[tool.snforge.fork]] name = "MAINNET_LATEST" url = "https://starknet-mainnet.public.blastapi.io/rpc/v0_8" block_id.tag = "latest" -[workspace.tool.scarb] +[tool.scarb] allow-prebuilt-plugins = ["snforge_std"] + +[[test]] +name = "contracts_unittest" +build-external-contracts = ["starkware_utils::erc20::erc20_mocks::DualCaseERC20Mock"] + +[tool.fmt] +sort-module-level-items = true + +[features] +fork_test = [] diff --git a/scripts/check_all_flows_have_test.py b/scripts/check_all_flows_have_test.py index f9a8cce5..b93b37b8 100644 --- a/scripts/check_all_flows_have_test.py +++ b/scripts/check_all_flows_have_test.py @@ -6,7 +6,7 @@ from pprint import pprint CONTRACTS_FOLDER: Path = ( - Path(__file__).parent.parent / "workspace/apps/staking/contracts" + Path(__file__).parent.parent ) FLOWS_FILE: Path = CONTRACTS_FOLDER / "src/flow_test/flows.cairo" diff --git a/workspace/apps/staking/contracts/src/attestation.cairo b/src/attestation.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/attestation.cairo rename to src/attestation.cairo diff --git a/workspace/apps/staking/contracts/src/attestation/attestation.cairo b/src/attestation/attestation.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/attestation/attestation.cairo rename to src/attestation/attestation.cairo diff --git a/workspace/apps/staking/contracts/src/attestation/errors.cairo b/src/attestation/errors.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/attestation/errors.cairo rename to src/attestation/errors.cairo diff --git a/workspace/apps/staking/contracts/src/attestation/interface.cairo b/src/attestation/interface.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/attestation/interface.cairo rename to src/attestation/interface.cairo diff --git a/workspace/apps/staking/contracts/src/attestation/test.cairo b/src/attestation/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/attestation/test.cairo rename to src/attestation/test.cairo diff --git a/workspace/apps/staking/contracts/src/constants.cairo b/src/constants.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/constants.cairo rename to src/constants.cairo diff --git a/workspace/apps/staking/contracts/src/errors.cairo b/src/errors.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/errors.cairo rename to src/errors.cairo diff --git a/workspace/apps/staking/contracts/src/event_test_utils.cairo b/src/event_test_utils.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/event_test_utils.cairo rename to src/event_test_utils.cairo diff --git a/workspace/apps/staking/contracts/src/flow_test.cairo b/src/flow_test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/flow_test.cairo rename to src/flow_test.cairo diff --git a/workspace/apps/staking/contracts/src/flow_test/flow_ideas.md b/src/flow_test/flow_ideas.md similarity index 100% rename from workspace/apps/staking/contracts/src/flow_test/flow_ideas.md rename to src/flow_test/flow_ideas.md diff --git a/workspace/apps/staking/contracts/src/flow_test/flows.cairo b/src/flow_test/flows.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/flow_test/flows.cairo rename to src/flow_test/flows.cairo diff --git a/workspace/apps/staking/contracts/src/flow_test/fork_test.cairo b/src/flow_test/fork_test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/flow_test/fork_test.cairo rename to src/flow_test/fork_test.cairo diff --git a/workspace/apps/staking/contracts/src/flow_test/multi_version_tests.cairo b/src/flow_test/multi_version_tests.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/flow_test/multi_version_tests.cairo rename to src/flow_test/multi_version_tests.cairo diff --git a/workspace/apps/staking/contracts/src/flow_test/test.cairo b/src/flow_test/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/flow_test/test.cairo rename to src/flow_test/test.cairo diff --git a/workspace/apps/staking/contracts/src/flow_test/utils.cairo b/src/flow_test/utils.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/flow_test/utils.cairo rename to src/flow_test/utils.cairo diff --git a/workspace/apps/staking/contracts/src/legacy_eic/align_upg_vars_eic.cairo b/src/legacy_eic/align_upg_vars_eic.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/legacy_eic/align_upg_vars_eic.cairo rename to src/legacy_eic/align_upg_vars_eic.cairo diff --git a/workspace/apps/staking/contracts/src/legacy_eic/assign_root_gov_eic.cairo b/src/legacy_eic/assign_root_gov_eic.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/legacy_eic/assign_root_gov_eic.cairo rename to src/legacy_eic/assign_root_gov_eic.cairo diff --git a/workspace/apps/staking/contracts/src/lib.cairo b/src/lib.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/lib.cairo rename to src/lib.cairo diff --git a/workspace/apps/staking/contracts/src/minting_curve.cairo b/src/minting_curve.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/minting_curve.cairo rename to src/minting_curve.cairo diff --git a/workspace/apps/staking/contracts/src/minting_curve/errors.cairo b/src/minting_curve/errors.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/minting_curve/errors.cairo rename to src/minting_curve/errors.cairo diff --git a/workspace/apps/staking/contracts/src/minting_curve/interface.cairo b/src/minting_curve/interface.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/minting_curve/interface.cairo rename to src/minting_curve/interface.cairo diff --git a/workspace/apps/staking/contracts/src/minting_curve/minting_curve.cairo b/src/minting_curve/minting_curve.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/minting_curve/minting_curve.cairo rename to src/minting_curve/minting_curve.cairo diff --git a/workspace/apps/staking/contracts/src/minting_curve/test.cairo b/src/minting_curve/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/minting_curve/test.cairo rename to src/minting_curve/test.cairo diff --git a/workspace/apps/staking/contracts/src/pool.cairo b/src/pool.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool.cairo rename to src/pool.cairo diff --git a/workspace/apps/staking/contracts/src/pool/eic.cairo b/src/pool/eic.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/eic.cairo rename to src/pool/eic.cairo diff --git a/workspace/apps/staking/contracts/src/pool/errors.cairo b/src/pool/errors.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/errors.cairo rename to src/pool/errors.cairo diff --git a/workspace/apps/staking/contracts/src/pool/interface.cairo b/src/pool/interface.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/interface.cairo rename to src/pool/interface.cairo diff --git a/workspace/apps/staking/contracts/src/pool/interface_v0.cairo b/src/pool/interface_v0.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/interface_v0.cairo rename to src/pool/interface_v0.cairo diff --git a/workspace/apps/staking/contracts/src/pool/objects.cairo b/src/pool/objects.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/objects.cairo rename to src/pool/objects.cairo diff --git a/workspace/apps/staking/contracts/src/pool/pool.cairo b/src/pool/pool.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/pool.cairo rename to src/pool/pool.cairo diff --git a/workspace/apps/staking/contracts/src/pool/pool_member_balance_trace.cairo b/src/pool/pool_member_balance_trace.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/pool_member_balance_trace.cairo rename to src/pool/pool_member_balance_trace.cairo diff --git a/workspace/apps/staking/contracts/src/pool/pool_member_balance_trace/mock.cairo b/src/pool/pool_member_balance_trace/mock.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/pool_member_balance_trace/mock.cairo rename to src/pool/pool_member_balance_trace/mock.cairo diff --git a/workspace/apps/staking/contracts/src/pool/pool_member_balance_trace/test.cairo b/src/pool/pool_member_balance_trace/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/pool_member_balance_trace/test.cairo rename to src/pool/pool_member_balance_trace/test.cairo diff --git a/workspace/apps/staking/contracts/src/pool/pool_member_balance_trace/trace.cairo b/src/pool/pool_member_balance_trace/trace.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/pool_member_balance_trace/trace.cairo rename to src/pool/pool_member_balance_trace/trace.cairo diff --git a/workspace/apps/staking/contracts/src/pool/tests.cairo b/src/pool/tests.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/tests.cairo rename to src/pool/tests.cairo diff --git a/workspace/apps/staking/contracts/src/pool/tests/test.cairo b/src/pool/tests/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/tests/test.cairo rename to src/pool/tests/test.cairo diff --git a/workspace/apps/staking/contracts/src/pool/utils.cairo b/src/pool/utils.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/pool/utils.cairo rename to src/pool/utils.cairo diff --git a/workspace/apps/staking/contracts/src/reward_supplier.cairo b/src/reward_supplier.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/reward_supplier.cairo rename to src/reward_supplier.cairo diff --git a/workspace/apps/staking/contracts/src/reward_supplier/errors.cairo b/src/reward_supplier/errors.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/reward_supplier/errors.cairo rename to src/reward_supplier/errors.cairo diff --git a/workspace/apps/staking/contracts/src/reward_supplier/interface.cairo b/src/reward_supplier/interface.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/reward_supplier/interface.cairo rename to src/reward_supplier/interface.cairo diff --git a/workspace/apps/staking/contracts/src/reward_supplier/reward_supplier.cairo b/src/reward_supplier/reward_supplier.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/reward_supplier/reward_supplier.cairo rename to src/reward_supplier/reward_supplier.cairo diff --git a/workspace/apps/staking/contracts/src/reward_supplier/test.cairo b/src/reward_supplier/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/reward_supplier/test.cairo rename to src/reward_supplier/test.cairo diff --git a/workspace/apps/staking/contracts/src/reward_supplier/utils.cairo b/src/reward_supplier/utils.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/reward_supplier/utils.cairo rename to src/reward_supplier/utils.cairo diff --git a/workspace/apps/staking/contracts/src/rewards_service.cairo b/src/rewards_service.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/rewards_service.cairo rename to src/rewards_service.cairo diff --git a/workspace/apps/staking/contracts/src/rewards_service/errors.cairo b/src/rewards_service/errors.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/rewards_service/errors.cairo rename to src/rewards_service/errors.cairo diff --git a/workspace/apps/staking/contracts/src/rewards_service/rewards_service.cairo b/src/rewards_service/rewards_service.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/rewards_service/rewards_service.cairo rename to src/rewards_service/rewards_service.cairo diff --git a/workspace/apps/staking/contracts/src/rewards_service/tests.cairo b/src/rewards_service/tests.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/rewards_service/tests.cairo rename to src/rewards_service/tests.cairo diff --git a/workspace/apps/staking/contracts/src/rewards_service/tests/test.cairo b/src/rewards_service/tests/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/rewards_service/tests/test.cairo rename to src/rewards_service/tests/test.cairo diff --git a/workspace/apps/staking/contracts/src/rewards_service/tests/test_utils.cairo b/src/rewards_service/tests/test_utils.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/rewards_service/tests/test_utils.cairo rename to src/rewards_service/tests/test_utils.cairo diff --git a/workspace/apps/staking/contracts/src/staking.cairo b/src/staking.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking.cairo rename to src/staking.cairo diff --git a/workspace/apps/staking/contracts/src/staking/eic.cairo b/src/staking/eic.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/eic.cairo rename to src/staking/eic.cairo diff --git a/workspace/apps/staking/contracts/src/staking/errors.cairo b/src/staking/errors.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/errors.cairo rename to src/staking/errors.cairo diff --git a/workspace/apps/staking/contracts/src/staking/interface.cairo b/src/staking/interface.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/interface.cairo rename to src/staking/interface.cairo diff --git a/workspace/apps/staking/contracts/src/staking/objects.cairo b/src/staking/objects.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/objects.cairo rename to src/staking/objects.cairo diff --git a/workspace/apps/staking/contracts/src/staking/staker_balance_trace.cairo b/src/staking/staker_balance_trace.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/staker_balance_trace.cairo rename to src/staking/staker_balance_trace.cairo diff --git a/workspace/apps/staking/contracts/src/staking/staker_balance_trace/mock.cairo b/src/staking/staker_balance_trace/mock.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/staker_balance_trace/mock.cairo rename to src/staking/staker_balance_trace/mock.cairo diff --git a/workspace/apps/staking/contracts/src/staking/staker_balance_trace/test.cairo b/src/staking/staker_balance_trace/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/staker_balance_trace/test.cairo rename to src/staking/staker_balance_trace/test.cairo diff --git a/workspace/apps/staking/contracts/src/staking/staker_balance_trace/trace.cairo b/src/staking/staker_balance_trace/trace.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/staker_balance_trace/trace.cairo rename to src/staking/staker_balance_trace/trace.cairo diff --git a/workspace/apps/staking/contracts/src/staking/staking.cairo b/src/staking/staking.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/staking.cairo rename to src/staking/staking.cairo diff --git a/workspace/apps/staking/contracts/src/staking/tests.cairo b/src/staking/tests.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/tests.cairo rename to src/staking/tests.cairo diff --git a/workspace/apps/staking/contracts/src/staking/tests/interface_v0.cairo b/src/staking/tests/interface_v0.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/tests/interface_v0.cairo rename to src/staking/tests/interface_v0.cairo diff --git a/workspace/apps/staking/contracts/src/staking/tests/interface_v1.cairo b/src/staking/tests/interface_v1.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/tests/interface_v1.cairo rename to src/staking/tests/interface_v1.cairo diff --git a/workspace/apps/staking/contracts/src/staking/tests/pause_test.cairo b/src/staking/tests/pause_test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/tests/pause_test.cairo rename to src/staking/tests/pause_test.cairo diff --git a/workspace/apps/staking/contracts/src/staking/tests/test.cairo b/src/staking/tests/test.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/tests/test.cairo rename to src/staking/tests/test.cairo diff --git a/workspace/apps/staking/contracts/src/staking/utils.cairo b/src/staking/utils.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/staking/utils.cairo rename to src/staking/utils.cairo diff --git a/workspace/apps/staking/contracts/src/test_utils.cairo b/src/test_utils.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/test_utils.cairo rename to src/test_utils.cairo diff --git a/workspace/apps/staking/contracts/src/types.cairo b/src/types.cairo similarity index 100% rename from workspace/apps/staking/contracts/src/types.cairo rename to src/types.cairo diff --git a/workspace/apps/staking/contracts/Scarb.toml b/workspace/apps/staking/contracts/Scarb.toml deleted file mode 100644 index b4c66f10..00000000 --- a/workspace/apps/staking/contracts/Scarb.toml +++ /dev/null @@ -1,40 +0,0 @@ -[package] -name = "staking" -version = "1.14.5" -edition = "2024_07" - -[dependencies] -starknet.workspace = true -openzeppelin.workspace = true -starkware_utils.workspace = true - -[dev-dependencies] -assert_macros.workspace = true -snforge_std.workspace = true -starkware_utils_testing.workspace = true - -[scripts] -test = "snforge test" - -[lib] - -[[target.starknet-contract]] - -[[test]] -name = "contracts_unittest" -build-external-contracts = ["starkware_utils::erc20::erc20_mocks::DualCaseERC20Mock"] - -[tool.fmt] -sort-module-level-items = true - -[tool] -snforge.workspace = true -scarb.workspace = true - -[features] -fork_test = [] - -[profile.dev.cairo] -unstable-add-statements-functions-debug-info = true -unstable-add-statements-code-locations-debug-info = true -inlining-strategy = "avoid"