From 2a04fc24f400d943f22362238ef9f7f657ca3838 Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Tue, 9 Jan 2024 09:05:09 +1300
Subject: [PATCH] Update nostr-types (nip-44)

---
 Cargo.lock            | 27 +++++++++++++++++----------
 gossip-bin/Cargo.toml |  4 ++--
 gossip-lib/Cargo.toml |  4 ++--
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 44ab75f1..8d861f6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -949,6 +949,12 @@ dependencies = [
  "tiny-keccak",
 ]
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1956,7 +1962,7 @@ dependencies = [
 [[package]]
 name = "gossip-relay-picker"
 version = "0.2.0-unstable"
-source = "git+https://github.com/mikedilger/gossip-relay-picker?rev=360aadc068496dd5dbc956e1e861f1c693de136e#360aadc068496dd5dbc956e1e861f1c693de136e"
+source = "git+https://github.com/mikedilger/gossip-relay-picker?rev=798364277d5aa1ec908d58aba498b800f24ed32c#798364277d5aa1ec908d58aba498b800f24ed32c"
 dependencies = [
  "async-trait",
  "dashmap",
@@ -2716,14 +2722,15 @@ dependencies = [
 [[package]]
 name = "nip44"
 version = "0.1.0"
-source = "git+https://github.com/mikedilger/nip44?rev=e38717f86ccccb91c25ebf07881a77d66411161c#e38717f86ccccb91c25ebf07881a77d66411161c"
+source = "git+https://github.com/mikedilger/nip44?rev=e6ab1bc4480fd53aa854814bbacacf200c51af14#e6ab1bc4480fd53aa854814bbacacf200c51af14"
 dependencies = [
  "base64",
  "chacha20",
+ "constant_time_eq",
  "hkdf",
  "hmac",
  "rand_core",
- "secp256k1 0.27.0",
+ "secp256k1 0.28.1",
  "sha2",
  "thiserror",
 ]
@@ -2793,7 +2800,7 @@ dependencies = [
 [[package]]
 name = "nostr-types"
 version = "0.7.0-unstable"
-source = "git+https://github.com/mikedilger/nostr-types?rev=661273cfaf8ab164d8ad09959d4194e3ace05fff#661273cfaf8ab164d8ad09959d4194e3ace05fff"
+source = "git+https://github.com/mikedilger/nostr-types?rev=4e35bacf9fe114dab94183d1d8aad1dce67bbbce#4e35bacf9fe114dab94183d1d8aad1dce67bbbce"
 dependencies = [
  "aes",
  "base64",
@@ -2817,7 +2824,7 @@ dependencies = [
  "rand_core",
  "regex",
  "scrypt",
- "secp256k1 0.27.0",
+ "secp256k1 0.28.1",
  "serde",
  "serde_json",
  "sha2",
@@ -3900,13 +3907,13 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.27.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
+checksum = "3f622567e3b4b38154fb8190bcf6b160d7a4301d70595a49195b48c116007a27"
 dependencies = [
  "bitcoin_hashes 0.12.0",
  "rand",
- "secp256k1-sys 0.8.1",
+ "secp256k1-sys 0.9.2",
  "serde",
 ]
 
@@ -3921,9 +3928,9 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.8.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e"
+checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb"
 dependencies = [
  "cc",
 ]
diff --git a/gossip-bin/Cargo.toml b/gossip-bin/Cargo.toml
index 7d7f3ded..27ba3a10 100644
--- a/gossip-bin/Cargo.toml
+++ b/gossip-bin/Cargo.toml
@@ -22,13 +22,13 @@ bech32 = "0.9"
 eframe = { git = "https://github.com/mikedilger/egui", rev = "50393e4f34ac6246b8c2424e42fbe5b95e4b4452", features = [ "persistence", "wayland" ] }
 egui-winit = { git = "https://github.com/mikedilger/egui", rev = "50393e4f34ac6246b8c2424e42fbe5b95e4b4452", features = [ "default" ] }
 egui-video = { git = "https://github.com/mikedilger/egui-video", rev = "d12a4859d383524f978a0dd29d61e1ebd281e735",  features = [ "from_bytes" ], optional = true }
-gossip-relay-picker = { git = "https://github.com/mikedilger/gossip-relay-picker", rev = "360aadc068496dd5dbc956e1e861f1c693de136e" }
+gossip-relay-picker = { git = "https://github.com/mikedilger/gossip-relay-picker", rev = "798364277d5aa1ec908d58aba498b800f24ed32c" }
 gossip-lib = { path = "../gossip-lib" }
 humansize = "2.1"
 image = { version = "0.24.6", features = [ "png", "jpeg" ] }
 lazy_static = "1.4"
 memoize = "0.4"
-nostr-types = { git = "https://github.com/mikedilger/nostr-types", rev = "661273cfaf8ab164d8ad09959d4194e3ace05fff", features = [ "speedy" ] }
+nostr-types = { git = "https://github.com/mikedilger/nostr-types", rev = "4e35bacf9fe114dab94183d1d8aad1dce67bbbce", features = [ "speedy" ] }
 qrcode = { git = "https://github.com/mikedilger/qrcode-rust", rev = "519b77b3efa3f84961169b47d3de08c5ddd86548" }
 resvg = "0.35.0"
 rpassword = "7.2"
diff --git a/gossip-lib/Cargo.toml b/gossip-lib/Cargo.toml
index 02c3094e..b098e00a 100644
--- a/gossip-lib/Cargo.toml
+++ b/gossip-lib/Cargo.toml
@@ -47,7 +47,7 @@ fallible-iterator = "0.2"
 filetime = "0.2"
 futures = "0.3"
 futures-util = "0.3"
-gossip-relay-picker = { git = "https://github.com/mikedilger/gossip-relay-picker", rev = "360aadc068496dd5dbc956e1e861f1c693de136e" }
+gossip-relay-picker = { git = "https://github.com/mikedilger/gossip-relay-picker", rev = "798364277d5aa1ec908d58aba498b800f24ed32c" }
 heed = { git = "https://github.com/meilisearch/heed", rev = "8bfdf3beeda292fe166dc6b2f468cdb23af7181b" }
 hex = "0.4"
 http = "0.2"
@@ -56,7 +56,7 @@ kamadak-exif = "0.5"
 lazy_static = "1.4"
 linkify = "0.9"
 mime = "0.3"
-nostr-types = { git = "https://github.com/mikedilger/nostr-types", rev = "661273cfaf8ab164d8ad09959d4194e3ace05fff", features = [ "speedy" ] }
+nostr-types = { git = "https://github.com/mikedilger/nostr-types", rev = "4e35bacf9fe114dab94183d1d8aad1dce67bbbce", features = [ "speedy" ] }
 parking_lot = "0.12"
 paste = "1.0"
 rand = "0.8"