Exporting intermediate structs, but RewardEstimationResponse fails to calculate import path

common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml

@@ -21,9 +21,10 @@ time = { version = "0.3.6", features = ["parsing", "formatting"] }
 
 contracts-common = { path = "../contracts-common" }
 
+ts-rs = { version =  "6.1.2", optional = true }
+
 [dev-dependencies]
 time = { version = "0.3.5", features = ["serde", "macros"] }
-ts-rs = "6.1.2"
 
 [features]
 default = []

common/cosmwasm-smart-contracts/mixnet-contract/src/gateway.rs

@@ -8,9 +8,9 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::Display;
 
-#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
 #[cfg_attr(
-    test,
+    all(feature = "ts-rs", test),
     ts(export, export_to = "../../../nym-wallet/src/types/rust/gateway.ts")
 )]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]

common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs

@@ -14,9 +14,9 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::cmp::Ordering;
 use std::fmt::Display;
 
-#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
 #[cfg_attr(
-    test,
+    all(feature = "ts-rs", test),
     ts(
         export,
         export_to = "../../../nym-wallet/src/types/rust/rewardedsetnodestatus.ts"
@@ -109,9 +109,9 @@ impl PendingUndelegate {
     }
 }
 
-#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
 #[cfg_attr(
-    test,
+    all(feature = "ts-rs", test),
     ts(export, export_to = "../../../nym-wallet/src/types/rust/mixnode.ts")
 )]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]

common/cosmwasm-smart-contracts/mixnet-contract/src/reward_params.rs

@@ -96,10 +96,25 @@ impl NodeEpochRewards {
 }
 
 #[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(
+    all(feature = "ts-rs", test),
+    ts(
+        export,
+        export_to = "../../../nym-wallet/src/types/rust/epochrewardparams.ts"
+    )
+)]
 pub struct EpochRewardParams {
+    #[cfg_attr(feature = "ts-rs", ts(type = "string"))]
     epoch_reward_pool: Uint128,
+
+    #[cfg_attr(feature = "ts-rs", ts(type = "string"))]
     rewarded_set_size: Uint128,
+
+    #[cfg_attr(feature = "ts-rs", ts(type = "string"))]
     active_set_size: Uint128,
+
+    #[cfg_attr(feature = "ts-rs", ts(type = "string"))]
     circulating_supply: Uint128,
     sybil_resistance_percent: u8,
     active_set_work_factor: u8,
@@ -157,8 +172,17 @@ impl EpochRewardParams {
 }
 
 #[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(
+    all(feature = "ts-rs", test),
+    ts(
+        export,
+        export_to = "../../../nym-wallet/src/types/rust/noderewardparams.ts"
+    )
+)]
 pub struct NodeRewardParams {
     reward_blockstamp: u64,
+    #[cfg_attr(feature = "ts-rs", ts(type = "string"))]
     uptime: Uint128,
     in_active_set: bool,
 }
@@ -186,6 +210,14 @@ impl NodeRewardParams {
 }
 
 #[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(
+    all(feature = "ts-rs", test),
+    ts(
+        export,
+        export_to = "../../../nym-wallet/src/types/rust/rewardparams.ts"
+    )
+)]
 pub struct RewardParams {
     pub epoch: EpochRewardParams,
     pub node: NodeRewardParams,

nym-wallet/Cargo.lock

@@ -5387,6 +5387,7 @@ dependencies = [
 name = "validator-api-requests"
 version = "0.1.0"
 dependencies = [
+ "mixnet-contract-common",
  "serde",
 ]
 

nym-wallet/src/types/rust/corenodestatusresponse.ts

@@ -1,4 +1,2 @@
-export interface CoreNodeStatusResponse {
+
-  identity: string;
+export interface CoreNodeStatusResponse { identity: string, count: number, }
-  count: number;
-}

nym-wallet/src/types/rust/epochrewardparams.ts

@@ -0,0 +1,2 @@
+
+export interface EpochRewardParams { epoch_reward_pool: string, rewarded_set_size: string, active_set_size: string, circulating_supply: string, sybil_resistance_percent: number, active_set_work_factor: number, }

nym-wallet/src/types/rust/gateway.ts

@@ -1,9 +1,2 @@
-export interface Gateway {
+
-  host: string;
+export interface Gateway { host: string, mix_port: number, clients_port: number, location: string, sphinx_key: string, identity_key: string, version: string, }
-  mix_port: number;
-  clients_port: number;
-  location: string;
-  sphinx_key: string;
-  identity_key: string;
-  version: string;
-}

nym-wallet/src/types/rust/inclusionprobabilityresponse.ts

@@ -1,4 +1,2 @@
-export interface InclusionProbabilityResponse {
+
-  in_active: number;
+export interface InclusionProbabilityResponse { in_active: number, in_reserve: number, }
-  in_reserve: number;
-}

nym-wallet/src/types/rust/mixnode.ts

@@ -1,10 +1,2 @@
-export interface MixNode {
+
-  host: string;
+export interface MixNode { host: string, mix_port: number, verloc_port: number, http_api_port: number, sphinx_key: string, identity_key: string, version: string, profit_margin_percent: number, }
-  mix_port: number;
-  verloc_port: number;
-  http_api_port: number;
-  sphinx_key: string;
-  identity_key: string;
-  version: string;
-  profit_margin_percent: number;
-}

nym-wallet/src/types/rust/mixnodestatus.ts

@@ -1 +1,2 @@
-export type MixnodeStatus = 'active' | 'standby' | 'inactive' | 'not_found';
+
+export type MixnodeStatus = "active" | "standby" | "inactive" | "not_found";

nym-wallet/src/types/rust/mixnodestatusresponse.ts

@@ -1,5 +1,3 @@
-import type { MixnodeStatus } from './mixnodestatus';
+import type { MixnodeStatus } from "./mixnodestatus";
 
-export interface MixnodeStatusResponse {
+export interface MixnodeStatusResponse { status: MixnodeStatus, }
-  status: MixnodeStatus;
-}

nym-wallet/src/types/rust/noderewardparams.ts

@@ -0,0 +1,2 @@
+
+export interface NodeRewardParams { reward_blockstamp: bigint, uptime: string, in_active_set: boolean, }

nym-wallet/src/types/rust/rewardedsetnodestatus.ts

@@ -1 +1,2 @@
-export type RewardedSetNodeStatus = 'Active' | 'Standby';
+
+export type RewardedSetNodeStatus = "Active" | "Standby";

nym-wallet/src/types/rust/rewardestimationresponse.ts

@@ -0,0 +1,2 @@
+
+export interface RewardEstimationResponse { estimated_total_node_reward: bigint, estimated_operator_reward: bigint, estimated_delegators_reward: bigint, as_at: bigint, }

nym-wallet/src/types/rust/rewardparams.ts

@@ -0,0 +1,4 @@
+import type { EpochRewardParams } from "./epochrewardparams";
+import type { NodeRewardParams } from "./noderewardparams";
+
+export interface RewardParams { epoch: EpochRewardParams, node: NodeRewardParams, }

nym-wallet/src/types/rust/stakesaturationresponse.ts

@@ -1,4 +1,2 @@
-export interface StakeSaturationResponse {
+
-  saturation: number;
+export interface StakeSaturationResponse { saturation: number, as_at: bigint, }
-  as_at: bigint;
-}

validator-api/validator-api-requests/Cargo.toml

@@ -11,3 +11,4 @@ mixnet-contract-common = { path= ".../../../../common/cosmwasm-smart-contracts/m
 
 [dev-dependencies]
 ts-rs = "6.1.2"
+mixnet-contract-common = { path= ".../../../../common/cosmwasm-smart-contracts/mixnet-contract", features = ["ts-rs"] }

validator-api/validator-api-requests/src/models.rs

@@ -53,6 +53,14 @@ pub struct MixnodeStatusResponse {
 }
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(
+    test,
+    ts(
+        export,
+        export_to = "../../nym-wallet/src/types/rust/rewardestimationresponse.ts"
+    )
+)]
 pub struct RewardEstimationResponse {
     pub estimated_total_node_reward: u64,
     pub estimated_operator_reward: u64,