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

Sovereign-Forge SC #207

Merged
merged 106 commits into from
Dec 13, 2024
Merged

Sovereign-Forge SC #207

merged 106 commits into from
Dec 13, 2024

Conversation

andreiblt1304
Copy link
Contributor

No description provided.

andreiblt1304 and others added 30 commits November 25, 2024 11:50
@andreiblt1304
Merge pull request #191 from multiversx/merge-beta-in-sovereign-forge
1f12f09 
Merge beta in sovereign forge
@andreiblt1304
Removed bridge module
f487641 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added update_config endpoint
3aedf9e 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added endpoint to finish setup_phase
03267f8 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added endpoint to deploy esdt_safe
5fe6ad8 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added functions to deploy esdt-safe and header-verifier
0d251bf 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added complete_phases module for chain-factory SC
ed0de28 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added empty deploy_phase_two endpoint
9388b08 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added chain-factory as dependency
49ea528 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Regenerated proxy and added export for sovereign forge
219c858 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added views + build + proxy regen
7425469 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed endpoint bug
f41524b 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed complete_setup_phase bug
d00a00a 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added unit tests
76c00f4 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fix after review
07543dd 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Set setup_phase_complete to true
a3af379 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #192 from multiversx/phase-one
289b4a6 
Phase one
@andreiblt1304
Merge branch 'feat/sovereign-forge' into forge-tdd
7d64754
@andreiblt1304
Added more tests
6c19855 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #193 from multiversx/forge-tdd
aab02c3 
Sovereign-Forge TDD
@andreiblt1304
Completed endpoint for phase two deployment
ab15d7f 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Modified storage logic for sovereign history
6db7e27 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge branch 'forge-storage' into phase-two
9af6408
@andreiblt1304
Added alias type to be more explicit
ce21a4c 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Modified helper function to check for deployed contract with parameter
3be917a 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Made type alias public
cf59257 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added getter function for chain_id
6c89084 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Renamed contracts in enum
e26b18f 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added logic for phase two of deployment
897e6c4 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Updated proxy
8731152 
Signed-off-by: Andrei Baltariu <[email protected]>
andreiblt1304 and others added 22 commits December 10, 2024 12:14
@andreiblt1304
Merge pull request #203 from multiversx/phase-three
fa66115 
Sovereign-Forge Phase Three
@andreiblt1304
Added workflow for chain-simulator tests
ed7d46c 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added Makefile
95100ab 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added docker-compose file
3968673 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed proxy and modified sc-config to not generate proxy in interactor
586e475 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Updated state.toml
f1711bd 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed makefile and docker-compose
6ec9842 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added commit hash for action.yml
769c41f 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Fixed cs test
b42d94a 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Reverted yml file
6e90a97 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added deploy_phase_four endpoint
ad67803 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed comments
767794c 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added fee-market as dependency
2f07c42 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added proxy rename + regen
9872203 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Modified error message
6f3e181 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Added unit tests
47fde5d 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #204 from multiversx/phase-three-interactor
a78f490 
Sovereign Forge Interactor
@andreiblt1304
Added logic to also set fee_market_address in ESDTSafe contract
4f366ed 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge branch 'feat/sovereign-forge' into phase-four
669a447
@andreiblt1304
Added setup + chain-simulator test update
120737f 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Removed state.toml
8412739 
Signed-off-by: Andrei Baltariu <[email protected]>
@andreiblt1304
Merge pull request #205 from multiversx/phase-four
467a819 
Sovereign Forge Phase Four
@github-actions GitHub Actions
Copy link

Coverage Summary

Totals

Count Covered %
Lines 8164 4608 56.44
Regions 2048 807 39.40
Functions 825 402 48.73
Instantiations 3430 838 24.43

Files

Expand
File Lines Regions Functions Instantiations
/chain-config/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/chain-config/src/lib.rs 38.30% 27.27% 50.00% 25.00%
/chain-config/src/validator_rules.rs 16.00% 21.74% 44.44% 18.07%
/chain-factory/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/chain-factory/src/complete_phases.rs 0.00% 0.00% 0.00% 0.00%
/chain-factory/src/factory.rs 81.32% 75.00% 83.33% 27.27%
/chain-factory/src/lib.rs 100.00% 100.00% 100.00% 32.61%
/chain-factory/tests/chain_factory_tests.rs 97.27% 88.89% 100.00% 100.00%
/common/interactor/src/interactor_config.rs 0.00% 0.00% 0.00% 0.00%
/common/interactor/src/interactor_state.rs 0.00% 0.00% 0.00% 0.00%
/common/max-bridged-amount-module/src/lib.rs 76.92% 62.50% 75.00% 18.18%
/common/proxies/src/chain_config_proxy.rs 20.77% 7.14% 10.53% 20.51%
/common/proxies/src/chain_factory_proxy.rs 51.43% 46.15% 46.15% 43.33%
/common/proxies/src/enshrine_esdt_safe_proxy.rs 56.17% 52.38% 52.38% 24.00%
/common/proxies/src/esdt_safe_proxy.rs 31.93% 33.33% 33.33% 26.42%
/common/proxies/src/fee_market_proxy.rs 50.68% 29.17% 40.00% 29.03%
/common/proxies/src/header_verifier_proxy.rs 82.42% 75.00% 75.00% 47.46%
/common/proxies/src/sovereign_forge_proxy.rs 69.43% 64.29% 64.29% 23.26%
/common/proxies/src/testing_sc_proxy.rs 0.00% 0.00% 0.00% 0.00%
/common/proxies/src/token_handler_proxy.rs 83.33% 80.00% 80.00% 63.16%
/common/setup-phase/src/lib.rs 100.00% 83.33% 100.00% 13.85%
/common/token-whitelist/src/lib.rs 26.67% 31.25% 50.00% 12.50%
/common/transaction/src/lib.rs 60.45% 40.15% 46.97% 34.85%
/common/transaction/src/transaction_status.rs 0.00% 0.00% 0.00% 0.00%
/common/tx-batch-module/src/lib.rs 100.00% 83.33% 100.00% 28.57%
/common/utils/src/lib.rs 81.25% 67.74% 80.00% 21.88%
/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs 0.00% 0.00% 0.00% 0.00%
/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor_main.rs 0.00% 0.00% 0.00% 0.00%
/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs 0.00% 0.00% 0.00% 0.00%
/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/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/tests/enshrine_esdt_safe_blackbox_test.rs 99.88% 98.51% 100.00% 100.00%
/esdt-safe/interactor/src/esdt_safe_interactor.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/interactor/src/esdt_safe_interactor_main.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/interactor/tests/esdt_safe_interactor_tests.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/from_sovereign/events.rs 100.00% 66.67% 100.00% 12.50%
/esdt-safe/src/from_sovereign/token_mapping.rs 1.10% 5.41% 5.26% 5.21%
/esdt-safe/src/from_sovereign/transfer_tokens.rs 41.63% 50.00% 75.00% 22.39%
/esdt-safe/src/lib.rs 76.47% 75.00% 66.67% 22.86%
/esdt-safe/src/to_sovereign/create_tx.rs 45.51% 50.94% 62.50% 20.41%
/esdt-safe/src/to_sovereign/events.rs 100.00% 66.67% 100.00% 12.50%
/esdt-safe/tests/bridge_blackbox_tests.rs 86.16% 92.86% 91.67% 91.67%
/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% 27.59%
/fee-market/src/fee_type.rs 85.29% 53.66% 64.29% 25.74%
/fee-market/src/lib.rs 66.67% 85.71% 66.67% 30.30%
/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% 14.67%
/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/lib.rs 74.74% 77.50% 84.62% 43.27%
/header-verifier/tests/header_verifier_blackbox_test.rs 100.00% 100.00% 100.00% 100.00%
/sovereign-forge/interactor/src/config.rs 0.00% 0.00% 0.00% 0.00%
/sovereign-forge/interactor/src/interact.rs 0.00% 0.00% 0.00% 0.00%
/sovereign-forge/interactor/src/interactor_main.rs 0.00% 0.00% 0.00% 0.00%
/sovereign-forge/interactor/tests/interact_cs_tests.rs 0.00% 0.00% 0.00% 0.00%
/sovereign-forge/interactor/tests/interact_tests.rs 0.00% 0.00% 0.00% 0.00%
/sovereign-forge/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/sovereign-forge/src/common/sc_deploy.rs 97.06% 57.14% 80.00% 22.22%
/sovereign-forge/src/common/storage.rs 100.00% 33.33% 100.00% 15.79%
/sovereign-forge/src/common/utils.rs 89.02% 56.36% 66.67% 29.69%
/sovereign-forge/src/lib.rs 100.00% 100.00% 100.00% 23.26%
/sovereign-forge/src/phases.rs 99.00% 90.00% 100.00% 27.50%
/sovereign-forge/tests/sovereign_forge_unit_tests.rs 99.72% 95.65% 100.00% 100.00%
/testing-sc/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/testing-sc/src/lib.rs 0.00% 0.00% 0.00% 0.00%
/token-handler/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/token-handler/src/common_storage.rs 100.00% 50.00% 100.00% 21.05%
/token-handler/src/lib.rs 100.00% 100.00% 100.00% 27.91%
/token-handler/src/transfer_tokens.rs 50.52% 36.67% 66.67% 30.30%
/token-handler/tests/token_handler_blackbox_tests.rs 94.85% 95.24% 100.00% 100.00%

@github-actions GitHub Actions
Copy link

Contract comparison - from 70fd828 to 467a819

Path                                                                                             size                  has-allocator                     has-format
chain-config-full.wasm 5541 ➡️ 4761 🟢 false without message
chain-config-view.wasm 626 false None
chain-config.wasm 5541 ➡️ 4761 🟢 false without message
enshrine-esdt-safe-full.wasm 21878 ➡️ 21879 🔴 false without message
enshrine-esdt-safe-view.wasm 626 false None
enshrine-esdt-safe.wasm 21878 ➡️ 21879 🔴 false without message
esdt-safe.wasm 22936 ➡️ 22939 🔴 false without message
esdt-safe-view.wasm 626 false None
esdt-safe-full.wasm 22935 ➡️ 22938 🔴 false without message
testing-sc.wasm 461 false None
testing-view.wasm 626 false None
testing-sc-full.wasm 461 false None
fee-market.wasm 11570 false without message
fee-market-view.wasm 626 false None
soveriegn-forge-view.wasm 626 false None
sovereign-forge-full.wasm 5833 ➡️ 9264 🔴 false without message
sovereign-forge.wasm 5833 ➡️ 9264 🔴 false without message
chain-factory-full.wasm 6771 ➡️ 7364 🔴 false without message
chain-factory-view.wasm 626 false None
chain-factory.wasm 6771 ➡️ 7364 🔴 false without message
header-verifier-full.wasm 4572 ➡️ 5678 🔴 false without message
header-verifier.wasm 4572 ➡️ 5678 🔴 false without message
multisig-view.wasm 626 false None
token-handler-view.wasm 626 false None
token-handler-full.wasm 9359 false without message
token-handler.wasm 9359 false without message

@andreiblt1304 andreiblt1304 marked this pull request as ready for review December 13, 2024 07:25
andreiblt1304
andreiblt1304 commented Dec 13, 2024
View reviewed changes
.github/workflows/actions.yml
@@ -20,7 +20,7 @@ permissions:
jobs:
contracts:
name: Contracts
uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.3.1
uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@79d7ac76e34b3208fbe07559ac276d0ea48be4da
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be modified when a stable release of the actions.yml is launched

alyn509
alyn509 reviewed Dec 13, 2024
View reviewed changes
chain-config/src/lib.rs
Comment on lines +62 to +69
let mut additional_stake_vec = ManagedVec::new();
for multi_value in additional_stake_required {
let (token_id, amount) = multi_value.into_tuple();
let value = TokenIdAmountPair { token_id, amount };

additional_stake_vec.push(value);
}
self.additional_stake_required().set(additional_stake_vec);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extract in separate function

@andreiblt1304 andreiblt1304 merged commit 2e233d8 into feat/beta Dec 13, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@axenteoctavian axenteoctavian axenteoctavian approved these changes

@alyn509 alyn509 alyn509 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 @alyn509 @axenteoctavian