use pallet-contracts crate

Author: SkymanOne

Cargo.lock

@@ -83,12 +83,12 @@ xxhash-rust = { version = "0.8" }
 const_env = { version = "0.1"}
 
 # Substrate dependencies
-pallet-contracts-primitives = { version = "=29.0.0", default-features = false }
+pallet-contracts = { version = "27.0.0", default-features = false }
 pallet-contracts-uapi = { package = "ink-pallet-contracts-uapi", version = "=6.0.0", default-features = false }
-sp-core = { version = "=26.0.0", default-features = false }
-sp-keyring = { version = "=29.0.0", default-features = false }
-sp-runtime = { version = "=29.0.0", default-features = false }
-sp-weights = { version = "=27.0.0", default-features = false }
+sp-core = { version = "28.0.0", default-features = false }
+sp-keyring = { version = "31.0.0", default-features = false }
+sp-runtime = { version = "31.0.1", default-features = false }
+sp-weights = { version = "27.0.0", default-features = false }
 
 # Local dependencies
 ink = { version = "=5.0.0-rc.1", path = "crates/ink", default-features = false }

Cargo.toml

@@ -40,7 +40,7 @@ wasm-instrument = { workspace = true }
 which = { workspace = true }
 
 # Substrate
-pallet-contracts-primitives = { workspace = true }
+pallet-contracts = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
 sp-runtime = { workspace = true }
@@ -52,7 +52,17 @@ scale-info = { workspace = true, features = ["derive"] }
 
 [features]
 default = ["std"]
-std = []
+std = [
+	"impl-serde/std",
+	"pallet-contracts/std",
+	"scale/std",
+	"scale-info/std",
+	"serde/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-weights/std",
+	"ink_e2e_macro/std"
+]
 drink = [
     "dep:drink",
     "subxt-metadata",

crates/e2e/Cargo.toml

@@ -32,4 +32,5 @@ quote = { workspace = true }
 temp-env = "0.3.6"
 
 [features]
+std = []
 drink = []

crates/e2e/macro/Cargo.toml

@@ -21,7 +21,7 @@ use ink_primitives::{
     ConstructorResult,
     MessageResult,
 };
-use pallet_contracts_primitives::{
+use pallet_contracts::{
     CodeUploadResult,
     ContractExecResult,
     ContractInstantiateResult,

crates/e2e/src/contract_results.rs

@@ -42,16 +42,15 @@ use drink::{
     RuntimeCall,
     Sandbox,
     SandboxConfig,
+    Weight,
     DEFAULT_GAS_LIMIT,
 };
 
-use sp_weigths::Weight;
-
-use pallet_contracts_primitives::ContractResult;
+use pallet_contracts::ContractResult;
 
 use ink_env::Environment;
 use jsonrpsee::core::async_trait;
-use pallet_contracts_primitives::{
+use pallet_contracts::{
     CodeUploadReturnValue,
     ContractInstantiateResult,
     InstantiateReturnValue,

crates/e2e/src/drink_client.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use pallet_contracts_primitives::ContractExecResult;
+use pallet_contracts::ContractExecResult;
 
 use std::fmt;
 

crates/e2e/src/error.rs

@@ -85,7 +85,7 @@ use ink_env::{
     ContractEnv,
     Environment,
 };
-use pallet_contracts_primitives::{
+use pallet_contracts::{
     ContractExecResult,
     ContractInstantiateResult,
 };

crates/e2e/src/lib.rs

@@ -50,7 +50,7 @@ use ink_env::{
     Environment,
 };
 use jsonrpsee::core::async_trait;
-use pallet_contracts_primitives::ContractResult;
+use pallet_contracts::ContractResult;
 use scale::{
     Decode,
     Encode,

crates/e2e/src/subxt_client.rs

@@ -22,7 +22,7 @@ use super::{
 use ink_env::Environment;
 
 use core::marker::PhantomData;
-use pallet_contracts_primitives::CodeUploadResult;
+use pallet_contracts::CodeUploadResult;
 use sp_core::H256;
 use subxt::{
     backend::{