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 merge into feat/beta #178

Merged
merged 653 commits into from
Nov 15, 2024
Merged

feat/enshrine merge into feat/beta #178

merged 653 commits into from
Nov 15, 2024

Conversation

andreiblt1304
Copy link
Contributor

No description provided.

andreiblt1304 and others added 30 commits September 10, 2024 13:39
@andreiblt1304
Removed unused import
f79ce74 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added separate function for fee checking
de7827b 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Renamed fee function
3019339 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Renamed test
4663b15 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added more specific test name
858d5ed 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Moved expected payment amount to avoid cloninng
d2dec7d 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added 2 more tests
5ce8bd1 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added bool to disable fee in setup function
be60a1a 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added enable fee function and switched condition in setup
f7a1b05 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed unnecessary bool argument and added enable_fee on set_fee
62a3762 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge branch 'deposit-coverage' into enshrine-unified
f69d0c7
@andreiblt1304
Moved enable fee logic to add_fee endpoint
e8d0351 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed build error + regenerated proxy
76fed3a 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added by hand NestedDecode to fee market proxy
46b2995 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fee market init logic
fea1d85 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #117 from multiversx/deposit-coverage
cf4bacd 
Enshrine ESDT Fix after review
@andreiblt1304
Modified test and logic to fit new fee market fee setup
a4332b7 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed tests and setup to fit new fee market logic
a11daea 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #122 from multiversx/fee-market-init-option
e354851 
Moved enable fee logic to add_fee endpoint
@andreiblt1304
Added check of zero payments
e5ef254 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added ToSelf instead of ToCaller
07fb931 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Modified refundable amount check
95885cc 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #120 from multiversx/enshrine-unified
c0fe0f4 
Enshrine ESDT unified syntax migration
@andreiblt1304
Removed fee market specific test
8d5177c 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Reverted delete
cfbbce1 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed error match on fee market deploy
908b18a 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #123 from multiversx/enshrine-tests-fix
2b3beb4 
Enshrine Test and Setup fixes
@andreiblt1304
Fixed failing esdt safe tests
e2358dc 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #126 from multiversx/enshrine-tests-fix
5504211 
Fixed failing esdt safe tests
@andreiblt1304
Updated test setup for header verifier
54a0df0 
Signed-off-by: Andrei Baltariu <[email protected]>
andreiblt1304 and others added 24 commits October 31, 2024 11:57
@andreiblt1304
Added hash_of_hashes mapper variable
08e888a 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added new() for OperationEsdtPayment in ESDT-Safe
0998833 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #162 from multiversx/pending-flag
43a0c43 
Added pending flag for operation execution
@andreiblt1304
Enshrine FW-upgrade
ac2dfbf 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed interactor after fw upgrade
ab90c0d 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #167 from multiversx/fw-upgrade
8817037 
Enshrine FW-upgrade
@andreiblt1304
Merge branch 'feat/enshrine-esdt' into interactor-tests
403db4f
@andreiblt1304
Cargo.lock update
9edbdc0 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed prepare_async deprecated function
eee2b5b 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed code after fw upgrade
7eb323e 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed esdt-safe dir
9bfaefd 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
testing-sc fw upgrade
80554e4 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed interactor output files paths
6e76b7c 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed failing test
fc2071d 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed mandos test
8fb1762 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed go mandos test
bb2826b 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed contract codes from the common folder
5739db6 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Modified structs wallet address field
0b0b504 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #151 from multiversx/interactor-tests
b7fa35d 
Interactor setup and test fixes
@andreiblt1304
Enshrine ESDT fw upgrade
540e82d 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #176 from multiversx/enshrine-fw-upgrade
e73b345 
Enshrine ESDT fw upgrade
@andreiblt1304
Merge branch 'feat/enshrine-esdt' into beta-enshrine-merge
b670c6c
@andreiblt1304
Updated proxy and cargo.lock
99383b6 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #177 from multiversx/beta-enshrine-merge
5c5601c 
`feat/enshrine` inline for `feat/beta` merge
@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%

@github-actions GitHub Actions
Copy link

Contract comparison - from 6018b7a to 5c5601c

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 marked this pull request as ready for review November 15, 2024 09:24
@sasurobert sasurobert merged commit 8d053a4 into feat/beta Nov 15, 2024
11 checks passed
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.
5 participants
@andreiblt1304 @axenteoctavian @mihaicalinluca @sasurobert @sergiuosvat