fix: typescript generate types (nymtech#1660)

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

@@ -16,6 +16,7 @@ schemars = "0.8"
 thiserror = "1.0"
 contracts-common = { path = "../contracts-common" }
 serde_json = "1.0.0"
+humantime-serde = "1.1.1"
 
 # TO CHECK WHETHER STILL NEEDED:
 log = "0.4.14"

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

@@ -60,14 +60,23 @@ pub(crate) mod string_rfc3339_offset_date_time {
     }
 }
 
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/Interval.ts")
+)]
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct Interval {
     id: IntervalId,
     epochs_in_interval: u32,
 
+    // TODO add a better TS type generation
+    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
     #[serde(with = "string_rfc3339_offset_date_time")]
     current_epoch_start: OffsetDateTime,
     current_epoch_id: EpochId,
+    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[serde(with = "humantime_serde")]
     epoch_length: Duration,
     total_elapsed_epochs: EpochId,
 }

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

@@ -580,6 +580,7 @@ pub struct UnbondedMixnode {
     #[cfg_attr(feature = "generate-ts", ts(type = "string | null"))]
     pub proxy: Option<Addr>,
 
+    #[cfg_attr(feature = "generate-ts", ts(type = "number"))]
     pub unbonding_height: u64,
 }
 

common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/mod.rs

@@ -8,15 +8,24 @@ use serde::{Deserialize, Serialize};
 pub mod helpers;
 pub mod simulator;
 
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/RewardEstimate.ts")
+)]
 #[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
 pub struct RewardEstimate {
+    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
     pub total_node_reward: Decimal,
 
     // note that operator reward includes the operating_cost,
     // i.e. say total_node_reward was `1nym` and operating_cost was `2nym`
     // in that case the operator reward would still be `1nym` as opposed to 0
+    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
     pub operator: Decimal,
+    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
     pub delegates: Decimal,
+    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
     pub operating_cost: Decimal,
 }
 

tools/ts-rs-cli/src/main.rs

@@ -1,6 +1,7 @@
+use mixnet_contract_common::rewarding::RewardEstimate;
 use mixnet_contract_common::{
-    IntervalRewardParams, IntervalRewardingParamsUpdate, MixNode, MixNodeConfigUpdate,
-    RewardedSetNodeStatus, RewardingParams, UnbondedMixnode,
+    Interval as ContractInterval, IntervalRewardParams, IntervalRewardingParamsUpdate, MixNode,
+    MixNodeConfigUpdate, RewardedSetNodeStatus, RewardingParams, UnbondedMixnode,
 };
 use nym_types::account::{Account, AccountEntry, AccountWithMnemonic, Balance};
 use nym_types::currency::{CurrencyDenom, DecCoin};
@@ -28,7 +29,8 @@ use std::path::Path;
 use ts_rs::TS;
 use validator_api_requests::models::{
     GatewayCoreStatusResponse, InclusionProbabilityResponse, MixnodeCoreStatusResponse,
-    MixnodeStatus, MixnodeStatusResponse, SelectionChance, StakeSaturationResponse,
+    MixnodeStatus, MixnodeStatusResponse, RewardEstimationResponse, SelectionChance,
+    StakeSaturationResponse,
 };
 use vesting_contract_common::Period;
 use walkdir::WalkDir;
@@ -65,6 +67,8 @@ fn main() {
     do_export!(RewardingParams);
     do_export!(RewardedSetNodeStatus);
     do_export!(UnbondedMixnode);
+    do_export!(RewardEstimate);
+    do_export!(ContractInterval);
 
     // common/types/src
     do_export!(Account);
@@ -116,6 +120,7 @@ fn main() {
     do_export!(MixnodeStatusResponse);
     do_export!(SelectionChance);
     do_export!(StakeSaturationResponse);
+    do_export!(RewardEstimationResponse);
 
     // nym-wallet
     do_export!(AppEnv);

ts-packages/types/src/types/rust/DelegationEventKind.ts

@@ -1,2 +1 @@
-
-export type DelegationEventKind = "Delegate" | "Undelegate";
+export type DelegationEventKind = 'Delegate' | 'Undelegate';

ts-packages/types/src/types/rust/Interval.ts

@@ -0,0 +1,8 @@
+export interface Interval {
+  id: number;
+  epochs_in_interval: number;
+  current_epoch_start: string;
+  current_epoch_id: number;
+  epoch_length: string;
+  total_elapsed_epochs: number;
+}

ts-packages/types/src/types/rust/RewardEstimate.ts

@@ -1,6 +1,6 @@
-export type RewardEstimate = {
+export interface RewardEstimate {
   total_node_reward: string;
   operator: string;
   delegates: string;
   operating_cost: string;
-};
+}

ts-packages/types/src/types/rust/RewardEstimationResponse.ts

@@ -1,9 +1,10 @@
-import { RewardEstimate } from './RewardEstimate';
-import { RewardingParams } from './RewardingParams';
+import type { Interval } from './Interval';
+import type { RewardEstimate } from './RewardEstimate';
+import type { RewardingParams } from './RewardingParams';
 
-export type RewardEstimationResponse = {
+export interface RewardEstimationResponse {
   estimation: RewardEstimate;
   reward_params: RewardingParams;
-  // epoch: Interval;
+  epoch: Interval;
   as_at: number;
-};
+}

ts-packages/types/src/types/rust/UnbondedMixnode.ts

@@ -1,2 +1,6 @@
-
-export interface UnbondedMixnode { identity_key: string, owner: string, proxy: string | null, unbonding_height: bigint, }
+export interface UnbondedMixnode {
+  identity_key: string;
+  owner: string;
+  proxy: string | null;
+  unbonding_height: number;
+}

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

@@ -101,12 +101,17 @@ pub struct ComputeRewardEstParam {
     pub total_delegation: Option<u64>,
 }
 
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/RewardEstimationResponse.ts")
+)]
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct RewardEstimationResponse {
     pub estimation: RewardEstimate,
-
     pub reward_params: RewardingParams,
     pub epoch: Interval,
+    #[cfg_attr(feature = "generate-ts", ts(type = "number"))]
     pub as_at: i64,
 }