Update cargo-contract crate versions (#91)

Author: SkymanOne

Cargo.lock

@@ -18,15 +18,15 @@ homepage = "https://github.com/Cardinal-Cryptography/drink"
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/Cardinal-Cryptography/drink"
-version = "0.8.4"
+version = "0.8.5"
 
 [workspace.dependencies]
 anyhow = { version = "1.0.71" }
 cargo_metadata = { version = "0.18.1" }
 clap = { version = "4.3.4" }
-contract-build = { version = "3.0.1" }
-contract-metadata = { version = "3.2.0" }
-contract-transcode = { version = "3.2.0" }
+contract-build = { version = "4.0.0-rc.1" }
+contract-metadata = { version = "4.0.0-rc.1" }
+contract-transcode = { version = "4.0.0-rc.1" }
 convert_case = { version = "0.6.0" }
 crossterm = { version = "0.26.0" }
 parity-scale-codec = { version = "3.4" }
@@ -56,5 +56,5 @@ sp-runtime-interface = { version = "19.0.0" }
 
 # Local dependencies
 
-drink = { version = "0.8.4", path = "drink" }
-drink-test-macro = { version = "0.8.4", path = "drink/test-macro" }
+drink = { version = "0.8.5", path = "drink" }
+drink-test-macro = { version = "0.8.5", path = "drink/test-macro" }

Cargo.toml

@@ -6,8 +6,8 @@ use std::{
 
 use cargo_metadata::{Metadata, MetadataCommand, Package};
 use contract_build::{
-    BuildArtifacts, BuildMode, ExecuteArgs, Features, ManifestPath, Network, OptimizationPasses,
-    OutputType, Target, UnstableFlags, Verbosity,
+    BuildArtifacts, BuildMode, ExecuteArgs, Features, ImageVariant, ManifestPath, Network,
+    OptimizationPasses, OutputType, Target, UnstableFlags, Verbosity,
 };
 
 use crate::bundle_provision::BundleProviderGenerator;
@@ -102,10 +102,12 @@ fn build_contract_crate(pkg: &Package) -> (String, PathBuf) {
                 unstable_flags: UnstableFlags::default(),
                 optimization_passes: Some(OptimizationPasses::default()),
                 keep_debug_symbols: false,
-                lint: false,
+                dylint: false,
                 output_type: OutputType::HumanReadable,
                 skip_wasm_validation: false,
                 target: Target::Wasm,
+                image: ImageVariant::Default,
+                max_memory_pages: contract_build::DEFAULT_MAX_MEMORY_PAGES,
             };
 
             let result = contract_build::execute(args).expect("Error building contract");

drink/test-macro/src/contract_building.rs

@@ -10,7 +10,7 @@ version = "0.1.0"
 path = "src/lib.rs"
 
 [dependencies]
-ink = { version = "=4.2.1", default-features = false }
+ink = { version = "=5.0.0-rc", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }

examples/chain-extension/Cargo.toml

@@ -1,12 +1,12 @@
 use ink::env::{chain_extension::FromStatusCode, DefaultEnvironment, Environment};
 
 /// Simple chain extension that provides some staking information.
-#[ink::chain_extension]
+#[ink::chain_extension(extension = 0)]
 pub trait StakingExtension {
     type ErrorCode = StakingExtensionErrorCode;
 
     /// Returns the number of the validators.
-    #[ink(extension = 41, handle_status = false)]
+    #[ink(function = 41, handle_status = false)]
     fn get_num_of_validators() -> u32;
 }
 

examples/chain-extension/src/chain_extension_ink_side.rs

@@ -7,7 +7,7 @@ repository = "https://github.com/Cardinal-Cryptography/drink"
 version = "0.1.0"
 
 [dependencies]
-ink = { version = "=4.2.1", default-features = false }
+ink = { version = "=5.0.0-rc", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }

examples/cross-contract-call-tracing/Cargo.toml

@@ -53,8 +53,8 @@ mod contract {
         #[ink(message)]
         pub fn inner_call(&self, arg: u32) -> u32 {
             match arg % 2 {
-                0 => arg / 2,
-                _ => 3 * arg + 1,
+                0 => arg.checked_div(2).unwrap(),
+                _ => 3_u32.saturating_mul(arg).saturating_add(1),
             }
         }
     }
@@ -117,7 +117,7 @@ mod tests {
                 };
 
                 transcoder
-                    .decode_return(call_name, &mut result.as_slice())
+                    .decode_message_return(call_name, &mut result.as_slice())
                     .unwrap()
             } else {
                 Value::Unit

examples/cross-contract-call-tracing/lib.rs

@@ -7,7 +7,7 @@ repository = "https://github.com/Cardinal-Cryptography/drink"
 version = "0.1.0"
 
 [dependencies]
-ink = { version = "=4.2.1", default-features = false, features = ["ink-debug"] }
+ink = { version = "=5.0.0-rc", default-features = false, features = ["ink-debug"] }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }

examples/flipper/Cargo.toml

@@ -7,7 +7,7 @@ repository = "https://github.com/Cardinal-Cryptography/drink"
 version = "0.1.0"
 
 [dependencies]
-ink = { version = "=4.2.1", default-features = false }
+ink = { version = "=5.0.0-rc", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }

examples/mocking/Cargo.toml

@@ -13,7 +13,7 @@ path = "lib.rs"
 # We use standard dependencies for an ink! smart-contract.
 
 # For debugging from contract, we enable the `ink-debug` feature of `ink` crate.
-ink = { version = "=4.2.1", default-features = false, features = ["ink-debug"] }
+ink = { version = "=5.0.0-rc", default-features = false, features = ["ink-debug"] }
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }