feat: genralized token contract (#23)

contracts/balanced_dollar/Cargo.toml → contracts/spoke_token/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "balanced-dollar"
+name = "spoke-token"
 version = "0.1.0"
 edition = "2021"
 

contracts/balanced_dollar/src/contract.rs → contracts/spoke_token/src/contract.rs

@@ -2,10 +2,10 @@
 //! interface.
 use crate::allowance::{read_allowance, spend_allowance, write_allowance};
 use crate::balance::{read_balance, receive_balance, spend_balance};
-use crate::{balanced_dollar, storage_types};
+use crate::{spoke_token, storage_types};
 use crate::errors::ContractError;
 use crate::metadata::{read_decimal, read_name, read_symbol, write_metadata};
-use crate::storage_types::{get_upgrade_authority, set_icon_bnusd, set_upgrade_authority, set_xcall, set_xcall_manager, INSTANCE_BUMP_AMOUNT, INSTANCE_LIFETIME_THRESHOLD
+use crate::storage_types::{get_upgrade_authority, set_icon_hub_token, set_upgrade_authority, set_xcall, set_xcall_manager, INSTANCE_BUMP_AMOUNT, INSTANCE_LIFETIME_THRESHOLD
 };
 use soroban_sdk::{
     contract, contractimpl, panic_with_error, Address, Bytes, BytesN, Env, String, Vec,
@@ -23,14 +23,10 @@ pub struct BalancedDollar;
 
 #[contractimpl]
 impl BalancedDollar {
-    pub fn initialize(e: Env, xcall: Address, xcall_manager: Address, icon_bnusd: String, upgrade_auth: Address) {
+    pub fn initialize(e: Env, xcall: Address, xcall_manager: Address, hub_token: String, upgrade_auth: Address, name: String, symbol: String, decimal: u32) {
         if storage_types::has_upgrade_auth(&e) {
             panic_with_error!(e, ContractError::ContractAlreadyInitialized)
         }
-        //initialize token properties
-        let decimal = 18;
-        let name = String::from_str(&e, "Balanced Dollar");
-        let symbol = String::from_str(&e, "bnUSD");
 
         write_metadata(
             &e,
@@ -41,7 +37,7 @@ impl BalancedDollar {
             },
         );
         set_xcall(&e, xcall);
-        set_icon_bnusd(&e, icon_bnusd);
+        set_icon_hub_token(&e, hub_token);
         set_xcall_manager(&e, xcall_manager);
         set_upgrade_authority(&e, upgrade_auth);
     }
@@ -55,7 +51,7 @@ impl BalancedDollar {
     ) -> Result<(), ContractError> {
         from.require_auth();
         let transfer_data = data.unwrap_or(Bytes::from_array(&e, &[0u8; 32]));
-        return balanced_dollar::_cross_transfer(e.clone(), from, amount, to, transfer_data);
+        return spoke_token::_cross_transfer(e.clone(), from, amount, to, transfer_data);
     }
 
     pub fn handle_call_message(
@@ -64,7 +60,7 @@ impl BalancedDollar {
         data: Bytes,
         protocols: Vec<String>,
     ) -> Result<(), ContractError> {
-        return balanced_dollar::_handle_call_message(e, from, data, protocols);
+        return spoke_token::_handle_call_message(e, from, data, protocols);
     }
 
     pub fn is_initialized(e: Env) -> bool {

contracts/balanced_dollar/src/errors.rs → contracts/spoke_token/src/errors.rs

@@ -8,7 +8,7 @@ pub enum ContractError {
     ContractAlreadyInitialized = 2,
     DecimalMustFitInAu8 = 3,
     ProtocolMismatch = 4,
-    OnlyIconBnUSD = 5,
+    OnlyIconHubToken = 5,
     OnlyCallService = 6,
     UnknownMessageType = 7,
     InvalidAddress = 8,

contracts/balanced_dollar/src/lib.rs → contracts/spoke_token/src/lib.rs

@@ -2,7 +2,7 @@
 
 mod allowance;
 mod balance;
-pub mod balanced_dollar;
+pub mod spoke_token;
 pub mod contract;
 mod errors;
 mod metadata;

contracts/balanced_dollar/src/balanced_dollar.rs → contracts/spoke_token/src/spoke_token.rs

@@ -1,5 +1,5 @@
 use crate::balance::{receive_balance, spend_balance};
-use crate::storage_types::{get_icon_bnusd, get_xcall, get_xcall_manager};
+use crate::storage_types::{get_icon_hub_token, get_xcall, get_xcall_manager};
 use soroban_sdk::{xdr::ToXdr, Address, Bytes, Env, String, Vec};
 mod xcall {
     soroban_sdk::contractimport!(file = "../../wasm/xcall.wasm");
@@ -32,7 +32,7 @@ pub fn _cross_transfer(
     }
     let xcall_message = CrossTransfer::new(from.clone().to_string(), to, amount, data);
     let rollback = CrossTransferRevert::new(from.clone(), amount);
-    let icon_bn_usd = get_icon_bnusd(&e)?;
+    let icon_bn_usd = get_icon_hub_token(&e)?;
 
     let rollback_bytes = rollback.encode(&e, String::from_str(&e, CROSS_TRANSFER_REVERT));
     let message_bytes = xcall_message.encode(&e, String::from_str(&e, CROSS_TRANSFER));
@@ -76,10 +76,10 @@ pub fn _handle_call_message(
     xcall.require_auth();
 
     let method = CrossTransfer::get_method(&e, data.clone());
-    let icon_bn_usd: String = get_icon_bnusd(&e)?;
+    let icon_bn_usd: String = get_icon_hub_token(&e)?;
     if method == String::from_str(&e, &CROSS_TRANSFER) {
         if from != icon_bn_usd {
-            return Err(ContractError::OnlyIconBnUSD);
+            return Err(ContractError::OnlyIconHubToken);
         }
         let message = CrossTransfer::decode(&e, data);
         let to_network_address: Address = get_address(message.to, &e)?;

contracts/balanced_dollar/src/storage_types.rs → contracts/spoke_token/src/storage_types.rs

@@ -29,7 +29,7 @@ pub enum DataKey {
     Balance(Address),
     XcallManager,
     XCall,
-    IconBnusd,
+    HubToken,
     UpgradeAuthority
 }
 
@@ -41,8 +41,8 @@ pub fn set_xcall(e: &Env, value: Address) {
     e.storage().instance().set(&DataKey::XCall, &value);
 }
 
-pub fn set_icon_bnusd(e: &Env, value: String) {
-    e.storage().instance().set(&DataKey::IconBnusd, &value);
+pub fn set_icon_hub_token(e: &Env, value: String) {
+    e.storage().instance().set(&DataKey::HubToken, &value);
 }
 
 pub fn set_upgrade_authority(e: &Env, value: Address) {
@@ -68,8 +68,8 @@ pub fn get_xcall(e: &Env) -> Result<Address, ContractError> {
         .get(&key)
         .ok_or(ContractError::Uninitialized)}
 
-pub fn get_icon_bnusd(e: &Env) -> Result<String, ContractError> {
-    let key = DataKey::IconBnusd;
+pub fn get_icon_hub_token(e: &Env) -> Result<String, ContractError> {
+    let key = DataKey::HubToken;
     e.storage()
         .instance()
         .get(&key)

contracts/balanced_dollar/src/tests/setup.rs → contracts/spoke_token/src/tests/setup.rs

@@ -88,7 +88,11 @@ impl TestContext {
             icon_bn_usd: self.icon_bn_usd.clone(),
             upgrade_authority: self.upgrade_authority.clone(),
         };
-        client.initialize(&config.xcall, &config.xcall_manager, &config.icon_bn_usd, &config.upgrade_authority);
+                //initialize token properties
+        let decimal = 18;
+        let name = String::from_str(&self.env, "Balanced Dollar");
+        let symbol = String::from_str(&self.env, "bnUSD");
+        client.initialize(&config.xcall, &config.xcall_manager, &config.icon_bn_usd, &config.upgrade_authority, &name, &symbol, &decimal);
     }
 
     pub fn init_xcall_manager_context(&self) {