Update publish-nym-wallet-macos.yml

Release/2023.5-rolo into master

.github/workflows/publish-nym-wallet-macos.yml

@@ -19,7 +19,7 @@ jobs:
 
     outputs:
       release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
       version: ${{ steps.release-info.outputs.version }}
       filename: ${{ steps.release-info.outputs.filename }}
       file_hash: ${{ steps.release-info.outputs.file_hash }}
@@ -93,6 +93,18 @@ jobs:
         if: ${{ always() }}
         run: |
           security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+
+      - name: debug print
+        run: |
+          echo "Release ID: ${{ steps.create-release.outputs.id }}"
+          echo "Release Assets: ${{ steps.create-release.outputs.assets }}"
+
+      # this is failing somehow, let's see what's being outputted
+      - name: debug print 2
+        run: |
+          echo "Release ID: ${{ steps.create-release.outputs.id }}"
+          echo "Release Assets: ${{ steps.create-release.outputs.assets }}"
+
       - id: create-release
         name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1

CHANGELOG.md

@@ -4,6 +4,22 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
+## [2023.5-rolo] (2023-11-28)
+
+- Gateway won't open websocket listener until embedded Network Requester becomes available ([#4166])
+- Feature/gateway described nr ([#4147])
+- Bugfix/prerelease versionbump ([#4145])
+- returning 'nil' for non-existing origin as opposed to an empty string ([#4135])
+- using performance^20 when calculating active set selection weight ([#4126])
+- Change default http API timeout from 3s to 10s ([#4117])
+
+[#4166]: https://github.com/nymtech/nym/issues/4166
+[#4147]: https://github.com/nymtech/nym/pull/4147
+[#4145]: https://github.com/nymtech/nym/pull/4145
+[#4135]: https://github.com/nymtech/nym/pull/4135
+[#4126]: https://github.com/nymtech/nym/pull/4126
+[#4117]: https://github.com/nymtech/nym/pull/4117
+
 ## [2023.nyxd-upgrade] (2023-11-22)
 
 - Chore/nyxd 043 upgrade ([#3968])

Cargo.lock

@@ -2929,7 +2929,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "explorer-api"
-version = "1.1.31"
+version = "1.1.32"
 dependencies = [
  "chrono",
  "clap 4.4.7",
@@ -5905,7 +5905,7 @@ dependencies = [
 
 [[package]]
 name = "nym-api"
-version = "1.1.33"
+version = "1.1.34"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -6055,7 +6055,7 @@ dependencies = [
 
 [[package]]
 name = "nym-cli"
-version = "1.1.32"
+version = "1.1.33"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -6128,7 +6128,7 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.1.31"
+version = "1.1.32"
 dependencies = [
  "clap 4.4.7",
  "dirs 4.0.0",
@@ -6472,7 +6472,7 @@ dependencies = [
 
 [[package]]
 name = "nym-gateway"
-version = "1.1.31"
+version = "1.1.32"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6677,7 +6677,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnode"
-version = "1.1.33"
+version = "1.1.34"
 dependencies = [
  "anyhow",
  "axum",
@@ -6797,7 +6797,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-requester"
-version = "1.1.31"
+version = "1.1.32"
 dependencies = [
  "anyhow",
  "async-file-watcher",
@@ -6845,7 +6845,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-statistics"
-version = "1.1.31"
+version = "1.1.32"
 dependencies = [
  "dirs 4.0.0",
  "log",
@@ -7090,7 +7090,7 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.1.31"
+version = "1.1.32"
 dependencies = [
  "clap 4.4.7",
  "lazy_static",

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.31"
+version = "1.1.32"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.31"
+version = "1.1.32"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"

common/cosmwasm-smart-contracts/contracts-common/src/types.rs

@@ -3,6 +3,7 @@
 
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Decimal;
+use cosmwasm_std::OverflowError;
 use cosmwasm_std::Uint128;
 use serde::de::Error;
 use serde::{Deserialize, Deserializer};
@@ -71,6 +72,10 @@ impl Percent {
         // we know the cast from u128 to u8 is a safe one since the internal value must be within 0 - 1 range
         truncate_decimal(hundred * self.0).u128() as u8
     }
+
+    pub fn checked_pow(&self, exp: u32) -> Result<Self, OverflowError> {
+        self.0.checked_pow(exp).map(Percent)
+    }
 }
 
 impl Display for Percent {

explorer-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "explorer-api"
-version = "1.1.31"
+version = "1.1.32"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

gateway/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-gateway"
 license = "GPL-3"
-version = "1.1.31"
+version = "1.1.32"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

gateway/src/node/mod.rs

@@ -476,6 +476,13 @@ impl<St> Gateway<St> {
             });
         }
 
+        self.start_client_websocket_listener(
+            mix_forwarding_channel.clone(),
+            active_clients_store.clone(),
+            shutdown.subscribe().named("websocket::Listener"),
+            Arc::new(coconut_verifier),
+        );
+
         let nr_request_filter = if self.config.network_requester.enabled {
             let embedded_nr = self
                 .start_network_requester(
@@ -496,7 +503,7 @@ impl<St> Gateway<St> {
         if self.config.ip_packet_router.enabled {
             let embedded_ip_sp = self
                 .start_ip_packet_router(
-                    mix_forwarding_channel.clone(),
+                    mix_forwarding_channel,
                     shutdown.subscribe().named("ip_service_provider"),
                 )
                 .await?;
@@ -513,13 +520,6 @@ impl<St> Gateway<St> {
         .with_maybe_network_request_filter(nr_request_filter)
         .start(shutdown.subscribe().named("http-api"))?;
 
-        self.start_client_websocket_listener(
-            mix_forwarding_channel,
-            active_clients_store,
-            shutdown.subscribe().named("websocket::Listener"),
-            Arc::new(coconut_verifier),
-        );
-
         // Once this is a bit more mature, make this a commandline flag instead of a compile time
         // flag
         #[cfg(feature = "wireguard")]

mixnode/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-mixnode"
 license = "GPL-3"
-version = "1.1.33"
+version = "1.1.34"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

nym-api/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-api"
 license = "GPL-3"
-version = "1.1.33"
+version = "1.1.34"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

nym-api/src/epoch_operations/rewarded_set_assignment.rs

@@ -24,7 +24,15 @@ struct MixnodeWithStakeAndPerformance {
 
 impl MixnodeWithStakeAndPerformance {
     fn to_selection_weight(&self) -> f64 {
-        let scaled_stake = self.total_stake * self.performance;
+        let scaled_performance = match self.performance.checked_pow(20) {
+            Ok(perf) => perf,
+            Err(overflow) => {
+                warn!("the node's performance ({}) has overflow while scaling it by the factor of 20: {overflow}. Setting it to 0 instead.", self.performance);
+                return 0.;
+            }
+        };
+
+        let scaled_stake = self.total_stake * scaled_performance;
         stake_to_f64(scaled_stake)
     }
 }

service-providers/network-requester/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-network-requester"
 license = "GPL-3"
-version = "1.1.31"
+version = "1.1.32"
 authors.workspace = true
 edition.workspace = true
 rust-version = "1.65"

service-providers/network-statistics/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-network-statistics"
-version = "1.1.31"
+version = "1.1.32"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

tools/nym-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-cli"
-version = "1.1.32"
+version = "1.1.33"
 authors.workspace = true
 edition = "2021"