From b8ad709523ce3b4f964a34cf9f4f82d6423b4002 Mon Sep 17 00:00:00 2001 From: schwartz-concordium <132270889+schwartz-concordium@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:48:43 +0100 Subject: [PATCH] bump --- rust-bindings/Cargo.lock | 40 ++++++++++++++++++++++------------------ rust-bindings/Cargo.toml | 2 +- rust-bindings/src/lib.rs | 8 ++++---- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/rust-bindings/Cargo.lock b/rust-bindings/Cargo.lock index e1a9a41c..1efcef23 100644 --- a/rust-bindings/Cargo.lock +++ b/rust-bindings/Cargo.lock @@ -66,9 +66,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -120,11 +120,12 @@ dependencies = [ [[package]] name = "bs58" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" dependencies = [ "sha2", + "tinyvec", ] [[package]] @@ -192,7 +193,7 @@ dependencies = [ [[package]] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" dependencies = [ "base64", "bs58", @@ -235,12 +236,23 @@ dependencies = [ ] [[package]] -name = "digest" -version = "0.9.0" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", ] [[package]] @@ -383,12 +395,6 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -588,15 +594,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.9" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "block-buffer", "cfg-if", "cpufeatures", "digest", - "opaque-debug", ] [[package]] diff --git a/rust-bindings/Cargo.toml b/rust-bindings/Cargo.toml index 88c35a48..4c445843 100644 --- a/rust-bindings/Cargo.toml +++ b/rust-bindings/Cargo.toml @@ -15,7 +15,7 @@ thiserror = "1.0" anyhow="1.0" serde_json = "1.0" serde = { version = "1.0" } -concordium-contracts-common = { version = "8.1.1", features = ["derive-serde"], path = "../concordium-base/smart-contracts/contracts-common/concordium-contracts-common" } +concordium-contracts-common = { version = "9.0.0", features = ["derive-serde"], path = "../concordium-base/smart-contracts/contracts-common/concordium-contracts-common" } [dev-dependencies] hex = "0.4" diff --git a/rust-bindings/src/lib.rs b/rust-bindings/src/lib.rs index 006ae8c0..1f7a6ee5 100644 --- a/rust-bindings/src/lib.rs +++ b/rust-bindings/src/lib.rs @@ -49,7 +49,7 @@ pub unsafe extern "C" fn schema_display( schema_size: i32, schema_version: FFIByteOption, callback: ResultCallback, -) -> u32 { +) -> u8 { let schema = std::slice::from_raw_parts(schema_ptr, schema_size as usize); assign_result(callback, || { schema_display_aux(schema, schema_version.into_option()) @@ -88,7 +88,7 @@ pub unsafe extern "C" fn get_receive_contract_parameter( value_ptr: *const u8, value_size: i32, callback: ResultCallback, -) -> u32 { +) -> u8 { assign_result(callback, || { let schema = std::slice::from_raw_parts(schema_ptr, schema_size as usize); let contract_name_str = get_str_from_pointer(contract_name)?; @@ -132,7 +132,7 @@ pub unsafe extern "C" fn get_event_contract( value_ptr: *const u8, value_size: i32, callback: ResultCallback, -) -> u32 { +) -> u8 { assign_result(callback, || { let schema = std::slice::from_raw_parts(schema_ptr, schema_size as usize); let contract_name_str = get_str_from_pointer(contract_name)?; @@ -158,7 +158,7 @@ pub unsafe extern "C" fn get_event_contract( /// # Returns /// /// A boolean, that indicates whether the computation was successful or not. -fn assign_result Result, FFIError>>(callback: ResultCallback, f: F) -> u32 { +fn assign_result Result, FFIError>>(callback: ResultCallback, f: F) -> u8 { match f() { Ok(output) => { let out_lenght = output.len() as i32;