Merge pull request #5250 from igor-casper/core-78

mpapierski · web-flow · commit 883cad2eb16b · 2025-06-11T16:54:00.000+02:00
Update casper-wasmi, bump toolchain for smart contracts
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ci/casper_updater/src/main.rs b/ci/casper_updater/src/main.rs
@@ -25,7 +25,6 @@
     macro_expanded_macro_exports_accessed_by_absolute_paths,
     mutable_transmutes,
     no_mangle_const_items,
-    order_dependent_trait_objects,
     overflowing_literals,
     pub_use_of_private_extern_crate,
     unknown_crate_types
diff --git a/execution_engine/Cargo.toml b/execution_engine/Cargo.toml
@@ -19,9 +19,9 @@ blake3 = { version = "1.5.0", default-features = false, features = ["pure"] }
 sha2 = { version = "0.10.8", default-features = false }
 casper-storage = { version = "2.1.0", path = "../storage", default-features = true }
 casper-types = { version = "6.0.0", path = "../types", default-features = false, features = ["datasize", "gens", "json-schema", "std"] }
-casper-wasm = { version = "0.46.0", default-features = false, features = ["sign_ext"] }
-casper-wasm-utils = { version = "3.0.0", default-features = false, features = ["sign_ext"] }
-casper-wasmi = { version = "0.14.0", features = ["sign_ext"] }
+casper-wasm = { version = "1.0.0", default-features = false, features = ["sign_ext", "call_indirect_overlong"] }
+casper-wasm-utils = { version = "4.0.0", default-features = false, features = ["sign_ext", "call_indirect_overlong"] }
+casper-wasmi = { version = "1.0.0", features = ["sign_ext", "call_indirect_overlong"] }
 datasize = "0.2.4"
 either = "1.8.1"
 hex-buffer-serde = "0.2.1"
diff --git a/execution_engine_testing/tests/Cargo.toml b/execution_engine_testing/tests/Cargo.toml
@@ -11,7 +11,7 @@ casper-execution-engine = { path = "../../execution_engine", features = ["test-s
 casper-storage = { path = "../../storage" }
 casper-types = { path = "../../types", default-features = false, features = ["datasize", "json-schema"] }
 ed25519-dalek = { version = "2.1.1", default-features = false, features = ["alloc", "zeroize"] }
-casper-wasm = "0.46.0"
+casper-wasm = "1.0.0"
 clap = "2"
 fs_extra = "1.2.0"
 log = "0.4.8"
diff --git a/execution_engine_testing/tests/src/test/explorer/faucet.rs b/execution_engine_testing/tests/src/test/explorer/faucet.rs
@@ -663,14 +663,14 @@ fn faucet_costs() {
     // This test will fail if execution costs vary.  The expected costs should not be updated
     // without understanding why the cost has changed.  If the costs do change, it should be
     // reflected in the "Costs by Entry Point" section of the faucet crate's README.md.
-    const EXPECTED_FAUCET_INSTALL_COST: u64 = 147_060_757_349;
+    const EXPECTED_FAUCET_INSTALL_COST: u64 = 149_230_872_143;
     const EXPECTED_FAUCET_INSTALL_COST_ALT: u64 = 158_323_799_135;
 
-    const EXPECTED_FAUCET_SET_VARIABLES_COST: u64 = 79_640_385;
+    const EXPECTED_FAUCET_SET_VARIABLES_COST: u64 = 79_455_975;
 
-    const EXPECTED_FAUCET_CALL_BY_INSTALLER_COST: u64 = 2_652_701_548;
+    const EXPECTED_FAUCET_CALL_BY_INSTALLER_COST: u64 = 2_652_626_533;
 
-    const EXPECTED_FAUCET_CALL_BY_USER_COST: u64 = 2_558_410_901;
+    const EXPECTED_FAUCET_CALL_BY_USER_COST: u64 = 2_558_318_531;
 
     let installer_account = AccountHash::new([1u8; 32]);
     let user_account: AccountHash = AccountHash::new([2u8; 32]);
diff --git a/node/src/reactor/main_reactor/tests/transactions.rs b/node/src/reactor/main_reactor/tests/transactions.rs
@@ -46,7 +46,7 @@ pub(crate) static CHARLIE_PUBLIC_KEY: Lazy<PublicKey> =
 // The amount of gas it takes to execute the generated do_nothing.wasm.
 // Passing this around as a constant is brittle and should be replaced
 // with a more sustainable solution in the future.
-const DO_NOTHING_WASM_EXECUTION_GAS: u64 = 116955_u64;
+const DO_NOTHING_WASM_EXECUTION_GAS: u64 = 117720_u64;
 pub(crate) const MIN_GAS_PRICE: u8 = 1;
 const CHAIN_NAME: &str = "single-transaction-test-net";
 
diff --git a/smart_contracts/contracts/explorer/faucet/README.md b/smart_contracts/contracts/explorer/faucet/README.md
@@ -35,7 +35,7 @@ If you try to invoke the contract before these variables are set, then you'll ge
 
 | feature                  | cost              |
 |--------------------------|-------------------|
-| faucet install           | `142_640_262_074` |
-| faucet set variables     | `134_259_210`     |
-| faucet call by installer | `2_879_594_967`   |
-| faucet call by user      | `2_615_492_876`   |
+| faucet install           | `1492_30_872_143` |
+| faucet set variables     | `79_455_975`      |
+| faucet call by installer | `265_26_265_33`   |
+| faucet call by user      | `2_558_318_531`   |
diff --git a/smart_contracts/contracts/test/host-function-costs/src/main.rs b/smart_contracts/contracts/test/host-function-costs/src/main.rs
@@ -251,7 +251,7 @@ fn measure_arg_size(bytes: usize) {
         .expect("should have key")
         .into();
 
-    let argument: Vec<u8> = iter::repeat(b'1').take(bytes).collect();
+    let argument: Vec<u8> = iter::repeat_n(b'1', bytes).collect();
 
     runtime::call_versioned_contract::<()>(
         contract_package_hash,
diff --git a/smart_contracts/rust-toolchain b/smart_contracts/rust-toolchain
@@ -1 +1 @@
-nightly-2024-07-31
+nightly-2025-02-16
diff --git a/smart_contracts/sdk/src/contrib/cep18.rs b/smart_contracts/sdk/src/contrib/cep18.rs
@@ -66,7 +66,7 @@ use crate as casper_contract_sdk;
 use crate::{collections::Map, macros::blake2b256, prelude::*};
 
 /// While the code consuming this contract needs to define further error variants, it can
-/// return those via the [`Error::User`] variant or equivalently via the [`ApiError::User`]
+/// return those via the `Error::User` variant or equivalently via the `ApiError::User`
 /// variant.
 #[derive(Debug, PartialEq, Eq)]
 #[casper]
diff --git a/smart_contracts/sdk/src/contrib/pausable.rs b/smart_contracts/sdk/src/contrib/pausable.rs
@@ -8,7 +8,7 @@
 //! The `Pausable` trait is designed to be used with the `casper` macro, which generates
 //! the necessary boilerplate code for the contract.
 //!
-//! For security reasons you may want to combine [`AccessControl`] or [`Ownable`] with
+//! For security reasons you may want to combine `AccessControl` or `Ownable` with
 //! this trait to ensure that only selected entities can manage the pause state.
 use crate::{self as casper_contract_sdk, casper, casper::Entity, macros::casper};
 
diff --git a/types/src/block/block_header.rs b/types/src/block/block_header.rs
@@ -34,6 +34,7 @@ pub const BLOCK_HEADER_V2_TAG: u8 = 1;
 #[cfg_attr(any(feature = "std", test), derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "datasize", derive(DataSize))]
 #[cfg_attr(feature = "json-schema", derive(JsonSchema))]
+#[allow(clippy::large_enum_variant)]
 pub enum BlockHeader {
     /// The legacy, initial version of the header portion of a block.
     #[cfg_attr(any(feature = "std", test), serde(rename = "Version1"))]
diff --git a/types/src/chainspec/vm_config/host_function_costs_v2.rs b/types/src/chainspec/vm_config/host_function_costs_v2.rs
@@ -21,7 +21,7 @@ pub type Cost = u64;
 /// but to avoid changing the public API of that crate, we are creating a new struct
 /// with the same name and fields.
 ///
-/// There is some opportunity to unify the code to turn [`HostFunction`] into a generic struct
+/// There is some opportunity to unify the code to turn `HostFunction` into a generic struct
 /// that generalizes over the cost type, but that would require a lot of work and
 /// is not worth it at this time.
 #[derive(Copy, Clone, PartialEq, Eq, Deserialize, Serialize, Debug)]
diff --git a/types/src/execution/transform_kind.rs b/types/src/execution/transform_kind.rs
@@ -20,6 +20,7 @@ use crate::{
 
 /// Taxonomy of Transform.
 #[derive(PartialEq, Eq, Debug, Clone)]
+#[allow(clippy::large_enum_variant)]
 pub enum TransformInstruction {
     /// Store a StoredValue.
     Store(StoredValue),
@@ -53,6 +54,7 @@ impl From<StoredValue> for TransformInstruction {
 #[cfg_attr(feature = "datasize", derive(DataSize))]
 #[cfg_attr(feature = "json-schema", derive(JsonSchema))]
 #[serde(deny_unknown_fields)]
+#[allow(clippy::large_enum_variant)]
 pub enum TransformKindV2 {
     /// An identity transformation that does not modify a value in the global state.
     ///
diff --git a/types/src/uint.rs b/types/src/uint.rs
@@ -31,7 +31,8 @@ use crate::bytesrepr::{self, Error, FromBytes, ToBytes, U8_SERIALIZED_LENGTH};
     clippy::manual_range_contains,
     clippy::range_plus_one,
     clippy::transmute_ptr_to_ptr,
-    clippy::reversed_empty_ranges
+    clippy::reversed_empty_ranges,
+    clippy::manual_div_ceil
 )]
 mod macro_code {
     #[cfg(feature = "datasize")]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-nightly-2024-07-31`
	`1`	`+nightly-2025-02-16`