Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 1 addition & 45 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,48 +88,4 @@ jobs:
${{ runner.os }}-cargo-build-
${{ runner.os }}-cargo-
- name: Build all crates
run: cargo build --all --verbose

wasm-check:
name: WASM Compatibility Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-unknown-unknown
- name: Cache cargo registry
uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
contracts/target
key: ${{ runner.os }}-cargo-wasm-${{ hashFiles('contracts/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-wasm-
${{ runner.os }}-cargo-
- name: Build for WASM target
run: cargo build --all --target wasm32-unknown-unknown --verbose

ci-success:
name: CI Success
runs-on: ubuntu-latest
needs: [format, clippy, test, build, wasm-check]
if: always()
defaults:
run:
working-directory: .
steps:
- name: Check all jobs
run: |
if [[ "${{ needs.format.result }}" != "success" || \
"${{ needs.clippy.result }}" != "success" || \
"${{ needs.test.result }}" != "success" || \
"${{ needs.build.result }}" != "success" || \
"${{ needs.wasm-check.result }}" != "success" ]]; then
echo "One or more CI jobs failed"
exit 1
fi
echo "All CI jobs passed successfully"
run: cargo build --all --verbose
29 changes: 29 additions & 0 deletions contracts/assetsup/src/asset.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
use soroban_sdk::{Address, BytesN, String, contracttype};

use crate::types::{AssetStatus, AssetType};

#[contracttype]
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum DataKey {
Asset(BytesN<32>),
}

#[contracttype]
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct Asset {
pub id: BytesN<32>,
pub name: String,
pub asset_type: AssetType,
pub category: String,
pub branch_id: u64,
pub department_id: u64,
pub status: AssetStatus,
pub purchase_date: u64,
pub purchase_cost: i128,
pub current_value: i128,
pub warranty_expiry: u64,
pub stellar_token_id: BytesN<32>,
pub owner: Address,
}

// Note: Contract methods implemented in lib.rs
8 changes: 8 additions & 0 deletions contracts/assetsup/src/errors.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
use soroban_sdk::contracterror;

#[contracterror]
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
pub enum ContractError {
AssetAlreadyExists = 1,
AssetNotFound = 2,
}
36 changes: 35 additions & 1 deletion contracts/assetsup/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#![no_std]
use soroban_sdk::{Address, Env, contract, contractimpl, contracttype};
use soroban_sdk::{Address, BytesN, Env, contract, contractimpl, contracttype};

pub(crate) mod asset;
pub(crate) mod errors;
pub(crate) mod types;

#[contracttype]
#[derive(Clone, Debug, Eq, PartialEq)]
Expand All @@ -24,6 +28,36 @@ impl AssetUpContract {
pub fn get_admin(env: Env) -> Address {
env.storage().persistent().get(&DataKey::Admin).unwrap()
}

// Asset functions
pub fn register_asset(env: Env, asset: asset::Asset) -> Result<(), errors::ContractError> {
// Access control
asset.owner.require_auth();

if asset.name.is_empty() {
panic!("Name cannot be empty");
}

let key = asset::DataKey::Asset(asset.id.clone());
let store = env.storage().persistent();
if store.has(&key) {
return Err(errors::ContractError::AssetAlreadyExists);
}
store.set(&key, &asset);
Ok(())
}

pub fn get_asset(
env: Env,
asset_id: BytesN<32>,
) -> Result<asset::Asset, errors::ContractError> {
let key = asset::DataKey::Asset(asset_id);
let store = env.storage().persistent();
match store.get::<_, asset::Asset>(&key) {
Some(a) => Ok(a),
None => Err(errors::ContractError::AssetNotFound),
}
}
}

mod tests;
103 changes: 103 additions & 0 deletions contracts/assetsup/src/tests/asset.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
#![cfg(test)]

extern crate std;

use soroban_sdk::{Address, BytesN, Env, String, testutils::Address as _};

use crate::{
asset::Asset,
types::{AssetStatus, AssetType},
};

use super::initialize::setup_test_environment;

fn make_bytes32(env: &Env, seed: u32) -> BytesN<32> {
let mut arr = [0u8; 32];
// Simple deterministic fill
for (i, item) in arr.iter_mut().enumerate() {
*item = ((seed as usize + i) % 256) as u8;
}
BytesN::from_array(env, &arr)
}

#[test]
fn test_register_and_get_asset_success() {
let (env, client, _admin) = setup_test_environment();
let owner = Address::generate(&env);

let id = make_bytes32(&env, 1);
let token = make_bytes32(&env, 2);

let name = String::from_str(&env, "Laptop A");
let category = String::from_str(&env, "Electronics");

let asset = Asset {
id: id.clone(),
name: name.clone(),
asset_type: AssetType::IT,
category: category.clone(),
branch_id: 10,
department_id: 20,
status: AssetStatus::Active,
purchase_date: 1_725_000_000,
purchase_cost: 120_000,
current_value: 100_000,
warranty_expiry: 1_800_000_000,
stellar_token_id: token.clone(),
owner: owner.clone(),
};

let res = client.try_register_asset(&asset);
assert!(res.is_ok());

let got = client.try_get_asset(&id).unwrap().unwrap();

assert_eq!(got.id, id);
assert_eq!(got.name, name);
assert_eq!(got.asset_type, AssetType::IT);
assert_eq!(got.category, category);
assert_eq!(got.branch_id, 10);
assert_eq!(got.department_id, 20);
assert_eq!(got.status, AssetStatus::Active);
assert_eq!(got.purchase_date, 1_725_000_000);
assert_eq!(got.purchase_cost, 120_000);
assert_eq!(got.current_value, 100_000);
assert_eq!(got.warranty_expiry, 1_800_000_000);
assert_eq!(got.stellar_token_id, token);
assert_eq!(got.owner, owner);
}

#[test]
#[should_panic]
fn test_register_asset_duplicate() {
let (env, client, _admin) = setup_test_environment();
let owner = Address::generate(&env);

let id = make_bytes32(&env, 3);
let token = make_bytes32(&env, 4);

let name = String::from_str(&env, "Office Chair");
let category = String::from_str(&env, "Furniture");

let asset = Asset {
id: id.clone(),
name: name.clone(),
asset_type: AssetType::Furniture,
category: category.clone(),
branch_id: 1,
department_id: 2,
status: AssetStatus::Active,
purchase_date: 1_700_000_000,
purchase_cost: 15_000,
current_value: 12_000,
warranty_expiry: 1_750_000_000,
stellar_token_id: token.clone(),
owner: owner.clone(),
};

// First registration should succeed
client.register_asset(&asset);

// Second registration with same ID should panic (Err propagated)
client.register_asset(&asset);
}
2 changes: 1 addition & 1 deletion contracts/assetsup/src/tests/initialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fn test_initialize() {
}

#[test]
#[should_panic()]
#[should_panic]
fn test_initialize_panic() {
let (_env, client, admin) = setup_test_environment();
client.initialize(&admin);
Expand Down
1 change: 1 addition & 0 deletions contracts/assetsup/src/tests/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
mod asset;
mod initialize;
22 changes: 22 additions & 0 deletions contracts/assetsup/src/types.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#![allow(clippy::upper_case_acronyms)]
use soroban_sdk::contracttype;

#[contracttype]
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum AssetType {
IT,
Furniture,
Vehicle,
RealEstate,
Machinery,
Other,
}

#[contracttype]
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum AssetStatus {
Active,
Maintenance,
Retired,
Disposed,
}
Loading