diff --git a/Cargo.lock b/Cargo.lock index 60884fd..f3f9736 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,9 +223,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.2" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b1be7772ee4501dba05acbe66bb1e8760f6a6c474a36035631638e4415f130" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -705,6 +705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", + "serde", ] [[package]] @@ -870,6 +871,7 @@ checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown", + "serde", ] [[package]] @@ -939,17 +941,23 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mime" @@ -1021,9 +1029,9 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f" [[package]] name = "multiversx-sc" -version = "0.50.2" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63741fdb380f1f9cfd2e90da2665ed8b130477851c88890869a4f625958ac1" +checksum = "1d79d1cea2d23e8f2545749c9b31952305b54c415af88b224b985784d3d6529d" dependencies = [ "bitflags 2.5.0", "hex-literal", @@ -1059,9 +1067,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.50.2" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a4a0720c3796d08c57abfd5c7970ac48f1abec4f04a176bde47868d6caeb75" +checksum = "54e6926e181f6306b69aa805b8d24aa33084497e38ac03e37df457456b6757cc" dependencies = [ "hex", "proc-macro2", @@ -1072,9 +1080,9 @@ dependencies = [ [[package]] name = "multiversx-sc-meta" -version = "0.50.2" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a83e25c5d7c599efd87ebef1c9728ed97e312481d98ded071798d873daffb8e" +checksum = "07fe6edb214529678c77e82e25d9495b04773d489c441ef49fc19ad0664504f3" dependencies = [ "clap", "colored", @@ -1099,9 +1107,9 @@ dependencies = [ [[package]] name = "multiversx-sc-scenario" -version = "0.50.2" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fa43f1cf1af9da80064232deec34ab169b58861218736401f02212b5dd11c9" +checksum = "3dd07e4626e551c051f3065c0b2b44047d3281c20cdbcef9375aecb5f9fd5307" dependencies = [ "base64 0.22.1", "bech32", @@ -1799,6 +1807,12 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "slab" version = "0.4.9" @@ -2231,22 +2245,23 @@ checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasmparser" -version = "0.207.0" +version = "0.208.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c" +checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58" dependencies = [ "ahash", "bitflags 2.5.0", "hashbrown", "indexmap", "semver", + "serde", ] [[package]] name = "wasmprinter" -version = "0.207.0" +version = "0.208.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115" +checksum = "0700bdace4821e6c694617938500ae9999946df464bb13219c16570f8b6f202f" dependencies = [ "anyhow", "wasmparser", @@ -2486,9 +2501,9 @@ dependencies = [ [[package]] name = "zip" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f4a27345eb6f7aa7bd015ba7eb4175fa4e1b462a29874b779e0bbcf96c6ac7" +checksum = "e2568cd0f20e86cd9a7349fe05178f7bd22f22724678448ae5a9bac266df2689" dependencies = [ "arbitrary", "crc32fast", @@ -2496,5 +2511,21 @@ dependencies = [ "displaydoc", "flate2", "indexmap", + "memchr", "thiserror", + "zopfli", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] diff --git a/Cargo.toml b/Cargo.toml index ac632db..8be247c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/escrow.rs" [dependencies.multiversx-sc] -version = "0.50.2" +version = "0.50.3" [dev-dependencies] num-bigint = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "0.50.2" +version = "0.50.3" [workspace] members = [ diff --git a/meta/Cargo.toml b/meta/Cargo.toml index 293aa8c..fd2a9df 100644 --- a/meta/Cargo.toml +++ b/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.50.2" +version = "0.50.3" default-features = false diff --git a/src/escrow.rs b/src/escrow.rs index 5b5975a..20e4f53 100644 --- a/src/escrow.rs +++ b/src/escrow.rs @@ -81,12 +81,12 @@ pub trait Escrow: offer::OfferModule + events::EventsModule { self.send().direct_esdt( &offer.creator, - &payment.token_identifier, - payment.token_nonce, - &payment.amount, + &offer.accepted_payment.token_identifier, + offer.accepted_payment.token_nonce, + &offer.accepted_payment.amount, ); self.send().direct_esdt( - &caller, + &offer.accepted_address, &offer.offered_payment.token_identifier, offer.offered_payment.token_nonce, &offer.offered_payment.amount, diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index caa798f..133a6fa 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -55,9 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.50.2" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63741fdb380f1f9cfd2e90da2665ed8b130477851c88890869a4f625958ac1" +checksum = "1d79d1cea2d23e8f2545749c9b31952305b54c415af88b224b985784d3d6529d" dependencies = [ "bitflags", "hex-literal", @@ -92,9 +92,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.50.2" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a4a0720c3796d08c57abfd5c7970ac48f1abec4f04a176bde47868d6caeb75" +checksum = "54e6926e181f6306b69aa805b8d24aa33084497e38ac03e37df457456b6757cc" dependencies = [ "hex", "proc-macro2", @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.50.2" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e84503bd0147f2532beb9764fa6284743666e7b96ea2a9671c1f83e84696d7" +checksum = "4350e286afce68bb2448d30572f68dd344b2e98e160404dd7f7d13f185e7acfd" dependencies = [ "multiversx-sc", ] diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index 3cf52c0..1892084 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.50.2" +version = "0.50.3" [workspace] members = ["."]