Merge branch 'main' into fix/db/base-token-activity-query

Author: Alex6323

Cargo.lock

@@ -32,7 +32,7 @@ eyre = { version = "0.6", default-features = false, features = [ "track-caller",
 futures = { version = "0.3", default-features = false }
 humantime = { version = "2.1.0", default-features = false }
 humantime-serde = { version = "1.1", default-features = false }
-mongodb = { version = "2.2", default-features = false, features = [ "tokio-runtime" ] }
+mongodb = { version = "2.3", default-features = false, features = [ "tokio-runtime" ] }
 pin-project = { version = "1.0", default-features = false }
 prefix-hex = { version = "0.5.0", default-features = false, features = [ "primitive-types" ] }
 primitive-types = { version = "0.12", default-features = false }

Cargo.toml

@@ -1,7 +1,7 @@
 // Copyright 2022 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use iota_types::api::response as iota;
+use iota_types::{api::response as iota, block::protocol::dto::ProtocolParametersDto};
 use serde::{Deserialize, Serialize};
 
 use crate::api::responses::impl_success_response;
@@ -13,7 +13,7 @@ pub struct InfoResponse {
     pub name: String,
     pub version: String,
     pub status: iota::StatusResponse,
-    pub protocol: iota::ProtocolResponse,
+    pub protocol: ProtocolParametersDto,
     pub base_token: iota::BaseTokenResponse,
 }
 

src/bin/inx-chronicle/api/stardust/core/responses.rs

@@ -34,12 +34,14 @@ use iota_types::{
         dto::ReceiptDto,
         response::{
             self as iota, BaseTokenResponse, BlockMetadataResponse, ConfirmedMilestoneResponse,
-            LatestMilestoneResponse, OutputMetadataResponse, OutputWithMetadataResponse, ProtocolResponse,
-            ReceiptsResponse, RentStructureResponse, StatusResponse, TreasuryResponse, UtxoChangesResponse,
+            LatestMilestoneResponse, OutputMetadataResponse, OutputWithMetadataResponse, ReceiptsResponse,
+            StatusResponse, TreasuryResponse, UtxoChangesResponse,
         },
     },
     block::{
+        output::dto::RentStructureDto,
         payload::{dto::MilestonePayloadDto, milestone::option::dto::MilestoneOptionDto},
+        protocol::dto::ProtocolParametersDto,
         BlockDto,
     },
 };
@@ -168,13 +170,13 @@ pub async fn info(database: Extension<MongoDb>) -> ApiResult<InfoResponse> {
             confirmed_milestone,
             pruning_index: oldest_milestone.milestone_index.0 - 1,
         },
-        protocol: ProtocolResponse {
-            version: protocol.version,
+        protocol: ProtocolParametersDto {
+            protocol_version: protocol.version,
             network_name: protocol.network_name,
             below_max_depth: protocol.below_max_depth,
             bech32_hrp: protocol.bech32_hrp,
             min_pow_score: protocol.min_pow_score,
-            rent_structure: RentStructureResponse {
+            rent_structure: RentStructureDto {
                 v_byte_cost: protocol.rent_structure.v_byte_cost,
                 v_byte_factor_data: protocol.rent_structure.v_byte_factor_data,
                 v_byte_factor_key: protocol.rent_structure.v_byte_factor_key,

src/bin/inx-chronicle/api/stardust/core/routes.rs

@@ -69,8 +69,8 @@ fn compute_rent_structure(output: &iota_types::block::output::Output) -> RentStr
         output.rent_cost(
             &RentStructureBuilder::new()
                 .byte_cost(byte_cost)
-                .data_factor(data_factor)
-                .key_factor(key_factor)
+                .byte_factor_data(data_factor)
+                .byte_factor_key(key_factor)
                 .finish(),
         )
     };
@@ -153,9 +153,9 @@ mod test {
         for output in outputs {
             let rent = compute_rent_structure(&output);
             assert_eq!(
-                (rent.num_data_bytes * protocol_params.rent_structure().v_byte_factor_data as u64
-                    + rent.num_key_bytes * protocol_params.rent_structure().v_byte_factor_key as u64)
-                    * protocol_params.rent_structure().v_byte_cost as u64,
+                (rent.num_data_bytes * protocol_params.rent_structure().byte_factor_data() as u64
+                    + rent.num_key_bytes * protocol_params.rent_structure().byte_factor_key() as u64)
+                    * protocol_params.rent_structure().byte_cost() as u64,
                 output.rent_cost(protocol_params.rent_structure())
             );
         }

src/types/ledger/output_metadata.rs

@@ -17,9 +17,9 @@ pub struct RentStructure {
 impl From<&iota::output::RentStructure> for RentStructure {
     fn from(value: &iota::output::RentStructure) -> Self {
         Self {
-            v_byte_cost: value.v_byte_cost,
-            v_byte_factor_data: value.v_byte_factor_data,
-            v_byte_factor_key: value.v_byte_factor_key,
+            v_byte_cost: value.byte_cost(),
+            v_byte_factor_data: value.byte_factor_data(),
+            v_byte_factor_key: value.byte_factor_key(),
         }
     }
 }
@@ -28,8 +28,8 @@ impl From<RentStructure> for iota::output::RentStructure {
     fn from(value: RentStructure) -> Self {
         Self::build()
             .byte_cost(value.v_byte_cost)
-            .data_factor(value.v_byte_factor_data)
-            .key_factor(value.v_byte_factor_key)
+            .byte_factor_data(value.v_byte_factor_data)
+            .byte_factor_key(value.v_byte_factor_key)
             .finish()
     }
 }