Fix and Compiled, Build and Tested all the smart contract in the swit…

contracts/dispute_resolution_contract/Cargo.toml

@@ -2,17 +2,10 @@
 name = "dispute_resolution_contract"
 version = "0.1.0"
 edition = "2021"
-description = "Soroban dispute resolution smart contract for SwiftChain logistics escrow workflows."
-license = "MIT"
-repository = "https://github.com/SwiftChainn/SwiftChain-SmartContract"
-authors = ["SwiftChain Contributors <dev@swiftchain.org>"]
-keywords = ["soroban", "stellar", "escrow", "dispute", "logistics", "blockchain"]
-homepage = "https://github.com/SwiftChainn/SwiftChain-SmartContract"
-documentation = "https://github.com/SwiftChainn/SwiftChain-SmartContract#readme"
 
 [lib]
-path = "lib.rs"
 crate-type = ["cdylib", "rlib"]
+path = "lib.rs"
 
 [dependencies]
 soroban-sdk = { workspace = true }

contracts/dispute_resolution_contract/lib.rs

@@ -6,6 +6,8 @@ use soroban_sdk::{
 };
 use shared_types::{DeliveryId, DeliveryStatus, EscrowRecord, EscrowStatus, SwiftChainError};
 
+const DISPUTE_REPUTATION_PENALTY: u32 = 10;
+
 #[contracttype]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum DisputeStatus {
@@ -247,8 +249,11 @@ impl DisputeResolutionContract {
         env.storage().persistent().extend_ttl(&dispute_key, 518400, 518400);
 
         let delivery_contract_addr = Self::get_delivery_contract(env.clone());
-        let delivery_client = DeliveryContractClient::new(&env, &delivery_contract_addr);
-        let delivery = delivery_client.get_delivery(&delivery_id);
+        let delivery: shared_types::DeliveryRecord = env.invoke_contract(
+            &delivery_contract_addr,
+            &Symbol::new(&env, "get_delivery"),
+            soroban_sdk::vec![&env, delivery_id.into_val(&env)],
+        );
         let driver = delivery
             .driver
             .unwrap_or_else(|| panic_with_error!(&env, SwiftChainError::ProviderNotFound));
@@ -258,12 +263,15 @@ impl DisputeResolutionContract {
             .instance()
             .get::<DataKey, Address>(&DataKey::IdentityReputationContract)
         {
-            let reputation_client =
-                IdentityReputationContractClient::new(&env, &reputation_addr);
-            reputation_client.decrease_reputation(
-                &env.current_contract_address(),
-                &driver,
-                &DISPUTE_REPUTATION_PENALTY,
+            let _: () = env.invoke_contract(
+                &reputation_addr,
+                &Symbol::new(&env, "decrease_reputation"),
+                soroban_sdk::vec![
+                    &env,
+                    env.current_contract_address().into_val(&env),
+                    driver.clone().into_val(&env),
+                    DISPUTE_REPUTATION_PENALTY.into_val(&env),
+                ],
             );
         }
 

contracts/dispute_resolution_contract/test.rs

@@ -5,7 +5,7 @@ use soroban_sdk::{
     token::{Client as TokenClient, StellarAssetClient},
     Address, Env, String,
 };
-use shared_types::DeliveryId;
+use shared_types::{DeliveryId, DeliveryStatus, DeliveryRecord, EscrowRecord, EscrowStatus};
 
 fn did(value: u64) -> DeliveryId {
     DeliveryId::from(value)
@@ -16,19 +16,19 @@ pub struct MockDeliveryContract;
 
 #[contractimpl]
 impl MockDeliveryContract {
-    pub fn get_delivery(env: Env, delivery_id: DeliveryId) -> delivery_contract::DeliveryRecord {
+    pub fn get_delivery(env: Env, delivery_id: DeliveryId) -> DeliveryRecord {
         env.storage()
             .instance()
-            .get(&u64::from(delivery_id))
+            .get::<_, DeliveryRecord>(&u64::from(delivery_id))
             .unwrap_or_else(|| panic!("DeliveryNotFound"))
     }
 
     pub fn raise_dispute(env: Env, _caller: Address, delivery_id: DeliveryId) {
         let storage_key = u64::from(delivery_id);
         if env.storage().instance().has(&storage_key) {
-            let mut record: delivery_contract::DeliveryRecord =
+            let mut record: DeliveryRecord =
                 env.storage().instance().get(&storage_key).unwrap();
-            record.status = delivery_contract::DeliveryStatus::Disputed;
+            record.status = shared_types::DeliveryStatus::Disputed;
             env.storage().instance().set(&storage_key, &record);
         }
     }
@@ -131,7 +131,7 @@ fn set_mock_delivery(
     env: &Env,
     delivery_contract_id: &Address,
     delivery_id: DeliveryId,
-    record: &delivery_contract::DeliveryRecord,
+    record: &DeliveryRecord,
 ) {
     env.as_contract(delivery_contract_id, || {
         env.storage().instance().set(&u64::from(delivery_id), record);
@@ -154,9 +154,9 @@ fn create_mock_delivery_record(
     delivery_id: DeliveryId,
     sender: Address,
     recipient: Address,
-    status: delivery_contract::DeliveryStatus,
+    status: DeliveryStatus,
     delivered_at: Option<u64>,
-) -> delivery_contract::DeliveryRecord {
+) -> DeliveryRecord {
     let cargo = shared_types::CargoDescriptor {
         weight_grams: 500,
         category: shared_types::CargoCategory::Electronics,
@@ -170,7 +170,7 @@ fn create_mock_delivery_record(
         created_at: env.ledger().timestamp(),
         estimated_delivery: env.ledger().timestamp() + 3600,
     };
-    delivery_contract::DeliveryRecord {
+    DeliveryRecord {
         delivery_id,
         sender,
         recipient,
@@ -244,7 +244,7 @@ fn test_raise_dispute_active_delivery() {
     let (env, _admin, sender, recipient, driver, delivery_id, escrow_id, dispute_client) = setup_test();
 
     // Setup mock delivery status: Active
-    let delivery_record = create_mock_delivery_record(&env, did(1), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Active, None);
+    let delivery_record = create_mock_delivery_record(&env, did(1), sender.clone(), recipient.clone(), DeliveryStatus::Active, None);
     set_mock_delivery(&env, &delivery_id, did(1), &delivery_record);
 
     // Setup mock escrow status: Locked
@@ -257,7 +257,7 @@ fn test_raise_dispute_active_delivery() {
 
     // Verify delivery status changed to Disputed in MockDeliveryContract
     let delivery = MockDeliveryContractClient::new(&env, &delivery_id).get_delivery(&did(1));
-    assert_eq!(delivery.status, delivery_contract::DeliveryStatus::Disputed);
+    assert_eq!(delivery.status, DeliveryStatus::Disputed);
 
     // Verify escrow status changed to Paused in MockEscrowContract
     let escrow = MockEscrowContractClient::new(&env, &escrow_id).get_escrow(&1);
@@ -277,7 +277,7 @@ fn test_raise_dispute_delivered_within_time_limit() {
 
     // Setup mock delivery status: Delivered with timestamp
     let delivered_at = env.ledger().timestamp();
-    let delivery_record = create_mock_delivery_record(&env, did(2), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Delivered, Some(delivered_at));
+    let delivery_record = create_mock_delivery_record(&env, did(2), sender.clone(), recipient.clone(), DeliveryStatus::Delivered, Some(delivered_at));
     set_mock_delivery(&env, &delivery_id, did(2), &delivery_record);
 
     // Setup mock escrow status: Released
@@ -304,7 +304,7 @@ fn test_raise_dispute_delivered_exceeds_time_limit() {
 
     // Setup mock delivery status: Delivered
     let delivered_at = env.ledger().timestamp();
-    let delivery_record = create_mock_delivery_record(&env, did(3), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Delivered, Some(delivered_at));
+    let delivery_record = create_mock_delivery_record(&env, did(3), sender.clone(), recipient.clone(), DeliveryStatus::Delivered, Some(delivered_at));
     set_mock_delivery(&env, &delivery_id, did(3), &delivery_record);
 
     // Setup mock escrow status: Released
@@ -324,7 +324,7 @@ fn test_resolve_dispute_refund_sender_by_admin() {
     let (env, admin, sender, recipient, driver, delivery_id, escrow_id, dispute_client) = setup_test();
 
     // Setup mock delivery with driver assigned (required for reputation penalty on resolve)
-    let mut delivery_record = create_mock_delivery_record(&env, did(4), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Active, None);
+    let mut delivery_record = create_mock_delivery_record(&env, did(4), sender.clone(), recipient.clone(), DeliveryStatus::Active, None);
     delivery_record.driver = Some(driver.clone());
     set_mock_delivery(&env, &delivery_id, did(4), &delivery_record);
 
@@ -353,7 +353,7 @@ fn test_resolve_dispute_refund_sender_by_admin() {
 fn test_unauthorized_resolve_dispute_fails() {
     let (env, _admin, sender, recipient, driver, delivery_id, escrow_id, dispute_client) = setup_test();
 
-    let delivery_record = create_mock_delivery_record(&env, did(5), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Active, None);
+    let delivery_record = create_mock_delivery_record(&env, did(5), sender.clone(), recipient.clone(), DeliveryStatus::Active, None);
     set_mock_delivery(&env, &delivery_id, did(5), &delivery_record);
 
     let token = Address::generate(&env);
@@ -370,7 +370,7 @@ fn test_unauthorized_resolve_dispute_fails() {
 fn test_add_evidence_hash_success() {
     let (env, _admin, sender, recipient, _driver, delivery_id, _escrow_id, dispute_client) = setup_test();
 
-    let delivery_record = create_mock_delivery_record(&env, did(6), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Active, None);
+    let delivery_record = create_mock_delivery_record(&env, did(6), sender.clone(), recipient.clone(), DeliveryStatus::Active, None);
     set_mock_delivery(&env, &delivery_id, did(6), &delivery_record);
 
     dispute_client.raise_dispute(&sender, &did(6));
@@ -394,7 +394,7 @@ fn test_add_evidence_hash_success() {
 fn test_add_evidence_unauthorized_fails() {
     let (env, _admin, sender, recipient, _driver, delivery_id, _escrow_id, dispute_client) = setup_test();
 
-    let delivery_record = create_mock_delivery_record(&env, did(7), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Active, None);
+    let delivery_record = create_mock_delivery_record(&env, did(7), sender.clone(), recipient.clone(), DeliveryStatus::Active, None);
     set_mock_delivery(&env, &delivery_id, did(7), &delivery_record);
 
     dispute_client.raise_dispute(&sender, &did(7));
@@ -492,7 +492,7 @@ fn test_resolve_dispute_pay_driver_by_admin() {
     let (env, admin, sender, recipient, driver, delivery_id, escrow_id, dispute_client) = setup_test();
 
     // Setup mock delivery
-    let delivery_record = create_mock_delivery_record(&env, did(8), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Active, None);
+    let delivery_record = create_mock_delivery_record(&env, did(8), sender.clone(), recipient.clone(), DeliveryStatus::Active, None);
     set_mock_delivery(&env, &delivery_id, did(8), &delivery_record);
 
     // Setup mock escrow as Paused (representing escrow paused after dispute raised)
@@ -520,7 +520,7 @@ fn test_resolve_dispute_pay_driver_by_admin() {
 fn test_unauthorized_resolve_pay_driver_fails() {
     let (env, _admin, sender, recipient, driver, delivery_id, escrow_id, dispute_client) = setup_test();
 
-    let delivery_record = create_mock_delivery_record(&env, did(9), sender.clone(), recipient.clone(), delivery_contract::DeliveryStatus::Active, None);
+    let delivery_record = create_mock_delivery_record(&env, did(9), sender.clone(), recipient.clone(), DeliveryStatus::Active, None);
     set_mock_delivery(&env, &delivery_id, did(9), &delivery_record);
 
     let token = Address::generate(&env);

contracts/escrow_contract/Cargo.toml

@@ -10,7 +10,6 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 shared_types = { path = "../shared_types" }
-settlement_contract = { path = "../settlement_contract" }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

contracts/escrow_contract/lib.rs

@@ -6,9 +6,8 @@ use shared_types::{
 };
 use soroban_sdk::{
     contract, contracterror, contractimpl, contracttype, panic_with_error, token, Address, Env,
-    Symbol,
+    Symbol, IntoVal,
 };
-use settlement_contract::SettlementContractClient;
 
 pub mod constants {
     pub const ESCROW_TTL_THRESHOLD: u32 = 518400;
@@ -61,16 +60,26 @@ fn payout_driver(env: &Env, token: &Address, driver: &Address, amount: i128) {
     }
 
     if let Some(settlement_addr) = get_settlement_contract(env) {
-        let settlement_client = SettlementContractClient::new(env, &settlement_addr);
-        if let Some(preferred_asset) = settlement_client.get_driver_preference(driver) {
+        let preferred_asset: Option<Address> = env.invoke_contract(
+            &settlement_addr,
+            &Symbol::new(env, "get_driver_preference"),
+            soroban_sdk::vec![env, driver.into_val(env)],
+        );
+
+        if let Some(preferred_asset) = preferred_asset {
             if preferred_asset != token.clone() {
-                settlement_client.execute_settlement_swap(
-                    &env.current_contract_address(),
-                    token,
-                    &preferred_asset,
-                    driver,
-                    &amount,
-                    &0i128,
+                let _: () = env.invoke_contract(
+                    &settlement_addr,
+                    &Symbol::new(env, "execute_settlement_swap"),
+                    soroban_sdk::vec![
+                        env,
+                        env.current_contract_address().into_val(env),
+                        token.into_val(env),
+                        preferred_asset.into_val(env),
+                        driver.into_val(env),
+                        amount.into_val(env),
+                        0i128.into_val(env),
+                    ],
                 );
                 return;
             }

contracts/fleet_management_contract/Cargo.toml

@@ -4,11 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [lib]
-path = "lib.rs"
 crate-type = ["cdylib", "rlib"]
+path = "lib.rs"
 
 [dependencies]
 soroban-sdk = { workspace = true }
+shared_types = { path = "../shared_types" }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

contracts/identity_reputation_contract/Cargo.toml

@@ -13,18 +13,3 @@ shared_types = { path = "../shared_types" }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
-
-[profile.release]
-opt-level = "z"
-overflow-checks = true
-debug = 0
-strip = "symbols"
-debug-assertions = false
-panic = "abort"
-codegen-units = 1
-lto = true
-
-[profile.release-with-logs]
-inherits = "release"
-debug-assertions = true
-

contracts/identity_reputation_contract/lib.rs

@@ -1,7 +1,7 @@
 #![no_std]
 
 use shared_types::SwiftChainError;
-use soroban_sdk::contract, contracurl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | shctimpl, contracttype, panic_with_error, Address, Env, Symbol};
+use soroban_sdk::{contract, contractimpl, contracttype, panic_with_error, Address, Env, Symbol};
 
 #[contracttype]
 #[derive(Clone, Debug, PartialEq)]

contracts/settlement_contract/Cargo.toml

@@ -4,11 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [lib]
-path = "lib.rs"
 crate-type = ["cdylib", "rlib"]
+path = "lib.rs"
 
 [dependencies]
 soroban-sdk = { workspace = true }
+shared_types = { path = "../shared_types" }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }