From 06fa111f58b0172c9f4ba7c209c8b6945787faeb Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Tue, 9 Jan 2024 12:43:53 +0100
Subject: [PATCH] Contracts: Bump polkavm (#2884)

bump polkavm-x deps to 0.4.0
---
 .gitlab-ci.yml                                |  2 +-
 Cargo.lock                                    | 26 +++++++------------
 substrate/frame/contracts/fixtures/Cargo.toml |  2 +-
 .../frame/contracts/fixtures/build/Cargo.toml |  2 +-
 substrate/frame/contracts/uapi/Cargo.toml     |  7 +++--
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc4b3cf162..2289341a35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ workflow:
     - if: $CI_COMMIT_BRANCH
 
 variables:
-  CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
+  CI_IMAGE: "docker.io/paritytech/ci-unified:bullseye-1.74.0-2023-11-01-v20240108"
   # BUILDAH_IMAGE is defined in group variables
   BUILDAH_COMMAND: "buildah --storage-driver overlay2"
   RELENG_SCRIPTS_BRANCH: "master"
diff --git a/Cargo.lock b/Cargo.lock
index 5fba3e6203..d4d3b2f640 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13786,21 +13786,15 @@ dependencies = [
 
 [[package]]
 name = "polkavm-common"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01363cf0a778e8d93eff31e8a03bc59992cba35faa419ea4f3e80146b69195ba"
-
-[[package]]
-name = "polkavm-common"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88e869d66a254db6c7069992f240626416aba8e87d65c00e4be443135babfe82"
+checksum = "fecd2caacfc4a7ee34243758dd7348859e6dec73f5e5df059890f5742ee46f0e"
 
 [[package]]
 name = "polkavm-derive"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26501292b2cb980cbeaac3304f0fc4480ff1bac2473045453d7333d775658b6a"
+checksum = "db65a500d4adf574893c726ae365e37e4fbb7f2cbd403f6eaa1b665457456adc"
 dependencies = [
  "polkavm-derive-impl",
  "syn 2.0.48",
@@ -13808,11 +13802,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903e16ad3ed768f35e6f40acff2e8aaf6afb9f2889b0a8982dd43dcbee29db2d"
+checksum = "c99f4e7a9ff434ef9c885b874c99d824c3a5693bf5e3e8569bb1d2245a8c1b7f"
 dependencies = [
- "polkavm-common 0.2.0",
+ "polkavm-common",
  "proc-macro2",
  "quote",
  "syn 2.0.48",
@@ -13820,15 +13814,15 @@ dependencies = [
 
 [[package]]
 name = "polkavm-linker"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f8719d37effca6df1cecf5c816d84ab09b7d18e960511f61c254a7581fa50c3"
+checksum = "550738c1b49b9279fa19d8ebed81f551b911b869227a20a190f85f6db45d5d0e"
 dependencies = [
  "gimli 0.28.0",
  "hashbrown 0.14.3",
  "log",
  "object 0.32.2",
- "polkavm-common 0.3.0",
+ "polkavm-common",
  "rustc-demangle",
 ]
 
diff --git a/substrate/frame/contracts/fixtures/Cargo.toml b/substrate/frame/contracts/fixtures/Cargo.toml
index 36bc3974f5..5ffac43d9d 100644
--- a/substrate/frame/contracts/fixtures/Cargo.toml
+++ b/substrate/frame/contracts/fixtures/Cargo.toml
@@ -21,7 +21,7 @@ parity-wasm = "0.45.0"
 tempfile = "3.8.1"
 toml = "0.8.2"
 twox-hash = "1.6.3"
-polkavm-linker = { version = "0.3.0", optional = true }
+polkavm-linker = { version = "0.4.0", optional = true }
 anyhow = "1.0.0"
 
 [features]
diff --git a/substrate/frame/contracts/fixtures/build/Cargo.toml b/substrate/frame/contracts/fixtures/build/Cargo.toml
index 7fd42b887e..70bf0ba94f 100644
--- a/substrate/frame/contracts/fixtures/build/Cargo.toml
+++ b/substrate/frame/contracts/fixtures/build/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 uapi = { package = 'pallet-contracts-uapi', path = "", default-features = false }
 common = { package = 'pallet-contracts-fixtures-common', path = "" }
-polkavm-derive = '0.2.0'
+polkavm-derive = '0.4.0'
 
 [profile.release]
 opt-level = 3
diff --git a/substrate/frame/contracts/uapi/Cargo.toml b/substrate/frame/contracts/uapi/Cargo.toml
index d3f6fc0626..eb12c4361f 100644
--- a/substrate/frame/contracts/uapi/Cargo.toml
+++ b/substrate/frame/contracts/uapi/Cargo.toml
@@ -8,9 +8,8 @@ homepage = "https://substrate.io"
 repository.workspace = true
 description = "Exposes all the host functions that a contract can import."
 
-# [lints]
-# TODO: uncomment when rve toolchain is updated to rust 1.74 or greater.
-# workspace = true
+[lints]
+workspace = true
 
 [dependencies]
 paste = { version = "1.0", default-features = false }
@@ -22,7 +21,7 @@ scale = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ], optional = true }
 
 [target.'cfg(target_arch = "riscv32")'.dependencies]
-polkavm-derive = '0.2.0'
+polkavm-derive = '0.4.0'
 
 [features]
 default = ["scale"]