Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

farm supply for week fix #938

Merged
merged 15 commits into from
Aug 5, 2024
Merged

farm supply for week fix #938

merged 15 commits into from
Aug 5, 2024

Conversation

psorinionut
Copy link
Contributor

No description provided.

Copy link

github-actions bot commented Aug 1, 2024

Coverage Summary

Totals

Count Covered %
Lines 43009 40127 93.30
Regions 7539 5563 73.79
Functions 2768 2217 80.09
Instantiations 26704 7014 26.27

Files

Expand
File Lines Regions Functions Instantiations
/common/common_structs/src/farm_types.rs 81.48% 48.00% 53.85% 47.34%
/common/common_structs/src/locked_token_types.rs 79.35% 58.23% 64.58% 21.49%
/common/common_structs/src/wrapper_types.rs 50.00% 19.30% 23.81% 5.71%
/common/modules/farm/config/src/config.rs 55.00% 71.43% 75.00% 35.58%
/common/modules/farm/contexts/src/claim_rewards_context.rs 93.55% 77.78% 100.00% 68.75%
/common/modules/farm/contexts/src/enter_farm_context.rs 91.67% 81.82% 100.00% 80.00%
/common/modules/farm/contexts/src/exit_farm_context.rs 95.24% 66.67% 100.00% 75.00%
/common/modules/farm/contexts/src/storage_cache.rs 100.00% 100.00% 100.00% 81.25%
/common/modules/farm/events/src/events.rs 97.01% 51.85% 69.23% 49.79%
/common/modules/farm/farm_base_impl/src/base_farm_init.rs 82.14% 60.00% 100.00% 23.53%
/common/modules/farm/farm_base_impl/src/base_farm_validation.rs 83.33% 57.14% 100.00% 20.59%
/common/modules/farm/farm_base_impl/src/base_traits_impl.rs 84.97% 82.61% 78.57% 68.09%
/common/modules/farm/farm_base_impl/src/claim_rewards.rs 100.00% 80.00% 100.00% 24.69%
/common/modules/farm/farm_base_impl/src/compound_rewards.rs 98.39% 66.67% 100.00% 7.81%
/common/modules/farm/farm_base_impl/src/enter_farm.rs 100.00% 75.00% 100.00% 20.59%
/common/modules/farm/farm_base_impl/src/exit_farm.rs 100.00% 75.00% 100.00% 19.12%
/common/modules/farm/farm_base_impl/src/lib.rs 0.00% 0.00% 0.00% 0.00%
/common/modules/farm/farm_token/src/farm_token.rs 2.08% 10.53% 10.00% 17.90%
/common/modules/farm/rewards/src/rewards.rs 20.00% 42.86% 66.67% 26.97%
/common/modules/legacy_token_decode_module/src/lib.rs 100.00% 83.33% 100.00% 7.78%
/common/modules/locking_module/src/lock_with_energy_module.rs 100.00% 75.00% 100.00% 20.00%
/common/modules/locking_module/src/locking_module.rs 83.33% 60.00% 71.43% 16.28%
/common/modules/math/src/lib.rs 79.55% 80.00% 75.00% 35.14%
/common/modules/pausable/src/pausable.rs 68.42% 52.94% 75.00% 20.09%
/common/modules/permissions_module/src/permissions.rs 68.42% 66.67% 50.00% 54.84%
/common/modules/permissions_module/src/permissions_module.rs 60.00% 65.22% 66.67% 22.24%
/common/modules/sc_whitelist_module/src/sc_whitelist_module.rs 68.42% 57.14% 66.67% 15.55%
/common/modules/token_merge_helper/src/lib.rs 16.67% 20.00% 40.00% 5.36%
/common/modules/token_send/src/token_send.rs 95.65% 87.50% 100.00% 30.54%
/common/modules/utils/src/lib.rs 96.55% 84.00% 91.67% 39.84%
/common/traits/fixed-supply-token/src/lib.rs 95.00% 85.71% 100.00% 59.26%
/common/traits/mergeable/src/lib.rs 55.88% 47.06% 57.14% 15.52%
/common/traits/unwrappable/src/lib.rs 75.00% 66.67% 50.00% 22.41%
/dex/farm-with-locked-rewards/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/dex/farm-with-locked-rewards/src/lib.rs 89.22% 76.32% 75.00% 28.57%
/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/fees_collector_mock.rs 50.00% 50.00% 50.00% 50.00%
/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs 100.00% 100.00% 100.00% 100.00%
/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_test.rs 100.00% 100.00% 100.00% 100.00%
/dex/farm/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/dex/farm/src/base_functions.rs 95.28% 87.27% 85.71% 44.09%
/dex/farm/src/exit_penalty.rs 52.17% 23.08% 40.00% 20.75%
/dex/farm/src/lib.rs 90.85% 80.77% 80.00% 19.94%
/dex/farm/tests/energy_update_test.rs 100.00% 100.00% 100.00% 100.00%
/dex/farm/tests/farm_multi_user_test.rs 100.00% 100.00% 100.00% 100.00%
/dex/farm/tests/farm_review_distribution.rs 100.00% 100.00% 100.00% 100.00%
/dex/farm/tests/farm_setup/farm_rewards_distr_setup.rs 96.96% 94.59% 94.12% 18.82%
/dex/farm/tests/farm_setup/multi_user_farm_setup.rs 97.05% 97.60% 96.30% 28.15%
/dex/farm/tests/farm_setup/single_user_farm_setup.rs 89.18% 87.23% 87.50% 17.50%
/dex/farm/tests/farm_single_user_test.rs 100.00% 100.00% 100.00% 100.00%
/dex/farm/tests/total_farm_position_test.rs 100.00% 100.00% 100.00% 100.00%
/dex/fuzz/src/fuzz_data.rs 99.82% 90.00% 93.33% 93.33%
/dex/fuzz/src/fuzz_factory.rs 69.23% 54.55% 75.00% 75.00%
/dex/fuzz/src/fuzz_farm.rs 94.69% 83.78% 100.00% 100.00%
/dex/fuzz/src/fuzz_pair.rs 89.61% 70.59% 100.00% 100.00%
/dex/fuzz/src/fuzz_price_discovery.rs 88.30% 83.33% 100.00% 100.00%
/dex/fuzz/src/fuzz_start.rs 99.58% 95.83% 100.00% 100.00%
/dex/governance/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/dex/governance/src/config.rs 51.67% 72.73% 56.25% 15.00%
/dex/governance/src/events.rs 100.00% 77.78% 100.00% 32.14%
/dex/governance/src/lib.rs 100.00% 91.30% 100.00% 12.90%
/dex/governance/src/proposal.rs 68.12% 33.33% 28.57% 8.33%
/dex/governance/src/validation.rs 85.71% 25.00% 50.00% 8.33%
/dex/governance/src/vote.rs 88.89% 40.74% 58.33% 28.12%
/dex/governance/src/weight.rs 77.42% 58.82% 100.00% 27.59%
/dex/governance/tests/gov_tests.rs 100.00% 100.00% 100.00% 100.00%
/dex/pair-mock/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/dex/pair-mock/src/pair.rs 45.98% 22.22% 75.00% 23.53%
/dex/pair/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/dex/pair/src/amm.rs 100.00% 88.89% 100.00% 28.97%
/dex/pair/src/config.rs 60.00% 60.00% 60.00% 27.20%
/dex/pair/src/contexts/add_liquidity.rs 100.00% 100.00% 100.00% 63.64%
/dex/pair/src/contexts/base.rs 100.00% 100.00% 100.00% 50.65%
/dex/pair/src/contexts/output_builder.rs 100.00% 92.86% 100.00% 34.11%
/dex/pair/src/contexts/remove_liquidity.rs 100.00% 100.00% 100.00% 45.45%
/dex/pair/src/contexts/swap.rs 100.00% 100.00% 100.00% 45.45%
/dex/pair/src/events.rs 76.47% 40.74% 53.85% 30.16%
/dex/pair/src/fee.rs 39.74% 36.19% 48.00% 7.00%
/dex/pair/src/lib.rs 69.39% 55.17% 66.67% 30.00%
/dex/pair/src/liquidity_pool.rs 93.70% 69.57% 100.00% 29.46%
/dex/pair/src/locking_wrapper.rs 94.59% 83.33% 88.89% 9.84%
/dex/pair/src/pair_actions/add_liq.rs 92.50% 66.67% 100.00% 27.54%
/dex/pair/src/pair_actions/common_methods.rs 100.00% 83.33% 100.00% 28.57%
/dex/pair/src/pair_actions/initial_liq.rs 91.23% 65.00% 100.00% 10.45%
/dex/pair/src/pair_actions/remove_liq.rs 92.66% 64.29% 100.00% 17.59%
/dex/pair/src/pair_actions/swap.rs 73.36% 46.38% 45.45% 14.01%
/dex/pair/src/pair_actions/views.rs 75.38% 73.17% 83.33% 6.36%
/dex/pair/src/read_pair_storage.rs 100.00% 88.89% 100.00% 17.95%
/dex/pair/src/safe_price.rs 92.22% 70.18% 70.00% 23.47%
/dex/pair/src/safe_price_view.rs 86.38% 67.39% 84.21% 7.41%
/dex/pair/tests/pair_rs_test.rs 99.93% 95.40% 96.97% 96.97%
/dex/pair/tests/pair_setup/mod.rs 100.00% 100.00% 100.00% 100.00%
/dex/price-discovery/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/dex/price-discovery/src/common_storage.rs 100.00% 33.33% 100.00% 13.04%
/dex/price-discovery/src/events.rs 96.15% 47.62% 70.00% 26.47%
/dex/price-discovery/src/lib.rs 99.00% 91.07% 100.00% 17.11%
/dex/price-discovery/src/phase.rs 93.75% 70.00% 70.00% 17.91%
/dex/price-discovery/src/redeem_token.rs 41.03% 61.54% 75.00% 15.91%
/dex/price-discovery/tests/price_disc_tests.rs 100.00% 100.00% 100.00% 100.00%
/dex/price-discovery/tests/tests_common.rs 100.00% 100.00% 100.00% 50.00%
/dex/proxy-deployer/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/dex/proxy-deployer/src/farm_deploy.rs 0.00% 0.00% 0.00% 0.00%
/dex/proxy-deployer/src/lib.rs 0.00% 0.00% 0.00% 0.00%
/dex/router/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/dex/router/src/config.rs 85.19% 63.64% 60.00% 16.18%
/dex/router/src/contract.rs 53.28% 61.54% 71.43% 14.00%
/dex/router/src/enable_swap_by_user.rs 93.71% 73.08% 87.50% 12.31%
/dex/router/src/events.rs 94.74% 46.67% 71.43% 17.31%
/dex/router/src/factory.rs 62.81% 35.00% 42.11% 11.49%
/dex/router/src/multi_pair_swap.rs 65.52% 66.67% 75.00% 9.09%
/dex/router/tests/router_setup/mod.rs 100.00% 100.00% 100.00% 100.00%
/dex/router/tests/router_test.rs 100.00% 100.00% 100.00% 100.00%
/dex/tests/dex_scenario_go_test.rs 100.00% 100.00% 100.00% 100.00%
/dex/tests/dex_scenario_rs_test.rs 100.00% 100.00% 100.00% 100.00%
/energy-integration/common-modules/energy-query/src/lib.rs 97.78% 88.89% 100.00% 35.09%
/energy-integration/common-modules/week-timekeeping/src/lib.rs 63.16% 45.45% 60.00% 30.56%
/energy-integration/common-modules/weekly-rewards-splitting/src/base_impl.rs 100.00% 93.75% 100.00% 42.22%
/energy-integration/common-modules/weekly-rewards-splitting/src/events.rs 100.00% 87.50% 100.00% 42.55%
/energy-integration/common-modules/weekly-rewards-splitting/src/global_info.rs 100.00% 96.67% 100.00% 41.26%
/energy-integration/common-modules/weekly-rewards-splitting/src/lib.rs 80.81% 66.67% 70.00% 16.04%
/energy-integration/common-modules/weekly-rewards-splitting/src/locked_token_buckets.rs 98.81% 90.91% 100.00% 42.41%
/energy-integration/common-modules/weekly-rewards-splitting/src/update_claim_progress_energy.rs 94.12% 90.00% 100.00% 25.00%
/energy-integration/common-types/src/lib.rs 0.00% 0.00% 0.00% 0.00%
/energy-integration/energy-factory-mock/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/energy-integration/energy-factory-mock/src/lib.rs 14.29% 33.33% 40.00% 14.02%
/energy-integration/energy-update/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/energy-integration/energy-update/src/lib.rs 12.50% 14.29% 50.00% 5.66%
/energy-integration/farm-boosted-yields/src/boosted_yields_factors.rs 89.66% 64.52% 70.00% 28.13%
/energy-integration/farm-boosted-yields/src/lib.rs 96.36% 88.52% 100.00% 28.37%
/energy-integration/fees-collector/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/energy-integration/fees-collector/src/additional_locked_tokens.rs 100.00% 77.78% 100.00% 12.00%
/energy-integration/fees-collector/src/config.rs 28.21% 35.71% 33.33% 11.72%
/energy-integration/fees-collector/src/events.rs 100.00% 75.00% 100.00% 18.18%
/energy-integration/fees-collector/src/fees_accumulation.rs 100.00% 93.33% 100.00% 15.71%
/energy-integration/fees-collector/src/lib.rs 95.51% 89.47% 87.50% 16.99%
/energy-integration/fees-collector/tests/fees_collector_rust_test.rs 100.00% 100.00% 100.00% 100.00%
/energy-integration/fees-collector/tests/fees_collector_test_setup/mod.rs 100.00% 100.00% 100.00% 100.00%
/energy-integration/governance-v2/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/energy-integration/governance-v2/src/configurable.rs 81.13% 70.83% 66.67% 15.38%
/energy-integration/governance-v2/src/events.rs 100.00% 33.33% 100.00% 29.17%
/energy-integration/governance-v2/src/lib.rs 98.01% 88.89% 100.00% 18.18%
/energy-integration/governance-v2/src/proposal.rs 65.00% 29.27% 42.11% 29.41%
/energy-integration/governance-v2/src/proposal_storage.rs 77.78% 32.14% 53.85% 18.00%
/energy-integration/governance-v2/src/views.rs 95.31% 85.19% 88.89% 21.43%
/energy-integration/governance-v2/tests/gov_rust_test.rs 98.14% 84.44% 100.00% 100.00%
/energy-integration/governance-v2/tests/gov_test_setup/mod.rs 99.64% 98.08% 100.00% 100.00%
/farm-staking/farm-staking-proxy/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/farm-staking/farm-staking-proxy/src/dual_yield_token.rs 69.44% 61.11% 75.00% 20.00%
/farm-staking/farm-staking-proxy/src/external_contracts_interactions.rs 96.88% 75.00% 100.00% 25.00%
/farm-staking/farm-staking-proxy/src/lib.rs 100.00% 50.00% 100.00% 6.67%
/farm-staking/farm-staking-proxy/src/lp_farm_token.rs 100.00% 50.00% 100.00% 11.11%
/farm-staking/farm-staking-proxy/src/proxy_actions/claim.rs 98.53% 40.00% 66.67% 11.11%
/farm-staking/farm-staking-proxy/src/proxy_actions/stake.rs 98.61% 66.67% 50.00% 6.25%
/farm-staking/farm-staking-proxy/src/proxy_actions/unstake.rs 97.67% 25.00% 50.00% 6.25%
/farm-staking/farm-staking-proxy/src/result_types.rs 60.61% 8.33% 18.75% 11.54%
/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp.rs 100.00% 100.00% 100.00% 100.00%
/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_external_contracts/mod.rs 100.00% 100.00% 100.00% 100.00%
/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_interactions/mod.rs 100.00% 100.00% 100.00% 100.00%
/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_setup/mod.rs 100.00% 100.00% 100.00% 100.00%
/farm-staking/farm-staking/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/farm-staking/farm-staking/src/base_impl_wrapper.rs 96.72% 94.74% 92.31% 71.43%
/farm-staking/farm-staking/src/claim_only_boosted_staking_rewards.rs 95.16% 91.67% 100.00% 34.78%
/farm-staking/farm-staking/src/claim_stake_farm_rewards.rs 100.00% 84.62% 100.00% 22.22%
/farm-staking/farm-staking/src/compound_stake_farm_rewards.rs 100.00% 75.00% 100.00% 11.54%
/farm-staking/farm-staking/src/custom_rewards.rs 55.88% 54.55% 50.00% 15.49%
/farm-staking/farm-staking/src/farm_token_roles.rs 25.00% 50.00% 50.00% 3.85%
/farm-staking/farm-staking/src/lib.rs 70.00% 71.43% 66.67% 17.71%
/farm-staking/farm-staking/src/stake_farm.rs 100.00% 83.33% 100.00% 24.39%
/farm-staking/farm-staking/src/token_attributes.rs 79.27% 56.00% 52.63% 49.38%
/farm-staking/farm-staking/src/unbond_farm.rs 96.00% 40.00% 50.00% 7.69%
/farm-staking/farm-staking/src/unstake_farm.rs 100.00% 87.50% 100.00% 28.89%
/farm-staking/farm-staking/tests/farm_staking_energy_test.rs 100.00% 100.00% 100.00% 100.00%
/farm-staking/farm-staking/tests/farm_staking_setup/mod.rs 100.00% 100.00% 100.00% 63.00%
/farm-staking/farm-staking/tests/farm_staking_test.rs 100.00% 100.00% 100.00% 100.00%
/farm-staking/metabonding-staking/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/farm-staking/metabonding-staking/src/events.rs 100.00% 33.33% 100.00% 18.75%
/farm-staking/metabonding-staking/src/lib.rs 77.66% 55.88% 70.00% 10.00%
/farm-staking/metabonding-staking/src/locked_asset_token.rs 98.31% 75.86% 90.91% 26.67%
/farm-staking/metabonding-staking/tests/metabonding_staking_setup/mod.rs 100.00% 100.00% 100.00% 100.00%
/farm-staking/metabonding-staking/tests/metabonding_staking_test.rs 100.00% 100.00% 100.00% 100.00%
/legacy-contracts/farm-staking-proxy-v-13/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/legacy-contracts/farm-staking-proxy-v-13/src/dual_yield_token.rs 0.00% 0.00% 0.00% 0.00%
/legacy-contracts/farm-staking-proxy-v-13/src/external_contracts_interactions.rs 0.00% 0.00% 0.00% 0.00%
/legacy-contracts/farm-staking-proxy-v-13/src/lib.rs 0.00% 0.00% 0.00% 0.00%
/legacy-contracts/farm-staking-proxy-v-13/src/lp_farm_token.rs 0.00% 0.00% 0.00% 0.00%
/legacy-contracts/farm-v-13/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/legacy-contracts/farm-v-13/src/lib.rs 0.00% 0.00% 0.00% 0.00%
/legacy-contracts/simple-lock-legacy/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/legacy-contracts/simple-lock-legacy/src/basic_lock_unlock.rs 93.55% 50.00% 75.00% 11.54%
/legacy-contracts/simple-lock-legacy/src/lib.rs 88.89% 57.14% 100.00% 4.84%
/legacy-contracts/simple-lock-legacy/src/locked_token.rs 50.00% 29.41% 50.00% 11.63%
/legacy-contracts/simple-lock-legacy/src/proxy_farm.rs 89.29% 37.14% 57.14% 12.50%
/legacy-contracts/simple-lock-legacy/src/proxy_lp.rs 91.67% 36.84% 62.50% 10.91%
/legacy-contracts/simple-lock-legacy/tests/rust_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/distribution/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/distribution/src/global_op.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/distribution/src/lib.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/energy-factory/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/energy-factory/src/energy.rs 96.18% 82.76% 92.59% 48.14%
/locked-asset/energy-factory/src/events.rs 87.50% 41.67% 60.00% 43.10%
/locked-asset/energy-factory/src/extend_lock.rs 100.00% 92.86% 100.00% 25.00%
/locked-asset/energy-factory/src/lib.rs 100.00% 94.74% 100.00% 26.47%
/locked-asset/energy-factory/src/local_roles.rs 10.00% 20.00% 33.33% 4.44%
/locked-asset/energy-factory/src/lock_options.rs 86.49% 61.76% 70.00% 46.77%
/locked-asset/energy-factory/src/lock_options_endpoints.rs 91.84% 86.67% 87.50% 32.63%
/locked-asset/energy-factory/src/locked_token_transfer.rs 72.22% 58.33% 75.00% 9.79%
/locked-asset/energy-factory/src/migration.rs 94.70% 88.89% 100.00% 14.55%
/locked-asset/energy-factory/src/penalty.rs 100.00% 92.86% 100.00% 14.47%
/locked-asset/energy-factory/src/token_merging.rs 96.08% 65.38% 77.78% 15.05%
/locked-asset/energy-factory/src/token_whitelist.rs 100.00% 75.00% 100.00% 29.61%
/locked-asset/energy-factory/src/unlock_with_penalty.rs 99.13% 84.62% 100.00% 10.14%
/locked-asset/energy-factory/src/unstake.rs 100.00% 88.89% 100.00% 13.96%
/locked-asset/energy-factory/src/virtual_lock.rs 100.00% 88.89% 100.00% 19.83%
/locked-asset/energy-factory/tests/energy_factory_setup/mod.rs 100.00% 100.00% 100.00% 47.22%
/locked-asset/energy-factory/tests/energy_factory_setup/unbond_sc_mock.rs 100.00% 100.00% 100.00% 50.00%
/locked-asset/energy-factory/tests/old_tokens_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/energy-factory/tests/simple_lock_energy_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/energy-factory/tests/token_merging_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/energy-factory/tests/virtual_lock_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/factory/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/factory/src/attr_ex_helper.rs 40.74% 36.36% 66.67% 17.07%
/locked-asset/factory/src/cache.rs 63.64% 57.14% 60.00% 14.29%
/locked-asset/factory/src/events.rs 95.65% 46.67% 71.43% 11.32%
/locked-asset/factory/src/lib.rs 73.50% 62.96% 62.50% 15.86%
/locked-asset/factory/src/locked_asset.rs 63.96% 60.00% 70.00% 26.98%
/locked-asset/factory/src/locked_asset_token_merge.rs 98.41% 95.45% 100.00% 21.05%
/locked-asset/factory/src/migration.rs 36.67% 14.29% 40.00% 4.29%
/locked-asset/factory/tests/factory_setup/mod.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/factory/tests/lock_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/factory/tests/unlock_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/lkmex-transfer/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/lkmex-transfer/src/energy_transfer.rs 97.67% 82.35% 75.00% 18.75%
/locked-asset/lkmex-transfer/src/events.rs 95.83% 54.55% 83.33% 16.67%
/locked-asset/lkmex-transfer/src/lib.rs 81.58% 42.37% 52.63% 10.12%
/locked-asset/lkmex-transfer/tests/lkmex_transfer_tests.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/locked-token-wrapper/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/locked-token-wrapper/src/lib.rs 100.00% 71.43% 100.00% 5.56%
/locked-asset/locked-token-wrapper/src/wrapped_token.rs 49.21% 36.00% 60.00% 10.53%
/locked-asset/locked-token-wrapper/tests/locked_token_wrapping_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/proxy_dex/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/proxy_dex/src/energy_update.rs 72.09% 36.84% 80.00% 22.22%
/locked-asset/proxy_dex/src/events.rs 79.31% 41.03% 57.89% 16.36%
/locked-asset/proxy_dex/src/external_merging.rs 100.00% 100.00% 100.00% 41.67%
/locked-asset/proxy_dex/src/farm_interactions.rs 100.00% 66.67% 100.00% 11.11%
/locked-asset/proxy_dex/src/lib.rs 19.67% 10.00% 28.57% 3.57%
/locked-asset/proxy_dex/src/other_sc_whitelist.rs 52.38% 33.33% 42.86% 7.00%
/locked-asset/proxy_dex/src/pair_interactions.rs 100.00% 60.00% 100.00% 15.62%
/locked-asset/proxy_dex/src/proxy_common.rs 58.75% 57.14% 80.00% 16.67%
/locked-asset/proxy_dex/src/proxy_farm.rs 99.69% 91.43% 88.89% 9.52%
/locked-asset/proxy_dex/src/proxy_pair.rs 88.94% 76.92% 85.71% 13.24%
/locked-asset/proxy_dex/src/wrapped_farm_attributes.rs 89.09% 75.00% 83.33% 26.67%
/locked-asset/proxy_dex/src/wrapped_farm_token_merge.rs 96.36% 50.00% 75.00% 7.50%
/locked-asset/proxy_dex/src/wrapped_lp_attributes.rs 97.83% 74.19% 83.33% 31.90%
/locked-asset/proxy_dex/src/wrapped_lp_token_merge.rs 64.58% 37.50% 50.00% 5.00%
/locked-asset/proxy_dex/tests/proxy_dex_test_setup/mod.rs 99.31% 97.06% 94.74% 92.11%
/locked-asset/proxy_dex/tests/proxy_farm_test.rs 99.93% 99.26% 100.00% 100.00%
/locked-asset/proxy_dex/tests/proxy_lp_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/simple-lock/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/simple-lock/src/basic_lock_unlock.rs 100.00% 81.25% 100.00% 24.32%
/locked-asset/simple-lock/src/farm_interactions.rs 100.00% 81.82% 100.00% 12.86%
/locked-asset/simple-lock/src/lib.rs 92.31% 75.00% 100.00% 22.16%
/locked-asset/simple-lock/src/locked_token.rs 77.78% 72.50% 72.73% 29.26%
/locked-asset/simple-lock/src/lp_interactions.rs 96.30% 66.67% 100.00% 7.38%
/locked-asset/simple-lock/src/proxy_farm.rs 80.18% 52.86% 57.89% 8.31%
/locked-asset/simple-lock/src/proxy_lp.rs 80.69% 50.94% 75.00% 7.86%
/locked-asset/simple-lock/src/token_attributes.rs 96.43% 75.00% 66.67% 25.00%
/locked-asset/simple-lock/tests/rust_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/tests/distribution_scenario_go_test.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/token-unstake/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/locked-asset/token-unstake/src/cancel_unstake.rs 85.42% 63.64% 50.00% 4.76%
/locked-asset/token-unstake/src/events.rs 100.00% 50.00% 100.00% 21.05%
/locked-asset/token-unstake/src/fees_handler.rs 98.39% 86.67% 100.00% 40.00%
/locked-asset/token-unstake/src/lib.rs 100.00% 80.00% 100.00% 21.05%
/locked-asset/token-unstake/src/tokens_per_user.rs 57.14% 38.89% 57.14% 54.76%
/locked-asset/token-unstake/src/unbond_tokens.rs 100.00% 88.89% 100.00% 25.00%
/locked-asset/token-unstake/tests/token_unstake_setup/fees_collector_mock.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/token-unstake/tests/token_unstake_setup/mod.rs 93.33% 88.89% 86.36% 63.64%
/locked-asset/token-unstake/tests/token_unstake_test.rs 100.00% 100.00% 100.00% 100.00%
/locked-asset/token-unstake/tests/unlock_early_test.rs 100.00% 100.00% 100.00% 100.00%
/pause-all/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/pause-all/src/lib.rs 69.74% 54.55% 75.00% 16.84%
/pause-all/src/ongoing_pause_operation.rs 53.33% 23.53% 40.00% 11.11%
/pause-all/tests/pause_all_test.rs 100.00% 100.00% 100.00% 100.00%

Copy link

github-actions bot commented Aug 1, 2024

Contract comparison - from 6cd702c to f5d2593
⚠️ Warning: Could not download the report for the base branch. Displaying only the report for the current branch. ⚠️

Path                                                                                             size                  has-allocator                     has-format
mx-exchange-sc
- pause-all/pause-all.wasm 5459 No No
- pause-all/pause-all.wasm 5459 No No
mx-exchange-sc/dex
- farm/farm.wasm 36933 No No
- farm-with-locked-rewards/farm-with-locked-rewards.wasm 36752 No No
- governance/governance.wasm 16161 No No
- governance/governance.wasm 16161 No No
- pair
- - pair.wasm 31633 No No
- - pair-full.wasm 33005 No No
- - safe-price-view.wasm 7973 No No
- pair-mock/pair-mock.wasm 4352 No No
- price-discovery/price-discovery.wasm 16182 No No
- proxy-deployer/proxy-deployer.wasm 4039 No No
- proxy-deployer/proxy-deployer.wasm 4039 No No
- router/router.wasm 25238 No No
mx-exchange-sc/energy-integration
- energy-factory-mock/energy-factory-mock.wasm 3637 No No
- energy-factory-mock/energy-factory-mock.wasm 3637 No No
- energy-update/energy-update.wasm 1571 No No
- fees-collector/fees-collector.wasm 17994 No No
- governance-v2/governance-v2.wasm 15773 No No
mx-exchange-sc/farm-staking
- farm-staking/farm-staking.wasm 41089 No No
- farm-staking-proxy/farm-staking-proxy.wasm 19172 No No
- metabonding-staking/metabonding-staking.wasm 9137 No No
- metabonding-staking/metabonding-staking.wasm 9137 No No
mx-exchange-sc/legacy-contracts
- farm-staking-proxy-v-13/farm-staking-proxy-v-13.wasm 9667 No No
- farm-v-13/farm-v-13.wasm 2343 No No
- simple-lock-legacy/simple-lock-legacy.wasm 6225 No No
mx-exchange-sc/locked-asset
- distribution/distribution.wasm 12262 No No
- distribution/distribution.wasm 12262 No No
- energy-factory/energy-factory.wasm 33617 No No
- factory/factory.wasm 29154 No No
- factory/factory.wasm 29154 No No
- lkmex-transfer/lkmex-transfer.wasm 10507 No No
- locked-token-wrapper/locked-token-wrapper.wasm 14729 No No
- proxy_dex/proxy_dex.wasm 36227 No No
- simple-lock/simple-lock.wasm 25188 No No
- token-unstake/token-unstake.wasm 13249 No No
- token-unstake/token-unstake.wasm 13249 No No

let boosted_rewards = self.claim_only_boosted_payment(user);
let boosted_rewards_payment =
EsdtTokenPayment::new(self.reward_token_id().get(), 0, boosted_rewards);

self.set_farm_supply_for_current_week(&storage_cache.farm_token_supply);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have to do this every single time ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could also update all the claim endpoints to pass through an if statement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to do this on claim, only when the storage is empty.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about adding it but I don't think it will bring any real improvement. An if statement would require a few extra storage reads (we would need to compute the current week), so in the end gas won't be saved, but at the same time it would add some extra logic with the if statement, which in turn would complicate the review/audit/testing parts.

let boosted_rewards = self.claim_only_boosted_payment(user);

self.set_farm_supply_for_current_week(&storage_cache.farm_token_supply);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have to do this every single time ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented above. Also, this is how it already works for the other endpoints (enter, exit, claim).

@psorinionut psorinionut changed the title farm supply for week fix. incl claimBoosted aggr farm supply for week fix Aug 2, 2024
@psorinionut psorinionut merged commit 57b3433 into rc/v3.0 Aug 5, 2024
6 checks passed
@psorinionut psorinionut deleted the farm-supply-for-week-fix branch August 5, 2024 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants