Merge branch 'rc/v3.0' into simple-lock-legacy-contract

.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 }}

.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/[email protected]
+    with:
+      image_tag: v7.0.0
+      package_whole_project_src: true

.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

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
             );
         }