From b9c36b1ef2bd3177c525e744c51fe0cd79119bc8 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Thu, 9 May 2024 12:47:40 +0300 Subject: [PATCH 1/8] fixed new lints --- data/codec/tests/derive_struct_with_generic_test.rs | 1 + framework/base/src/types/managed/wrapped/managed_address.rs | 6 ------ .../src/api/managed_types/static_var_api_node.rs | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/data/codec/tests/derive_struct_with_generic_test.rs b/data/codec/tests/derive_struct_with_generic_test.rs index 80739b01b1..bde74b0a9d 100644 --- a/data/codec/tests/derive_struct_with_generic_test.rs +++ b/data/codec/tests/derive_struct_with_generic_test.rs @@ -9,6 +9,7 @@ use codec::{ // to test, run the following command in the crate folder: // cargo expand --test struct_with_generic_derive_test > expanded.rs +#[allow(dead_code)] trait SimpleTrait { fn simple_function(&self); } diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs index bb5db20bc6..ca871a718b 100644 --- a/framework/base/src/types/managed/wrapped/managed_address.rs +++ b/framework/base/src/types/managed/wrapped/managed_address.rs @@ -6,7 +6,6 @@ use crate::{ codec::{ DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, - TryStaticCast, }, formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCLowerHex}, types::{heap::Address, ManagedBuffer, ManagedByteArray, ManagedType}, @@ -200,11 +199,6 @@ where } } -#[derive(Clone)] -pub(crate) struct ManagedBufferSizeContext(pub usize); - -impl TryStaticCast for ManagedBufferSizeContext {} - impl NestedEncode for ManagedAddress where M: ManagedTypeApi, diff --git a/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs b/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs index 272bbba578..51284fcb34 100644 --- a/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs +++ b/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs @@ -31,6 +31,7 @@ impl StaticVarApi for VmApiImpl { } impl StaticVarApiImpl for VmApiImpl { + #[allow(static_mut_refs)] fn with_lockable_static_buffer R>(&self, f: F) -> R { unsafe { f(&mut STATIC_BUFFER) } } From 071715234f68173eee8bd33e8fb95abc7d70f9c6 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Thu, 9 May 2024 13:19:41 +0300 Subject: [PATCH 2/8] Stable Rust: GitHub Actions & toolchain --- .github/workflows/actions-nightly.yml | 24 ++++++++++++++++++++ .github/workflows/actions.yml | 2 +- .github/workflows/lldb-formatter-tests.yml | 2 +- .github/workflows/release-upload.yml | 2 +- .github/workflows/template-test-current.yml | 2 +- .github/workflows/template-test-released.yml | 2 +- rust-toolchain.toml | 2 +- 7 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/actions-nightly.yml diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml new file mode 100644 index 0000000000..4589f2e60b --- /dev/null +++ b/.github/workflows/actions-nightly.yml @@ -0,0 +1,24 @@ +name: CI + +on: + push: + branches: + - master + pull_request: + workflow_dispatch: + +permissions: + checks: write + pull-requests: write + +jobs: + contracts: + name: Contracts (nightly) + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0 + with: + rust-toolchain: nightly-2023-12-11 + path-to-sc-meta: framework/meta + mx-scenario-go-version: v2.1.0-alpha + coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md + secrets: + token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index d9d598ab33..dc0bcc8596 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -16,7 +16,7 @@ jobs: name: Contracts uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0 with: - rust-toolchain: nightly-2023-12-11 + rust-toolchain: stable path-to-sc-meta: framework/meta mx-scenario-go-version: v2.1.0-alpha coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md diff --git a/.github/workflows/lldb-formatter-tests.yml b/.github/workflows/lldb-formatter-tests.yml index 36f2d29f08..9aaba9eadd 100644 --- a/.github/workflows/lldb-formatter-tests.yml +++ b/.github/workflows/lldb-formatter-tests.yml @@ -16,7 +16,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: default: true - toolchain: nightly-2023-12-11 + toolchain: stable - name: Download vscode-lldb uses: robinraju/release-downloader@v1.5 diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml index 6ecb73df9b..1309c97e5f 100644 --- a/.github/workflows/release-upload.yml +++ b/.github/workflows/release-upload.yml @@ -20,7 +20,7 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1 with: default: true - toolchain: nightly-2023-12-11 + toolchain: stable target: wasm32-unknown-unknown - name: Setup the PATH variable diff --git a/.github/workflows/template-test-current.yml b/.github/workflows/template-test-current.yml index 457a91435a..56382850fe 100644 --- a/.github/workflows/template-test-current.yml +++ b/.github/workflows/template-test-current.yml @@ -22,7 +22,7 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1 with: default: true - toolchain: nightly-2023-12-11 + toolchain: stable target: wasm32-unknown-unknown - name: Install prerequisites diff --git a/.github/workflows/template-test-released.yml b/.github/workflows/template-test-released.yml index 8d60860f08..e6227765db 100644 --- a/.github/workflows/template-test-released.yml +++ b/.github/workflows/template-test-released.yml @@ -22,7 +22,7 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1 with: default: true - toolchain: nightly-2023-12-11 + toolchain: stable target: wasm32-unknown-unknown - name: Install prerequisites diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 9a2458c117..292fe499e3 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2023-12-11" +channel = "stable" From 294261d203bda9b8366b81047417129cd4361c8b Mon Sep 17 00:00:00 2001 From: Laurentiu Ciobanu Date: Fri, 10 May 2024 20:50:30 +0300 Subject: [PATCH 3/8] disable contract size report on nightly actions --- .github/workflows/actions-nightly.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml index 4589f2e60b..7b1199a237 100644 --- a/.github/workflows/actions-nightly.yml +++ b/.github/workflows/actions-nightly.yml @@ -14,10 +14,11 @@ permissions: jobs: contracts: name: Contracts (nightly) - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0 + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@c721fa99bea9d34624fa7ee58729301116518eea with: rust-toolchain: nightly-2023-12-11 path-to-sc-meta: framework/meta + enable-contracts-size-report: 'false' mx-scenario-go-version: v2.1.0-alpha coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md secrets: From b3ebe61d9b96a1b39fbea706dc3b0e1c84476492 Mon Sep 17 00:00:00 2001 From: Laurentiu Ciobanu Date: Fri, 10 May 2024 20:52:53 +0300 Subject: [PATCH 4/8] disable contract size report on nightly actions --- .github/workflows/actions-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml index 7b1199a237..27122568d3 100644 --- a/.github/workflows/actions-nightly.yml +++ b/.github/workflows/actions-nightly.yml @@ -14,7 +14,7 @@ permissions: jobs: contracts: name: Contracts (nightly) - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@c721fa99bea9d34624fa7ee58729301116518eea + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@11821017a15f590ba3308f5721e92ec78797c4c8 with: rust-toolchain: nightly-2023-12-11 path-to-sc-meta: framework/meta From 8d8abb1e1ac6043a4901fa0932dbd243b4c2c224 Mon Sep 17 00:00:00 2001 From: Laurentiu Ciobanu Date: Fri, 10 May 2024 20:53:55 +0300 Subject: [PATCH 5/8] disable contract size report on nightly actions --- .github/workflows/actions-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml index 27122568d3..1a7b47624d 100644 --- a/.github/workflows/actions-nightly.yml +++ b/.github/workflows/actions-nightly.yml @@ -18,7 +18,7 @@ jobs: with: rust-toolchain: nightly-2023-12-11 path-to-sc-meta: framework/meta - enable-contracts-size-report: 'false' + enable-contracts-size-report: false mx-scenario-go-version: v2.1.0-alpha coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md secrets: From 1e6a8e6f41523e4b095132894269692af4673887 Mon Sep 17 00:00:00 2001 From: Laurentiu Ciobanu Date: Fri, 10 May 2024 20:55:47 +0300 Subject: [PATCH 6/8] disable contract size report on nightly actions --- .github/workflows/actions-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml index 1a7b47624d..d4412df7af 100644 --- a/.github/workflows/actions-nightly.yml +++ b/.github/workflows/actions-nightly.yml @@ -14,7 +14,7 @@ permissions: jobs: contracts: name: Contracts (nightly) - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@11821017a15f590ba3308f5721e92ec78797c4c8 + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@a6f57c43a0ae9c6d3bafffa01b5aa46dea0c3d3e with: rust-toolchain: nightly-2023-12-11 path-to-sc-meta: framework/meta From 747afd51ec1cb6bd2b2559ab75e21c78abc58a12 Mon Sep 17 00:00:00 2001 From: Laurentiu Ciobanu Date: Mon, 13 May 2024 11:43:17 +0300 Subject: [PATCH 7/8] use stable version of sc-actions --- .github/workflows/actions-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml index d4412df7af..a94745de41 100644 --- a/.github/workflows/actions-nightly.yml +++ b/.github/workflows/actions-nightly.yml @@ -14,7 +14,7 @@ permissions: jobs: contracts: name: Contracts (nightly) - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@a6f57c43a0ae9c6d3bafffa01b5aa46dea0c3d3e + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.2.0 with: rust-toolchain: nightly-2023-12-11 path-to-sc-meta: framework/meta From 8bbca64fa081d773512a987d2d83d8b10b9a9473 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 13 May 2024 13:56:09 +0300 Subject: [PATCH 8/8] clippy fix - unknown_lints --- framework/wasm-adapter/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/wasm-adapter/src/lib.rs b/framework/wasm-adapter/src/lib.rs index 4fb63ea0f0..9bd84315c5 100644 --- a/framework/wasm-adapter/src/lib.rs +++ b/framework/wasm-adapter/src/lib.rs @@ -1,4 +1,5 @@ #![no_std] +#![allow(unknown_lints)] // Allows us to use alloc::vec::Vec; // TODO: get rid of the legacy API and also of this.