waku-org
/
waku-rust-bindings
mirror of https://github.com/waku-org/waku-rust-bindings.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update deps 

Fix update changes
Upgrade beta version
This commit is contained in:
Daniel Sanchez Quiros 2023-02-16 18:22:06 +01:00
parent f80947d283
commit bda4cf28f3
5 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Cargo.lock generated
View File

@ -81,9 +81,9 @@ checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
[[package]]
name = "base64"
version = "0.13.0"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "bindgen"
@ -678,9 +678,9 @@ dependencies = [
[[package]]
name = "multiaddr"
version = "0.16.0"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e"
checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c"
dependencies = [
"arrayref",
"byteorder",
@ -707,9 +707,9 @@ dependencies = [
[[package]]
name = "multihash"
version = "0.16.3"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc"
checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
dependencies = [
"core2",
"multihash-derive",
@ -994,9 +994,9 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
[[package]]
name = "secp256k1"
version = "0.24.1"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964"
checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894"
dependencies = [
"rand",
"secp256k1-sys",
@ -1005,9 +1005,9 @@ dependencies = [
[[package]]
name = "secp256k1-sys"
version = "0.6.1"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff"
dependencies = [
"cc",
]
@ -1045,9 +1045,9 @@ dependencies = [
[[package]]
name = "serial_test"
version = "0.10.0"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c789ec87f4687d022a2405cf46e0cd6284889f1839de292cadeb6c6019506f2"
checksum = "538c30747ae860d6fb88330addbbd3e0ddbe46d662d032855596d8a8ca260611"
dependencies = [
"dashmap",
"futures",
@ -1059,9 +1059,9 @@ dependencies = [
[[package]]
name = "serial_test_derive"
version = "0.10.0"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b64f9e531ce97c88b4778aad0ceee079216071cffec6ac9b904277f8f92e7fe3"
checksum = "079a83df15f85d89a68d64ae1238f142f172b1fa915d0d76b26a7cba1b659a69"
dependencies = [
"proc-macro2",
"quote",
@ -1132,9 +1132,9 @@ dependencies = [
[[package]]
name = "sscanf"
version = "0.3.1"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ecdd7ea17bcadebf81d656db919f58f96c1d194d748cf0839a44a220123eedd"
checksum = "887a5b09bbf30cc01d059ccb4b7a0b508a0cef3028df2f2ee0d745bc9e624c56"
dependencies = [
"const_format",
"lazy_static",
@ -1144,14 +1144,16 @@ dependencies = [
[[package]]
name = "sscanf_macro"
version = "0.3.1"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe2309d255caf220c1ff9f380d89420a1377de1cabc1d57e0b308e53b0406bed"
checksum = "b124cd4c68600cc3188a26987b1c3bed8cadcfd1be93124026096c668f2c0ee8"
dependencies = [
"proc-macro2",
"quote",
"regex-syntax",
"strsim",
"syn",
"unicode-width",
]
[[package]]
@ -1160,6 +1162,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "subtle"
version = "2.4.1"
@ -1381,7 +1389,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "waku-bindings"
version = "0.1.0-beta4"
version = "0.1.0-beta.5"
dependencies = [
"aes-gcm",
"base64",
@ -1403,7 +1411,7 @@ dependencies = [
[[package]]
name = "waku-sys"
version = "0.1.0-beta4"
version = "0.1.0-beta.5"
dependencies = [
"bindgen",
]

14
waku-bindings/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "waku-bindings"
version = "0.1.0-beta4"
version = "0.1.0-beta.5"
edition = "2021"
authors = [
"Daniel Sanchez Quiros <danielsq@status.im>"
@ -14,20 +14,20 @@ categories = ["network-programming"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
aes-gcm = { version = "0.10", features = ["aes"] }
base64 = "0.13"
base64 = "0.21"
hex = "0.4"
multiaddr = "0.16"
multiaddr = "0.17"
once_cell = "1.15"
rand = "0.8"
secp256k1 = { version = "0.24", features = ["rand", "recovery", "serde"] }
secp256k1 = { version = "0.26", features = ["rand", "recovery", "serde"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sscanf = "0.3"
sscanf = "0.4"
smart-default = "0.6"
url = "2.3"
waku-sys = { version = "0.1.0-beta4", path = "../waku-sys" }
waku-sys = { version = "0.1.0-beta.5", path = "../waku-sys" }
[dev-dependencies]
futures = "0.3.25"
serial_test = "0.10.0"
serial_test = "1.0.0"
tokio = { version = "1.24.2", features = ["macros", "rt", "sync", "time"] }

23
waku-bindings/src/general/mod.rs
View File

@ -1,11 +1,12 @@
//! Waku [general](https://rfc.vac.dev/spec/36/#general) types
use std::borrow::Cow;
// std
use std::borrow::Cow;
use std::fmt::{Display, Formatter};
use std::str::FromStr;
// crates
use aes_gcm::{Aes256Gcm, Key};
use base64::Engine;
use secp256k1::{ecdsa::Signature, PublicKey, SecretKey};
use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
use sscanf::{scanf, RegexRepresentation};
@ -312,14 +313,17 @@ impl Display for Encoding {
}
impl FromStr for Encoding {
type Err = String;
type Err = std::io::Error;
fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
match s.to_lowercase().as_str() {
"proto" => Ok(Self::Proto),
"rlp" => Ok(Self::Rlp),
"rfc26" => Ok(Self::Rfc26),
encoding => Err(format!("Unrecognized encoding: {encoding}")),
encoding => Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
format!("Unrecognized encoding: {encoding}"),
)),
}
}
}
@ -477,6 +481,7 @@ impl<'de> Deserialize<'de> for WakuPubSubTopic {
}
mod base64_serde {
use base64::Engine;
use serde::de::Error;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
@ -484,7 +489,9 @@ mod base64_serde {
where
S: Serializer,
{
base64::encode(value).serialize(serializer)
base64::engine::general_purpose::STANDARD
.encode(value)
.serialize(serializer)
}
pub fn deserialize<'de, D>(deserializer: D) -> std::result::Result<Vec<u8>, D::Error>
@ -492,7 +499,9 @@ mod base64_serde {
D: Deserializer<'de>,
{
let base64_str: String = String::deserialize(deserializer)?;
base64::decode(base64_str).map_err(D::Error::custom)
base64::engine::general_purpose::STANDARD
.decode(base64_str)
.map_err(D::Error::custom)
}
}
@ -505,7 +514,9 @@ where
let base64_str: Option<String> = Option::<String>::deserialize(deserializer)?;
base64_str
.map(|base64_str| {
let raw_bytes = base64::decode(base64_str).map_err(D::Error::custom)?;
let raw_bytes = base64::engine::general_purpose::STANDARD
.decode(base64_str)
.map_err(D::Error::custom)?;
PublicKey::from_slice(&raw_bytes).map_err(D::Error::custom)
})
.transpose()

2
waku-sys/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "waku-sys"
version = "0.1.0-beta4"
version = "0.1.0-beta.5"
edition = "2021"
authors = [
"Daniel Sanchez Quiros <danielsq@status.im>"

2
waku-sys/vendor

@ -1 +1 @@
Subproject commit 11161b8919d2d2ad28b9f51dc38ca28ce2c94b72
Subproject commit 20f310a815bad46c377b410996bd01f93a02269f