From 57fb153ecfb6858c387fb604a83b65edadbcb1a6 Mon Sep 17 00:00:00 2001
From: Aniket Dixit <dixitaniket199@gmail.com>
Date: Tue, 19 Sep 2023 13:22:33 +0530
Subject: [PATCH] refactor init

---
 .../contracts/price-feed/examples/schema.rs   |  2 +-
 cosmwasm/contracts/price-feed/src/contract.rs | 43 +++++++++++++------
 cosmwasm/contracts/price-feed/src/errors.rs   |  3 ++
 cosmwasm/contracts/price-feed/src/msg.rs      |  8 ++--
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/cosmwasm/contracts/price-feed/examples/schema.rs b/cosmwasm/contracts/price-feed/examples/schema.rs
index 02699cc..f400853 100644
--- a/cosmwasm/contracts/price-feed/examples/schema.rs
+++ b/cosmwasm/contracts/price-feed/examples/schema.rs
@@ -4,7 +4,7 @@ use std::fs::create_dir_all;
 use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
 
 use std_reference::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
-use std_reference::state::{RefData, RefMedianData, ReferenceData,RefDeviationData};
+use std_reference::state::{RefData, RefDeviationData, RefMedianData, ReferenceData};
 
 fn main() {
     let mut out_dir = current_dir().unwrap();
diff --git a/cosmwasm/contracts/price-feed/src/contract.rs b/cosmwasm/contracts/price-feed/src/contract.rs
index a35dd56..2bc351e 100644
--- a/cosmwasm/contracts/price-feed/src/contract.rs
+++ b/cosmwasm/contracts/price-feed/src/contract.rs
@@ -4,7 +4,6 @@ use cosmwasm_std::{
 };
 use cw2::{get_contract_version, set_contract_version};
 use semver::Version;
-
 use crate::errors::ContractError;
 use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 use crate::state::{
@@ -57,10 +56,11 @@ pub fn execute(
         ExecuteMsg::AddRelayers { relayers } => execute_add_relayers(deps, info, relayers),
         ExecuteMsg::RemoveRelayers { relayers } => execute_remove_relayers(deps, info, relayers),
         ExecuteMsg::Relay {
-            symbol_rates,
+            symbols,
+            rates,
             resolve_time,
             request_id,
-        } => execute_relay(deps, info, symbol_rates, resolve_time, request_id),
+        } => execute_relay(deps, info, symbols, rates, resolve_time, request_id),
         ExecuteMsg::ForceRelay {
             symbol_rates,
             resolve_time,
@@ -167,7 +167,8 @@ fn execute_remove_relayers(
 fn execute_relay(
     deps: DepsMut,
     info: MessageInfo,
-    symbol_rates: Vec<(String, Uint64)>,
+    symbols: Vec<String>,
+    rates: Vec<Uint256>,
     resolve_time: Uint64,
     request_id: Uint64,
 ) -> Result<Response, ContractError> {
@@ -179,18 +180,32 @@ fn execute_relay(
         });
     }
 
-    // Saves price data
-    for (symbol, rate) in symbol_rates {
-        if let Some(existing_refdata) = REFDATA.may_load(deps.storage, &symbol)? {
-            if existing_refdata.resolve_time >= resolve_time {
-                continue;
+    for i in 0..rates.len() {
+        let symbol_rates = rates[i].to_le_bytes();
+        let index=i*4;
+        for j in index..index+4{
+            if j >= symbols.len(){
+                // No more symbols left update
+                break;
+            }
+
+            let rate= Uint64::from(symbol_rates[j]);
+            if rate.is_zero(){
+                
             }
+
+            if let Some(existing_refdata) = REFDATA.may_load(deps.storage, &symbols[i + j])? {
+                if existing_refdata.resolve_time >= resolve_time {
+                    continue;
+                }
+            }
+
+            REFDATA.save(
+                deps.storage,
+                &symbols[i + j],
+                &RefData::new(rate, resolve_time, request_id),
+            )?
         }
-        REFDATA.save(
-            deps.storage,
-            &symbol,
-            &RefData::new(rate, resolve_time, request_id),
-        )?
     }
 
     Ok(Response::default().add_attribute("action", "execute_relay"))
diff --git a/cosmwasm/contracts/price-feed/src/errors.rs b/cosmwasm/contracts/price-feed/src/errors.rs
index d8ff5f6..dc5746f 100644
--- a/cosmwasm/contracts/price-feed/src/errors.rs
+++ b/cosmwasm/contracts/price-feed/src/errors.rs
@@ -16,6 +16,9 @@ pub enum ContractError {
     #[error("Median is disabled")]
     MedianDisabled {},
 
+    #[error("Invalid rates")]
+    InvalidRates {},
+
     #[error("Cannot migrate from different contract type: {previous_contract}")]
     CannotMigrate { previous_contract: String },
 
diff --git a/cosmwasm/contracts/price-feed/src/msg.rs b/cosmwasm/contracts/price-feed/src/msg.rs
index 643a155..6413124 100644
--- a/cosmwasm/contracts/price-feed/src/msg.rs
+++ b/cosmwasm/contracts/price-feed/src/msg.rs
@@ -1,6 +1,6 @@
+use crate::state::{RefData, RefDeviationData, RefMedianData, ReferenceData};
 use cosmwasm_schema::{cw_serde, QueryResponses};
-use cosmwasm_std::Uint64;
-use crate::state::{RefData,RefDeviationData,RefMedianData,ReferenceData};
+use cosmwasm_std::{Uint256, Uint64};
 
 #[cw_serde]
 pub struct InstantiateMsg {}
@@ -37,7 +37,9 @@ pub enum ExecuteMsg {
         // e.g.
         // BTC = 19,343.34, ETH = 1,348.57
         // symbol_rates ≡ <("BTC", 19343340000000), ("ETH", 1348570000000)>
-        symbol_rates: Vec<(String, Uint64)>,
+        symbols: Vec<String>,
+
+        rates: Vec<Uint256>,
         // Resolve time of request on Ojo in Unix timestamp
         resolve_time: Uint64,
         // Request ID of the results on Ojo