Sync with polkadot-sdk + migrate to Blake2x256 + storage deposit limit fixes

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [Unreleased]
 
+### Changed
+- Synchronized with `polkadot-sdk/c40b36c3a7c208f9a6837b80812473af3d9ba7f7` ‒ [2589](https://github.com/use-ink/ink/pull/2589)
+
+### Fixed
+- E2E: Fixes around correct handling of storage deposit limit ‒ [#2589](https://github.com/use-ink/ink/pull/2589)
+
+## Version 6.0.0-alpha.1
+
 ### Added
 - Support ABI `cfg` flag in codegen - [#2501](https://github.com/use-ink/ink/pull/2501)
 - Generate Solidity ABI compatibility metadata - [#2510](https://github.com/use-ink/ink/pull/2510)

Cargo.toml

@@ -82,22 +82,22 @@ const_env = { version = "0.1" }
 
 # Substrate dependencies
 frame-metadata = { version = "23.0.0", default-features = false }
-frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
 
-pallet-revive = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
-pallet-revive-uapi = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false, features = ["unstable-hostfn"] }
+pallet-revive = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
+pallet-revive-uapi = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false, features = ["unstable-hostfn"] }
 
-sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
-sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false, features = ["disable_target_static_assertions"] }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4" }
-sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
-xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false }
+sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
+sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false, features = ["disable_target_static_assertions"] }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
+sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7" }
+sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
+xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false }
 
 # PolkaVM dependencies
 polkavm-derive = { version = "0.26.0", default-features = false }

crates/e2e/Cargo.toml

@@ -49,8 +49,8 @@ sp-weights = { workspace = true }
 regex = "1.11.1"
 itertools = "0.14.0"
 
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
-sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cb629d46ebf00aa65624013a61f9c69ebf02b0b4", default-features = false, features = ["disable_target_static_assertions"] }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
+sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "c40b36c3a7c208f9a6837b80812473af3d9ba7f7", default-features = false, features = ["disable_target_static_assertions"] }
 
 # todo Pin until https://github.com/jhpratt/deranged/issues/18 is resolved
 deranged = { version = "=0.4.0", default-features = false }

crates/e2e/sandbox/src/api/revive_api.rs

@@ -1,4 +1,5 @@
 use crate::{
+    balance_to_evm_value,
     AccountIdFor,
     ContractExecResultFor,
     ContractResultInstantiate,
@@ -178,7 +179,7 @@ where
         self.execute_with(|| {
             pallet_revive::Pallet::<Self::T>::bare_instantiate(
                 origin,
-                value,
+                balance_to_evm_value::<BalanceOf<Self::T>>(value),
                 gas_limit,
                 storage_deposit_limit,
                 Code::Upload(contract_bytes),
@@ -203,7 +204,7 @@ where
         self.execute_with(|| {
             pallet_revive::Pallet::<Self::T>::bare_instantiate(
                 origin,
-                value,
+                balance_to_evm_value::<BalanceOf<Self::T>>(value),
                 gas_limit,
                 storage_deposit_limit,
                 Code::Existing(code_hash),
@@ -243,7 +244,7 @@ where
             pallet_revive::Pallet::<Self::T>::bare_call(
                 origin,
                 address,
-                value,
+                balance_to_evm_value::<BalanceOf<Self::T>>(value),
                 gas_limit,
                 storage_deposit_limit,
                 data,

crates/e2e/sandbox/src/lib.rs

@@ -16,6 +16,7 @@ use frame_system::{
     },
     EventRecord,
 };
+use ink_primitives::U256;
 pub use macros::{
     BlockBuilder,
     DefaultSandbox,
@@ -147,3 +148,21 @@ pub trait Sandbox {
     /// Restore the storage from the given snapshot.
     fn restore_snapshot(&mut self, snapshot: Snapshot);
 }
+
+/// Converts from the generic `Balance` type to the Ethereum native `U256`.
+///
+/// # Developer Note
+///
+/// `pallet-revive` uses both types, hence we have to convert in between them
+/// for certain functions. Notice that precision loss might occur when converting
+/// the other way (from `U256` to `Balance`).
+///
+/// See <https://github.com/paritytech/polkadot-sdk/pull/9101> for more details.
+pub fn balance_to_evm_value<Balance>(value: Balance) -> U256
+where
+    Balance: Into<U256>,
+{
+    let native_to_eth_ratio: U256 = 100_000_000.into();
+    let evm_value: U256 = value.into();
+    native_to_eth_ratio.saturating_mul(evm_value)
+}

crates/e2e/src/backend_calls.rs

@@ -26,6 +26,7 @@ use sp_weights::Weight;
 
 use super::{
     balance_to_deposit_limit,
+    balance_to_deposit_limit_dry_run,
     InstantiateDryRunResult,
     Keypair,
 };
@@ -56,7 +57,7 @@ where
     value: E::Balance,
     extra_gas_portion: Option<u64>,
     gas_limit: Option<Weight>,
-    storage_deposit_limit: E::Balance,
+    storage_deposit_limit: Option<E::Balance>,
 }
 
 impl<'a, E, Args, RetType, B, Abi> CallBuilder<'a, E, Args, RetType, B, Abi>
@@ -83,7 +84,7 @@ where
             value: 0u32.into(),
             extra_gas_portion: None,
             gas_limit: None,
-            storage_deposit_limit: 0u32.into(),
+            storage_deposit_limit: None,
         }
     }
 
@@ -130,7 +131,7 @@ where
         &mut self,
         storage_deposit_limit: E::Balance,
     ) -> &mut Self {
-        self.storage_deposit_limit = storage_deposit_limit;
+        self.storage_deposit_limit = Some(storage_deposit_limit);
         self
     }
 
@@ -151,7 +152,7 @@ where
             self.caller,
             self.message,
             self.value,
-            balance_to_deposit_limit::<E>(self.storage_deposit_limit),
+            balance_to_deposit_limit_dry_run::<E>(self.storage_deposit_limit),
         )
         .await?;
 
@@ -192,7 +193,7 @@ where
             self.caller,
             self.message,
             self.value,
-            balance_to_deposit_limit::<E>(self.storage_deposit_limit),
+            balance_to_deposit_limit_dry_run::<E>(self.storage_deposit_limit),
         )
         .await
     }
@@ -330,9 +331,9 @@ where
             self.constructor,
             self.value,
             gas_limit,
-            balance_to_deposit_limit::<E>(
+            balance_to_deposit_limit::<E>(Some(
                 dry_run.contract_result.storage_deposit.charge_or_zero(),
-            ),
+            )),
         )
         .await?;
 

crates/e2e/src/contract_build.rs

@@ -162,6 +162,7 @@ fn build_contracts(
     contract_manifests: &[(PathBuf, Vec<String>)],
     target_dir: PathBuf,
 ) -> Vec<PathBuf> {
+    #[allow(clippy::type_complexity)]
     static CONTRACT_BUILD_JOBS: OnceLock<
         Mutex<HashMap<(PathBuf, Vec<String>), PathBuf>>,
     > = OnceLock::new();
@@ -191,7 +192,7 @@ fn build_contracts(
 
 fn add_features_to_filename(
     contract_binary_path: PathBuf,
-    features: &Vec<String>,
+    features: &[String],
 ) -> PathBuf {
     // add features to file name
     let mut path_with_features = contract_binary_path.clone();

crates/e2e/src/contract_results.rs

@@ -388,7 +388,7 @@ impl<E: Environment, Abi> From<ContractInstantiateResultFor<E>>
 impl<E: Environment, Abi> InstantiateDryRunResult<E, Abi> {
     /// Returns true if the dry-run execution resulted in an error.
     pub fn is_err(&self) -> bool {
-        self.contract_result.result.is_err()
+        self.contract_result.result.is_err() || self.did_revert()
     }
 
     /// Returns the [`InstantiateReturnValue`] resulting from the dry-run message call.

crates/e2e/src/lib.rs

@@ -179,18 +179,44 @@ where
     <<Contract as ContractCallBuilder>::Type<Abi> as FromAddr>::from_addr(acc_id)
 }
 
+/// Transforms `Option<<E as Environment>::Balance>>` into `DepositLimit`.
+///
+/// This function must only be used for dry-runs, a `None` will
+/// become an unrestricted deposit limit (`DepositLimit::UnsafeOnlyForDryRun`).
+fn balance_to_deposit_limit_dry_run<E: Environment>(
+    b: Option<<E as Environment>::Balance>,
+) -> DepositLimit<<E as Environment>::Balance> {
+    match b {
+        Some(v) => DepositLimit::Balance(v),
+        None => DepositLimit::UnsafeOnlyForDryRun,
+    }
+}
+
+/// Transforms `Option<<E as Environment>::Balance>>` into `DepositLimit`.
+/// This function must be used for submitting extrinsics on-chain.
+///
+/// Panics if `limit` is `None`. Make sure to execute a dry-run
+/// beforehand and use the `storage_deposit_limit` result of it here.
 fn balance_to_deposit_limit<E: Environment>(
-    b: <E as Environment>::Balance,
+    limit: Option<<E as Environment>::Balance>,
 ) -> DepositLimit<<E as Environment>::Balance> {
-    DepositLimit::Balance(b)
+    match limit {
+        Some(val) => DepositLimit::Balance(val),
+        None => panic!("Deposit limit must be specified for on-chain submissions."),
+    }
 }
 
+/// Transforms `DepositLimit<<E as Environment>::Balance>` into `<E as
+/// Environment>::Balance>`.
+///
+/// Panics if `limit` is unrestricted (`DepositLimit::UnsafeOnlyForDryRun`).
 fn deposit_limit_to_balance<E: Environment>(
-    l: DepositLimit<<E as Environment>::Balance>,
+    limit: DepositLimit<<E as Environment>::Balance>,
 ) -> <E as Environment>::Balance {
-    match l {
-        DepositLimit::Balance(l) => l,
-        // todo
-        DepositLimit::UnsafeOnlyForDryRun => panic!("`Unchecked` is not supported"),
+    match limit {
+        DepositLimit::Balance(val) => val,
+        DepositLimit::UnsafeOnlyForDryRun => {
+            panic!("Unrestricted deposit limit not allowed for balance conversion!")
+        }
     }
 }

crates/e2e/src/sandbox_client.rs

@@ -582,6 +582,7 @@ where
 /// Exposes preset sandbox configurations to be used in tests.
 pub mod preset {
     /*
+    // todo
     pub mod mock_network {
         use ink_sandbox::{
             frame_system,

crates/e2e/src/subxt_client.rs

@@ -722,7 +722,7 @@ where
                 dest,
                 exec_input,
                 value,
-                deposit_limit_to_balance::<E>(storage_deposit_limit),
+                storage_deposit_limit,
                 caller,
             )
             .await;