fix: usn sources

Author: EvolveArt

deployments/mainnet/declarations.json

@@ -1,5 +1,5 @@
 {
-  "pragma_Oracle": "0x5df039f55ebfbdaa71aecea779f72017cd136c81d70d59e58b4cbe0daf90d64",
+  "pragma_Oracle": "0x4d6370214accdaac8cc249db34a916c92464235b87cf03641a85889d2f6d8e7",
   "pragma_Ownable": "0x7b50a7a9bbb75d08248135003f1c87f0d44ba23018dc0ca480ac37a901531f3",
   "pragma_PublisherRegistry": "0x306288971002bd7906e3a607d504dfb28dcbdc7655a115984e567dce3b67e8f",
   "pragma_SummaryStats": "0x3b5bf1c2f918de14620b3c63e2c6543cf0a138df258bce3d03e3fb0b7d2183a",

pragma-deployer/pragma_deployer/add_pairs.py

@@ -119,6 +119,20 @@
     0x0,  # Replace with actual starknet_address if available
     0x0000000000000000000000000000000000000000,
 )
+USN = Currency(
+    "USN",
+    18,
+    0,
+    0x0,  # Replace with actual starknet_address if available
+    0x0000000000000000000000000000000000000000,
+)
+SUSN = Currency(
+    "SUSN",
+    18,
+    0,
+    0x0,  # Replace with actual starknet_address if available
+    0x0000000000000000000000000000000000000000,
+)
 
 # BTC LST pairs
 xwbtc_usd_pair = Pair(XWBTC, USD)
@@ -131,29 +145,29 @@
 mre7yield_usd_pair = Pair(MRE7YIELD, USD)
 lbtc_usd_pair = Pair(LBTC, USD)
 unibtc_usd_pair = Pair(UNIBTC, USD)
+usn_usd_pair = Pair(USN, USD)
+susn_usd_pair = Pair(SUSN, USD)
 
-CURRENCIES_TO_ADD = [XWBTC, XTBTC, XLBTC, XSBTC]
+CURRENCIES_TO_ADD = [USN, SUSN]
 
 PAIRS_TO_ADD = [
-    xwbtc_usd_pair,
-    xtbtc_usd_pair,
-    xlbtc_usd_pair,
-    xsbtc_usd_pair,
+    usn_usd_pair,
+    susn_usd_pair,
 ]
 
 PAIRS_TO_UPDATE = [
-    {
-        "pair_id": 384270964630611589151504336040458606883082949444,
-        "pair": [384270964630611589151504336040458606883082949444, XWBTC.id, USD.id],
-    },
-    {
-        "pair_id": 384270964630611589151504336040242434100969165636,
-        "pair": [384270964630611589151504336040242434100969165636, XTBTC.id, USD.id],
-    },
-    {
-        "pair_id": 384270964630611589151504336039665973348665742148,
-        "pair": [384270964630611589151504336039665973348665742148, XLBTC.id, USD.id],
-    },
+    # {
+    #     "pair_id": 384270964630611589151504336040458606883082949444,
+    #     "pair": [384270964630611589151504336040458606883082949444, XWBTC.id, USD.id],
+    # },
+    # {
+    #     "pair_id": 384270964630611589151504336040242434100969165636,
+    #     "pair": [384270964630611589151504336040242434100969165636, XTBTC.id, USD.id],
+    # },
+    # {
+    #     "pair_id": 384270964630611589151504336039665973348665742148,
+    #     "pair": [384270964630611589151504336039665973348665742148, XLBTC.id, USD.id],
+    # },
     # Pair(XSTRK, USD),
     # Pair("SSTRK/USD", "SSTRK", "USD"),
     # Pair("WSTETH/USD", "WSTETH", "USD"),
@@ -176,25 +190,25 @@ async def main(port: Optional[int]) -> None:
     #     logger.info(f"Added currency {currency} with tx hash {hex(tx_hash)}")
 
     # # Update Pairs
-    for pair in PAIRS_TO_UPDATE:
-        tx_hash = await invoke(
-            "pragma_Oracle",
-            "update_pair",
-            [pair["pair_id"]] + pair["pair"],
-            port=port,
-        )
-        logger.info(f"Updated pair {pair} with tx hash {hex(tx_hash)}")
-
-    # # Add Pairs
-    # for pair in PAIRS_TO_ADD[2:]:
+    # for pair in PAIRS_TO_UPDATE:
     #     tx_hash = await invoke(
     #         "pragma_Oracle",
-    #         "add_pair",
-    #         (pair.id, pair.quote_currency.id, pair.base_currency.id),
+    #         "update_pair",
+    #         [pair["pair_id"]] + pair["pair"],
     #         port=port,
     #     )
-    #     await asyncio.sleep(1)
-    #     logger.info(f"Added pair {pair} with tx hash {hex(tx_hash)}")
+    #     logger.info(f"Updated pair {pair} with tx hash {hex(tx_hash)}")
+
+    # # Add Pairs
+    for pair in PAIRS_TO_ADD:
+        tx_hash = await invoke(
+            "pragma_Oracle",
+            "add_pair",
+            (pair.id, pair.quote_currency.id, pair.base_currency.id),
+            port=port,
+        )
+        await asyncio.sleep(1)
+        logger.info(f"Added pair {pair} with tx hash {hex(tx_hash)}")
 
     # for pair in PAIRS_TO_ADD:
     #     tx_hash = await invoke(

pragma-deployer/pragma_deployer/register_publishers.py

@@ -50,7 +50,9 @@
     "BITGET",
     "RE7_ONCHAIN",
     "CHAINLINK",
-    "REDSTONE"
+    "REDSTONE",
+    "USN_ORACLE",
+    "SUSN_VAULT",
 ]
 
 BTCFI_SOURCES = [
@@ -73,7 +75,9 @@
     "BITSTAMP",
     "COINBASE",
     "DEFILLAMA",
-    "STARKNET"
+    "STARKNET",
+    "USN_ORACLE",
+    "SUSN_VAULT",
 ]
 
 DEX_SOURCES = ["MYSWAP", "MYSWAPV2", "EKUBO", "SITHSWAP", "JEDISWAP", "10KSWAP"]

pragma-oracle/src/oracle/oracle.cairo

@@ -541,6 +541,11 @@ mod Oracle {
                 DataType::GenericEntry(pair_id) => pair_id,
             };
 
+            if pair_id == 'USN/USD' || pair_id == 'SUSN/USD' {
+                let sources = IOracleABI::get_all_sources(self, data_type);
+                return IOracleABI::get_data_for_sources(self, data_type, aggregation_mode, sources);
+            }
+
             let registered_conversion_rate_pairs = self.get_registered_conversion_rate_pairs();
             if registered_conversion_rate_pairs.contains(pair_id)
                 || aggregation_mode == AggregationMode::ConversionRate {
@@ -1615,7 +1620,6 @@ mod Oracle {
             registered_pairs.append(new_pair_id);
         }
 
-
         // @notice add a new currency to the oracle (e.g ETH)
         // @dev can be called only by the admin
         // @param new_currency: the new currency to be added