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

Merge v3 into v3.5 11.11 #253

Merged
merged 12 commits into from
Nov 13, 2024
Merged

Merge v3 into v3.5 11.11 #253

merged 12 commits into from
Nov 13, 2024

Conversation

evelinemolnar
Copy link
Contributor

No description provided.

dragos-rebegea and others added 12 commits November 6, 2024 11:35
- added ledger support
# Conflicts:
#	bridge-proxy/tests/bridge_proxy_blackbox_test.rs
#	bridged-tokens-wrapper/src/lib.rs
#	multi-transfer-esdt/src/bridged_tokens_wrapper_proxy.rs
#	multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs
#	multisig/src/bridged_tokens_wrapper_proxy.rs
Copy link

Coverage Summary

Totals

Count Covered %
Lines 10458 7739 74.00
Regions 1668 1099 65.89
Functions 842 543 64.49
Instantiations 5093 1534 30.12

Files

Expand
File Lines Regions Functions Instantiations
/home/runner/.cargo/git/checkouts/mx-contracts-rs-13011bd47afef959/e72c201/contracts/crowdfunding-esdt/src/crowdfunding_esdt.rs 51.56% 57.14% 77.78% 64.00%
/home/runner/.cargo/git/checkouts/mx-contracts-rs-13011bd47afef959/e72c201/contracts/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs 100.00% 100.00% 100.00% 100.00%
/bridge-proxy/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/bridge-proxy/src/bridge-proxy.rs 68.21% 70.00% 78.57% 23.12%
/bridge-proxy/src/config.rs 100.00% 66.67% 100.00% 30.00%
/bridge-proxy/tests/bridge_proxy_blackbox_test.rs 71.06% 88.00% 78.57% 78.57%
/bridged-tokens-wrapper/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/bridged-tokens-wrapper/src/dfp_big_uint.rs 100.00% 100.00% 100.00% 50.00%
/bridged-tokens-wrapper/src/events.rs 100.00% 33.33% 100.00% 10.34%
/bridged-tokens-wrapper/src/lib.rs 100.00% 100.00% 100.00% 23.19%
/bridged-tokens-wrapper/tests/bridged_tokens_wrapper_whitebox_test.rs 89.58% 90.80% 90.22% 90.22%
/bridged-tokens-wrapper/tests/dfp_big_uint_test.rs 100.00% 100.00% 100.00% 100.00%
/bridged-tokens-wrapper/tests/scenario_go_test.rs 100.00% 100.00% 100.00% 100.00%
/common/eth-address/src/lib.rs 93.33% 66.67% 88.89% 50.52%
/common/fee-estimator-module/src/lib.rs 100.00% 93.33% 100.00% 24.77%
/common/fee-estimator-module/src/price_aggregator_proxy.rs 6.14% 4.76% 6.67% 10.53%
/common/max-bridged-amount-module/src/lib.rs 100.00% 87.50% 100.00% 24.27%
/common/mock-contracts/mock-bridge-proxy/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-bridge-proxy/src/mock_bridge_proxy.rs 100.00% 33.33% 100.00% 3.70%
/common/mock-contracts/mock-bridged-tokens-wrapper/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-bridged-tokens-wrapper/src/mock_bridged_tokens_wrapper.rs 100.00% 33.33% 100.00% 3.23%
/common/mock-contracts/mock-esdt-safe/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-esdt-safe/src/mock_esdt_safe.rs 25.00% 21.05% 25.00% 10.64%
/common/mock-contracts/mock-multi-transfer-esdt/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-multi-transfer-esdt/src/mock_multi_transfer_esdt.rs 100.00% 33.33% 100.00% 7.69%
/common/mock-contracts/mock-multisig/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-multisig/src/mock_multisig.rs 100.00% 100.00% 100.00% 35.48%
/common/mock-contracts/mock-price-aggregator/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-price-aggregator/src/mock_price_aggregator.rs 100.00% 66.67% 100.00% 20.00%
/common/mock-proxies/src/mock_multisig_proxy.rs 72.41% 62.50% 62.50% 55.56%
/common/sc-proxies/src/bridge_proxy_contract_proxy.rs 67.01% 63.64% 63.64% 52.50%
/common/sc-proxies/src/bridged_tokens_wrapper_proxy.rs 43.98% 45.00% 45.00% 38.18%
/common/sc-proxies/src/crowdfunding_esdt_proxy.rs 0.00% 0.00% 0.00% 0.00%
/common/sc-proxies/src/esdt_safe_proxy.rs 68.97% 52.38% 59.26% 37.57%
/common/sc-proxies/src/multi_transfer_esdt_proxy.rs 40.37% 43.75% 43.75% 34.88%
/common/sc-proxies/src/multisig_proxy.rs 16.24% 12.50% 14.46% 15.84%
/common/storage-module/src/lib.rs 100.00% 88.89% 100.00% 27.66%
/common/token-module/src/lib.rs 91.38% 81.01% 90.00% 29.57%
/common/transaction/src/lib.rs 73.58% 50.98% 66.67% 39.30%
/common/transaction/src/transaction_status.rs 83.33% 66.67% 83.33% 42.86%
/common/tx-batch-module/src/batch_status.rs 66.67% 50.00% 66.67% 20.00%
/common/tx-batch-module/src/lib.rs 88.64% 82.19% 87.50% 24.26%
/common/tx-batch-module/src/tx_batch_mapper.rs 97.01% 93.10% 100.00% 52.50%
/esdt-safe/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/src/lib.rs 89.07% 71.90% 78.38% 27.96%
/esdt-safe/tests/esdt_safe_blackbox_test.rs 99.21% 83.33% 100.00% 100.00%
/esdt-safe/tests/esdt_safe_scenario_rs_test.rs 100.00% 100.00% 100.00% 100.00%
/esdt-safe/tests/scenario_go_test.rs 100.00% 100.00% 100.00% 100.00%
/multi-transfer-esdt/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/multi-transfer-esdt/src/lib.rs 88.24% 84.00% 84.62% 25.48%
/multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs 86.37% 75.61% 78.79% 78.79%
/multi-transfer-esdt/tests/multi_transfer_esdt_scenario_rs_test.rs 57.14% 30.00% 30.00% 30.00%
/multi-transfer-esdt/tests/scenario_go_test.rs 30.00% 30.00% 30.00% 30.00%
/multisig/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/multisig/src/action.rs 25.00% 22.22% 33.33% 30.77%
/multisig/src/events.rs 100.00% 66.67% 100.00% 12.90%
/multisig/src/lib.rs 67.93% 70.00% 70.00% 25.66%
/multisig/src/multisig_general.rs 80.00% 65.38% 75.00% 30.77%
/multisig/src/queries.rs 64.52% 61.76% 57.89% 15.79%
/multisig/src/setup.rs 26.11% 33.33% 25.93% 7.11%
/multisig/src/storage.rs 100.00% 66.67% 100.00% 27.15%
/multisig/src/user_role.rs 83.33% 72.73% 75.00% 41.67%
/multisig/src/util.rs 94.44% 84.38% 100.00% 44.12%
/multisig/tests/multisig_blackbox_test.rs 100.00% 100.00% 100.00% 100.00%
/multisig/tests/multisig_scenario_rs_test.rs 82.69% 72.73% 72.73% 72.73%
/multisig/tests/scenario_go_test.rs 70.00% 70.00% 70.00% 70.00%
/test-caller/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/test-caller/src/test-caller.rs 0.00% 0.00% 0.00% 0.00%

Copy link

Contract comparison - from 4bb7379 to 47cae92

Path                                                                                             size                  has-allocator                     has-format
test-caller.wasm 3274 false without message
esdt-safe.wasm 26288 false without message
mock-multi-transfer-esdt.wasm 241 false none
mock-multisig.wasm 2186 false none
mock-esdt-safe.wasm 1800 false without message
mock-price-aggregator.wasm 1099 false none
mock-bridge-proxy.wasm 728 false none
mock-bridged-tokens-wrapper.wasm 942 false none
multi-transfer-esdt.wasm 16519 false without message
bridge-proxy.wasm 13363 false without message
bridged-tokens-wrapper.wasm 8836 ➡️ 8781 🟢 false without message
multisig.wasm 28936 false without message

@dragos-rebegea dragos-rebegea merged commit 919fc98 into feat/v3.5 Nov 13, 2024
5 checks passed
@dragos-rebegea dragos-rebegea deleted the mergev3intov3.5_11.11 branch November 13, 2024 12:06
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.

4 participants