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

feat/enshrine inline for feat/beta merge #177

Merged
merged 38 commits into from
Nov 15, 2024
Merged

feat/enshrine inline for feat/beta merge #177

merged 38 commits into from
Nov 15, 2024

Conversation

andreiblt1304
Copy link
Contributor

No description provided.

andreiblt1304 and others added 30 commits October 22, 2024 11:53
@andreiblt1304
FW-upgrade
cf397f2 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
FW upgrade to 0.53.2
408c6a2 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added fee-market contract and removed mock scs
ea3d525 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #152 from multiversx/framework-upgrade
bad12ca 
FW-upgrade
@andreiblt1304
Merge branch 'main' into fee-market-update
158050c
@andreiblt1304
Header-Verifier copy paste
6672339 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Clippy fix
40b26c0 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #155 from multiversx/header-verifier-update
1b45929 
Header-Verifier copy paste
@andreiblt1304
Esdt-Safe copy paste
ea47e04 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
common copy-paste
6178aa7 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #154 from multiversx/fee-market-update
fa7ae70 
Fee market copy paste
@andreiblt1304
Esdt-Safe copy paste
694038f 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge branch 'feat/next' into esdt-safe
fadcfa9
@andreiblt1304
Merge pull request #161 from multiversx/esdt-safe
bf083f4 
Esdt-Safe Copy-Paste
@andreiblt1304
Added lock logic for operation hash
ceed878 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Copy paste of Header-Verifier lock logic
8655c9e 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #165 from multiversx/lock-hash-merge
988a722 
Lock Operation Hash logic copy-paste
@andreiblt1304
FW upgrade
69571e8 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #170 from multiversx/next-fw-upgrade
1597650 
FW upgrade
@andreiblt1304
Removed token-whitelist commented code
d59f7c6 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #172 from multiversx/feat-next-cleanup
efaef09 
Removed token-whitelist commented code
@andreiblt1304
Added interactor files
f2c31cd 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed interactor
3879072 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed proxies from src/ folder
14c569f 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Updated fee-market to create proxy in interactor
93663a1 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Used correct endpoint name in tests
5ea2068 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #173 from multiversx/esdt-interactor
1e2a779 
Esdt-Safe interactor for `feat/next`
@andreiblt1304
Merge pull request #169 from multiversx/feat/next
829251a 
Beta Update
@andreiblt1304
FW upgrade to 0.54.1
d1851ad 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #174 from multiversx/beta-fw-upgrade
f6867d5 
FW upgrade to 0.54.1
@andreiblt1304 andreiblt1304 changed the base branch from feat/beta to feat/enshrine-esdt November 15, 2024 08:42
@andreiblt1304 andreiblt1304 changed the title feat/enshrine merge into feat/beta feat/enshrine inline for feat/beta merge Nov 15, 2024
@github-actions GitHub Actions
Copy link

Coverage Summary

Totals

Count Covered %
Lines 7286 3337 45.80
Regions 1821 631 34.65
Functions 767 310 40.42
Instantiations 2639 626 23.72

Files

Expand
File Lines Regions Functions Instantiations
/chain-config/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/chain-config/src/bridge.rs 0.00% 0.00% 0.00% 0.00%
/chain-config/src/lib.rs 0.00% 0.00% 0.00% 0.00%
/chain-config/src/validator_rules.rs 0.00% 0.00% 0.00% 0.00%
/chain-factory/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/chain-factory/src/factory.rs 4.17% 16.67% 33.33% 5.88%
/chain-factory/src/lib.rs 100.00% 100.00% 100.00% 16.67%
/chain-factory/src/slash.rs 4.00% 14.29% 20.00% 2.33%
/common/bls-signature/src/lib.rs 2.50% 9.09% 16.67% 3.28%
/common/max-bridged-amount-module/src/lib.rs 76.92% 62.50% 75.00% 22.86%
/common/setup-phase/src/lib.rs 31.82% 50.00% 50.00% 16.22%
/common/token-whitelist/src/lib.rs 26.67% 31.25% 50.00% 15.62%
/common/transaction/src/lib.rs 60.45% 40.15% 46.97% 36.77%
/common/transaction/src/transaction_status.rs 0.00% 0.00% 0.00% 0.00%
/common/tx-batch-module/src/batch_status.rs 0.00% 0.00% 0.00% 0.00%
/common/tx-batch-module/src/lib.rs 4.55% 6.85% 18.75% 5.06%
/common/tx-batch-module/src/tx_batch_mapper.rs 0.00% 0.00% 0.00% 0.00%
/common/utils/src/lib.rs 81.25% 67.74% 80.00% 23.29%
/enshrine-esdt-safe/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/enshrine-esdt-safe/src/common/storage.rs 100.00% 66.67% 100.00% 26.32%
/enshrine-esdt-safe/src/enshrine_esdt_safe_proxy.rs 36.77% 33.33% 33.33% 26.67%
/enshrine-esdt-safe/src/from_sovereign/events.rs 100.00% 66.67% 100.00% 16.67%
/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs 90.08% 82.35% 83.33% 32.56%
/enshrine-esdt-safe/src/lib.rs 91.43% 82.35% 100.00% 24.07%
/enshrine-esdt-safe/src/to_sovereign/create_tx.rs 95.41% 93.75% 100.00% 34.29%
/enshrine-esdt-safe/src/to_sovereign/events.rs 100.00% 66.67% 100.00% 16.67%
/enshrine-esdt-safe/src/token_handler_proxy.rs 83.33% 80.00% 80.00% 54.55%
/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs 99.88% 98.53% 100.00% 100.00%
/esdt-safe/interactor/src/interactor_main.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/interactor/src/proxies/fee_market_proxy.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/interactor/src/proxies/header_verifier_proxy.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/interactor/src/proxies/price_aggregator_proxy.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/interactor/src/proxies/proxy.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/interactor/src/proxies/testing_sc_proxy.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/src/esdt_safe_proxy.rs 20.99% 21.21% 21.21% 19.51%
/esdt-safe/src/from_sovereign/events.rs 100.00% 66.67% 100.00% 16.67%
/esdt-safe/src/from_sovereign/token_mapping.rs 1.10% 5.41% 5.26% 5.71%
/esdt-safe/src/from_sovereign/transfer_tokens.rs 41.63% 50.00% 75.00% 31.91%
/esdt-safe/src/lib.rs 76.47% 75.00% 66.67% 16.67%
/esdt-safe/src/to_sovereign/create_tx.rs 45.51% 50.94% 62.50% 22.86%
/esdt-safe/src/to_sovereign/events.rs 100.00% 66.67% 100.00% 16.67%
/esdt-safe/tests/bridge_blackbox_tests.rs 86.54% 93.10% 92.00% 92.00%
/fee-market/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/fee-market/src/fee_common.rs 100.00% 75.00% 100.00% 29.17%
/fee-market/src/fee_market_proxy.rs 40.76% 27.45% 35.71% 35.94%
/fee-market/src/fee_type.rs 85.29% 53.66% 64.29% 29.76%
/fee-market/src/lib.rs 66.67% 85.71% 66.67% 26.79%
/fee-market/src/price_aggregator.rs 0.00% 0.00% 0.00% 0.00%
/fee-market/src/subtract_fee.rs 42.86% 37.50% 43.75% 17.74%
/fee-market/tests/fee_market_blackbox_test.rs 91.30% 88.64% 100.00% 100.00%
/header-verifier/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/header-verifier/src/header_verifier_proxy.rs 63.03% 60.00% 60.00% 66.67%
/header-verifier/src/lib.rs 92.21% 91.18% 91.67% 52.42%
/header-verifier/tests/header_verifier_blackbox_test.rs 100.00% 100.00% 100.00% 100.00%
/testing-sc/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/testing-sc/src/lib.rs 33.33% 75.00% 50.00% 12.12%
/testing-sc/tests/testing_sc_scenario_go_test.rs 100.00% 100.00% 100.00% 100.00%
/testing-sc/tests/testing_sc_scenario_rs_test.rs 100.00% 100.00% 100.00% 100.00%
/token-handler/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/token-handler/src/chain_factory_proxy.rs 15.91% 18.18% 18.18% 15.38%
/token-handler/src/common_storage.rs 100.00% 50.00% 100.00% 16.67%
/token-handler/src/dummy_enshrine_proxy.rs 0.00% 0.00% 0.00% 0.00%
/token-handler/src/lib.rs 100.00% 100.00% 100.00% 30.77%
/token-handler/src/token_handler_proxy.rs 83.33% 80.00% 80.00% 54.55%
/token-handler/src/transfer_tokens.rs 50.52% 36.67% 66.67% 23.81%
/token-handler/tests/token_handler_blackbox_tests.rs 94.68% 95.24% 100.00% 100.00%
/token-handler/tests/token_handler_scenario_rs_test.rs 100.00% 100.00% 100.00% 100.00%

@andreiblt1304 andreiblt1304 marked this pull request as ready for review November 15, 2024 08:44
@github-actions GitHub Actions
Copy link

Contract comparison - from 6018b7a to 99383b6

Path                                                                                             size                  has-allocator                     has-format
chain-config.wasm 5494 false without message
enshrine-esdt-safe-full.wasm 35539 ➡️ 28273 🟢 false without message
enshrine-esdt-safe-view.wasm 626 false None
enshrine-esdt-safe.wasm 35540 ➡️ 28274 🟢 false without message
esdt-safe.wasm 28651 false without message
esdt-safe-view.wasm 626 false None
esdt-safe-full.wasm 28651 false without message
fee-market.wasm 12093 false without message
multisig-view.wasm 626 false None
chain-factory.wasm 5533 false None
header-verifier-full.wasm 5584 false without message
header-verifier.wasm 5584 false without message
multisig-view.wasm 626 false None

@andreiblt1304 andreiblt1304 merged commit 5c5601c into feat/enshrine-esdt Nov 15, 2024
7 checks passed
@andreiblt1304 andreiblt1304 deleted the beta-enshrine-merge branch December 3, 2024 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mihaicalinluca mihaicalinluca mihaicalinluca approved these changes

@axenteoctavian axenteoctavian axenteoctavian 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.
3 participants
@andreiblt1304 @axenteoctavian @mihaicalinluca