From c01ffa209d0cb3eecbe9222052a38607e1ad9873 Mon Sep 17 00:00:00 2001 From: Cyrill Leutwiler Date: Mon, 8 Apr 2024 22:52:54 +0200 Subject: [PATCH] Polkadot: Update rust cross contract call example to ink! v5.0 (#1635) --- integration/polkadot/ink/caller/Cargo.toml | 7 +------ integration/polkadot/ink/caller/lib.rs | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/integration/polkadot/ink/caller/Cargo.toml b/integration/polkadot/ink/caller/Cargo.toml index 9b1dde822..5f891f046 100755 --- a/integration/polkadot/ink/caller/Cargo.toml +++ b/integration/polkadot/ink/caller/Cargo.toml @@ -5,10 +5,7 @@ authors = ["Cyrill Leutwiler "] edition = "2021" [dependencies] -ink = { version = "4.3.0", default-features = false } - -scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.10", default-features = false, features = ["derive"], optional = true } +ink = { version = "5.0.0", default-features = false } [lib] path = "lib.rs" @@ -17,8 +14,6 @@ path = "lib.rs" default = ["std"] std = [ "ink/std", - "scale/std", - "scale-info/std", ] [workspace] diff --git a/integration/polkadot/ink/caller/lib.rs b/integration/polkadot/ink/caller/lib.rs index 0586643e7..10675e646 100755 --- a/integration/polkadot/ink/caller/lib.rs +++ b/integration/polkadot/ink/caller/lib.rs @@ -5,7 +5,7 @@ #[ink::contract] mod caller { use ink::env::{ - call::{build_call, Call, ExecutionInput, Selector}, + call::{build_call, ExecutionInput, Selector}, DefaultEnvironment, }; @@ -31,7 +31,8 @@ mod caller { transfer_value: Option, ) -> u32 { build_call::() - .call_type(Call::new(callee).gas_limit(max_gas.unwrap_or_default())) + .call_v1(callee) + .gas_limit(max_gas.unwrap_or(u64::MAX)) .transferred_value(transfer_value.unwrap_or_default()) .exec_input(ExecutionInput::new(Selector::new(selector)).push_arg(arg)) .returns::() // FIXME: This should be Result to respect LanguageError