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 Feat/v3.1 #258

Draft
wants to merge 125 commits into
base: main
Choose a base branch
from
Draft

Merge Feat/v3.1 #258

wants to merge 125 commits into from

Conversation

CostinCarabas
Copy link
Contributor

No description provided.

evelinemolnar and others added 30 commits September 11, 2024 12:19
* set sc config based on endpoints needed and generated new proxies

* last updates

* .

* fixed proxy error

* proxy sc-config
* first-commit

* first-commit

* quick renane

* first-commit

* 99%

* small-fix

* .

* .

* .

* .

* white-box

* multi-contract

* .

* .

* change upgrade to init

* refactor - moved some tests in multitransafer blackbox

* forgot to include a proxy file

* fix case

* last-updates

* .

* .

* remove-duplicate-code

* clippy fixes

* fix proxy after merge

* fix clippy

* fix clippy

---------

Co-authored-by: evelinemolnar <[email protected]>
Co-authored-by: Molnar Noemi Eveline <[email protected]>
…v3intov3.5-03.10.24

# Conflicts:
#	bridge-proxy/src/bridge_proxy_contract_proxy.rs
#	common/token-module/src/lib.rs
#	esdt-safe/sc-config.toml
#	esdt-safe/src/lib.rs
#	esdt-safe/wasm/src/lib.rs
#	multi-transfer-esdt/src/bridge_proxy_contract_proxy.rs
#	multisig/src/esdt_safe_proxy.rs
#	multisig/src/multisig_proxy.rs
#	multisig/wasm/src/lib.rs
# Conflicts:
#	bridge-proxy/sc-config.toml
#	bridge-proxy/src/esdt_safe_proxy.rs
#	bridged-tokens-wrapper/src/esdt_safe_proxy.rs
#	multi-transfer-esdt/src/esdt_safe_proxy.rs
#	multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs
#	multisig/src/esdt_safe_proxy.rs
…v3intov3.5-03.10.24

# Conflicts:
#	bridge-proxy/src/esdt_safe_proxy.rs
#	esdt-safe/src/lib.rs
Merge latest version of v3 into v3.5 04.10.24
@CostinCarabas CostinCarabas changed the base branch from main to feat/v3 December 2, 2024 17:03
Copy link

github-actions bot commented Dec 2, 2024

Coverage Summary

Totals

Count Covered %
Lines 11737 9941 84.70
Regions 1723 1258 73.01
Functions 884 667 75.45
Instantiations 5158 1832 35.52

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% 57.73%
/common/fee-estimator-module/src/lib.rs 100.00% 93.33% 100.00% 33.33%
/common/fee-estimator-module/src/price_aggregator_proxy.rs 6.14% 4.76% 6.67% 13.16%
/common/max-bridged-amount-module/src/lib.rs 100.00% 87.50% 100.00% 33.98%
/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% 5.26%
/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% 26.32% 25.00% 16.92%
/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% 100.00% 100.00% 17.31%
/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% 25.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 83.51% 81.82% 81.82% 59.52%
/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 84.19% 64.52% 73.58% 49.45%
/common/sc-proxies/src/multi_transfer_esdt_proxy.rs 70.19% 68.75% 68.75% 46.67%
/common/sc-proxies/src/multisig_proxy.rs 72.49% 53.12% 61.45% 40.56%
/common/storage-module/src/lib.rs 100.00% 88.89% 100.00% 29.41%
/common/token-module/src/lib.rs 91.95% 82.28% 90.00% 34.62%
/common/transaction/src/lib.rs 73.58% 50.98% 66.67% 39.80%
/common/transaction/src/transaction_status.rs 83.33% 66.67% 83.33% 45.10%
/common/tx-batch-module/src/batch_status.rs 66.67% 50.00% 66.67% 20.00%
/common/tx-batch-module/src/lib.rs 96.02% 87.67% 100.00% 28.19%
/common/tx-batch-module/src/tx_batch_mapper.rs 97.01% 93.10% 100.00% 55.00%
/esdt-safe/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/src/lib.rs 88.24% 71.33% 77.78% 30.21%
/esdt-safe/tests/esdt_safe_blackbox_test.rs 99.18% 83.05% 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% 29.03%
/multisig/src/lib.rs 91.84% 86.25% 100.00% 38.16%
/multisig/src/multisig_general.rs 98.00% 80.77% 100.00% 41.03%
/multisig/src/queries.rs 64.52% 61.76% 57.89% 15.79%
/multisig/src/setup.rs 100.00% 97.62% 100.00% 30.33%
/multisig/src/storage.rs 100.00% 66.67% 100.00% 33.11%
/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

github-actions bot commented Dec 2, 2024

Contract comparison - from 13782bd to 7eb68ea

Path                                                                                             size                  has-allocator                     has-format
test-caller.wasm 3274 ➡️ 3802 🔴 false without message
esdt-safe.wasm 26679 ➡️ 25531 🟢 false without message
multi-transfer-esdt.wasm 17273 ➡️ 16519 🟢 false without message
bridge-proxy.wasm 14238 ➡️ 13363 🟢 false without message
bridged-tokens-wrapper.wasm 8781 false without message
multisig.wasm 29365 ➡️ 28936 🟢 false without message

@CostinCarabas CostinCarabas changed the base branch from feat/v3 to main December 3, 2024 09:10
@CostinCarabas CostinCarabas marked this pull request as draft December 3, 2024 09:10
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.

5 participants