From 55792ac4acb7dacd013d611a3932e35a166ec3a1 Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Sun, 22 Jan 2023 19:50:35 +1300
Subject: [PATCH] Upgrade dependencies memoize and base64

---
 Cargo.lock                 | 26 +++++++++++++++-----------
 Cargo.toml                 |  4 ++--
 src/overlord/minion/mod.rs |  6 +++++-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f7bf0f7..aa733d67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -297,12 +297,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "base64"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
-
 [[package]]
 name = "base64"
 version = "0.21.0"
@@ -1731,7 +1725,7 @@ name = "gossip"
 version = "0.3.1-unstable"
 dependencies = [
  "async-recursion",
- "base64 0.20.0",
+ "base64 0.21.0",
  "dashmap",
  "dirs",
  "eframe",
@@ -2166,6 +2160,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "lru"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+dependencies = [
+ "hashbrown",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -2225,19 +2228,20 @@ dependencies = [
 
 [[package]]
 name = "memoize"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c25d125e4063f313300d87c8f658e5b3d69257095df9a4221c12ba50b0421bff"
+checksum = "3b2ae6b7c9fbefd9bad492a5c65013e9fd10d6db3f971ee1e2d1c55485dd5135"
 dependencies = [
  "lazy_static",
+ "lru",
  "memoize-inner",
 ]
 
 [[package]]
 name = "memoize-inner"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8b7d5160e6ffcc59d4c571c38238ec5b7065bc91a5a24f511988dabcddda723"
+checksum = "8bfde264c318ec8c2de5c39e0ba3910fac8d1065e3b947b183ebd884b799719b"
 dependencies = [
  "lazy_static",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 2b0b5934..eeb9a33f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2021"
 
 [dependencies]
 async-recursion = "1.0"
-base64 = "0.20"
+base64 = "0.21"
 dashmap = "5.4"
 dirs = "4.0"
 eframe = { version = "0.20", features = [ "dark-light", "persistence" ] }
@@ -25,7 +25,7 @@ http = "0.2"
 image = { version = "0.24", features = [ "png", "jpeg" ] }
 lazy_static = "1.4"
 linkify = "0.9"
-memoize = "0.3"
+memoize = "0.4"
 nostr-types = { git = "https://github.com/mikedilger/nostr-types" }
 parking_lot = "0.12"
 rand = "0.8"
diff --git a/src/overlord/minion/mod.rs b/src/overlord/minion/mod.rs
index 59ae8eec..1e47165d 100644
--- a/src/overlord/minion/mod.rs
+++ b/src/overlord/minion/mod.rs
@@ -5,6 +5,7 @@ use crate::comms::{ToMinionMessage, ToMinionPayload, ToOverlordMessage};
 use crate::db::DbRelay;
 use crate::error::Error;
 use crate::globals::GLOBALS;
+use base64::Engine;
 use futures::{SinkExt, StreamExt};
 use futures_util::stream::{SplitSink, SplitStream};
 use http::Uri;
@@ -123,7 +124,10 @@ impl Minion {
                 .header("Connection", "Upgrade")
                 .header("Upgrade", "websocket")
                 .header("Sec-WebSocket-Version", "13")
-                .header("Sec-WebSocket-Key", base64::encode(key))
+                .header(
+                    "Sec-WebSocket-Key",
+                    base64::engine::general_purpose::STANDARD.encode(key),
+                )
                 .uri(uri)
                 .body(())?;