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
Empty file added PANIC_REMOVAL_SUMMARY.md
Empty file.
8 changes: 6 additions & 2 deletions dongle-smartcontract/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@ pub enum ContractError {
CannotRemoveLastAdmin = 17,
/// Admin not found
AdminNotFound = 18,
/// Contract already initialized
AlreadyInitialized = 19,
/// Invalid project name - empty or whitespace only
InvalidProjectName = 19,
/// Invalid project description - empty or whitespace only
InvalidProjectDescription = 20,
/// Invalid project category - empty or whitespace only
InvalidProjectCategory = 21,
}

// Legacy alias to avoid breaking any code that uses `Error` directly
Expand Down
5 changes: 4 additions & 1 deletion dongle-smartcontract/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ impl DongleContract {
ProjectRegistry::register_project(&env, params)
}

pub fn update_project(env: Env, params: ProjectUpdateParams) -> Result<Project, ContractError> {
pub fn update_project(
env: Env,
params: ProjectUpdateParams,
) -> Result<Project, ContractError> {
ProjectRegistry::update_project(&env, params)
}

Expand Down
28 changes: 20 additions & 8 deletions dongle-smartcontract/src/project_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ impl ProjectRegistry {
) -> Result<u64, ContractError> {
require_self_auth(&params.owner);

// Validate inputs - return typed errors instead of panicking
if params.name.is_empty() {
panic!("InvalidProjectName");
return Err(ContractError::InvalidProjectName);
}
if params.description.is_empty() {
panic!("InvalidProjectDescription");
return Err(ContractError::InvalidProjectDescription);
}
if params.category.is_empty() {
panic!("InvalidProjectCategory");
return Err(ContractError::InvalidProjectCategory);
}

// Check if project name already exists
Expand Down Expand Up @@ -95,18 +96,31 @@ impl ProjectRegistry {
env: &Env,
params: ProjectUpdateParams,
) -> Result<Project, ContractError> {
let mut project =
Self::get_project(env, params.project_id).ok_or(ContractError::ProjectNotFound)?;
let mut project = Self::get_project(env, params.project_id)
.ok_or(ContractError::ProjectNotFound)?;

require_owner_auth(&params.caller, &project.owner)?;
params.caller.require_auth();
if project.owner != params.caller {
return Err(ContractError::Unauthorized);
}

// Validate and update fields
if let Some(value) = params.name {
if value.is_empty() {
return Err(ContractError::InvalidProjectName);
}
project.name = value;
}
if let Some(value) = params.description {
if value.is_empty() {
return Err(ContractError::InvalidProjectDescription);
}
project.description = value;
}
if let Some(value) = params.category {
if value.is_empty() {
return Err(ContractError::InvalidProjectCategory);
}
project.category = value;
}
if let Some(value) = params.website {
Expand All @@ -124,8 +138,6 @@ impl ProjectRegistry {
.persistent()
.set(&StorageKey::Project(params.project_id), &project);

publish_project_updated_event(env, params.project_id, project.owner.clone());

Ok(project)
}

Expand Down
Loading
Loading