fix: minor fixes (#85)

* bug: incorrect next proposal id

* refactor: rename data to results in paginated endpoints

chain/src/services/namada.rs

@@ -299,6 +299,14 @@ pub async fn query_next_governance_id(
     client: &HttpClient,
     block_height: BlockHeight,
 ) -> anyhow::Result<u64> {
+    // For block_height 0 the next id is always 0
+    if block_height == 0 {
+        return Ok(0);
+    }
+    // For all other block heights we need to subtract 1
+    // as namada already saved current block and bumped next proposal id
+    let block_height = block_height - 1;
+
     let proposal_counter_key =
         namada_sdk::governance::storage::keys::get_counter_key();
     let block_height = to_block_height(block_height);

shared/src/ser.rs

@@ -1,5 +1,3 @@
-use serde::{Deserialize, Serialize};
-
 use std::collections::{BTreeMap, HashMap};
 use std::str::FromStr;
 
@@ -9,6 +7,7 @@ use namada_sdk::token::{
     Account as NamadaAccount, DenominatedAmount as NamadaDenominatedAmount,
     Transfer as NamadaTransfer,
 };
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone)]
 pub struct AccountsMap(pub BTreeMap<NamadaAccount, NamadaDenominatedAmount>);

swagger-codegen.json

@@ -1,5 +1,5 @@
 {
   "npmName": "@anomaorg/namada-indexer-client",
-  "npmVersion": "0.0.19"
+  "npmVersion": "0.0.20"
 }
 

swagger.yml

@@ -38,9 +38,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [data, pagination]
+                required: [results, pagination]
                 properties:
-                  data:
+                  results:
                     type: array
                     items:
                       $ref: '#/components/schemas/Validator'
@@ -108,9 +108,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [data, pagination]
+                required: [results, pagination]
                 properties:
-                  data:
+                  results:
                     type: array
                     items:
                       $ref: '#/components/schemas/Bond'
@@ -139,9 +139,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [data, pagination]
+                required: [results, pagination]
                 properties:
-                  data:
+                  results:
                     type: array
                     items:
                       $ref: '#/components/schemas/MergedBond'
@@ -170,9 +170,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [data, pagination]
+                required: [results, pagination]
                 properties:
-                  data:
+                  results:
                     type: array
                     items:
                       $ref: '#/components/schemas/Unbond'
@@ -201,9 +201,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [data, pagination]
+                required: [results, pagination]
                 properties:
-                  data:
+                  results:
                     type: array
                     items:
                       $ref: '#/components/schemas/Unbond'
@@ -237,9 +237,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [data, pagination]
+                required: [results, pagination]
                 properties:
-                  data:
+                  results:
                     type: array
                     items:
                       $ref: '#/components/schemas/Withdraw'
@@ -289,9 +289,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [data, pagination]
+                required: [results, pagination]
                 properties:
-                  data:
+                  results:
                     type: array
                     items:
                       $ref: '#/components/schemas/Proposal'
@@ -363,9 +363,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [data, pagination]
+                required: [results, pagination]
                 properties:
-                  data:
+                  results:
                     type: array
                     items:
                       $ref: '#/components/schemas/Vote'
@@ -604,7 +604,7 @@ components:
       enum: [consensus, belowCapacity, belowThreshold, inactive, jailed, unknown]
     Proposal:
       type: object
-      required: [id, content, type, author, startEpoch, endEpoch, activationEpoch, startTime, endTime, currentTime, status, yayVotes, nayVotes, abstainVotes, tallyType]
+      required: [id, content, type, author, startEpoch, endEpoch, activationEpoch, startTime, endTime, currentTime, activationTime, status, yayVotes, nayVotes, abstainVotes, tallyType]
       properties:
         id:
           type: string
@@ -632,6 +632,8 @@ components:
           type: string
         currentTime:
           type: string
+        activationTime:
+          type: string
         status:
           type: string
           enum: [pending, voting, passed, rejected]

webserver/src/response/governance.rs

@@ -97,6 +97,7 @@ pub struct Proposal {
     pub start_time: String,
     pub end_time: String,
     pub current_time: String,
+    pub activation_time: String,
     pub status: ProposalStatus,
     pub yay_votes: String,
     pub nay_votes: String,
@@ -140,9 +141,18 @@ impl Proposal {
             min_duration,
         );
 
+        let to_activation = time_between_epochs(
+            min_num_of_blocks,
+            epoch_progress,
+            chain_state.last_processed_epoch,
+            value.activation_epoch,
+            min_duration,
+        );
+
         let time_now = chain_state.timestamp.and_utc().timestamp();
         let start_time = time_now + i64::from(to_start);
         let end_time = time_now + i64::from(to_end);
+        let activation_time = time_now + i64::from(to_activation);
 
         Self {
             id: value.id.to_string(),
@@ -179,6 +189,7 @@ impl Proposal {
             start_time: start_time.to_string(),
             end_time: end_time.to_string(),
             current_time: time_now.to_string(),
+            activation_time: activation_time.to_string(),
 
             status: match value.result {
                 GovernanceProposalResultDb::Passed => ProposalStatus::Passed,

webserver/src/response/utils.rs

@@ -5,7 +5,7 @@ use crate::constant::ITEM_PER_PAGE;
 
 #[derive(Clone, Debug, Serialize)]
 pub struct PaginatedResponse<T: Serialize> {
-    pub data: T,
+    pub results: T,
     pub pagination: Pagination,
 }
 
@@ -22,9 +22,14 @@ impl<T> PaginatedResponse<T>
 where
     T: Serialize,
 {
-    pub fn new(data: T, page: u64, total_pages: u64, total_items: u64) -> Self {
+    pub fn new(
+        results: T,
+        page: u64,
+        total_pages: u64,
+        total_items: u64,
+    ) -> Self {
         Self {
-            data,
+            results,
             pagination: Pagination {
                 page,
                 per_page: ITEM_PER_PAGE,