diff --git a/contracts/nft-escrow/Cargo.toml b/contracts/nft-escrow/Cargo.toml index fd2ce709..1631740b 100644 --- a/contracts/nft-escrow/Cargo.toml +++ b/contracts/nft-escrow/Cargo.toml @@ -8,11 +8,8 @@ publish = false [lib] path = "src/lib.rs" -[dev-dependencies] -num-bigint = "0.4.2" - [dependencies.multiversx-sc] -version = "0.41.1" +version = "0.43.4" [dev-dependencies.multiversx-sc-scenario] -version = "0.41.1" +version = "0.43.4" diff --git a/contracts/nft-escrow/meta/Cargo.toml b/contracts/nft-escrow/meta/Cargo.toml index e0af38ba..cf1cbcfd 100644 --- a/contracts/nft-escrow/meta/Cargo.toml +++ b/contracts/nft-escrow/meta/Cargo.toml @@ -11,4 +11,4 @@ authors = [ "you",] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.1" +version = "0.43.4" diff --git a/contracts/nft-escrow/src/lib.rs b/contracts/nft-escrow/src/lib.rs index 99ffb642..dc975728 100644 --- a/contracts/nft-escrow/src/lib.rs +++ b/contracts/nft-escrow/src/lib.rs @@ -143,7 +143,7 @@ pub trait NftEscrowContract { let mut result = MultiValueEncoded::new(); for offer_id in self.created_offers(&address).iter() { - result.push(MultiValue2::from((offer_id, self.offers(offer_id).get()))); + result.push(self.get_offer_result(offer_id)); } result @@ -157,12 +157,18 @@ pub trait NftEscrowContract { let mut result = MultiValueEncoded::new(); for offer_id in self.wanted_offers(&address).iter() { - result.push(MultiValue2::from((offer_id, self.offers(offer_id).get()))); + result.push(self.get_offer_result(offer_id)); } result } + fn get_offer_result(&self, offer_id: u32) -> MultiValue2> { + let offer = self.offers(offer_id).get(); + + MultiValue2::from((offer_id, offer)) + } + #[view] #[storage_mapper("createdOffers")] fn created_offers(&self, address: &ManagedAddress) -> UnorderedSetMapper; diff --git a/contracts/nft-escrow/wasm/Cargo.lock b/contracts/nft-escrow/wasm/Cargo.lock index 003bdb32..cce0feda 100644 --- a/contracts/nft-escrow/wasm/Cargo.lock +++ b/contracts/nft-escrow/wasm/Cargo.lock @@ -66,9 +66,9 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[package]] name = "multiversx-sc" -version = "0.41.3" +version = "0.43.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfbe80ec68fedf299dd65469f8999cf3c0f884ffa497122428f08303bcb8b884" +checksum = "406939660d0c79dd191c6677f4b048df873a95f4531d8abafc9cdbe282bf1725" dependencies = [ "bitflags", "hashbrown", @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d70ea458247d263b7e9fdfb207530b6a530546247139c162450e515c013a18" +checksum = "0f1e15b46c17b87c0c7cdd79b041a4abd7f3a2b45f3c993f6ce38c0f233e82b6" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -90,9 +90,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ad6920f80fda67fc60fd51aaa9f83ec7e069470f60a068c81205f9da5d05a30" +checksum = "9a7bc0762cd6d88f8bc54805bc652b042a61cd7fbc2d0a325010f088b78fb2ac" dependencies = [ "hex", "proc-macro2", @@ -102,9 +102,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.41.3" +version = "0.43.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2b87d817f2176bf1830bef938884f24267516c334a377e71a96bc18ebb09c1" +checksum = "9e006240993963b482fe0682ae49b2d07255495e3c86706925d119137376cdfc" dependencies = [ "hex", "proc-macro2", @@ -115,9 +115,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.41.3" +version = "0.43.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "932327626de71eeb1dbe86b863cc70cc532f8ceba8e73a059410f6aa56b22a77" +checksum = "40e721d1bc80de2ede4099a9040519486c3c1139cb0287d8fc4f9fc3e8a3f19e" dependencies = [ "multiversx-sc", ] diff --git a/contracts/nft-escrow/wasm/Cargo.toml b/contracts/nft-escrow/wasm/Cargo.toml index df25984e..4e7db800 100644 --- a/contracts/nft-escrow/wasm/Cargo.toml +++ b/contracts/nft-escrow/wasm/Cargo.toml @@ -24,4 +24,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.41.1" +version = "0.43.4" diff --git a/contracts/nft-escrow/wasm/src/lib.rs b/contracts/nft-escrow/wasm/src/lib.rs index 2b2c1e7e..7d6e71c8 100644 --- a/contracts/nft-escrow/wasm/src/lib.rs +++ b/contracts/nft-escrow/wasm/src/lib.rs @@ -10,6 +10,9 @@ // Total number of exported functions: 10 #![no_std] + +// Configuration that works with rustc < 1.73.0. +// TODO: Recommended rustc version: 1.73.0 or newer. #![feature(lang_items)] multiversx_sc_wasm_adapter::allocator!(); @@ -18,15 +21,16 @@ multiversx_sc_wasm_adapter::panic_handler!(); multiversx_sc_wasm_adapter::endpoints! { nft_escrow ( - escrow - cancel - accept - getCreatedOffers - getWantedOffers - created_offers - wanted_offers - offers + init => init + escrow => escrow + cancel => cancel + accept => accept + getCreatedOffers => get_created_offers + getWantedOffers => get_wanted_offers + created_offers => created_offers + wanted_offers => wanted_offers + offers => offers ) } -multiversx_sc_wasm_adapter::empty_callback! {} +multiversx_sc_wasm_adapter::async_callback_empty! {}