diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 187c221a..8cd29235 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -20,10 +20,11 @@ permissions: jobs: contracts: name: Contracts - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v4.2.1 + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v4.2.2 with: rust-toolchain: stable coverage-args: --ignore-filename-regex='/.cargo/git' --output ./coverage.md + enable-interactor-tests: true secrets: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/on_pull_request_build_contracts.yml b/.github/workflows/on_pull_request_build_contracts.yml index 68af298d..f40e7e9a 100644 --- a/.github/workflows/on_pull_request_build_contracts.yml +++ b/.github/workflows/on_pull_request_build_contracts.yml @@ -8,6 +8,6 @@ permissions: jobs: build: - uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v3.2.0 + uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v4.2.2 with: image_tag: v8.0.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef4ba278..4dbd19d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ permissions: jobs: build: - uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v3.2.0 + uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v4.2.2 with: image_tag: v8.0.0 attach_to_existing_release: true diff --git a/sovereign-forge/interactor/src/interact.rs b/sovereign-forge/interactor/src/interact.rs index a32a9121..512488bd 100644 --- a/sovereign-forge/interactor/src/interact.rs +++ b/sovereign-forge/interactor/src/interact.rs @@ -246,15 +246,13 @@ impl ContractInteract { } pub async fn deploy_header_verifier_template(&mut self) { - let chain_config_address = Bech32Address::from_bech32_string("chain_config".to_string()); - let new_address = self .interactor .tx() .from(&self.wallet_address) .gas(50_000_000u64) .typed(HeaderverifierProxy) - .init(chain_config_address) + .init(self.state.config_address.clone().unwrap()) .returns(ReturnsNewAddress) .code(MxscPath::new(HEADER_VERIFIER_CODE_PATH)) .run() @@ -274,7 +272,7 @@ impl ContractInteract { .interactor .tx() .from(&self.wallet_address) - .gas(80_000_000u64) + .gas(100_000_000u64) .typed(EsdtSafeProxy) .init(false) .returns(ReturnsNewAddress) diff --git a/sovereign-forge/interactor/tests/interact_cs_tests.rs b/sovereign-forge/interactor/tests/interact_cs_tests.rs index b478f4ae..008fdd49 100644 --- a/sovereign-forge/interactor/tests/interact_cs_tests.rs +++ b/sovereign-forge/interactor/tests/interact_cs_tests.rs @@ -7,8 +7,8 @@ async fn deploy_test_sovereign_forge_cs() { let mut interactor = ContractInteract::new().await; interactor.deploy().await; - interactor.deploy_header_verifier_template().await; interactor.deploy_chain_config_template().await; + interactor.deploy_header_verifier_template().await; interactor.deploy_esdt_safe_template().await; interactor.deploy_fee_market_template().await; interactor.deploy_chain_factory().await; diff --git a/sovereign-forge/interactor/tests/interact_tests.rs b/sovereign-forge/interactor/tests/interact_tests.rs deleted file mode 100644 index 3d755c41..00000000 --- a/sovereign-forge/interactor/tests/interact_tests.rs +++ /dev/null @@ -1,26 +0,0 @@ -use forge_rust_interact::ContractInteract; -use multiversx_sc_snippets::imports::tokio; - -#[tokio::test] -#[ignore = "run on demand, relies on real blockchain state"] -async fn deploy_test_sovereign_forge() { - let mut interactor = ContractInteract::new().await; - interactor.deploy().await; - - interactor.deploy_chain_factory().await; - interactor.deploy_chain_config_template().await; - interactor.deploy_header_verifier_template().await; - - interactor.register_token_handler(1).await; - interactor.register_token_handler(2).await; - interactor.register_token_handler(3).await; - interactor.register_chain_factory(1).await; - interactor.register_chain_factory(2).await; - interactor.register_chain_factory(3).await; - - interactor.complete_setup_phase().await; - - interactor.deploy_phase_one().await; - interactor.deploy_phase_two().await; - interactor.deploy_phase_three().await; -}