From 80fd950bdff5d6b0962d2f45ec0e45f224aaea6d Mon Sep 17 00:00:00 2001
From: Armando Dutra <crisdut@outlook.com>
Date: Mon, 24 Jul 2023 21:28:35 -0300
Subject: [PATCH] refactor: remove alternative names

---
 build.rs             |  4 ++--
 file_hashes.toml     |  4 ++--
 src/rgb/carbonado.rs | 25 +++++++------------------
 src/rgb/constants.rs |  3 ---
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/build.rs b/build.rs
index 8b740f6a..7fa75ddc 100644
--- a/build.rs
+++ b/build.rs
@@ -97,11 +97,11 @@ fn main() -> Result<()> {
         .to_ascii_lowercase();
 
     doc.ASSETS_STOCK
-        .entry(format!("{NETWORK}-{assets_stock_hash}"))
+        .entry(format!("{NETWORK}-{assets_stock_hash}.c15"))
         .or_insert(assets_stock_name);
 
     doc.ASSETS_WALLETS
-        .entry(format!("{NETWORK}-{assets_wallets_hash}"))
+        .entry(format!("{NETWORK}-{assets_wallets_hash}.c15"))
         .or_insert(assets_wallets_name);
 
     let toml = toml::to_string(&doc)?;
diff --git a/file_hashes.toml b/file_hashes.toml
index 1a3207a9..685ed620 100644
--- a/file_hashes.toml
+++ b/file_hashes.toml
@@ -1,5 +1,5 @@
 [ASSETS_STOCK]
-bitcoin-4b1bc93ea7f03c49c4424b56561c9c7437e5f16e5714cece615a48e249264a84 = "urn:ubideco:stl:4fGZWR5mH5zZzRZ1r7CSRe776zm3hLBUngfXc4s3vm3V#saturn-flash-emerald-bitmask-fungible_assets_stock.c15"
+"bitcoin-4b1bc93ea7f03c49c4424b56561c9c7437e5f16e5714cece615a48e249264a84.c15" = "urn:ubideco:stl:4fGZWR5mH5zZzRZ1r7CSRe776zm3hLBUngfXc4s3vm3V#saturn-flash-emerald-bitmask-fungible_assets_stock.c15"
 
 [ASSETS_WALLETS]
-bitcoin-6075e9716c984b37840f76ad2b50b3d1b98ed286884e5ceba5bcc8e6b74988d3 = "urn:ubideco:stl:4fGZWR5mH5zZzRZ1r7CSRe776zm3hLBUngfXc4s3vm3V#saturn-flash-emerald-bitmask-fungible_assets_wallets.c15"
+"bitcoin-6075e9716c984b37840f76ad2b50b3d1b98ed286884e5ceba5bcc8e6b74988d3.c15" = "urn:ubideco:stl:4fGZWR5mH5zZzRZ1r7CSRe776zm3hLBUngfXc4s3vm3V#saturn-flash-emerald-bitmask-fungible_assets_wallets.c15"
diff --git a/src/rgb/carbonado.rs b/src/rgb/carbonado.rs
index c9fa5faa..1b4c3e16 100644
--- a/src/rgb/carbonado.rs
+++ b/src/rgb/carbonado.rs
@@ -6,10 +6,7 @@ use strict_encoding::{StrictDeserialize, StrictSerialize};
 
 use crate::{
     carbonado::{retrieve, store},
-    rgb::{
-        constants::{OLD_LIB_ID_RGB, RGB_STRICT_TYPE_VERSION},
-        structs::RgbAccount,
-    },
+    rgb::{constants::RGB_STRICT_TYPE_VERSION, structs::RgbAccount},
 };
 
 #[derive(Debug, Clone, Eq, PartialEq, Display, From, Error)]
@@ -70,13 +67,9 @@ pub async fn retrieve_stock(sk: &str, name: &str) -> Result<Stock, StorageError>
         .to_hex()
         .to_lowercase();
 
-    let (data, _) = retrieve(
-        sk,
-        &format!("{hashed_name}.c15"),
-        vec![&name.to_string(), &format!("{OLD_LIB_ID_RGB}-{name}")],
-    )
-    .await
-    .map_err(|op| StorageError::CarbonadoRetrive(name.to_string(), op.to_string()))?;
+    let (data, _) = retrieve(sk, &format!("{hashed_name}.c15"), vec![])
+        .await
+        .map_err(|op| StorageError::CarbonadoRetrive(name.to_string(), op.to_string()))?;
 
     if data.is_empty() {
         Ok(Stock::default())
@@ -118,13 +111,9 @@ pub async fn retrieve_wallets(sk: &str, name: &str) -> Result<RgbAccount, Storag
         .to_hex()
         .to_lowercase();
 
-    let (data, _) = retrieve(
-        sk,
-        &format!("{hashed_name}.c15"),
-        vec![&name.to_string(), &format!("{OLD_LIB_ID_RGB}-{name}")],
-    )
-    .await
-    .map_err(|op| StorageError::CarbonadoRetrive(name.to_string(), op.to_string()))?;
+    let (data, _) = retrieve(sk, &format!("{hashed_name}.c15"), vec![])
+        .await
+        .map_err(|op| StorageError::CarbonadoRetrive(name.to_string(), op.to_string()))?;
 
     if data.is_empty() {
         Ok(RgbAccount::default())
diff --git a/src/rgb/constants.rs b/src/rgb/constants.rs
index 9f4ef690..50b9e429 100644
--- a/src/rgb/constants.rs
+++ b/src/rgb/constants.rs
@@ -6,9 +6,6 @@ pub const RGB_DEFAULT_NAME: &str = "default";
 pub const RGB_OLDEST_VERSION: [u8; 8] = [0; 8];
 pub const RGB_STRICT_TYPE_VERSION: [u8; 8] = *b"rgbst160";
 
-// Latest RGB ID before UBIDECO semantic ID changes
-pub const OLD_LIB_ID_RGB: &str = "memphis_asia_crash_4fGZWR5mH5zZzRZ1r7CSRe776zm3hLBUngfXc4s3vm3V";
-
 // General Errors
 #[cfg(target_arch = "wasm32")]
 pub const CARBONADO_UNAVALIABLE: &str = "carbonado filesystem";