Skip to content

fix: contracts workspace cleanup and README merge marker - #1071

Merged
ayomideadeniran merged 2 commits into
StellarDevHub:mainfrom
privexlabs:fix/issues-944-943-942-940
Jul 31, 2026
Merged

fix: contracts workspace cleanup and README merge marker#1071
ayomideadeniran merged 2 commits into
StellarDevHub:mainfrom
privexlabs:fix/issues-944-943-942-940

Conversation

@privexlabs

Copy link
Copy Markdown
Contributor

Summary

  • Remove leftover git merge conflict marker from README.md
  • Add the 7 missing contract crates to the Cargo workspace and fix the compile errors that surfaced (including
    two pre-existing broken members, did_registry and payment_gateway, that were blocking a clean cargo check
    across the workspace)
  • Remove contracts/src/, ~76 orphaned single-file contract templates documented in contracts/PROGRESS.md as
    never part of any workspace crate, along with the stale errors.json/errors2.json/errors3.json logs
  • Configure local .env files for the backend (Postgres + Redis, matching docker-compose's host port mappings) —
    not committed, .env is git-ignored

Details

  • contracts/Cargo.toml: added continuous_bonding_curve, dao_governance, fractional_nft_vault, lending_pool,
    parametric_insurance, zk_proof_verifier, hello_world to [workspace] members, alphabetized the list, and
    dropped the orphaned root [package] (nothing in the repo depended on it)
  • Removed each new member's redundant standalone [workspace] table so they join the outer workspace
  • did_registry: modernized to current soroban-sdk (added #[contract], replaced removed env.invoker() with
    explicit require_auth() params, switched storage().get/set to storage().persistent())
  • payment_gateway: fixed assert! misuse (error enum passed where a format string was expected), symbol_short!
    length limits, u32/u64 timestamp mismatches, a borrow-after-move
  • zk_proof_verifier: fixed a Hash<32>/BytesN<32> comparison and an Address serialization call that no longer
    exists in this SDK version
  • hello_world: added the missing alloc::string::ToString import
  • cargo check --workspace, cargo build --workspace, and cargo fmt --check all pass clean

Verified

  • cargo check --workspace — no errors
  • cargo build --workspace — matches CI's build step
  • cargo fmt --check — no diffs
  • README no longer contains >>>>>>>
  • Backend starts and passes env validation against dockerized Postgres/Redis with a locally configured .env
    (not committed)

Closes #944
Closes #943
Closes #942
Closes #940

- Add missing contract directories (continuous_bonding_curve,
  dao_governance, fractional_nft_vault, lending_pool,
  parametric_insurance, zk_proof_verifier, hello_world) to the
  Cargo workspace members list, sorted alphabetically, and fix the
  compilation errors surfaced once they were included (outdated
  soroban-sdk APIs, symbol length limits, type mismatches, borrow
  errors).
- Remove contracts/src/, the 70+ orphaned single-file contract
  templates that were never part of any workspace crate and caused
  70+ compilation errors on their own; drop the now-empty root
  package and the stale errors.json/errors2.json/errors3.json logs.
  cargo check now passes cleanly across the whole workspace.
- Remove the leftover git merge conflict marker in README.md.
@vercel

vercel Bot commented Jul 31, 2026

Copy link
Copy Markdown

@privexlabs is attempting to deploy a commit to the Ayomide Adeniran's projects Team on Vercel.

A member of the Team first needs to authorize it.

@drips-wave

drips-wave Bot commented Jul 31, 2026

Copy link
Copy Markdown

@privexlabs Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits.

You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀

Learn more about application limits

@ayomideadeniran

Copy link
Copy Markdown
Contributor

Pr under review

@ayomideadeniran
ayomideadeniran merged commit adcae8c into StellarDevHub:main Jul 31, 2026
2 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

2 participants