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.

Sign up for GitHub

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

Jump to bottom

Merge v3 to v3.5 29.10.2024 #244

Merged
merged 18 commits into from
Oct 30, 2024
Merged

Merge v3 to v3.5 29.10.2024 #244

merged 18 commits into from
Oct 30, 2024

Conversation

dragos-rebegea
Copy link
Collaborator

No description provided.

dragos-rebegea and others added 18 commits October 21, 2024 11:43
@dragos-rebegea
fix unwrap_token if native token
e2f0c00
@dragos-rebegea
improvement
0802c22
@dragos-rebegea
Merge pull request #237 from multiversx/native-tokens-skip-unwrap
c572288 
fix unwrap_token if native token
@CostinCarabas
esdt-safe: fix add_refund_batch
b6f2723
@evelinemolnar
unit test
cfd4363
@CostinCarabas
multi-transfer: add_refund_batch_test: add balances check
e7bd1f0
@CostinCarabas
clippy fix
afb61cd
@CostinCarabas
multi-transfer: add_refund_batch_test: query fee
884f0be
@iulianpascalau
Merge pull request #239 from multiversx/fix/esdt-safe-add-refund-batch
618817c 
esdt-safe: fix add_refund_batch
@evelinemolnar
fix unwrap and create transaction issue
1bd71d9
@evelinemolnar
check the transaction is created and balances updated
38b3258
@evelinemolnar
check token_liquidity
4b118d7
@evelinemolnar
increased min gas to save progress
1476020
@dragos-rebegea
Merge pull request #242 from multiversx/bridge_tokens_wrapper_audit_fix
2ac831c 
fix unwrap and create transaction issue and added unit tests
@dragos-rebegea
Merge branch 'feat/v3' into bridge-proxy-audit-fix
ce7f921
@dragos-rebegea
Merge pull request #243 from multiversx/bridge-proxy-audit-fix
9c6c0c8 
Fix “update_lowest_tx_id” fails
@dragos-rebegea
Merge branch 'feat/v3.5' into merge-v3-to-v3.5-29.10.2024
4b9b859
@evelinemolnar
fix tests
be4c206
@github-actions GitHub Actions
Copy link

Coverage Summary

Totals

Count Covered %
Lines 9735 6943 71.32
Regions 1681 1075 63.95
Functions 844 521 61.73
Instantiations 5105 1390 27.23

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 48.84% 62.71% 62.50% 19.42%
/bridge-proxy/src/config.rs 89.29% 73.33% 100.00% 25.00%
/bridge-proxy/tests/bridge_proxy_blackbox_test.rs 80.39% 88.89% 75.00% 75.00%
/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.00%
/bridged-tokens-wrapper/tests/bridged_tokens_wrapper_whitebox_test.rs 90.28% 91.28% 90.62% 90.62%
/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% 46.24%
/common/fee-estimator-module/src/lib.rs 100.00% 93.75% 100.00% 22.41%
/common/fee-estimator-module/src/price_aggregator_proxy.rs 6.14% 4.76% 6.67% 5.26%
/common/max-bridged-amount-module/src/lib.rs 100.00% 87.50% 100.00% 21.36%
/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 0.00% 0.00% 0.00% 0.00%
/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 0.00% 0.00% 0.00% 0.00%
/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 0.00% 0.00% 0.00% 0.00%
/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 0.00% 0.00% 0.00% 0.00%
/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 0.00% 0.00% 0.00% 0.00%
/common/sc-proxies/src/bridge_proxy_contract_proxy.rs 55.03% 50.00% 50.00% 48.00%
/common/sc-proxies/src/bridged_tokens_wrapper_proxy.rs 44.64% 45.45% 45.45% 36.84%
/common/sc-proxies/src/crowdfunding_esdt_proxy.rs 0.00% 0.00% 0.00% 0.00%
/common/sc-proxies/src/esdt_safe_proxy.rs 55.70% 42.25% 46.77% 30.51%
/common/sc-proxies/src/multi_transfer_esdt_proxy.rs 42.08% 40.91% 40.91% 35.59%
/common/sc-proxies/src/multisig_proxy.rs 15.38% 12.24% 14.12% 13.86%
/common/token-module/src/lib.rs 91.11% 81.71% 90.48% 28.95%
/common/transaction/src/lib.rs 73.58% 50.98% 66.67% 32.34%
/common/transaction/src/transaction_status.rs 83.33% 66.67% 83.33% 41.67%
/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% 22.55%
/common/tx-batch-module/src/tx_batch_mapper.rs 92.54% 89.66% 100.00% 41.25%
/esdt-safe/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/src/lib.rs 72.91% 62.73% 66.67% 21.17%
/esdt-safe/tests/esdt_safe_blackbox_test.rs 98.53% 77.78% 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 83.41% 78.69% 81.25% 26.64%
/multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs 99.67% 90.91% 100.00% 100.00%
/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 69.77% 71.05% 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 25.97% 32.61% 25.81% 7.00%
/multisig/src/storage.rs 100.00% 66.67% 100.00% 27.41%
/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%

@github-actions GitHub Actions
Copy link

Contract comparison - from eb7fa9d to be4c206

Path                                                                                             size                  has-allocator                     has-format
test-caller.wasm 3274 false without message
test-caller-dbg.wasm 7110 false without message
esdt-safe.wasm 27489 ➡️ 27476 🟢 false without message
esdt-safe-dbg.wasm 65318 ➡️ 65293 🟢 false without message
mock-multi-transfer-esdt.wasm 241 false none
mock-multi-transfer-esdt-dbg.wasm 664 false none
mock-multisig-dbg.wasm 2752 false none
mock-multisig.wasm 1067 false none
mock-esdt-safe.wasm 688 false none
mock-esdt-safe-dbg.wasm 1800 false none
mock-price-aggregator-dbg.wasm 2765 false none
mock-price-aggregator.wasm 1034 false none
mock-bridge-proxy.wasm 728 false none
mock-bridge-proxy-dbg.wasm 1938 false none
mock-bridged-tokens-wrapper-dbg.wasm 2530 false none
mock-bridged-tokens-wrapper.wasm 942 false none
multi-transfer-esdt.wasm 17273 false without message
multi-transfer-esdt-dbg.wasm 40924 false without message
bridge-proxy-dbg.wasm 34759 ➡️ 34841 🔴 false without message
bridge-proxy.wasm 13291 ➡️ 13364 🔴 false without message
bridged-tokens-wrapper.wasm 9195 ➡️ 9152 🟢 false without message
bridged-tokens-wrapper-dbg.wasm 26808 ➡️ 26745 🟢 false without message
multisig-dbg.wasm 72047 false without message
multisig.wasm 29366 false without message

@evelinemolnar evelinemolnar merged commit 7b7974a into feat/v3.5 Oct 30, 2024
5 checks passed
@evelinemolnar evelinemolnar deleted the merge-v3-to-v3.5-29.10.2024 branch October 30, 2024 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cosmatudor cosmatudor cosmatudor approved these changes

@evelinemolnar evelinemolnar evelinemolnar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dragos-rebegea @evelinemolnar @cosmatudor @CostinCarabas @iulianpascalau