test: assets precompile integration test

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `ink_revive_types` (and remove `pallet-revive` dependency from `ink_e2e`) - [#2657](https://github.com/use-ink/ink/pull/2657)
 - non-allocating Solidity ABI encoder - [#2655](https://github.com/use-ink/ink/pull/2655)
 - Implement XCM precompile, stabilize XCM API - [#2687](https://github.com/use-ink/ink/pull/2687)
+- Add `ink_precompiles` crate with ERC-20 assets precompile interface - [#2686](https://github.com/use-ink/ink/pull/2686)
 
 ### Changed
 - Marks the `pallet-revive` host function `account_id` stable - [#2578](https://github.com/use-ink/ink/pull/2578)

Cargo.toml

@@ -11,6 +11,7 @@ members = [
     "crates/ink/ir",
     "crates/ink/macro",
     "crates/metadata",
+    "crates/precompiles",
     "crates/revive-types",
     "crates/prelude",
     "crates/primitives",
@@ -115,6 +116,7 @@ ink_env = { version = "=6.0.0-beta", path = "crates/env", default-features = fal
 ink_ir = { version = "=6.0.0-beta", path = "crates/ink/ir", default-features = false }
 ink_macro = { version = "=6.0.0-beta", path = "crates/ink/macro", default-features = false }
 ink_metadata = { version = "=6.0.0-beta", path = "crates/metadata", default-features = false }
+ink_precompiles = { version = "=6.0.0-beta", path = "crates/precompiles", default-features = false }
 ink_prelude = { version = "=6.0.0-beta", path = "crates/prelude", default-features = false }
 ink_primitives = { version = "=6.0.0-beta", path = "crates/primitives", default-features = false }
 ink_revive_types = {  version = "=6.0.0-beta", path = "crates/revive-types", default-features = false }

crates/e2e/src/contract_results.rs

@@ -259,6 +259,31 @@ impl<E: Environment, V, EventLog, Abi> CallResult<E, V, EventLog, Abi> {
     pub fn return_data(&self) -> &[u8] {
         &self.dry_run.exec_return_value().data
     }
+
+    /// Returns the error from nested contract calls (e.g., precompile errors)
+    /// if available in the trace, otherwise returns the raw error data.
+    pub fn extract_error(&self) -> Option<String> {
+        if !self.dry_run.did_revert() {
+            return None;
+        }
+
+        // Check trace for error information
+        if let Some(trace) = &self.trace {
+            // // Check nested calls first (more specific errors)
+            for call in &trace.calls {
+                if let Some(error) = &call.error {
+                    return Some(error.clone());
+                }
+            }
+
+            // Then check top-level error
+            if let Some(error) = &trace.error {
+                return Some(error.clone());
+            }
+        }
+        // Fallback to raw data
+        Some(format!("{:?}", self.return_data()))
+    }
 }
 
 // TODO(#xxx) Improve the `Debug` implementation.

crates/e2e/src/lib.rs

@@ -206,3 +206,22 @@ where
 {
     <<Contract as ContractCallBuilder>::Type<Abi> as FromAddr>::from_addr(acc_id)
 }
+
+/// Extension trait for converting various types to Address (H160).
+pub trait IntoAddress {
+    /// Convert to an Address (H160).
+    fn address(&self) -> Address;
+}
+
+impl IntoAddress for Keypair {
+    fn address(&self) -> Address {
+        AccountIdMapper::to_address(&self.public_key().0)
+    }
+}
+
+impl IntoAddress for ink_primitives::AccountId {
+    fn address(&self) -> Address {
+        let bytes = *AsRef::<[u8; 32]>::as_ref(self);
+        AccountIdMapper::to_address(&bytes)
+    }
+}

crates/ink/codegen/src/generator/env.rs

@@ -39,8 +39,10 @@ impl GenerateCode for Env<'_> {
             type Hash = <<#storage_ident as ::ink::env::ContractEnv>::Env as ::ink::env::Environment>::Hash;
             type Timestamp = <<#storage_ident as ::ink::env::ContractEnv>::Env as ::ink::env::Environment>::Timestamp;
             type BlockNumber = <<#storage_ident as ::ink::env::ContractEnv>::Env as ::ink::env::Environment>::BlockNumber;
-            const NATIVE_TO_ETH_RATIO: u32 = <<#storage_ident as ::ink::env::ContractEnv>::Env as ::ink::env::Environment>::NATIVE_TO_ETH_RATIO;
             type EventRecord = <<#storage_ident as ::ink::env::ContractEnv>::Env as ::ink::env::Environment>::EventRecord;
+            const NATIVE_TO_ETH_RATIO: u32 = <<#storage_ident as ::ink::env::ContractEnv>::Env as ::ink::env::Environment>::NATIVE_TO_ETH_RATIO;
+            const TRUST_BACKED_ASSETS_PRECOMPILE_INDEX: u16 = <<#storage_ident as ::ink::env::ContractEnv>::Env as ::ink::env::Environment>::TRUST_BACKED_ASSETS_PRECOMPILE_INDEX;
+            const POOL_ASSETS_PRECOMPILE_INDEX: u16 = <<#storage_ident as ::ink::env::ContractEnv>::Env as ::ink::env::Environment>::POOL_ASSETS_PRECOMPILE_INDEX;
 
             type Address = ::ink::primitives::Address;
         }

crates/ink/codegen/src/generator/metadata.rs

@@ -358,6 +358,10 @@ impl Metadata<'_> {
                 .timestamp(#timestamp)
                 .block_number(#block_number)
                 .native_to_eth_ratio(NATIVE_TO_ETH_RATIO)
+                .trust_backed_assets_precompile_index(
+                    TRUST_BACKED_ASSETS_PRECOMPILE_INDEX,
+                )
+                .pool_assets_precompile_index(POOL_ASSETS_PRECOMPILE_INDEX)
                 .static_buffer_size(#buffer_size_const)
                 .done()
         )

crates/ink/macro/src/lib.rs

@@ -169,6 +169,8 @@ pub fn selector_bytes(input: TokenStream) -> TokenStream {
 ///
 ///   impl ink_env::Environment for MyEnvironment {
 ///       const NATIVE_TO_ETH_RATIO: u32 = 100_000_000;
+///       const TRUST_BACKED_ASSETS_PRECOMPILE_INDEX: u16 = 0x0120;
+///       const POOL_ASSETS_PRECOMPILE_INDEX: u16 = 0x0320;
 ///       type AccountId = [u8; 16];
 ///       type Balance = u128;
 ///       type Hash = [u8; 32];
@@ -187,6 +189,8 @@ pub fn selector_bytes(input: TokenStream) -> TokenStream {
 ///       #
 ///       # impl ink_env::Environment for MyEnvironment {
 ///       #     const NATIVE_TO_ETH_RATIO: u32 = 100_000_000;
+///       #     const TRUST_BACKED_ASSETS_PRECOMPILE_INDEX: u16 = 0x0120;
+///       #     const POOL_ASSETS_PRECOMPILE_INDEX: u16 = 0x0320;
 ///       #     type AccountId = [u8; 16];
 ///       #     type Balance = u128;
 ///       #     type Hash = [u8; 32];
@@ -776,6 +780,8 @@ pub fn trait_definition(attr: TokenStream, item: TokenStream) -> TokenStream {
 ///
 ///   impl ink_env::Environment for MyEnvironment {
 ///       const NATIVE_TO_ETH_RATIO: u32 = 100_000_000;
+///       const TRUST_BACKED_ASSETS_PRECOMPILE_INDEX: u16 = 0x0120;
+///       const POOL_ASSETS_PRECOMPILE_INDEX: u16 = 0x0320;
 ///       type AccountId = [u8; 16];
 ///       type Balance = u128;
 ///       type Hash = [u8; 32];
@@ -800,6 +806,8 @@ pub fn trait_definition(attr: TokenStream, item: TokenStream) -> TokenStream {
 ///   #
 ///   # impl ink_env::Environment for MyEnvironment {
 ///   #     const NATIVE_TO_ETH_RATIO: u32 = 100_000_000;
+///   #     const TRUST_BACKED_ASSETS_PRECOMPILE_INDEX: u16 = 0x0120;
+///   #     const POOL_ASSETS_PRECOMPILE_INDEX: u16 = 0x0320;
 ///   #     type AccountId = [u8; 16];
 ///   #     type Balance = u128;
 ///   #     type Hash = [u8; 32];

crates/ink/src/contract_ref.rs

@@ -153,6 +153,8 @@ use ink_primitives::Address;
 ///
 /// impl ink_env::Environment for CustomEnv {
 ///     const NATIVE_TO_ETH_RATIO: u32 = 100_000_000;
+///     const TRUST_BACKED_ASSETS_PRECOMPILE_INDEX: u16 = 0x0120;
+///     const POOL_ASSETS_PRECOMPILE_INDEX: u16 = 0x0320;
 ///     type AccountId = [u8; 32];
 ///     type Balance = u64;
 ///     type Hash = [u8; 32];

crates/ink/src/message_builder.rs

@@ -78,6 +78,8 @@
 ///
 /// impl ink_env::Environment for CustomEnv {
 ///     const NATIVE_TO_ETH_RATIO: u32 = 100_000_000;
+///     const TRUST_BACKED_ASSETS_PRECOMPILE_INDEX: u16 = 0x0120;
+///     const POOL_ASSETS_PRECOMPILE_INDEX: u16 = 0x0320;
 ///     type AccountId = [u8; 32];
 ///     type Balance = u64;
 ///     type Hash = [u8; 32];

crates/ink/tests/ui/contract/pass/config-custom-env.rs

@@ -5,6 +5,8 @@ pub struct CustomEnv;
 
 impl ink_env::Environment for CustomEnv {
     const NATIVE_TO_ETH_RATIO: u32 = 100_000_000;
+    const TRUST_BACKED_ASSETS_PRECOMPILE_INDEX: u16 = 0x0120;
+    const POOL_ASSETS_PRECOMPILE_INDEX: u16 = 0x0320;
     type AccountId = [u8; 32];
     type Balance = u64;
     type Hash = [u8; 32];