diff --git a/.github/workflows/build-and-upload-binaries-ci.yml b/.github/workflows/build-and-upload-binaries-ci.yml index fd761ff459..537e239753 100644 --- a/.github/workflows/build-and-upload-binaries-ci.yml +++ b/.github/workflows/build-and-upload-binaries-ci.yml @@ -69,7 +69,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: build - args: --workspace --release --all --features cpucycles + args: --workspace --release --all - name: Install Rust stable uses: actions-rs/toolchain@v1 diff --git a/Cargo.lock b/Cargo.lock index d2dfa3e281..521ba45873 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4059,6 +4059,7 @@ dependencies = [ "curve25519-dalek", "fastrand", "getrandom 0.2.9", + "log", "rand 0.7.3", "rayon", "sphinx-packet", diff --git a/common/client-core/src/client/mix_traffic.rs b/common/client-core/src/client/mix_traffic.rs index 8e7f7ce2fb..2f91c12a29 100644 --- a/common/client-core/src/client/mix_traffic.rs +++ b/common/client-core/src/client/mix_traffic.rs @@ -53,7 +53,7 @@ where } async fn on_messages(&mut self, mut mix_packets: Vec) { - debug_assert!(!mix_packets.is_empty()); + assert!(!mix_packets.is_empty()); let result = if mix_packets.len() == 1 { let mix_packet = mix_packets.pop().unwrap(); @@ -103,7 +103,7 @@ where } } shutdown.recv_timeout().await; - log::debug!("MixTrafficController: Exiting"); + log::error!("MixTrafficController: Exiting"); }) } } diff --git a/common/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs b/common/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs index 0034e00567..6b40d8a887 100644 --- a/common/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs +++ b/common/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs @@ -71,7 +71,8 @@ impl AcknowledgementListener { while !shutdown.is_shutdown() { tokio::select! { acks = self.ack_receiver.next() => match acks { - Some(acks) => self.handle_ack_receiver_item(acks).await, + + Some(acks) => {self.handle_ack_receiver_item(acks).await} None => { log::trace!("AcknowledgementListener: Stopping since channel closed"); break; diff --git a/common/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs b/common/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs index dc85004c78..7fa29d7a21 100644 --- a/common/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs +++ b/common/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs @@ -49,11 +49,11 @@ where packet_recipient: Recipient, chunk_data: Fragment, ) -> Result { - info!("retransmitting normal packet..."); + debug!("retransmitting normal packet..."); // TODO: Figure out retransmission packet type signaling self.message_handler - .try_prepare_single_chunk_for_sending(packet_recipient, chunk_data, PacketType::Mix) + .try_prepare_single_chunk_for_sending(packet_recipient, chunk_data, PacketType::Outfox) .await } diff --git a/common/client-core/src/client/real_messages_control/message_handler.rs b/common/client-core/src/client/real_messages_control/message_handler.rs index abbcae927c..a92ae58e90 100644 --- a/common/client-core/src/client/real_messages_control/message_handler.rs +++ b/common/client-core/src/client/real_messages_control/message_handler.rs @@ -431,7 +431,7 @@ where lane: TransmissionLane, packet_type: PacketType, ) -> Result<(), PreparationError> { - info!("Sending non-reply message with packet type {packet_type}"); + debug!("Sending non-reply message with packet type {packet_type}"); // TODO: I really dislike existence of this assertion, it implies code has to be re-organised debug_assert!(!matches!(message, NymMessage::Reply(_))); @@ -439,7 +439,11 @@ where let topology_permit = self.topology_access.get_read_permit().await; let topology = self.get_topology(&topology_permit)?; - let packet_size = self.optimal_packet_size(&message); + let packet_size = if packet_type == PacketType::Outfox { + PacketSize::OutfoxRegularPacket + } else { + self.optimal_packet_size(&message) + }; debug!("Using {packet_size} packets for {message}"); let fragments = self .message_preparer @@ -482,7 +486,7 @@ where amount: u32, packet_type: PacketType, ) -> Result<(), PreparationError> { - info!("Sending additional reply SURBs with packet type {packet_type}"); + debug!("Sending additional reply SURBs with packet type {packet_type}"); let sender_tag = self.get_or_create_sender_tag(&recipient); let (reply_surbs, reply_keys) = self.generate_reply_surbs_with_keys(amount as usize).await?; @@ -514,7 +518,7 @@ where lane: TransmissionLane, packet_type: PacketType, ) -> Result<(), SurbWrappedPreparationError> { - info!("Sending message with reply SURBs with packet type {packet_type}"); + debug!("Sending message with reply SURBs with packet type {packet_type}"); let sender_tag = self.get_or_create_sender_tag(&recipient); let (reply_surbs, reply_keys) = self .generate_reply_surbs_with_keys(num_reply_surbs as usize) @@ -538,7 +542,7 @@ where chunk: Fragment, packet_type: PacketType, ) -> Result { - info!("Sending single chunk with packet type {packet_type}"); + debug!("Sending single chunk with packet type {packet_type}"); let topology_permit = self.topology_access.get_read_permit().await; let topology = self.get_topology(&topology_permit)?; diff --git a/common/client-core/src/client/received_buffer.rs b/common/client-core/src/client/received_buffer.rs index b9c93d8922..7711b64ad6 100644 --- a/common/client-core/src/client/received_buffer.rs +++ b/common/client-core/src/client/received_buffer.rs @@ -353,7 +353,7 @@ impl ReceivedMessagesBuffer { }; if let Some(completed) = completed_message { - info!("received {completed}"); + debug!("received {completed}"); completed_messages.push(completed) } } diff --git a/common/client-libs/gateway-client/src/client.rs b/common/client-libs/gateway-client/src/client.rs index ccee80d659..51bb1de12b 100644 --- a/common/client-libs/gateway-client/src/client.rs +++ b/common/client-libs/gateway-client/src/client.rs @@ -579,6 +579,8 @@ impl GatewayClient { &mut self, packets: Vec, ) -> Result<(), GatewayClientError> { + warn!("Sending {} mix packets", packets.len()); + if !self.authenticated { return Err(GatewayClientError::NotAuthenticated); } @@ -623,9 +625,10 @@ impl GatewayClient { ) -> Result<(), GatewayClientError> { if let Err(err) = self.send_websocket_message_without_response(msg).await { if err.is_closed_connection() && self.should_reconnect_on_failure { - info!("Going to attempt a reconnection"); + error!("Going to attempt a reconnection"); self.attempt_reconnection().await } else { + error!("{err}"); Err(err) } } else { diff --git a/common/client-libs/gateway-client/src/packet_router.rs b/common/client-libs/gateway-client/src/packet_router.rs index c758abcc19..0b4a99f1c2 100644 --- a/common/client-libs/gateway-client/src/packet_router.rs +++ b/common/client-libs/gateway-client/src/packet_router.rs @@ -50,10 +50,15 @@ impl PacketRouter { let ack_overhead = PacketSize::AckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN; for received_packet in unwrapped_packets { - if received_packet.len() == PacketSize::AckPacket.plaintext_size() { + if received_packet.len() == PacketSize::AckPacket.plaintext_size() + || received_packet.len() == PacketSize::OutfoxAckPacket.plaintext_size() + { received_acks.push(received_packet); } else if received_packet.len() == PacketSize::RegularPacket.plaintext_size() - ack_overhead + || received_packet.len() + == PacketSize::OutfoxRegularPacket.plaintext_size() - ack_overhead + || received_packet.len() == PacketSize::OutfoxRegularPacket.size() - 6 { trace!("routing regular packet"); received_messages.push(received_packet); diff --git a/common/mixnode-common/src/packet_processor/processor.rs b/common/mixnode-common/src/packet_processor/processor.rs index aa216cfb5f..23d2f7e0ac 100644 --- a/common/mixnode-common/src/packet_processor/processor.rs +++ b/common/mixnode-common/src/packet_processor/processor.rs @@ -10,7 +10,7 @@ use nym_sphinx_forwarding::packet::MixPacket; use nym_sphinx_framing::packet::FramedNymPacket; use nym_sphinx_params::{PacketSize, PacketType}; use nym_sphinx_types::{ - Delay as SphinxDelay, DestinationAddressBytes, NodeAddressBytes, NymPacket, Payload, + Delay as SphinxDelay, DestinationAddressBytes, NodeAddressBytes, NymPacket, NymProcessedPacket, PrivateKey, ProcessedPacket, }; use std::convert::TryFrom; @@ -56,10 +56,10 @@ impl SphinxPacketProcessor { fn perform_initial_packet_processing( &self, packet: NymPacket, - ) -> Result { + ) -> Result { measure!({ packet.process(&self.sphinx_key).map_err(|err| { - debug!("Failed to unwrap Sphinx packet: {err}"); + info!("Failed to unwrap NymPacket packet: {err}"); MixProcessingError::NymPacketProcessingError(err) }) }) @@ -73,7 +73,7 @@ impl SphinxPacketProcessor { fn perform_initial_unwrapping( &self, received: FramedNymPacket, - ) -> Result { + ) -> Result { measure!({ let packet = received.into_inner(); @@ -101,14 +101,17 @@ impl SphinxPacketProcessor { fn split_hop_data_into_ack_and_message( &self, mut extracted_data: Vec, + packet_type: PacketType, ) -> Result<(Vec, Vec), MixProcessingError> { + let ack_len = SurbAck::len(Some(packet_type)); + // in theory it's impossible for this to fail since it managed to go into correct `match` // branch at the caller - if extracted_data.len() < SurbAck::len() { + if extracted_data.len() < ack_len { return Err(MixProcessingError::NoSurbAckInFinalHop); } - let message = extracted_data.split_off(SurbAck::len()); + let message = extracted_data.split_off(ack_len); let ack_data = extracted_data; Ok((ack_data, message)) } @@ -130,13 +133,18 @@ impl SphinxPacketProcessor { | PacketSize::ExtendedPacket8 | PacketSize::ExtendedPacket16 | PacketSize::ExtendedPacket32 - | PacketSize::OutfoxRegularPacket - | PacketSize::OutfoxExtendedPacket8 - | PacketSize::OutfoxExtendedPacket16 - | PacketSize::OutfoxExtendedPacket32 => { + | PacketSize::OutfoxRegularPacket => { trace!("received a normal packet!"); - let (ack_data, message) = self.split_hop_data_into_ack_and_message(data)?; - let (ack_first_hop, ack_packet) = SurbAck::try_recover_first_hop_packet(&ack_data)?; + let (ack_data, message) = + self.split_hop_data_into_ack_and_message(data, packet_type)?; + let (ack_first_hop, ack_packet) = + match SurbAck::try_recover_first_hop_packet(&ack_data, packet_type) { + Ok((first_hop, packet)) => (first_hop, packet), + Err(err) => { + error!("Failed to recover first hop from ack data: {err}"); + return Err(err.into()); + } + }; let forward_ack = MixPacket::new(ack_first_hop, ack_packet, packet_type); Ok((Some(forward_ack), message)) } @@ -149,14 +157,12 @@ impl SphinxPacketProcessor { fn process_final_hop( &self, destination: DestinationAddressBytes, - payload: Payload, + payload: Vec, packet_size: PacketSize, packet_type: PacketType, ) -> Result { - let packet_message = payload.recover_plaintext()?; - let (forward_ack, message) = - self.split_into_ack_and_message(packet_message, packet_size, packet_type)?; + self.split_into_ack_and_message(payload, packet_size, packet_type)?; Ok(MixProcessingResult::FinalHop(ProcessedFinalHop { destination, @@ -169,18 +175,48 @@ impl SphinxPacketProcessor { /// or a final hop. fn perform_final_processing( &self, - packet: ProcessedPacket, + packet: NymProcessedPacket, packet_size: PacketSize, packet_type: PacketType, ) -> Result { match packet { - ProcessedPacket::ForwardHop(packet, address, delay) => { - self.process_forward_hop(NymPacket::Sphinx(*packet), address, delay, packet_type) + NymProcessedPacket::Sphinx(packet) => { + match packet { + ProcessedPacket::ForwardHop(packet, address, delay) => self + .process_forward_hop( + NymPacket::Sphinx(*packet), + address, + delay, + packet_type, + ), + // right now there's no use for the surb_id included in the header - probably it should get removed from the + // sphinx all together? + ProcessedPacket::FinalHop(destination, _, payload) => self.process_final_hop( + destination, + payload.recover_plaintext()?, + packet_size, + packet_type, + ), + } } - // right now there's no use for the surb_id included in the header - probably it should get removed from the - // sphinx all together? - ProcessedPacket::FinalHop(destination, _, payload) => { - self.process_final_hop(destination, payload, packet_size, packet_type) + NymProcessedPacket::Outfox(packet) => { + let next_address = *packet.next_address(); + let packet = packet.into_packet(); + if packet.is_final_hop() { + self.process_final_hop( + DestinationAddressBytes::from_bytes(next_address), + packet.recover_plaintext().to_vec(), + packet_size, + packet_type, + ) + } else { + let mix_packet = MixPacket::new( + NymNodeRoutingAddress::try_from_bytes(&next_address)?, + NymPacket::Outfox(packet), + PacketType::Outfox, + ); + Ok(MixProcessingResult::ForwardHop(mix_packet, None)) + } } } } @@ -225,31 +261,71 @@ mod tests { let short_data = vec![42u8]; assert!(processor - .split_hop_data_into_ack_and_message(short_data) + .split_hop_data_into_ack_and_message(short_data, PacketType::Mix) .is_err()); - let sufficient_data = vec![42u8; SurbAck::len()]; + let sufficient_data = vec![42u8; SurbAck::len(Some(PacketType::Mix))]; let (ack, data) = processor - .split_hop_data_into_ack_and_message(sufficient_data.clone()) + .split_hop_data_into_ack_and_message(sufficient_data.clone(), PacketType::Mix) .unwrap(); assert_eq!(sufficient_data, ack); assert!(data.is_empty()); - let long_data = vec![42u8; SurbAck::len() * 5]; + let long_data = vec![42u8; SurbAck::len(Some(PacketType::Mix)) * 5]; let (ack, data) = processor - .split_hop_data_into_ack_and_message(long_data) + .split_hop_data_into_ack_and_message(long_data, PacketType::Mix) .unwrap(); - assert_eq!(ack.len(), SurbAck::len()); - assert_eq!(data.len(), SurbAck::len() * 4) + assert_eq!(ack.len(), SurbAck::len(Some(PacketType::Mix))); + assert_eq!(data.len(), SurbAck::len(Some(PacketType::Mix)) * 4) + } + + #[tokio::test] + async fn splitting_hop_data_works_for_sufficiently_long_payload_outfox() { + let processor = fixture(); + + let short_data = vec![42u8]; + assert!(processor + .split_hop_data_into_ack_and_message(short_data, PacketType::Outfox) + .is_err()); + + let sufficient_data = vec![42u8; SurbAck::len(Some(PacketType::Outfox))]; + let (ack, data) = processor + .split_hop_data_into_ack_and_message(sufficient_data.clone(), PacketType::Outfox) + .unwrap(); + assert_eq!(sufficient_data, ack); + assert!(data.is_empty()); + + let long_data = vec![42u8; SurbAck::len(Some(PacketType::Outfox)) * 5]; + let (ack, data) = processor + .split_hop_data_into_ack_and_message(long_data, PacketType::Outfox) + .unwrap(); + assert_eq!(ack.len(), SurbAck::len(Some(PacketType::Outfox))); + assert_eq!(data.len(), SurbAck::len(Some(PacketType::Outfox)) * 4) } #[tokio::test] async fn splitting_into_ack_and_message_returns_whole_data_for_ack() { let processor = fixture(); - let data = vec![42u8; SurbAck::len() + 10]; + let data = vec![42u8; SurbAck::len(Some(PacketType::Mix)) + 10]; let (ack, message) = processor - .split_into_ack_and_message(data.clone(), PacketSize::AckPacket, Default::default()) + .split_into_ack_and_message(data.clone(), PacketSize::AckPacket, PacketType::Mix) + .unwrap(); + assert!(ack.is_none()); + assert_eq!(data, message) + } + + #[tokio::test] + async fn splitting_into_ack_and_message_returns_whole_data_for_ack_outfox() { + let processor = fixture(); + + let data = vec![42u8; SurbAck::len(Some(PacketType::Outfox)) + 10]; + let (ack, message) = processor + .split_into_ack_and_message( + data.clone(), + PacketSize::OutfoxAckPacket, + PacketType::Outfox, + ) .unwrap(); assert!(ack.is_none()); assert_eq!(data, message) diff --git a/common/nymsphinx/acknowledgements/src/identifier.rs b/common/nymsphinx/acknowledgements/src/identifier.rs index 9f6ffb49be..3765b49004 100644 --- a/common/nymsphinx/acknowledgements/src/identifier.rs +++ b/common/nymsphinx/acknowledgements/src/identifier.rs @@ -3,9 +3,7 @@ use crate::AckKey; use nym_crypto::symmetric::stream_cipher::{self, encrypt, iv_from_slice, random_iv, IvSizeUser}; -use nym_sphinx_params::{ - packet_sizes::PacketSize, AckEncryptionAlgorithm, SerializedFragmentIdentifier, FRAG_ID_LEN, -}; +use nym_sphinx_params::{AckEncryptionAlgorithm, SerializedFragmentIdentifier, FRAG_ID_LEN}; use rand::{CryptoRng, RngCore}; // TODO: should those functions even exist in this file? @@ -28,9 +26,9 @@ pub fn recover_identifier( ) -> Option { // The content of an 'ACK' packet consists of AckEncryptionAlgorithm::IV followed by // serialized FragmentIdentifier - if iv_id_ciphertext.len() != PacketSize::AckPacket.plaintext_size() { - return None; - } + // if iv_id_ciphertext.len() != PacketSize::AckPacket.plaintext_size() { + // return None; + // } let iv_size = AckEncryptionAlgorithm::iv_size(); let iv = iv_from_slice::(&iv_id_ciphertext[..iv_size]); diff --git a/common/nymsphinx/acknowledgements/src/surb_ack.rs b/common/nymsphinx/acknowledgements/src/surb_ack.rs index 7d624b7aee..48e59e010e 100644 --- a/common/nymsphinx/acknowledgements/src/surb_ack.rs +++ b/common/nymsphinx/acknowledgements/src/surb_ack.rs @@ -17,6 +17,7 @@ use std::convert::TryFrom; use std::time; use thiserror::Error; +#[derive(Debug)] pub struct SurbAck { surb_ack_packet: NymPacket, first_hop_address: NymNodeRoutingAddress, @@ -55,15 +56,24 @@ impl SurbAck { let surb_ack_payload = prepare_identifier(rng, ack_key, marshaled_fragment_id); let packet_size = match packet_type { - PacketType::Outfox => PacketSize::OutfoxAckPacket.payload_size(), + PacketType::Outfox => { + if surb_ack_payload.len() >= 48 { + surb_ack_payload.len() + } else { + 48 + } + } PacketType::Mix => PacketSize::AckPacket.payload_size(), PacketType::Vpn => PacketSize::AckPacket.payload_size(), }; let surb_ack_packet = match packet_type { - PacketType::Outfox => { - NymPacket::outfox_build(surb_ack_payload, route.as_slice(), Some(packet_size))? - } + PacketType::Outfox => NymPacket::outfox_build( + surb_ack_payload, + route.as_slice(), + &destination, + Some(packet_size), + )?, PacketType::Mix => NymPacket::sphinx_build( packet_size, surb_ack_payload, @@ -92,10 +102,17 @@ impl SurbAck { }) } - pub fn len() -> usize { + pub fn len(packet_type: Option) -> usize { // TODO: this will be variable once/if we decide to introduce optimization described // in common/nymsphinx/chunking/src/lib.rs:available_plaintext_size() - PacketSize::AckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN + let packet_type = packet_type.unwrap_or(PacketType::Mix); + match packet_type { + PacketType::Outfox => { + PacketSize::OutfoxAckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN + } + PacketType::Mix => PacketSize::AckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN, + PacketType::Vpn => PacketSize::AckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN, + } } pub fn expected_total_delay(&self) -> Delay { @@ -116,21 +133,19 @@ impl SurbAck { // partial reciprocal of `prepare_for_sending` performed by the gateway pub fn try_recover_first_hop_packet( b: &[u8], + packet_type: PacketType, ) -> Result<(NymNodeRoutingAddress, NymPacket), SurbAckRecoveryError> { - if b.len() != Self::len() { - Err(SurbAckRecoveryError::InvalidPacketSize { - received: b.len(), - expected: Self::len(), - }) - } else { - let address = NymNodeRoutingAddress::try_from_bytes(b)?; + let address = NymNodeRoutingAddress::try_from_bytes(b)?; - // TODO: this will be variable once/if we decide to introduce optimization described - // in common/nymsphinx/chunking/src/lib.rs:available_plaintext_size() - let address_offset = MAX_NODE_ADDRESS_UNPADDED_LEN; - let packet = NymPacket::sphinx_from_bytes(&b[address_offset..])?; + // TODO: this will be variable once/if we decide to introduce optimization described + // in common/nymsphinx/chunking/src/lib.rs:available_plaintext_size() + let address_offset = MAX_NODE_ADDRESS_UNPADDED_LEN; + let packet = match packet_type { + PacketType::Outfox => NymPacket::outfox_from_bytes(&b[address_offset..])?, + PacketType::Mix => NymPacket::sphinx_from_bytes(&b[address_offset..])?, + PacketType::Vpn => NymPacket::sphinx_from_bytes(&b[address_offset..])?, + }; - Ok((address, packet)) - } + Ok((address, packet)) } } diff --git a/common/nymsphinx/framing/src/codec.rs b/common/nymsphinx/framing/src/codec.rs index f453276805..997914820c 100644 --- a/common/nymsphinx/framing/src/codec.rs +++ b/common/nymsphinx/framing/src/codec.rs @@ -42,7 +42,8 @@ impl Encoder for NymCodec { fn encode(&mut self, item: FramedNymPacket, dst: &mut BytesMut) -> Result<(), Self::Error> { item.header.encode(dst); let packet_bytes = item.packet.to_bytes()?; - dst.put(packet_bytes.as_slice()); + let encoded = packet_bytes.as_slice(); + dst.put(encoded); Ok(()) } } @@ -103,22 +104,23 @@ impl Decoder for NymCodec { // reserve for that. // we also assume the next packet coming from the same client will use exactly the same versioning // as the current packet - let mut allocate_for_next_packet = header.size() + PacketSize::AckPacket.size(); - if !src.is_empty() { - match Header::decode(src) { - Ok(Some(next_header)) => { - allocate_for_next_packet = next_header.size() + next_header.packet_size.size(); - } - Ok(None) => { - // we don't have enough information to know how much to reserve, fallback to the ack case - } - // the next frame will be malformed but let's leave handling the error to the next - // call to 'decode', as presumably, the current sphinx packet is still valid - Err(_) => return Ok(Some(nymsphinx_packet)), - }; - } - src.reserve(allocate_for_next_packet); + // let mut allocate_for_next_packet = header.size() + PacketSize::AckPacket.size(); + // if !src.is_empty() { + // match Header::decode(src) { + // Ok(Some(next_header)) => { + // allocate_for_next_packet = next_header.size() + next_header.packet_size.size(); + // } + // Ok(None) => { + // // we don't have enough information to know how much to reserve, fallback to the ack case + // } + + // // the next frame will be malformed but let's leave handling the error to the next + // // call to 'decode', as presumably, the current sphinx packet is still valid + // Err(_) => return Ok(Some(nymsphinx_packet)), + // }; + // } + // src.reserve(allocate_for_next_packet); Ok(Some(nymsphinx_packet)) } } @@ -154,11 +156,16 @@ mod packet_encoding { node4_pk, ); + let destination = Destination::new( + DestinationAddressBytes::from_bytes([3u8; DESTINATION_ADDRESS_LENGTH]), + [4u8; IDENTIFIER_LENGTH], + ); + let route = &[node1, node2, node3, node4]; let payload = vec![1; 48]; - NymPacket::outfox_build(payload, route, Some(size.plaintext_size())).unwrap() + NymPacket::outfox_build(payload, route, &destination, Some(size.plaintext_size())).unwrap() } fn make_valid_sphinx_packet(size: PacketSize) -> NymPacket { diff --git a/common/nymsphinx/framing/src/packet.rs b/common/nymsphinx/framing/src/packet.rs index 0ccef02b67..6189cf9306 100644 --- a/common/nymsphinx/framing/src/packet.rs +++ b/common/nymsphinx/framing/src/packet.rs @@ -24,14 +24,19 @@ impl FramedNymPacket { // already managed to somehow create a sphinx packet let packet_size = PacketSize::get_type(packet.len()).unwrap(); - FramedNymPacket { - header: Header { - packet_version: PacketVersion::new(use_legacy_version), - packet_size, - packet_type, - }, - packet, - } + let use_legacy = if packet_type == PacketType::Outfox { + false + } else { + use_legacy_version + }; + + let header = Header { + packet_version: PacketVersion::new(use_legacy), + packet_size, + packet_type, + }; + + FramedNymPacket { header, packet } } pub fn header(&self) -> Header { @@ -96,16 +101,16 @@ impl Header { pub(crate) fn encode(&self, dst: &mut BytesMut) { // we reserve one byte for `packet_size` and the other for `mode` - dst.reserve(Self::LEGACY_SIZE); + // dst.reserve(Self::LEGACY_SIZE); if let Some(version) = self.packet_version.as_u8() { - dst.reserve(Self::VERSIONED_SIZE); + // dst.reserve(Self::VERSIONED_SIZE); dst.put_u8(version) } dst.put_u8(self.packet_size as u8); dst.put_u8(self.packet_type as u8); // reserve bytes for the actual packet - dst.reserve(self.packet_size.size()); + // dst.reserve(self.packet_size.size()); } pub(crate) fn decode(src: &mut BytesMut) -> Result, NymCodecError> { diff --git a/common/nymsphinx/params/src/packet_sizes.rs b/common/nymsphinx/params/src/packet_sizes.rs index a20f8804ca..acdaedc058 100644 --- a/common/nymsphinx/params/src/packet_sizes.rs +++ b/common/nymsphinx/params/src/packet_sizes.rs @@ -28,11 +28,9 @@ const EXTENDED_PACKET_SIZE_8: usize = 8 * 1024 + SPHINX_PACKET_OVERHEAD; const EXTENDED_PACKET_SIZE_16: usize = 16 * 1024 + SPHINX_PACKET_OVERHEAD; const EXTENDED_PACKET_SIZE_32: usize = 32 * 1024 + SPHINX_PACKET_OVERHEAD; -const OUTFOX_ACK_PACKET_SIZE: usize = ACK_IV_SIZE + FRAG_ID_LEN + OUTFOX_PACKET_OVERHEAD; +// 48 is min outfox payload size +const OUTFOX_ACK_PACKET_SIZE: usize = 48 + OUTFOX_PACKET_OVERHEAD; const OUTFOX_REGULAR_PACKET_SIZE: usize = 2 * 1024 + OUTFOX_PACKET_OVERHEAD; -const OUTFOX_EXTENDED_PACKET_SIZE_8: usize = 8 * 1024 + OUTFOX_PACKET_OVERHEAD; -const OUTFOX_EXTENDED_PACKET_SIZE_16: usize = 16 * 1024 + OUTFOX_PACKET_OVERHEAD; -const OUTFOX_EXTENDED_PACKET_SIZE_32: usize = 32 * 1024 + OUTFOX_PACKET_OVERHEAD; #[derive(Debug, Error)] pub enum InvalidPacketSize { @@ -76,18 +74,6 @@ pub enum PacketSize { // for sending SURB-ACKs #[serde(rename = "outfox_ack")] OutfoxAckPacket = 7, - - // for example for streaming fast and furious in uncompressed 10bit 4K HDR quality - #[serde(rename = "outfox_extended32")] - OutfoxExtendedPacket32 = 8, - - // for example for streaming fast and furious in heavily compressed lossy RealPlayer quality - #[serde(rename = "outfox_extended8")] - OutfoxExtendedPacket8 = 9, - - // for example for streaming fast and furious in compressed XviD quality - #[serde(rename = "outfox_extended16")] - OutfoxExtendedPacket16 = 10, } impl PartialOrd for PacketSize { @@ -116,9 +102,6 @@ impl FromStr for PacketSize { "extended32" => Ok(Self::ExtendedPacket32), "outfox_regular" => Ok(Self::OutfoxRegularPacket), "outfox_ack" => Ok(Self::OutfoxAckPacket), - "outfox_extended8" => Ok(Self::OutfoxExtendedPacket8), - "outfox_extended16" => Ok(Self::OutfoxExtendedPacket16), - "outfox_extended32" => Ok(Self::OutfoxExtendedPacket32), s => Err(InvalidPacketSize::UnknownExtendedPacketVariant { received: s.to_string(), }), @@ -136,9 +119,6 @@ impl Display for PacketSize { PacketSize::ExtendedPacket16 => write!(f, "extended16"), PacketSize::OutfoxRegularPacket => write!(f, "outfox_regular"), PacketSize::OutfoxAckPacket => write!(f, "outfox_ack"), - PacketSize::OutfoxExtendedPacket32 => write!(f, "outfox_extended32"), - PacketSize::OutfoxExtendedPacket8 => write!(f, "outfox_extended8"), - PacketSize::OutfoxExtendedPacket16 => write!(f, "outfox_extended16"), } } } @@ -165,15 +145,6 @@ impl TryFrom for PacketSize { _ if value == (PacketSize::ExtendedPacket32 as u8) => Ok(Self::ExtendedPacket32), _ if value == (PacketSize::OutfoxRegularPacket as u8) => Ok(Self::OutfoxRegularPacket), _ if value == (PacketSize::OutfoxAckPacket as u8) => Ok(Self::OutfoxAckPacket), - _ if value == (PacketSize::OutfoxExtendedPacket8 as u8) => { - Ok(Self::OutfoxExtendedPacket8) - } - _ if value == (PacketSize::OutfoxExtendedPacket16 as u8) => { - Ok(Self::OutfoxExtendedPacket16) - } - _ if value == (PacketSize::OutfoxExtendedPacket32 as u8) => { - Ok(Self::OutfoxExtendedPacket32) - } v => Err(InvalidPacketSize::UnknownPacketTag { received: v }), } } @@ -189,9 +160,6 @@ impl PacketSize { PacketSize::ExtendedPacket32 => EXTENDED_PACKET_SIZE_32, PacketSize::OutfoxRegularPacket => OUTFOX_REGULAR_PACKET_SIZE, PacketSize::OutfoxAckPacket => OUTFOX_ACK_PACKET_SIZE, - PacketSize::OutfoxExtendedPacket8 => OUTFOX_EXTENDED_PACKET_SIZE_8, - PacketSize::OutfoxExtendedPacket16 => OUTFOX_EXTENDED_PACKET_SIZE_16, - PacketSize::OutfoxExtendedPacket32 => OUTFOX_EXTENDED_PACKET_SIZE_32, } } @@ -202,11 +170,7 @@ impl PacketSize { | PacketSize::ExtendedPacket8 | PacketSize::ExtendedPacket16 | PacketSize::ExtendedPacket32 => HEADER_SIZE, - PacketSize::OutfoxRegularPacket - | PacketSize::OutfoxAckPacket - | PacketSize::OutfoxExtendedPacket8 - | PacketSize::OutfoxExtendedPacket16 - | PacketSize::OutfoxExtendedPacket32 => MIX_PARAMS_LEN, + PacketSize::OutfoxRegularPacket | PacketSize::OutfoxAckPacket => MIX_PARAMS_LEN, } } @@ -217,11 +181,9 @@ impl PacketSize { | PacketSize::ExtendedPacket8 | PacketSize::ExtendedPacket16 | PacketSize::ExtendedPacket32 => PAYLOAD_OVERHEAD_SIZE, - PacketSize::OutfoxRegularPacket - | PacketSize::OutfoxAckPacket - | PacketSize::OutfoxExtendedPacket8 - | PacketSize::OutfoxExtendedPacket16 - | PacketSize::OutfoxExtendedPacket32 => OUTFOX_PACKET_OVERHEAD - MIX_PARAMS_LEN, + PacketSize::OutfoxRegularPacket | PacketSize::OutfoxAckPacket => { + OUTFOX_PACKET_OVERHEAD - MIX_PARAMS_LEN // Mix params are calculated into the total overhead so we take them out here + } } } @@ -244,16 +206,12 @@ impl PacketSize { Ok(PacketSize::ExtendedPacket16) } else if PacketSize::ExtendedPacket32.size() == size { Ok(PacketSize::ExtendedPacket32) - } else if PacketSize::OutfoxRegularPacket.size() == size { + } else if PacketSize::OutfoxRegularPacket.size() == size + || PacketSize::OutfoxRegularPacket.size() == size + 6 + { Ok(PacketSize::OutfoxRegularPacket) } else if PacketSize::OutfoxAckPacket.size() == size { Ok(PacketSize::OutfoxAckPacket) - } else if PacketSize::OutfoxExtendedPacket8.size() == size { - Ok(PacketSize::OutfoxExtendedPacket8) - } else if PacketSize::OutfoxExtendedPacket16.size() == size { - Ok(PacketSize::OutfoxExtendedPacket16) - } else if PacketSize::OutfoxExtendedPacket32.size() == size { - Ok(PacketSize::OutfoxExtendedPacket32) } else { Err(InvalidPacketSize::UnknownPacketSize { received: size }) } @@ -267,10 +225,7 @@ impl PacketSize { | PacketSize::OutfoxRegularPacket => false, PacketSize::ExtendedPacket8 | PacketSize::ExtendedPacket16 - | PacketSize::ExtendedPacket32 - | PacketSize::OutfoxExtendedPacket8 - | PacketSize::OutfoxExtendedPacket16 - | PacketSize::OutfoxExtendedPacket32 => true, + | PacketSize::ExtendedPacket32 => true, } } diff --git a/common/nymsphinx/params/src/packet_types.rs b/common/nymsphinx/params/src/packet_types.rs index 6256ca1425..39a5701367 100644 --- a/common/nymsphinx/params/src/packet_types.rs +++ b/common/nymsphinx/params/src/packet_types.rs @@ -6,6 +6,8 @@ use std::convert::TryFrom; use std::fmt; use thiserror::Error; +use crate::PacketSize; + #[derive(Error, Debug)] #[error("{received} is not a valid packet mode tag")] pub struct InvalidPacketType { @@ -58,3 +60,17 @@ impl TryFrom for PacketType { } } } + +impl From for PacketType { + fn from(s: PacketSize) -> Self { + match s { + PacketSize::RegularPacket => PacketType::Mix, + PacketSize::AckPacket => PacketType::Mix, + PacketSize::ExtendedPacket32 => PacketType::Mix, + PacketSize::ExtendedPacket8 => PacketType::Mix, + PacketSize::ExtendedPacket16 => PacketType::Mix, + PacketSize::OutfoxRegularPacket => PacketType::Outfox, + PacketSize::OutfoxAckPacket => PacketType::Outfox, + } + } +} diff --git a/common/nymsphinx/src/message.rs b/common/nymsphinx/src/message.rs index 3e0e260c2d..78cd598923 100644 --- a/common/nymsphinx/src/message.rs +++ b/common/nymsphinx/src/message.rs @@ -11,12 +11,14 @@ use nym_sphinx_anonymous_replies::requests::{ ReplyMessageContent, }; use nym_sphinx_chunking::fragment::Fragment; -use nym_sphinx_params::{PacketSize, ReplySurbKeyDigestAlgorithm}; +use nym_sphinx_params::{PacketSize, PacketType, ReplySurbKeyDigestAlgorithm}; use rand::Rng; use std::fmt::{Display, Formatter}; use thiserror::Error; pub(crate) const ACK_OVERHEAD: usize = MAX_NODE_ADDRESS_UNPADDED_LEN + PacketSize::AckPacket.size(); +pub(crate) const OUTFOX_ACK_OVERHEAD: usize = + MAX_NODE_ADDRESS_UNPADDED_LEN + PacketSize::AckPacket.size(); #[derive(Debug, Error)] pub enum NymMessageError { @@ -187,8 +189,15 @@ impl NymMessage { NymMessage::Reply(_) => ReplySurbKeyDigestAlgorithm::output_size(), }; + let packet_type = PacketType::from(packet_size); + // each packet will contain an ack + variant specific data (as described above) - packet_size.plaintext_size() - ACK_OVERHEAD - variant_overhead + match packet_type { + PacketType::Outfox => { + packet_size.plaintext_size() - OUTFOX_ACK_OVERHEAD - variant_overhead + } + _ => packet_size.plaintext_size() - ACK_OVERHEAD - variant_overhead, + } } /// Length of the actual (from the **message** point of view) data that is available in each packet. diff --git a/common/nymsphinx/src/preparer/mod.rs b/common/nymsphinx/src/preparer/mod.rs index a6bf7e4e15..2a9bca6159 100644 --- a/common/nymsphinx/src/preparer/mod.rs +++ b/common/nymsphinx/src/preparer/mod.rs @@ -1,9 +1,8 @@ // Copyright 2021-2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use crate::message::{NymMessage, ACK_OVERHEAD}; +use crate::message::{NymMessage, ACK_OVERHEAD, OUTFOX_ACK_OVERHEAD}; use crate::NymPayloadBuilder; -use log::info; use nym_crypto::asymmetric::encryption; use nym_crypto::Digest; use nym_sphinx_acknowledgements::surb_ack::SurbAck; @@ -114,7 +113,10 @@ pub trait FragmentPreparer { // each reply attaches the digest of the encryption key so that the recipient could // lookup correct key for decryption, let reply_overhead = ReplySurbKeyDigestAlgorithm::output_size(); - let expected_plaintext = fragment.serialized_size() + ACK_OVERHEAD + reply_overhead; + let expected_plaintext = match packet_type { + PacketType::Outfox => fragment.serialized_size() + OUTFOX_ACK_OVERHEAD + reply_overhead, + _ => fragment.serialized_size() + ACK_OVERHEAD + reply_overhead, + }; // the reason we're unwrapping (or rather 'expecting') here rather than handling the error // more gracefully is that this error should never be reached as it implies incorrect chunking @@ -157,7 +159,7 @@ pub trait FragmentPreparer { // well as the total delay of the ack packet. // we don't know the delays inside the reply surbs so we use best-effort estimation from our poisson distribution total_delay: expected_forward_delay + ack_delay, - mix_packet: MixPacket::new(first_hop_address, sphinx_packet, Default::default()), + mix_packet: MixPacket::new(first_hop_address, sphinx_packet, packet_type), fragment_identifier, }) } @@ -188,12 +190,16 @@ pub trait FragmentPreparer { packet_recipient: &Recipient, packet_type: PacketType, ) -> Result { - info!("Preparing {packet_type} packet for sending"); // each plain or repliable packet (i.e. not a reply) attaches an ephemeral public key so that the recipient // could perform diffie-hellman with its own keys followed by a kdf to re-derive // the packet encryption key let non_reply_overhead = encryption::PUBLIC_KEY_SIZE; - let expected_plaintext = fragment.serialized_size() + ACK_OVERHEAD + non_reply_overhead; + let expected_plaintext = match packet_type { + PacketType::Outfox => { + fragment.serialized_size() + OUTFOX_ACK_OVERHEAD + non_reply_overhead + } + _ => fragment.serialized_size() + ACK_OVERHEAD + non_reply_overhead, + }; // the reason we're unwrapping (or rather 'expecting') here rather than handling the error // more gracefully is that this error should never be reached as it implies incorrect chunking @@ -235,7 +241,8 @@ pub trait FragmentPreparer { PacketType::Outfox => NymPacket::outfox_build( packet_payload, route.as_slice(), - Some(packet_size.payload_size()), + &destination, + Some(packet_size.plaintext_size()), )?, PacketType::Mix => NymPacket::sphinx_build( packet_size.payload_size(), @@ -262,7 +269,7 @@ pub trait FragmentPreparer { // well as the total delay of the ack packet. // note that the last hop of the packet is a gateway that does not do any delays total_delay: delays.iter().take(delays.len() - 1).sum::() + ack_delay, - mix_packet: MixPacket::new(first_hop_address, packet, Default::default()), + mix_packet: MixPacket::new(first_hop_address, packet, packet_type), fragment_identifier, }) } diff --git a/common/nymsphinx/src/preparer/payload.rs b/common/nymsphinx/src/preparer/payload.rs index a91cf8ce99..5999026252 100644 --- a/common/nymsphinx/src/preparer/payload.rs +++ b/common/nymsphinx/src/preparer/payload.rs @@ -46,6 +46,7 @@ impl NymPayloadBuilder { // where variant-specific data is as follows: // for replies it would be the digest of the encryption key used // for 'regular' messages it would be the public component used in DH later used in the KDF + Ok(NymPayload( surb_ack_bytes .into_iter() diff --git a/common/nymsphinx/types/src/lib.rs b/common/nymsphinx/types/src/lib.rs index faf41ae133..6fb4fe3302 100644 --- a/common/nymsphinx/types/src/lib.rs +++ b/common/nymsphinx/types/src/lib.rs @@ -5,7 +5,7 @@ pub use nym_outfox::{ constants::MIX_PARAMS_LEN, constants::OUTFOX_PACKET_OVERHEAD, error::OutfoxError, }; // re-exporting types and constants available in sphinx -use nym_outfox::packet::OutfoxPacket; +use nym_outfox::packet::{OutfoxPacket, OutfoxProcessedPacket}; pub use sphinx_packet::{ constants::{ self, DESTINATION_ADDRESS_LENGTH, IDENTIFIER_LENGTH, MAX_PATH_LENGTH, NODE_ADDRESS_LENGTH, @@ -41,6 +41,11 @@ pub enum NymPacket { Outfox(OutfoxPacket), } +pub enum NymProcessedPacket { + Sphinx(ProcessedPacket), + Outfox(OutfoxProcessedPacket), +} + impl fmt::Debug for NymPacket { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match &self { @@ -77,11 +82,13 @@ impl NymPacket { pub fn outfox_build>( payload: M, route: &[Node], + destination: &Destination, size: Option, ) -> Result { Ok(NymPacket::Outfox(OutfoxPacket::build( payload, route.try_into()?, + destination, size, )?)) } @@ -108,10 +115,21 @@ impl NymPacket { } } - pub fn process(self, node_secret_key: &PrivateKey) -> Result { + pub fn process( + self, + node_secret_key: &PrivateKey, + ) -> Result { match self { - NymPacket::Sphinx(packet) => Ok(packet.process(node_secret_key)?), - NymPacket::Outfox(_packet) => todo!(), + NymPacket::Sphinx(packet) => { + Ok(NymProcessedPacket::Sphinx(packet.process(node_secret_key)?)) + } + NymPacket::Outfox(mut packet) => { + let next_address = packet.decode_next_layer(node_secret_key)?; + Ok(NymProcessedPacket::Outfox(OutfoxProcessedPacket::new( + packet, + next_address, + ))) + } } } } diff --git a/common/socks5-client-core/src/socks/client.rs b/common/socks5-client-core/src/socks/client.rs index ebd980a0e6..e9f9f15d49 100644 --- a/common/socks5-client-core/src/socks/client.rs +++ b/common/socks5-client-core/src/socks/client.rs @@ -499,13 +499,13 @@ impl SocksClient { }) .unwrap(); - info!( + debug!( "Starting proxy for {} (id: {})", remote_address.clone(), self.connection_id ); self.run_proxy(mix_receiver, remote_address.clone()).await; - info!( + debug!( "Proxy for {} is finished (id: {})", remote_address, self.connection_id ); diff --git a/common/socks5-client-core/src/socks/request.rs b/common/socks5-client-core/src/socks/request.rs index 782273f8b7..525391c9ab 100644 --- a/common/socks5-client-core/src/socks/request.rs +++ b/common/socks5-client-core/src/socks/request.rs @@ -78,7 +78,7 @@ impl SocksRequest { where R: AsyncRead + Unpin, { - log::info!("read from stream socks5"); + log::trace!("read from stream socks5"); let mut packet = [0u8; 4]; // Read a byte from the stream and determine the version being requested diff --git a/common/topology/src/lib.rs b/common/topology/src/lib.rs index c620c8e4de..225962e531 100644 --- a/common/topology/src/lib.rs +++ b/common/topology/src/lib.rs @@ -9,7 +9,6 @@ use nym_sphinx_addressing::nodes::NodeIdentity; use rand::prelude::SliceRandom; use nym_sphinx_types::{Node as SphinxNode, NymPacketError}; use rand::{CryptoRng, Rng}; -use std::array::TryFromSliceError; use std::collections::BTreeMap; use std::convert::TryInto; use std::fmt::{self, Display, Formatter}; diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index cef8236021..7eb0a02fa0 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -3,30 +3,13 @@ version = 3 [[package]] -<<<<<<< HEAD -======= -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array 0.14.7", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "aes" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", -<<<<<<< HEAD "cipher", -======= - "cipher 0.3.0", ->>>>>>> 8c48dccac (Outfox framing) "cpufeatures", "ctr", "opaque-debug 0.3.0", @@ -38,11 +21,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ -<<<<<<< HEAD "getrandom 0.2.8", -======= - "getrandom 0.2.9", ->>>>>>> 8c48dccac (Outfox framing) "once_cell", "version_check", ] @@ -60,15 +39,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] -<<<<<<< HEAD -======= -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -117,42 +87,12 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= -name = "blake3" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", - "digest 0.10.6", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.6", -======= - "generic-array 0.14.7", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array 0.14.7", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -211,54 +151,12 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher 0.4.4", - "cpufeatures", -] - -[[package]] -name = "chacha20poly1305" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" -dependencies = [ - "aead", - "chacha20", - "cipher 0.4.4", - "poly1305", - "zeroize", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "cipher" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.6", -======= - "generic-array 0.14.7", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", - "zeroize", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -293,15 +191,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] -<<<<<<< HEAD -======= -name = "constant_time_eq" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "cosmwasm-crypto" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -362,66 +251,14 @@ dependencies = [ [[package]] name = "cpufeatures" -<<<<<<< HEAD version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -======= -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "libc", ] [[package]] -<<<<<<< HEAD -======= -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -433,31 +270,13 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.6", -======= - "generic-array 0.14.7", ->>>>>>> 8c48dccac (Outfox framing) "rand_core 0.6.4", "subtle 2.4.1", "zeroize", ] [[package]] -<<<<<<< HEAD -======= -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array 0.14.7", - "rand_core 0.6.4", - "typenum", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "crypto-mac" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -473,11 +292,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.6", -======= - "generic-array 0.14.7", ->>>>>>> 8c48dccac (Outfox framing) "subtle 2.4.1", ] @@ -487,11 +302,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ -<<<<<<< HEAD "cipher", -======= - "cipher 0.3.0", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -687,22 +498,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.6", -======= - "generic-array 0.14.7", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle 2.4.1", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -740,11 +536,7 @@ checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek", "ed25519", -<<<<<<< HEAD "rand 0.7.3", -======= - "rand", ->>>>>>> 8c48dccac (Outfox framing) "serde", "sha2", "zeroize", @@ -781,11 +573,7 @@ dependencies = [ "crypto-bigint", "der", "ff", -<<<<<<< HEAD "generic-array 0.14.6", -======= - "generic-array 0.14.7", ->>>>>>> 8c48dccac (Outfox framing) "group", "rand_core 0.6.4", "sec1", @@ -875,7 +663,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" [[package]] -<<<<<<< HEAD name = "futures" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -971,8 +758,6 @@ dependencies = [ ] [[package]] -======= ->>>>>>> 8c48dccac (Outfox framing) name = "generic-array" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -983,15 +768,9 @@ dependencies = [ [[package]] name = "generic-array" -<<<<<<< HEAD version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -======= -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "typenum", "version_check", @@ -1012,7 +791,6 @@ dependencies = [ [[package]] name = "getrandom" -<<<<<<< HEAD version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" @@ -1020,17 +798,6 @@ dependencies = [ "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", -======= -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -1080,18 +847,6 @@ dependencies = [ [[package]] name = "hermit-abi" -<<<<<<< HEAD -======= -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" ->>>>>>> 8c48dccac (Outfox framing) version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" @@ -1149,18 +904,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1175,11 +918,7 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ -<<<<<<< HEAD "hermit-abi", -======= - "hermit-abi 0.3.1", ->>>>>>> 8c48dccac (Outfox framing) "libc", "windows-sys 0.48.0", ] @@ -1280,15 +1019,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -<<<<<<< HEAD version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" -======= -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" ->>>>>>> 8c48dccac (Outfox framing) [[package]] name = "lioness" @@ -1312,20 +1045,10 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -======= -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] ->>>>>>> 8c48dccac (Outfox framing) [[package]] name = "mixnet-vesting-integration-tests" @@ -1354,19 +1077,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "nym-coconut-bandwidth" version = "0.1.0" dependencies = [ @@ -1436,28 +1146,17 @@ dependencies = [ [[package]] name = "nym-crypto" -<<<<<<< HEAD version = "0.3.0" -======= -version = "0.2.0" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "bs58", "ed25519-dalek", "nym-pemstore", "nym-sphinx-types", -<<<<<<< HEAD "rand 0.7.3", "subtle-encoding", "thiserror", "x25519-dalek", "zeroize", -======= - "rand", - "subtle-encoding", - "thiserror", - "x25519-dalek", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -1524,7 +1223,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "nym-name-service" version = "0.1.0" dependencies = [ @@ -1552,21 +1250,6 @@ dependencies = [ "cosmwasm-std", "schemars", "serde", -======= -name = "nym-outfox" -version = "0.1.0" -dependencies = [ - "blake3", - "chacha20", - "chacha20poly1305", - "curve25519-dalek", - "getrandom 0.2.9", - "rand", - "rayon", - "sphinx-packet", - "thiserror", - "zeroize", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -1600,10 +1283,7 @@ name = "nym-service-provider-directory-common" version = "0.1.0" dependencies = [ "cosmwasm-std", -<<<<<<< HEAD "schemars", -======= ->>>>>>> 8c48dccac (Outfox framing) "serde", ] @@ -1611,13 +1291,7 @@ dependencies = [ name = "nym-sphinx-types" version = "0.2.0" dependencies = [ -<<<<<<< HEAD "sphinx-packet", -======= - "nym-outfox", - "sphinx-packet", - "thiserror", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -1690,7 +1364,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] -<<<<<<< HEAD name = "pin-project-lite" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1703,8 +1376,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -======= ->>>>>>> 8c48dccac (Outfox framing) name = "pkcs8" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1722,20 +1393,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] -<<<<<<< HEAD -======= -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "cpufeatures", - "opaque-debug 0.3.0", - "universal-hash", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1767,15 +1424,9 @@ dependencies = [ [[package]] name = "proc-macro2" -<<<<<<< HEAD version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" -======= -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "unicode-ident", ] @@ -1832,7 +1483,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1844,8 +1494,6 @@ dependencies = [ ] [[package]] -======= ->>>>>>> 8c48dccac (Outfox framing) name = "rand_chacha" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1880,11 +1528,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ -<<<<<<< HEAD "getrandom 0.2.8", -======= - "getrandom 0.2.9", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -1894,11 +1538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56" dependencies = [ "num-traits", -<<<<<<< HEAD "rand 0.7.3", -======= - "rand", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -1911,31 +1551,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1971,7 +1586,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "rstest" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1998,8 +1612,6 @@ dependencies = [ ] [[package]] -======= ->>>>>>> 8c48dccac (Outfox framing) name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2010,15 +1622,9 @@ dependencies = [ [[package]] name = "rustix" -<<<<<<< HEAD version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -======= -version = "0.37.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "bitflags", "errno", @@ -2077,26 +1683,13 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "sec1" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ "der", -<<<<<<< HEAD "generic-array 0.14.6", -======= - "generic-array 0.14.7", ->>>>>>> 8c48dccac (Outfox framing) "pkcs8", "subtle 2.4.1", "zeroize", @@ -2134,11 +1727,7 @@ checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD "syn 2.0.12", -======= - "syn 2.0.15", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -2171,11 +1760,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD "syn 2.0.12", -======= - "syn 2.0.15", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -2184,11 +1769,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ -<<<<<<< HEAD "block-buffer", -======= - "block-buffer 0.9.0", ->>>>>>> 8c48dccac (Outfox framing) "cfg-if", "cpufeatures", "digest 0.9.0", @@ -2206,7 +1787,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2216,8 +1796,6 @@ dependencies = [ ] [[package]] -======= ->>>>>>> 8c48dccac (Outfox framing) name = "sphinx-packet" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2235,11 +1813,7 @@ dependencies = [ "hmac", "lioness", "log", -<<<<<<< HEAD "rand 0.7.3", -======= - "rand", ->>>>>>> 8c48dccac (Outfox framing) "rand_distr", "sha2", "subtle 2.4.1", @@ -2295,15 +1869,9 @@ dependencies = [ [[package]] name = "syn" -<<<<<<< HEAD version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" -======= -version = "2.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "proc-macro2", "quote", @@ -2340,11 +1908,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD "syn 2.0.12", -======= - "syn 2.0.15", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -2409,15 +1973,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -<<<<<<< HEAD version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" -======= -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" ->>>>>>> 8c48dccac (Outfox framing) [[package]] name = "unicode-ident" @@ -2435,19 +1993,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= -name = "universal-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" -dependencies = [ - "crypto-common", - "subtle 2.4.1", -] - -[[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "url" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2722,9 +2267,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD "syn 2.0.12", -======= - "syn 2.0.15", ->>>>>>> 8c48dccac (Outfox framing) ] diff --git a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs index 193c5dd1fc..1a41937c4b 100644 --- a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs +++ b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs @@ -309,7 +309,10 @@ where async fn handle_binary(&self, bin_msg: Vec) -> Message { // this function decrypts the request and checks the MAC match BinaryRequest::try_from_encrypted_tagged_bytes(bin_msg, &self.client.shared_keys) { - Err(e) => RequestHandlingError::InvalidBinaryRequest(e).into_error_message(), + Err(e) => { + error!("{e}"); + RequestHandlingError::InvalidBinaryRequest(e).into_error_message() + } Ok(request) => match request { // currently only a single type exists BinaryRequest::ForwardSphinx(mix_packet) => self diff --git a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs index dd2bc5d402..913d2c33c1 100644 --- a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs +++ b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs @@ -121,7 +121,7 @@ impl ConnectionHandler { fn forward_ack(&self, forward_ack: Option, client_address: DestinationAddressBytes) { if let Some(forward_ack) = forward_ack { - trace!( + debug!( "Sending ack from packet for {} to {}", client_address, forward_ack.next_hop() @@ -206,7 +206,10 @@ impl ConnectionHandler { ); return; } - None => break, // stream got closed by remote + None => { + info!("Stream go closed by remote"); + break + }, // stream got closed by remote } } } diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml index 5f3da88b7f..ca509fdb42 100644 --- a/mixnode/Cargo.toml +++ b/mixnode/Cargo.toml @@ -51,6 +51,7 @@ nym-mixnet-client = { path = "../common/client-libs/mixnet-client" } nym-mixnode-common = { path = "../common/mixnode-common" } nym-nonexhaustive-delayqueue = { path = "../common/nonexhaustive-delayqueue" } nym-sphinx = { path = "../common/nymsphinx" } +nym-sphinx-params = { path = "../common/nymsphinx/params" } nym-pemstore = { path = "../common/pemstore", version = "0.2.0" } nym-task = { path = "../common/task" } nym-types = { path = "../common/types" } diff --git a/mixnode/src/node/listener/connection_handler/mod.rs b/mixnode/src/node/listener/connection_handler/mod.rs index d812c60e89..733d2660f8 100644 --- a/mixnode/src/node/listener/connection_handler/mod.rs +++ b/mixnode/src/node/listener/connection_handler/mod.rs @@ -108,7 +108,7 @@ impl ConnectionHandler { } Some(Err(err)) => { error!( - "The socket connection got corrupted with error: {err}. Closing the socket", + "{remote:?} - The socket connection got corrupted with error: {err}. Closing the socket", ); return; } diff --git a/nym-api/src/network_monitor/monitor/preparer.rs b/nym-api/src/network_monitor/monitor/preparer.rs index 92c98070f1..b873669f99 100644 --- a/nym-api/src/network_monitor/monitor/preparer.rs +++ b/nym-api/src/network_monitor/monitor/preparer.rs @@ -12,7 +12,7 @@ use nym_node_tester_utils::NodeTester; use nym_sphinx::acknowledgements::AckKey; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::forwarding::packet::MixPacket; -use nym_sphinx::params::PacketSize; +use nym_sphinx::params::{PacketSize, PacketType}; use nym_topology::{gateway, mix}; use rand_07::{rngs::ThreadRng, seq::SliceRandom, thread_rng, Rng}; use std::collections::{HashMap, HashSet}; @@ -290,7 +290,8 @@ impl PacketPreparer { &mut self, route: &TestRoute, num: usize, - packet_type: PacketType, + // TODO: Maybe do this + _packet_type: PacketType, ) -> GatewayPackets { let mut tester = self.ephemeral_mix_tester(route); let topology = route.topology(); @@ -360,7 +361,8 @@ impl PacketPreparer { &mut self, test_nonce: u64, test_routes: &[TestRoute], - packet_type: PacketType, + // TODO: Maybe do this + _packet_type: PacketType, ) -> PreparedPackets { // only test mixnodes that are rewarded, i.e. that will be rewarded in this interval. // (remember that "idle" nodes are still part of that set) diff --git a/nym-connect/desktop/Cargo.lock b/nym-connect/desktop/Cargo.lock index 01123a3124..ef860d020f 100644 --- a/nym-connect/desktop/Cargo.lock +++ b/nym-connect/desktop/Cargo.lock @@ -3563,6 +3563,7 @@ dependencies = [ "chacha20poly1305", "curve25519-dalek", "getrandom 0.2.8", + "log", "rand 0.7.3", "rayon", "sphinx-packet", diff --git a/nym-outfox/Cargo.toml b/nym-outfox/Cargo.toml index 095894552d..8fcadb2f03 100644 --- a/nym-outfox/Cargo.toml +++ b/nym-outfox/Cargo.toml @@ -17,6 +17,7 @@ getrandom = { version = "*", features = ["js"] } thiserror = "1" sphinx-packet = "0.1.0" rand = "0.7.3" +log = "0.4" [dev-dependencies] criterion = "0.4" diff --git a/nym-outfox/src/constants.rs b/nym-outfox/src/constants.rs index 279ce574f9..7dd23fe6ae 100644 --- a/nym-outfox/src/constants.rs +++ b/nym-outfox/src/constants.rs @@ -1,11 +1,14 @@ pub const GROUPELEMENTBYTES: u8 = 32; pub const TAGBYTES: u8 = 16; -pub const MIX_PARAMS_LEN: usize = 6; +pub const MIX_PARAMS_LEN: usize = DEFAULT_HOPS + 2; pub const MIN_MESSAGE_LEN: usize = 24 * 2; pub(crate) const CONTEXT: &str = "LIONKEYS"; pub(crate) const TAG_LEN: usize = 24; pub const DEFAULT_ROUTING_INFO_SIZE: u8 = 32; pub const DEFAULT_HOPS: usize = 4; +pub const ROUTING_INFORMATION_LENGTH_BY_STAGE: [u8; DEFAULT_HOPS] = + [DEFAULT_ROUTING_INFO_SIZE; DEFAULT_HOPS]; +pub const MIN_PACKET_SIZE: usize = 48; pub const OUTFOX_PACKET_OVERHEAD: usize = MIX_PARAMS_LEN + (groupelementbytes() + tagbytes() + DEFAULT_ROUTING_INFO_SIZE as usize) * DEFAULT_HOPS; diff --git a/nym-outfox/src/error.rs b/nym-outfox/src/error.rs index f36af5a69d..cb07bd00ce 100644 --- a/nym-outfox/src/error.rs +++ b/nym-outfox/src/error.rs @@ -1,5 +1,3 @@ -use std::array::TryFromSliceError; - use crate::constants::MIN_MESSAGE_LEN; use crate::constants::MIX_PARAMS_LEN; use chacha20::cipher::InvalidLength; @@ -23,7 +21,7 @@ pub enum OutfoxError { #[error("{source}")] TryFromSlice { #[from] - source: TryFromSliceError, + source: std::array::TryFromSliceError, }, #[error("Header length must be {MIX_PARAMS_LEN}, got {0}")] InvalidHeaderLength(usize), diff --git a/nym-outfox/src/format.rs b/nym-outfox/src/format.rs index 345d3da535..ca440796d3 100644 --- a/nym-outfox/src/format.rs +++ b/nym-outfox/src/format.rs @@ -62,7 +62,6 @@ use chacha20poly1305::Tag; use curve25519_dalek::constants::ED25519_BASEPOINT_TABLE; use curve25519_dalek::montgomery::MontgomeryPoint; use curve25519_dalek::scalar::Scalar; -use sphinx_packet::route::Node; use std::convert::TryInto; @@ -75,6 +74,7 @@ use crate::constants::DEFAULT_HOPS; use crate::constants::DEFAULT_ROUTING_INFO_SIZE; use crate::constants::GROUPELEMENTBYTES; use crate::constants::MIX_PARAMS_LEN; +use crate::constants::ROUTING_INFORMATION_LENGTH_BY_STAGE; use crate::constants::TAGBYTES; use crate::error::OutfoxError; use crate::lion::*; @@ -135,7 +135,7 @@ impl MixCreationParameters { /// The length of the buffer needed to build a packet. pub fn total_packet_length(&self) -> usize { let mut len = self.payload_length_bytes(); - for stage_len in &self.routing_information_length_by_stage { + for stage_len in ROUTING_INFORMATION_LENGTH_BY_STAGE.iter() { len += *stage_len as usize + groupelementbytes() + tagbytes() } len @@ -143,10 +143,10 @@ impl MixCreationParameters { /// Get the mix packet parameters for a single stage of mixing. pub fn get_stage_params(&self, layer_number: usize) -> (Range, MixStageParameters) { - assert!(layer_number < self.routing_information_length_by_stage.len()); + assert!(layer_number < ROUTING_INFORMATION_LENGTH_BY_STAGE.len()); let mut remaining_header_length_bytes = 0; - for (i, stage_len) in self.routing_information_length_by_stage.iter().enumerate() { + for (i, stage_len) in ROUTING_INFORMATION_LENGTH_BY_STAGE.iter().enumerate() { if i == layer_number { let params = MixStageParameters { routing_information_length_bytes: *stage_len, @@ -229,10 +229,11 @@ impl MixStageParameters { &self, buffer: &mut [u8], user_secret_key: &[u8], - node: &Node, + node_pub_key: &[u8], + destination: &[u8; 32], ) -> Result { - let routing_data = node.address.as_bytes().to_vec(); - let mix_public_key = MontgomeryPoint(*node.pub_key.as_bytes()); + let routing_data = destination; + let mix_public_key = MontgomeryPoint(node_pub_key.try_into()?); let user_secret_key = Scalar::from_bytes_mod_order(user_secret_key.try_into()?); if buffer.len() != self.incoming_packet_length() { @@ -253,7 +254,7 @@ impl MixStageParameters { let shared_key = user_secret_key * mix_public_key; // Copy rounting data into buffer - buffer[self.routing_data_range()].copy_from_slice(&routing_data); + buffer[self.routing_data_range()].copy_from_slice(routing_data); // Perform the AEAD let header_aead_key = ChaCha20Poly1305::new_from_slice(&shared_key.0[..])?; @@ -279,7 +280,7 @@ impl MixStageParameters { &self, buffer: &mut [u8], mix_secret_key: &[u8], - ) -> Result { + ) -> Result, OutfoxError> { // Check the length of the incoming buffer is correct. let mix_secret_key = Scalar::from_bytes_mod_order(mix_secret_key.try_into()?); @@ -311,10 +312,11 @@ impl MixStageParameters { ) .map_err(|e| OutfoxError::ChaCha20Poly1305Error(e.to_string()))?; + let routing_data = buffer[self.routing_data_range()].to_vec(); // Do a round of LION on the payload lion_transform_decrypt(&mut buffer[self.payload_range()], &shared_key.0)?; - Ok(shared_key) + Ok(routing_data) } } diff --git a/nym-outfox/src/packet.rs b/nym-outfox/src/packet.rs index e549542575..9ba4b05507 100644 --- a/nym-outfox/src/packet.rs +++ b/nym-outfox/src/packet.rs @@ -1,13 +1,23 @@ -use std::{convert::TryFrom, ops::Range}; +use std::{ + array::TryFromSliceError, + collections::VecDeque, + convert::{TryFrom, TryInto}, + iter::FromIterator, + ops::Range, +}; use crate::{ - constants::{DEFAULT_HOPS, MIX_PARAMS_LEN}, + constants::{DEFAULT_HOPS, MIN_PACKET_SIZE, MIX_PARAMS_LEN}, error::OutfoxError, format::{MixCreationParameters, MixStageParameters}, }; use rand::{rngs::OsRng, RngCore}; -use sphinx_packet::{packet::builder::DEFAULT_PAYLOAD_SIZE, route::Node}; +use sphinx_packet::{ + crypto::PrivateKey, + packet::builder::DEFAULT_PAYLOAD_SIZE, + route::{Destination, Node}, +}; #[derive(Debug)] pub struct OutfoxPacket { @@ -15,6 +25,28 @@ pub struct OutfoxPacket { payload: Vec, } +pub struct OutfoxProcessedPacket { + packet: OutfoxPacket, + next_address: [u8; 32], +} + +impl OutfoxProcessedPacket { + pub fn new(packet: OutfoxPacket, next_address: [u8; 32]) -> Self { + OutfoxProcessedPacket { + packet, + next_address, + } + } + + pub fn into_packet(self) -> OutfoxPacket { + self.packet + } + + pub fn next_address(&self) -> &[u8; 32] { + &self.next_address + } +} + impl TryFrom<&[u8]> for OutfoxPacket { type Error = OutfoxError; @@ -28,8 +60,20 @@ impl TryFrom<&[u8]> for OutfoxPacket { } impl OutfoxPacket { + pub fn recover_plaintext(&self) -> Vec { + let plaintext = self.payload()[self.payload_range()].to_vec(); + if plaintext.starts_with(&[0]) { + let mut plaintext = VecDeque::from_iter(plaintext); + while let Some(0) = plaintext.front() { + plaintext.pop_front(); + } + return plaintext.make_contiguous().to_vec(); + } + plaintext + } + pub fn len(&self) -> usize { - self.mix_params().total_packet_length() + self.mix_params().total_packet_length() + MIX_PARAMS_LEN } pub fn is_empty(&self) -> bool { @@ -46,20 +90,54 @@ impl OutfoxPacket { pub fn build>( payload: M, route: &[Node; 4], + destination: &Destination, packet_size: Option, ) -> Result { let mut secret_key = [0; 32]; OsRng.fill_bytes(&mut secret_key); let packet_size = packet_size.unwrap_or(DEFAULT_PAYLOAD_SIZE); + let packet_size = if packet_size < MIN_PACKET_SIZE { + MIN_PACKET_SIZE + } else { + packet_size + }; let mix_params = MixCreationParameters::new(packet_size as u16); let padding = mix_params.total_packet_length() - payload.as_ref().len(); let mut buffer = vec![0; padding]; buffer.extend_from_slice(payload.as_ref()); - for (idx, node) in route.iter().rev().enumerate() { - let (range, stage_params) = mix_params.get_stage_params(idx); - stage_params.encode_mix_layer(&mut buffer[range], &secret_key, node)?; + // Last node in the route is a gateway, it will decrypt last, and get the final destination address + let (range, stage_params) = mix_params.get_stage_params(0); + stage_params.encode_mix_layer( + &mut buffer[range], + &secret_key, + route.last().unwrap().pub_key.as_bytes(), + destination.address.as_bytes_ref(), + )?; + + let route = route.iter().rev().collect::>(); + + // We've reversed the route, and we iterate pairs of node, first node in the pair is the destination, and the second(last) is the processing node + // Route: [N1, N2, N3, G] + // Reverse: [G, N3, N2, N1] + // Pairs: [(G, N3), (N3, N2), (N2, N1)] + // We iterate over pairs, and encode the mix layer for each pair + // For the first pair, we encode the mix layer for N3, and the destination is G + // For the second pair, we encode the mix layer for N2, and the destination is N3 + // For the third pair, we encode the mix layer for N1, and the destination is N2 + // Entry gateway will simply forward the packet to N1 and processing will continue from there + for (idx, nodes) in route.windows(2).enumerate() { + let (range, stage_params) = mix_params.get_stage_params(idx + 1); + // We know that we'll always get 4 nodes, so we can unwrap here + let processing_node = nodes.last().unwrap(); + let destination_node = nodes.first().unwrap(); + stage_params.encode_mix_layer( + &mut buffer[range], + &secret_key, + processing_node.pub_key.as_bytes(), + destination_node.address.as_bytes_ref(), + )?; } Ok(OutfoxPacket { @@ -92,9 +170,52 @@ impl OutfoxPacket { &mut self, layer: usize, mix_secret_key: &[u8; 32], - ) -> Result<(), OutfoxError> { + ) -> Result, OutfoxError> { let (range, params) = self.stage_params(layer); - params.decode_mix_layer(&mut self.payload_mut()[range], mix_secret_key)?; + let routing_data = + params.decode_mix_layer(&mut self.payload_mut()[range], mix_secret_key)?; + Ok(routing_data) + } + + pub fn update_routing_information(&mut self, layer: usize) -> Result<(), TryFromSliceError> { + let mut routing_info = self + .mix_params() + .routing_information_length_by_stage + .to_vec(); + routing_info.push(0); + routing_info.swap_remove(layer); + self.mix_params.routing_information_length_by_stage = routing_info.as_slice().try_into()?; Ok(()) } + + pub fn is_final_hop(&self) -> bool { + self.mix_params() + .routing_information_length_by_stage + .iter() + .all(|x| x == &0) + } + + pub fn decode_next_layer( + &mut self, + mix_secret_key: &PrivateKey, + ) -> Result<[u8; 32], OutfoxError> { + let mix_secret_key = mix_secret_key.to_bytes(); + let routing_lenght_by_stage = self + .mix_params() + .routing_information_length_by_stage + .as_slice(); + let mut layer = DEFAULT_HOPS - 1; + for (i, length) in routing_lenght_by_stage.iter().rev().enumerate() { + if length == &32 { + layer = DEFAULT_HOPS - 1 - i; + break; + } + } + self.decode_mix_layer(layer, &mix_secret_key)?; + self.update_routing_information(layer)?; + let (range, stage_params) = self.mix_params().get_stage_params(layer); + let routing_bytes = &self.payload()[range][stage_params.routing_data_range()]; + let routing_address: [u8; 32] = routing_bytes.try_into()?; + Ok(routing_address) + } } diff --git a/nym-outfox/tests/unittests.rs b/nym-outfox/tests/unittests.rs index ea8eb6aa4b..eedb88a757 100644 --- a/nym-outfox/tests/unittests.rs +++ b/nym-outfox/tests/unittests.rs @@ -14,6 +14,8 @@ mod tests { use nym_outfox::packet::OutfoxPacket; use sphinx_packet::constants::NODE_ADDRESS_LENGTH; use sphinx_packet::crypto::PublicKey; + use sphinx_packet::route::Destination; + use sphinx_packet::route::DestinationAddressBytes; use sphinx_packet::route::Node; use sphinx_packet::route::NodeAddressBytes; use std::convert::TryFrom; @@ -37,6 +39,7 @@ mod tests { let mix_public_key = (&ED25519_BASEPOINT_TABLE * &mix_secret_scalar).to_montgomery(); let routing = [0; 32]; + let destination = [0; 32]; let buffer = randombytes(mix_params.incoming_packet_length()); @@ -48,7 +51,12 @@ mod tests { let node = Node::new(node_address_bytes, mix_public_key); let _ = mix_params - .encode_mix_layer(&mut new_buffer[..], &user_secret, &node) + .encode_mix_layer( + &mut new_buffer[..], + &user_secret, + node.pub_key.as_bytes(), + &destination, + ) .unwrap(); assert!(new_buffer[mix_params.payload_range()] != buffer[mix_params.payload_range()]); @@ -97,17 +105,23 @@ mod tests { node3_pub, ); - let (node4_pk, node4_pub) = sphinx_packet::crypto::keygen(); - let node4 = Node::new( + let (gateway_pk, gateway_pub) = sphinx_packet::crypto::keygen(); + let gateway = Node::new( NodeAddressBytes::from_bytes([3u8; NODE_ADDRESS_LENGTH]), - node4_pub, + gateway_pub, ); - let route = [node1, node2, node3, node4]; + let destination = Destination::new( + DestinationAddressBytes::from_bytes([9u8; NODE_ADDRESS_LENGTH]), + [0u8; 16], + ); - let payload = randombytes(2048); + let route = [node1.clone(), node2.clone(), node3.clone(), gateway.clone()]; - let packet = OutfoxPacket::build(&payload, &route, Some(2048)).unwrap(); + let payload = randombytes(21); + + let packet = + OutfoxPacket::build(&payload, &route, &destination, Some(payload.len())).unwrap(); let packet_bytes = packet.to_bytes().unwrap(); println!( "packet bytes length, {}, declared {}", @@ -117,11 +131,15 @@ mod tests { let mut packet = OutfoxPacket::try_from(packet_bytes.as_slice()).unwrap(); - packet.decode_mix_layer(3, &node1_pk.to_bytes()).unwrap(); - packet.decode_mix_layer(2, &node2_pk.to_bytes()).unwrap(); - packet.decode_mix_layer(1, &node3_pk.to_bytes()).unwrap(); - packet.decode_mix_layer(0, &node4_pk.to_bytes()).unwrap(); + let next_address = packet.decode_next_layer(&node1_pk).unwrap(); + assert_eq!(next_address, node2.address.as_bytes()); + let next_address = packet.decode_next_layer(&node2_pk).unwrap(); + assert_eq!(next_address, node3.address.as_bytes()); + let next_address = packet.decode_next_layer(&node3_pk).unwrap(); + assert_eq!(next_address, gateway.address.as_bytes()); + let destination_address = packet.decode_next_layer(&gateway_pk).unwrap(); + assert_eq!(destination_address, destination.address.as_bytes()); - assert_eq!(payload, &packet.payload()[packet.payload_range()]); + assert_eq!(payload, packet.recover_plaintext()); } } diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index 4632c433f3..2273e1ac25 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -16,28 +16,12 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -<<<<<<< HEAD -======= -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array 0.14.6", -] - -[[package]] -name = "aead" ->>>>>>> 8c48dccac (Outfox framing) version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ "crypto-common", -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -49,16 +33,11 @@ dependencies = [ "cfg-if", "cipher 0.3.0", "cpufeatures", -<<<<<<< HEAD "ctr 0.8.0", -======= - "ctr", ->>>>>>> 8c48dccac (Outfox framing) "opaque-debug 0.3.0", ] [[package]] -<<<<<<< HEAD name = "aes" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -79,17 +58,6 @@ dependencies = [ "aes 0.8.2", "cipher 0.4.4", "ctr 0.9.2", -======= -name = "aes-gcm" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" -dependencies = [ - "aead 0.4.3", - "aes", - "cipher 0.3.0", - "ctr", ->>>>>>> 8c48dccac (Outfox framing) "ghash", "subtle 2.4.1", ] @@ -100,7 +68,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] @@ -114,6 +82,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -130,14 +107,71 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.69" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "argon2" -<<<<<<< HEAD version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c" @@ -145,56 +179,29 @@ dependencies = [ "base64ct", "blake2 0.10.6", "password-hash", -======= -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25df3c03f1040d0069fcd3907e24e36d59f9b6fa07ba49be0eb25a794f036ba7" -dependencies = [ - "base64ct", - "blake2 0.10.6", - "password-hash 0.3.2", -] - -[[package]] -name = "argon2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27e27b63e4a34caee411ade944981136fdfa535522dc9944d6700196cbd899f" -dependencies = [ - "base64ct", - "blake2 0.10.6", - "password-hash 0.4.2", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] -<<<<<<< HEAD -======= name = "arrayvec" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "async-trait" -version = "0.1.64" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -218,7 +225,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] @@ -274,9 +281,9 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "base64ct" -version = "1.0.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bip32" @@ -356,8 +363,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= name = "blake3" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -372,7 +377,6 @@ dependencies = [ ] [[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -385,24 +389,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ "block-padding", -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -457,9 +453,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "serde", @@ -467,9 +463,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "byte-tools" @@ -479,9 +475,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -516,7 +512,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] @@ -526,7 +522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a" dependencies = [ "serde", - "toml", + "toml 0.5.11", ] [[package]] @@ -546,12 +542,13 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfb" -version = "0.6.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", - "uuid 0.8.2", + "fnv", + "uuid 1.3.3", ] [[package]] @@ -565,11 +562,12 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -589,8 +587,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= name = "chacha20" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -607,7 +603,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.5.2", + "aead", "chacha20", "cipher 0.4.4", "poly1305", @@ -615,17 +611,25 @@ dependencies = [ ] [[package]] ->>>>>>> 8c48dccac (Outfox framing) +name = "chrono" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "serde", + "winapi", +] + +[[package]] name = "cipher" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -636,41 +640,47 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", -<<<<<<< HEAD -======= "zeroize", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] name = "clap" -version = "4.1.4" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", "strsim", - "termcolor", ] [[package]] name = "clap_complete" -version = "4.1.4" +version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501ff0a401473ea1d4c3b125ff95506b62c5bc5768d818634195fbb7c4ad5ff4" +checksum = "1594fe2312ec4abf402076e407628f5c313e54c32ade058521df4ee34ecac8a8" dependencies = [ "clap", ] [[package]] name = "clap_complete_fig" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63a06158a72dbb088f864887b4409fd22600ba379f3cee3040f842234cc5c2d0" +checksum = "f3af28956330989baa428ed4d3471b853715d445c62de21b67292e22cf8a41fa" dependencies = [ "clap", "clap_complete", @@ -678,29 +688,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck 0.4.1", - "proc-macro-error", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "cocoa" @@ -720,9 +722,9 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ "bitflags", "block", @@ -739,6 +741,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "colored" version = "1.9.3" @@ -778,15 +786,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] -<<<<<<< HEAD -======= name = "constant_time_eq" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -804,9 +809,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-graphics" @@ -852,7 +857,7 @@ dependencies = [ "cosmos-sdk-proto", "ecdsa", "eyre", - "getrandom 0.2.8", + "getrandom 0.2.9", "k256", "prost", "prost-types", @@ -867,9 +872,9 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb0afef2325df81aadbf9be1233f522ed8f6e91df870c764bc44cca2b1415bd" +checksum = "970d1d705862179b5d7a233ae36f02f21c4ec1b8075fe60c77fc5b43471331fa" dependencies = [ "digest 0.9.0", "ed25519-zebra", @@ -884,11 +889,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4" dependencies = [ -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -910,9 +911,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -928,17 +929,15 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", ] [[package]] -<<<<<<< HEAD -======= name = "crossbeam-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -958,16 +957,15 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset", "scopeguard", ] [[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -984,11 +982,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) "rand_core 0.6.4", "subtle 2.4.1", "zeroize", @@ -1000,11 +994,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) "rand_core 0.6.4", "typenum", ] @@ -1025,11 +1015,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) "subtle 2.4.1", ] @@ -1047,11 +1033,7 @@ dependencies = [ "proc-macro2", "quote", "smallvec", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -1061,11 +1043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -1084,11 +1062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -1101,7 +1075,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "ctr" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1110,14 +1083,6 @@ dependencies = [ "cipher 0.4.4", ] -[[package]] -======= ->>>>>>> 8c48dccac (Outfox framing) -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -1192,9 +1157,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.13.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" dependencies = [ "darling_core", "darling_macro", @@ -1202,35 +1167,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -1251,12 +1208,8 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.4.0", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "rustc_version", + "syn 1.0.109", ] [[package]] @@ -1274,11 +1227,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -1287,7 +1236,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "crypto-common", "subtle 2.4.1", ] @@ -1341,9 +1290,9 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "dotenvy" -version = "0.15.6" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dtoa" @@ -1362,15 +1311,15 @@ dependencies = [ [[package]] name = "dunce" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" @@ -1438,11 +1387,7 @@ dependencies = [ "crypto-bigint", "der", "ff", -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) "group", "rand_core 0.6.4", "sec1", @@ -1476,17 +1421,13 @@ dependencies = [ [[package]] name = "enum-iterator-derive" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" +checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -1504,13 +1445,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1535,18 +1476,27 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] -name = "fern" -version = "0.6.1" +name = "fdeflate" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" dependencies = [ "colored 1.9.3", "log", @@ -1564,35 +1514,31 @@ dependencies = [ [[package]] name = "field-offset" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" dependencies = [ -<<<<<<< HEAD "memoffset", -======= - "memoffset 0.6.5", ->>>>>>> 8c48dccac (Outfox framing) - "rustc_version 0.3.3", + "rustc_version", ] [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.45.0", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -1662,9 +1608,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1677,9 +1623,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1687,15 +1633,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1704,42 +1650,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1801,7 +1743,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] @@ -1818,7 +1760,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] @@ -1830,21 +1772,21 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.1.0", "x11", ] [[package]] name = "generator" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" +checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" dependencies = [ "cc", "libc", "log", "rustversion", - "windows 0.39.0", + "windows 0.48.0", ] [[package]] @@ -1858,7 +1800,6 @@ dependencies = [ [[package]] name = "generic-array" -<<<<<<< HEAD version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" @@ -1866,14 +1807,6 @@ dependencies = [ "typenum", "version_check", "zeroize", -======= -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -1891,9 +1824,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "js-sys", @@ -1911,24 +1844,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] name = "ghash" -<<<<<<< HEAD version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -======= -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "opaque-debug 0.3.0", "polyval", @@ -1960,7 +1883,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.1.0", "winapi", ] @@ -1999,9 +1922,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.15.11" +version = "0.15.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck 0.4.1", @@ -2009,11 +1932,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -2023,7 +1942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] @@ -2038,7 +1957,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -2053,7 +1972,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] @@ -2106,32 +2025,28 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] name = "gtk3-macros" -version = "0.15.4" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] name = "h2" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -2276,22 +2191,18 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.5", + "itoa 1.0.6", ] [[package]] @@ -2350,9 +2261,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -2363,7 +2274,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.5", + "itoa 1.0.6", "pin-project-lite", "socket2", "tokio", @@ -2422,6 +2333,29 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "ico" version = "0.2.0" @@ -2440,11 +2374,10 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -2468,9 +2401,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.5" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", @@ -2487,9 +2420,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -2498,9 +2431,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.7.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" +checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" dependencies = [ "cfb", ] @@ -2511,11 +2444,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -2529,30 +2458,31 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.5" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2572,9 +2502,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "javascriptcore-rs" @@ -2621,18 +2551,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -2645,7 +2575,19 @@ checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" dependencies = [ "serde", "serde_json", - "treediff", + "treediff 3.0.2", +] + +[[package]] +name = "json-patch" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "treediff 4.0.2", ] [[package]] @@ -2664,9 +2606,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -2697,9 +2639,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libgit2-sys" @@ -2715,15 +2657,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -2742,9 +2684,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "lioness" @@ -2845,17 +2787,6 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -<<<<<<< HEAD -======= -name = "memoffset" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" @@ -2864,11 +2795,10 @@ dependencies = [ ] [[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minisign-verify" @@ -2878,23 +2808,24 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2955,15 +2886,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2982,11 +2904,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -3032,27 +2950,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -3100,7 +3014,7 @@ dependencies = [ "bs58", "digest 0.9.0", "ff", - "getrandom 0.2.8", + "getrandom 0.2.9", "group", "itertools", "nym-dkg", @@ -3154,7 +3068,7 @@ dependencies = [ "log", "nym-network-defaults", "serde", - "toml", + "toml 0.5.11", "url", ] @@ -3171,11 +3085,7 @@ dependencies = [ [[package]] name = "nym-crypto" -<<<<<<< HEAD version = "0.3.0" -======= -version = "0.2.0" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "bs58", "ed25519-dalek", @@ -3185,10 +3095,7 @@ dependencies = [ "subtle-encoding", "thiserror", "x25519-dalek", -<<<<<<< HEAD "zeroize", -======= ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -3253,7 +3160,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "nym-name-service-common" version = "0.1.0" dependencies = [ @@ -3263,8 +3169,6 @@ dependencies = [ ] [[package]] -======= ->>>>>>> 8c48dccac (Outfox framing) name = "nym-network-defaults" version = "0.1.0" dependencies = [ @@ -3278,8 +3182,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= name = "nym-outfox" version = "0.1.0" dependencies = [ @@ -3287,7 +3189,8 @@ dependencies = [ "chacha20", "chacha20poly1305", "curve25519-dalek", - "getrandom 0.2.8", + "getrandom 0.2.9", + "log", "rand 0.7.3", "rayon", "sphinx-packet", @@ -3296,7 +3199,6 @@ dependencies = [ ] [[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "nym-pemstore" version = "0.2.0" dependencies = [ @@ -3304,7 +3206,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "nym-service-provider-directory-common" version = "0.1.0" dependencies = [ @@ -3317,7 +3218,9 @@ dependencies = [ name = "nym-sphinx-types" version = "0.2.0" dependencies = [ + "nym-outfox", "sphinx-packet", + "thiserror", ] [[package]] @@ -3327,20 +3230,12 @@ dependencies = [ "aes-gcm", "argon2", "generic-array 0.14.7", - "getrandom 0.2.8", + "getrandom 0.2.9", "rand 0.8.5", "serde", "serde_json", "thiserror", "zeroize", -======= -name = "nym-sphinx-types" -version = "0.2.0" -dependencies = [ - "nym-outfox", - "sphinx-packet", - "thiserror", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -3394,13 +3289,9 @@ dependencies = [ "nym-group-contract-common", "nym-mixnet-contract-common", "nym-multisig-contract-common", -<<<<<<< HEAD "nym-name-service-common", "nym-network-defaults", "nym-service-provider-directory-common", -======= - "nym-network-defaults", ->>>>>>> 8c48dccac (Outfox framing) "nym-vesting-contract", "nym-vesting-contract-common", "prost", @@ -3426,7 +3317,7 @@ dependencies = [ "nym-mixnet-contract-common", "nym-vesting-contract-common", "schemars", - "semver 1.0.16", + "semver 1.0.17", "serde", "thiserror", "vergen", @@ -3447,22 +3338,13 @@ dependencies = [ name = "nym-wallet-recovery-cli" version = "0.1.0" dependencies = [ -<<<<<<< HEAD "anyhow", -======= - "aes-gcm", - "anyhow", - "argon2 0.4.0", ->>>>>>> 8c48dccac (Outfox framing) "base64 0.13.1", "bip39", "clap", "log", "nym-bin-common", -<<<<<<< HEAD "nym-store-cipher", -======= ->>>>>>> 8c48dccac (Outfox framing) "pretty_env_logger", "serde_json", ] @@ -3489,15 +3371,8 @@ dependencies = [ [[package]] name = "nym_wallet" -<<<<<<< HEAD version = "1.2.3" dependencies = [ -======= -version = "1.2.1" -dependencies = [ - "aes-gcm", - "argon2 0.3.4", ->>>>>>> 8c48dccac (Outfox framing) "async-trait", "base64 0.13.1", "bip39", @@ -3518,10 +3393,7 @@ dependencies = [ "nym-contracts-common", "nym-crypto", "nym-mixnet-contract-common", -<<<<<<< HEAD "nym-store-cipher", -======= ->>>>>>> 8c48dccac (Outfox framing) "nym-types", "nym-validator-client", "nym-vesting-contract", @@ -3544,7 +3416,7 @@ dependencies = [ "thiserror", "time", "tokio", - "toml", + "toml 0.5.11", "ts-rs", "url", "zeroize", @@ -3591,9 +3463,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -3619,9 +3491,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ "bitflags", "cfg-if", @@ -3634,17 +3506,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -3655,23 +3523,16 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", "vcpkg", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "overload" version = "0.1.1" @@ -3709,7 +3570,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] @@ -3730,33 +3591,16 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.45.0", ] [[package]] name = "password-hash" -<<<<<<< HEAD version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -======= -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle 2.4.1", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "base64ct", "rand_core 0.6.4", @@ -3765,9 +3609,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pathdiff" @@ -3830,9 +3674,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.5" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" +checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" dependencies = [ "thiserror", "ucd-trie", @@ -3840,9 +3684,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.5" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" +checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" dependencies = [ "pest", "pest_generator", @@ -3850,26 +3694,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.5" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" +checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] name = "pest_meta" -version = "2.5.5" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" +checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" dependencies = [ "once_cell", "pest", @@ -3939,11 +3779,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -3957,11 +3793,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -3984,26 +3816,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -4031,17 +3859,17 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.4.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5329b8f106a176ab0dce4aae5da86bfcb139bb74fb00882859e03745011f3635" +checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "indexmap", "line-wrap", "quick-xml", @@ -4051,23 +3879,18 @@ dependencies = [ [[package]] name = "png" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ "bitflags", "crc32fast", + "fdeflate", "flate2", "miniz_oxide", ] [[package]] -<<<<<<< HEAD -name = "polyval" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" -======= name = "poly1305" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4075,24 +3898,19 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", - "universal-hash 0.5.0", + "universal-hash", ] [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" ->>>>>>> 8c48dccac (Outfox framing) +checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" dependencies = [ "cfg-if", "cpufeatures", "opaque-debug 0.3.0", -<<<<<<< HEAD "universal-hash", -======= - "universal-hash 0.4.1", ->>>>>>> 8c48dccac (Outfox framing) ] [[package]] @@ -4119,9 +3937,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", "toml_edit", @@ -4136,11 +3954,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", "version_check", ] @@ -4163,15 +3977,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -<<<<<<< HEAD -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -======= -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" ->>>>>>> 8c48dccac (Outfox framing) +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] @@ -4196,11 +4004,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -4227,24 +4031,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.26.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" dependencies = [ "memchr", ] [[package]] name = "quote" -<<<<<<< HEAD -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -======= -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" ->>>>>>> 8c48dccac (Outfox framing) +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -4315,7 +4113,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -4348,16 +4146,11 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" -dependencies = [ - "cty", -] +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] -<<<<<<< HEAD -======= name = "rayon" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4380,7 +4173,6 @@ dependencies = [ ] [[package]] ->>>>>>> 8c48dccac (Outfox framing) name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4389,26 +4181,35 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", + "getrandom 0.2.9", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -4417,29 +4218,26 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64 0.21.0", "bytes", @@ -4533,36 +4331,27 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.17", ] [[package]] name = "rustix" -version = "0.36.8" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4592,15 +4381,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safemem" @@ -4628,9 +4417,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" dependencies = [ "dyn-clone", "indexmap", @@ -4641,18 +4430,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -4684,11 +4469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ "der", -<<<<<<< HEAD "generic-array 0.14.7", -======= - "generic-array 0.14.6", ->>>>>>> 8c48dccac (Outfox framing) "pkcs8", "subtle 2.4.1", "zeroize", @@ -4696,9 +4477,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" dependencies = [ "bitflags", "core-foundation", @@ -4709,9 +4490,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -4748,9 +4529,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] @@ -4766,15 +4547,9 @@ dependencies = [ [[package]] name = "serde" -<<<<<<< HEAD -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" -======= -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" ->>>>>>> 8c48dccac (Outfox framing) +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -4799,23 +4574,13 @@ dependencies = [ [[package]] name = "serde_derive" -<<<<<<< HEAD -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", -======= -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -4826,37 +4591,38 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ - "itoa 1.0.5", + "itoa 1.0.6", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", +] + +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", ] [[package]] @@ -4866,35 +4632,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.5", + "itoa 1.0.6", "ryu", "serde", ] [[package]] name = "serde_with" -version = "1.14.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap", "serde", + "serde_json", "serde_with_macros", + "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -4916,11 +4684,7 @@ checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -5008,6 +4772,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" + [[package]] name = "siphasher" version = "0.3.10" @@ -5016,9 +4786,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -5031,9 +4801,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -5073,11 +4843,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc43eda802856ee82a7555c7b75ceb9e07451741c7a2f5f23d036020e01189d4" dependencies = [ -<<<<<<< HEAD "aes 0.7.5", -======= - "aes", ->>>>>>> 8c48dccac (Outfox framing) "arrayref", "blake2 0.8.1", "bs58", @@ -5134,9 +4900,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "string_cache" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", @@ -5183,11 +4949,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -5213,9 +4975,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -5223,35 +4985,16 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -======= ->>>>>>> 8c48dccac (Outfox framing) -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) - "unicode-xid", -] - [[package]] name = "system-deps" version = "5.0.0" @@ -5261,20 +5004,20 @@ dependencies = [ "cfg-expr 0.9.1", "heck 0.3.3", "pkg-config", - "toml", + "toml 0.5.11", "version-compare 0.0.11", ] [[package]] name = "system-deps" -version = "6.0.3" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ - "cfg-expr 0.11.0", + "cfg-expr 0.15.1", "heck 0.4.1", "pkg-config", - "toml", + "toml 0.7.3", "version-compare 0.1.1", ] @@ -5318,7 +5061,7 @@ dependencies = [ "scopeguard", "serde", "unicode-segmentation", - "uuid 1.3.0", + "uuid 1.3.3", "windows 0.39.0", "windows-implement", "x11-dl", @@ -5341,6 +5084,12 @@ dependencies = [ "xattr", ] +[[package]] +name = "target-lexicon" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" + [[package]] name = "tauri" version = "1.2.3" @@ -5371,7 +5120,7 @@ dependencies = [ "raw-window-handle", "regex", "rfd", - "semver 1.0.16", + "semver 1.0.17", "serde", "serde_json", "serde_repr", @@ -5387,7 +5136,7 @@ dependencies = [ "time", "tokio", "url", - "uuid 1.3.0", + "uuid 1.3.3", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -5403,8 +5152,8 @@ dependencies = [ "anyhow", "cargo_toml", "heck 0.4.1", - "json-patch", - "semver 1.0.16", + "json-patch 0.2.7", + "semver 1.0.17", "serde_json", "tauri-utils", "winres", @@ -5419,20 +5168,20 @@ dependencies = [ "base64 0.13.1", "brotli", "ico", - "json-patch", + "json-patch 0.2.7", "plist", "png", "proc-macro2", "quote", "regex", - "semver 1.0.16", + "semver 1.0.17", "serde", "serde_json", "sha2 0.10.6", "tauri-utils", "thiserror", "time", - "uuid 1.3.0", + "uuid 1.3.3", "walkdir", ] @@ -5445,20 +5194,16 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", "tauri-codegen", "tauri-utils", ] [[package]] name = "tauri-runtime" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" +checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c" dependencies = [ "gtk", "http", @@ -5469,16 +5214,17 @@ dependencies = [ "serde_json", "tauri-utils", "thiserror", - "uuid 1.3.0", + "url", + "uuid 1.3.3", "webview2-com", "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" +checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab" dependencies = [ "cocoa", "gtk", @@ -5487,7 +5233,8 @@ dependencies = [ "raw-window-handle", "tauri-runtime", "tauri-utils", - "uuid 1.3.0", + "url", + "uuid 1.3.3", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -5496,9 +5243,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abbc109a6eb45127956ffcc26ef0e875d160150ac16cfa45d26a6b2871686f1" +checksum = "5a6f9c2dafef5cbcf52926af57ce9561bd33bb41d7394f8bb849c0330260d864" dependencies = [ "brotli", "ctor", @@ -5506,13 +5253,13 @@ dependencies = [ "heck 0.4.1", "html5ever", "infer", - "json-patch", + "json-patch 1.0.0", "kuchiki", "memchr", "phf 0.10.1", "proc-macro2", "quote", - "semver 1.0.16", + "semver 1.0.17", "serde", "serde_json", "serde_with", @@ -5524,16 +5271,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] @@ -5577,7 +5323,7 @@ dependencies = [ "serde", "serde_json", "tendermint", - "toml", + "toml 0.5.11", "url", ] @@ -5609,7 +5355,7 @@ dependencies = [ "bytes", "flex-error", "futures", - "getrandom 0.2.8", + "getrandom 0.2.9", "http", "hyper", "hyper-proxy", @@ -5660,26 +5406,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -5694,11 +5436,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ - "itoa 1.0.5", + "itoa 1.0.6", "libc", "num_threads", "serde", @@ -5708,15 +5450,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -5738,14 +5480,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -5753,22 +5494,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] @@ -5794,9 +5531,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -5816,20 +5553,37 @@ dependencies = [ ] [[package]] -name = "toml_datetime" -version = "0.5.1" +name = "toml" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", - "nom8", + "serde", + "serde_spanned", "toml_datetime", + "winnow", ] [[package]] @@ -5852,24 +5606,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -5888,9 +5638,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -5913,6 +5663,15 @@ dependencies = [ "serde_json", ] +[[package]] +name = "treediff" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +dependencies = [ + "serde_json", +] + [[package]] name = "try-lock" version = "0.2.4" @@ -5938,11 +5697,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", "termcolor", ] @@ -5972,15 +5727,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -5997,27 +5752,8 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "universal-hash" -<<<<<<< HEAD -======= -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array 0.14.6", - "subtle 2.4.1", -] - -[[package]] -name = "universal-hash" ->>>>>>> 8c48dccac (Outfox framing) version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" @@ -6034,9 +5770,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", @@ -6050,6 +5786,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "0.8.2" @@ -6058,11 +5800,11 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.3.0" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -6088,7 +5830,7 @@ dependencies = [ "enum-iterator", "getset", "git2", - "rustc_version 0.4.0", + "rustc_version", "rustversion", "thiserror", "time", @@ -6114,12 +5856,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -6147,9 +5888,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6157,28 +5898,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -6188,9 +5925,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6198,32 +5935,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -6273,7 +6006,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.0.3", + "system-deps 6.1.0", ] [[package]] @@ -6315,11 +6048,7 @@ checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", ] [[package]] @@ -6395,6 +6124,15 @@ dependencies = [ "windows_x86_64_msvc 0.39.0", ] +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-bindgen" version = "0.39.0" @@ -6411,11 +6149,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" dependencies = [ -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) + "syn 1.0.109", "windows-tokens", ] @@ -6431,13 +6165,13 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -6446,22 +6180,46 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -6472,9 +6230,15 @@ checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -6490,9 +6254,15 @@ checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -6508,9 +6278,15 @@ checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -6526,9 +6302,15 @@ checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -6544,15 +6326,27 @@ checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -6568,9 +6362,24 @@ checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -6587,7 +6396,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] @@ -6680,15 +6489,9 @@ dependencies = [ [[package]] name = "zeroize" -<<<<<<< HEAD version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" -======= -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" ->>>>>>> 8c48dccac (Outfox framing) dependencies = [ "serde", "zeroize_derive", @@ -6696,25 +6499,20 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", -<<<<<<< HEAD - "syn 1.0.107", -======= - "syn", ->>>>>>> 8c48dccac (Outfox framing) - "synstructure", + "syn 2.0.16", ] [[package]] name = "zip" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "byteorder", "crc32fast",