starkware-libs · arad-starkware · Nov 20, 2025 · Nov 17, 2025
diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml
@@ -43,7 +43,7 @@ jobs:
       - uses: codecov/[email protected]
         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
@@ -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
@@ -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/...s/staking/contracts/src/attestation.cairo → src/attestation.cairo b/...s/staking/contracts/src/attestation.cairo → src/attestation.cairo
diff --git a/...ntracts/src/attestation/attestation.cairo → src/attestation/attestation.cairo b/...ntracts/src/attestation/attestation.cairo → src/attestation/attestation.cairo
diff --git a/...ng/contracts/src/attestation/errors.cairo → src/attestation/errors.cairo b/...ng/contracts/src/attestation/errors.cairo → src/attestation/errors.cairo
diff --git a/...contracts/src/attestation/interface.cairo → src/attestation/interface.cairo b/...contracts/src/attestation/interface.cairo → src/attestation/interface.cairo
diff --git a/...king/contracts/src/attestation/test.cairo → src/attestation/test.cairo b/...king/contracts/src/attestation/test.cairo → src/attestation/test.cairo
diff --git a/...pps/staking/contracts/src/constants.cairo → src/constants.cairo b/...pps/staking/contracts/src/constants.cairo → src/constants.cairo
diff --git a/...e/apps/staking/contracts/src/errors.cairo → src/errors.cairo b/...e/apps/staking/contracts/src/errors.cairo → src/errors.cairo
diff --git a/...king/contracts/src/event_test_utils.cairo → src/event_test_utils.cairo b/...king/contracts/src/event_test_utils.cairo → src/event_test_utils.cairo
diff --git a/...pps/staking/contracts/src/flow_test.cairo → src/flow_test.cairo b/...pps/staking/contracts/src/flow_test.cairo → src/flow_test.cairo
diff --git a/...ing/contracts/src/flow_test/flow_ideas.md → src/flow_test/flow_ideas.md b/...ing/contracts/src/flow_test/flow_ideas.md → src/flow_test/flow_ideas.md
diff --git a/...aking/contracts/src/flow_test/flows.cairo → src/flow_test/flows.cairo b/...aking/contracts/src/flow_test/flows.cairo → src/flow_test/flows.cairo
diff --git a/...g/contracts/src/flow_test/fork_test.cairo → src/flow_test/fork_test.cairo b/...g/contracts/src/flow_test/fork_test.cairo → src/flow_test/fork_test.cairo
diff --git a/...s/src/flow_test/multi_version_tests.cairo → src/flow_test/multi_version_tests.cairo b/...s/src/flow_test/multi_version_tests.cairo → src/flow_test/multi_version_tests.cairo
diff --git a/...taking/contracts/src/flow_test/test.cairo → src/flow_test/test.cairo b/...taking/contracts/src/flow_test/test.cairo → src/flow_test/test.cairo
diff --git a/...aking/contracts/src/flow_test/utils.cairo → src/flow_test/utils.cairo b/...aking/contracts/src/flow_test/utils.cairo → src/flow_test/utils.cairo
diff --git a/...s/src/legacy_eic/align_upg_vars_eic.cairo → src/legacy_eic/align_upg_vars_eic.cairo b/...s/src/legacy_eic/align_upg_vars_eic.cairo → src/legacy_eic/align_upg_vars_eic.cairo
diff --git a/.../src/legacy_eic/assign_root_gov_eic.cairo → src/legacy_eic/assign_root_gov_eic.cairo b/.../src/legacy_eic/assign_root_gov_eic.cairo → src/legacy_eic/assign_root_gov_eic.cairo
diff --git a/...pace/apps/staking/contracts/src/lib.cairo → src/lib.cairo b/...pace/apps/staking/contracts/src/lib.cairo → src/lib.cairo
diff --git a/...staking/contracts/src/minting_curve.cairo → src/minting_curve.cairo b/...staking/contracts/src/minting_curve.cairo → src/minting_curve.cairo
diff --git a/.../contracts/src/minting_curve/errors.cairo → src/minting_curve/errors.cairo b/.../contracts/src/minting_curve/errors.cairo → src/minting_curve/errors.cairo
diff --git a/...ntracts/src/minting_curve/interface.cairo → src/minting_curve/interface.cairo b/...ntracts/src/minting_curve/interface.cairo → src/minting_curve/interface.cairo
diff --git a/...cts/src/minting_curve/minting_curve.cairo → src/minting_curve/minting_curve.cairo b/...cts/src/minting_curve/minting_curve.cairo → src/minting_curve/minting_curve.cairo
diff --git a/...ng/contracts/src/minting_curve/test.cairo → src/minting_curve/test.cairo b/...ng/contracts/src/minting_curve/test.cairo → src/minting_curve/test.cairo
diff --git a/...ace/apps/staking/contracts/src/pool.cairo → src/pool.cairo b/...ace/apps/staking/contracts/src/pool.cairo → src/pool.cairo
diff --git a/...apps/staking/contracts/src/pool/eic.cairo → src/pool/eic.cairo b/...apps/staking/contracts/src/pool/eic.cairo → src/pool/eic.cairo
diff --git a/...s/staking/contracts/src/pool/errors.cairo → src/pool/errors.cairo b/...s/staking/contracts/src/pool/errors.cairo → src/pool/errors.cairo
diff --git a/...taking/contracts/src/pool/interface.cairo → src/pool/interface.cairo b/...taking/contracts/src/pool/interface.cairo → src/pool/interface.cairo
diff --git a/...ing/contracts/src/pool/interface_v0.cairo → src/pool/interface_v0.cairo b/...ing/contracts/src/pool/interface_v0.cairo → src/pool/interface_v0.cairo
diff --git a/.../staking/contracts/src/pool/objects.cairo → src/pool/objects.cairo b/.../staking/contracts/src/pool/objects.cairo → src/pool/objects.cairo
diff --git a/...pps/staking/contracts/src/pool/pool.cairo → src/pool/pool.cairo b/...pps/staking/contracts/src/pool/pool.cairo → src/pool/pool.cairo
diff --git a/.../src/pool/pool_member_balance_trace.cairo → src/pool/pool_member_balance_trace.cairo b/.../src/pool/pool_member_balance_trace.cairo → src/pool/pool_member_balance_trace.cairo
diff --git a/...pool/pool_member_balance_trace/mock.cairo → ...pool/pool_member_balance_trace/mock.cairo b/...pool/pool_member_balance_trace/mock.cairo → ...pool/pool_member_balance_trace/mock.cairo
diff --git a/...pool/pool_member_balance_trace/test.cairo → ...pool/pool_member_balance_trace/test.cairo b/...pool/pool_member_balance_trace/test.cairo → ...pool/pool_member_balance_trace/test.cairo
diff --git a/...ool/pool_member_balance_trace/trace.cairo → ...ool/pool_member_balance_trace/trace.cairo b/...ool/pool_member_balance_trace/trace.cairo → ...ool/pool_member_balance_trace/trace.cairo
diff --git a/...ps/staking/contracts/src/pool/tests.cairo → src/pool/tests.cairo b/...ps/staking/contracts/src/pool/tests.cairo → src/pool/tests.cairo
diff --git a/...aking/contracts/src/pool/tests/test.cairo → src/pool/tests/test.cairo b/...aking/contracts/src/pool/tests/test.cairo → src/pool/tests/test.cairo
diff --git a/...ps/staking/contracts/src/pool/utils.cairo → src/pool/utils.cairo b/...ps/staking/contracts/src/pool/utils.cairo → src/pool/utils.cairo
diff --git a/...aking/contracts/src/reward_supplier.cairo → src/reward_supplier.cairo b/...aking/contracts/src/reward_supplier.cairo → src/reward_supplier.cairo
diff --git a/...ontracts/src/reward_supplier/errors.cairo → src/reward_supplier/errors.cairo b/...ontracts/src/reward_supplier/errors.cairo → src/reward_supplier/errors.cairo
diff --git a/...racts/src/reward_supplier/interface.cairo → src/reward_supplier/interface.cairo b/...racts/src/reward_supplier/interface.cairo → src/reward_supplier/interface.cairo
diff --git a/...src/reward_supplier/reward_supplier.cairo → src/reward_supplier/reward_supplier.cairo b/...src/reward_supplier/reward_supplier.cairo → src/reward_supplier/reward_supplier.cairo
diff --git a/.../contracts/src/reward_supplier/test.cairo → src/reward_supplier/test.cairo b/.../contracts/src/reward_supplier/test.cairo → src/reward_supplier/test.cairo
diff --git a/...contracts/src/reward_supplier/utils.cairo → src/reward_supplier/utils.cairo b/...contracts/src/reward_supplier/utils.cairo → src/reward_supplier/utils.cairo
diff --git a/...aking/contracts/src/rewards_service.cairo → src/rewards_service.cairo b/...aking/contracts/src/rewards_service.cairo → src/rewards_service.cairo
diff --git a/...ontracts/src/rewards_service/errors.cairo → src/rewards_service/errors.cairo b/...ontracts/src/rewards_service/errors.cairo → src/rewards_service/errors.cairo
diff --git a/...src/rewards_service/rewards_service.cairo → src/rewards_service/rewards_service.cairo b/...src/rewards_service/rewards_service.cairo → src/rewards_service/rewards_service.cairo
diff --git a/...contracts/src/rewards_service/tests.cairo → src/rewards_service/tests.cairo b/...contracts/src/rewards_service/tests.cairo → src/rewards_service/tests.cairo
diff --git a/...acts/src/rewards_service/tests/test.cairo → src/rewards_service/tests/test.cairo b/...acts/src/rewards_service/tests/test.cairo → src/rewards_service/tests/test.cairo
diff --git a/...rc/rewards_service/tests/test_utils.cairo → src/rewards_service/tests/test_utils.cairo b/...rc/rewards_service/tests/test_utils.cairo → src/rewards_service/tests/test_utils.cairo
diff --git a/.../apps/staking/contracts/src/staking.cairo → src/staking.cairo b/.../apps/staking/contracts/src/staking.cairo → src/staking.cairo
diff --git a/...s/staking/contracts/src/staking/eic.cairo → src/staking/eic.cairo b/...s/staking/contracts/src/staking/eic.cairo → src/staking/eic.cairo
diff --git a/...taking/contracts/src/staking/errors.cairo → src/staking/errors.cairo b/...taking/contracts/src/staking/errors.cairo → src/staking/errors.cairo
diff --git a/...ing/contracts/src/staking/interface.cairo → src/staking/interface.cairo b/...ing/contracts/src/staking/interface.cairo → src/staking/interface.cairo
diff --git a/...aking/contracts/src/staking/objects.cairo → src/staking/objects.cairo b/...aking/contracts/src/staking/objects.cairo → src/staking/objects.cairo
diff --git a/...ts/src/staking/staker_balance_trace.cairo → src/staking/staker_balance_trace.cairo b/...ts/src/staking/staker_balance_trace.cairo → src/staking/staker_balance_trace.cairo
diff --git a/...c/staking/staker_balance_trace/mock.cairo → src/staking/staker_balance_trace/mock.cairo b/...c/staking/staker_balance_trace/mock.cairo → src/staking/staker_balance_trace/mock.cairo
diff --git a/...c/staking/staker_balance_trace/test.cairo → src/staking/staker_balance_trace/test.cairo b/...c/staking/staker_balance_trace/test.cairo → src/staking/staker_balance_trace/test.cairo
diff --git a/.../staking/staker_balance_trace/trace.cairo → src/staking/staker_balance_trace/trace.cairo b/.../staking/staker_balance_trace/trace.cairo → src/staking/staker_balance_trace/trace.cairo
diff --git a/...aking/contracts/src/staking/staking.cairo → src/staking/staking.cairo b/...aking/contracts/src/staking/staking.cairo → src/staking/staking.cairo
diff --git a/...staking/contracts/src/staking/tests.cairo → src/staking/tests.cairo b/...staking/contracts/src/staking/tests.cairo → src/staking/tests.cairo
diff --git a/...acts/src/staking/tests/interface_v0.cairo → src/staking/tests/interface_v0.cairo b/...acts/src/staking/tests/interface_v0.cairo → src/staking/tests/interface_v0.cairo
diff --git a/...acts/src/staking/tests/interface_v1.cairo → src/staking/tests/interface_v1.cairo b/...acts/src/staking/tests/interface_v1.cairo → src/staking/tests/interface_v1.cairo
diff --git a/...tracts/src/staking/tests/pause_test.cairo → src/staking/tests/pause_test.cairo b/...tracts/src/staking/tests/pause_test.cairo → src/staking/tests/pause_test.cairo
diff --git a/...ng/contracts/src/staking/tests/test.cairo → src/staking/tests/test.cairo b/...ng/contracts/src/staking/tests/test.cairo → src/staking/tests/test.cairo
diff --git a/...staking/contracts/src/staking/utils.cairo → src/staking/utils.cairo b/...staking/contracts/src/staking/utils.cairo → src/staking/utils.cairo
diff --git a/...ps/staking/contracts/src/test_utils.cairo → src/test_utils.cairo b/...ps/staking/contracts/src/test_utils.cairo → src/test_utils.cairo
diff --git a/...ce/apps/staking/contracts/src/types.cairo → src/types.cairo b/...ce/apps/staking/contracts/src/types.cairo → src/types.cairo
diff --git a/workspace/apps/staking/contracts/Scarb.toml b/workspace/apps/staking/contracts/Scarb.toml