diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index eb7e44644..6becbecc0 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -20,9 +20,9 @@ permissions: jobs: contracts: name: Contracts - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0 + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.2.0 with: - rust-toolchain: nightly-2023-12-11 + rust-toolchain: nightly-2024-05-22 coverage-args: --ignore-filename-regex='/.cargo/git' --output ./coverage.md 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 new file mode 100644 index 000000000..dd4b3713c --- /dev/null +++ b/.github/workflows/on_pull_request_build_contracts.yml @@ -0,0 +1,14 @@ +name: On pull request, build contracts + +on: + pull_request: + +permissions: + contents: write + +jobs: + build: + uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v3.2.0 + with: + image_tag: v7.0.0 + package_whole_project_src: true \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a19b5ed98..352ab4397 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@v2.3.5 + uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v3.2.0 with: - image_tag: v6.0.0 + image_tag: v7.0.0 attach_to_existing_release: true diff --git a/legacy-contracts/simple-lock-legacy/src/proxy_lp.rs b/legacy-contracts/simple-lock-legacy/src/proxy_lp.rs index 5617219d5..2d384a1f3 100644 --- a/legacy-contracts/simple-lock-legacy/src/proxy_lp.rs +++ b/legacy-contracts/simple-lock-legacy/src/proxy_lp.rs @@ -72,7 +72,7 @@ pub trait ProxyLpModule: crate::locked_token::LockedTokenModule { .get_token_attributes(lp_proxy_token_attributes.second_token_locked_nonce); require!( - token_attributes.unlock_epoch >= current_epoch, + current_epoch >= token_attributes.unlock_epoch, CANNOT_UNLOCK_YET_ERR_MSG ); }