[rajiabdulrahmon2020-ui]

Summary

• Add releaser-authorized split settlement with bounded payout amounts.
• Preserve the existing release and refund behavior for regular escrows.
• Add regression coverage for zero, partial, full, negative, and over-balance settlements.

Verification

• cargo test --manifest-path contracts/escrow/Cargo.toml -- --test-threads=1 passed.
• ./scripts/check-generated-bindings.sh passed.
• git diff --check passed.

Closes #46

[drips-wave]

@rajiabdulrahmon2020-ui 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

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui

This PR has merge conflicts with main, which has moved on since this branch was created. Please rebase onto the latest main (or merge main into your branch), resolve the conflicts, and push. CI will then re-run, and the PR can be merged once it's conflict-free, CI is green and it's been reviewed. Thanks!

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui Thanks for the PR. It can't be merged yet. To unblock it:

CI is failing. Here's what broke:

Soroban contract (test + wasm build):

test release_transfers_funds_to_payee_and_marks_released ... FAILED
thread 'release_transfers_funds_to_payee_and_marks_released' (4878) panicked at tests/release_refund.rs:66:5:
test result: FAILED. 6 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.05s
error: test failed, to rerun pass `--test release_refund`

Please fix these errors and run the same steps locally before pushing (npm run typecheck && npm test && npm run build, or cargo test for contracts).

Merge conflicts: this branch conflicts with main. Please rebase onto the latest main (git fetch upstream && git rebase upstream/main), resolve the conflicts (often ROADMAP.md, ARCHITECTURE*.md or prisma/schema.prisma), and force-push.

Push to this same branch and CI will re-run. Once it's green and conflict-free, it'll be reviewed for merge.

[rajiabdulrahmon2020-ui]

@afeezorobsco-cyber I resolved the conflicts with main, integrated split settlement with the current quorum and token allowlist logic, and pushed the update. The focused split-settlement contract tests pass. Please review and merge when ready.

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui Thanks for the update. The malware scan passed and there are no conflicts, but CI fails on two checks:

Soroban contract (test + wasm build):

error[E0061]: this method takes 8 arguments but 7 arguments were supplied
error: could not compile `docforum-escrow` (test "split_settlement") due to 1 previous error

create_escrow on main now takes 8 arguments (the release-callback/quorum changes merged), so update the create_escrow calls in tests/split_settlement.rs to pass the new argument.

SDK bindings match contract WASM: your contract change needs regenerated SDK bindings. Run ./scripts/check-generated-bindings.sh, which prints the exact regeneration commands, then commit the updated sdk/src/generated/contract-client.ts. Also re-run cargo test and commit any updated test_snapshots/.

Push to this branch and CI will re-run. Once it's green it can be merged.

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui Your latest push still has the same two failures:

error[E0061]: this method takes 8 arguments but 7 arguments were supplied
error: could not compile `docforum-escrow` (test "split_settlement")
sdk/src/generated/contract-client.ts is out of date.

Update the create_escrow calls in tests/split_settlement.rs to pass the 8th argument, and run ./scripts/check-generated-bindings.sh, which prints the regeneration commands, then commit the regenerated sdk/src/generated/contract-client.ts. Please rebase onto the latest main too.

Push to this branch and CI will re-run. Once it's green it can be merged.

[github-actions]

@rajiabdulrahmon2020-ui This PR now has merge conflicts with main, most likely because #149 ([Phase E5] Add opt-in payee acceptance before release) was just merged, so it can't be merged until it's rebased:

git fetch upstream            # upstream = https://github.com/DocForum/docforum-escrow.git
git rebase upstream/main
# resolve the conflicts, re-run the tests, then:
git push --force-with-lease

The usual culprits are shared files like ROADMAP.md and ARCHITECTURE*.md. CI re-runs when you push, and the needs-rebase label is removed automatically once the conflicts are resolved.

_{Automated message. It won't repeat unless the PR conflicts again after your next push.}

[rajiabdulrahmon2020-ui]

@afeezorobsco-cyber I resolved the conflicts with current main and fixed the split-settlement CI failures. The contract suite and generated SDK binding check pass, and the description now has a standalone Closes #46 reference. Please review and merge when ready.

[github-actions]

@rajiabdulrahmon2020-ui This PR now has merge conflicts with main, most likely because #196 (feat(sdk): fee estimation and fee-bump sponsorship helpers) was just merged, so it can't be merged until it's rebased:

git fetch upstream            # upstream = https://github.com/DocForum/docforum-escrow.git
git rebase upstream/main
# resolve the conflicts, re-run the tests, then:
git push --force-with-lease

The usual culprits are shared files like ROADMAP.md and ARCHITECTURE*.md. CI re-runs when you push, and the needs-rebase label is removed automatically once the conflicts are resolved.

_{Automated message. It won't repeat unless the PR conflicts again after your next push.}

[rajiabdulrahmon2020-ui]

The branch now includes the latest main and the merge conflicts are resolved. I kept split settlement compatible with the acceptance changes and regenerated the contract bindings. The PR description still includes Closes #46. @afeezorobsco-cyber, please review the updated PR and merge it once the checks pass.

[github-actions]

@rajiabdulrahmon2020-ui This PR now has merge conflicts with main, most likely because #158 (feat(contract): sponsored funding: a funder distinct from the refund …) was just merged, so it can't be merged until it's rebased:

git fetch upstream            # upstream = https://github.com/DocForum/docforum-escrow.git
git rebase upstream/main
# resolve the conflicts, re-run the tests, then:
git push --force-with-lease

The usual culprits are shared files like ROADMAP.md and ARCHITECTURE*.md. CI re-runs when you push, and the needs-rebase label is removed automatically once the conflicts are resolved.

_{Automated message. It won't repeat unless the PR conflicts again after your next push.}

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui CI is failing on this branch against the latest main, so it can't be merged yet. The errors from the latest run:

SDK bindings match contract WASM

sdk/src/generated/contract-client.ts is out of date.

Soroban contract (test + wasm build)

cargo test changed committed Soroban snapshots under contracts/escrow/test_snapshots.

sdk/src/generated/contract-client.ts doesn't match the contract any more, because main has changed the contract since your branch was created. Regenerate the bindings against the latest main and commit them:

cd contracts/escrow && cargo build --target wasm32v1-none --release
stellar contract bindings typescript --wasm target/wasm32v1-none/release/docforum_escrow.wasm --output-dir /tmp/escrow-bindings --overwrite
cp /tmp/escrow-bindings/src/index.ts ../../sdk/src/generated/contract-client.ts

(scripts/check-generated-bindings.sh runs the same check locally.)

Your change alters contract behaviour that the committed Soroban snapshots record. Run cargo test in contracts/escrow, review the diff under contracts/escrow/test_snapshots/, and commit the updated snapshots.

This PR also conflicts with main again, so please rebase first, then fix the above.

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui CI is failing on this branch against the latest main, so it can't be merged yet. The errors from the latest run:

Soroban contract (test + wasm build)

thread 'split_settlement_supports_zero_full_and_partial_payouts' (5411) panicked at tests/split_settlement.rs:50:5:
test result: FAILED. 3 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.04s
error: test failed, to rerun pass `--test split_settlement`

split_settlement_supports_zero_full_and_partial_payouts panics at tests/split_settlement.rs:50. Run cargo test --test split_settlement in contracts/escrow on top of the latest main to see the assertion. create_escrow and the release path have changed on main since this branch was created.

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui CI is failing on this branch against the latest main, so it can't be merged yet. The errors from the latest run:

Soroban contract (test + wasm build)

thread 'split_settlement_supports_zero_full_and_partial_payouts' panicked at tests/split_settlement.rs:50:5
test result: FAILED. 3 passed; 1 failed

This is the same assertion as before. Run cargo test --test split_settlement -- --nocapture in contracts/escrow on top of the latest main to see the expected and actual values at line 50. create_escrow and the release/fee path have changed on main since this branch was created, so the expected payout amounts probably need updating.

[rajiabdulrahmon2020-ui]

Review needed: resolving conflicts changed what settle does, beyond the conflict fixes. It now enforces release_not_before and payee acceptance, rejects amounts above the escrowed total, sends the remainder to refund_to (not the payer), and rejects pooled escrows. Please confirm these semantics. The CI fix adds the missing create_escrow argument (&None) and regenerates bindings. The TLA+ spec is not updated.

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui CI is failing in cargo test (Soroban contract job):

thread 'split_settlement_supports_zero_full_and_partial_payouts' panicked at tests/split_settlement.rs:50:5:
assertion `left == right` failed
  left: Funded
 right: Released
test result: FAILED. 3 passed; 1 failed

After the split settlement, the escrow is still Funded instead of Released. Please fix it, run cargo test in contracts/escrow, and push.

[github-actions]

@rajiabdulrahmon2020-ui This PR now has merge conflicts with main, most likely because #242 (feat(contract): per-token liability accounting and solvency view) was just merged, so it can't be merged until it's rebased:

git fetch upstream            # upstream = https://github.com/DocForum/docforum-escrow.git
git rebase upstream/main
# resolve the conflicts, re-run the tests, then:
git push --force-with-lease

The usual culprits are shared docs like ROADMAP.md and ARCHITECTURE*.md. If the conflict is in the ROADMAP.md changelog, move your entry into a new file under changelog.d/ (see changelog.d/README.md) rather than resolving it in place, so it can't conflict again. CI re-runs when you push, and the needs-rebase label is removed automatically once the conflicts are resolved.

_{Automated message. It won't repeat unless the PR conflicts again after your next push.}

[zeemscript]

@afeezorobsco-cyber I fixed split settlement to refresh the status index and updated the committed test snapshot. The targeted split-settlement test passes locally, and the updated head passes the malware scan. GitHub still reports a merge conflict against current main; it needs conflict resolution before merge.

[afeezorobsco-cyber]

@rajiabdulrahmon2020-ui Heads-up: #268 just changed how contract PRs work in this repo. Your PR changes contracts/escrow/src/lib.rs, so CI's new "Contract changes use a fragment, not a version bump" step will fail it until you make these changes (details in contract-changes.d/README.md):

1. Don't edit CONTRACT_VERSION when you merge main (currently 2.3.0). Keep main's line as it is.

2. Add a fragment, e.g. contract-changes.d/46-phase-e5-add-releaser-authorized-split-s.md:

   bump: minor
   ---
   Issue #46: one-paragraph summary of the contract change.

   Use patch for a behaviour fix with no interface change, minor for new entry points, arguments, events or errors, and major for breaking changes.

3. Switch your new Error codes to provisional ones (issue number × 100 + n). This branch adds InvalidSettlementAmount = 35; use InvalidSettlementAmount = 4600. The fold assigns the final numbers. Don't renumber existing codes.

This should also make your next merge from main much easier: the version line was the one thing every contract PR conflicted on.

[rajiabdulrahmon2020-ui]

Synced this branch with current main and resolved the merge conflict. Kept CONTRACT_VERSION at 2.3.0, added the required issue #46 minor fragment and provisional InvalidSettlementAmount code 4600, and regenerated the SDK binding. Full Rust tests, the contract-change check, and generated-binding check pass. GitHub reports mergeable=true; Malware scan passed. @afeezorobsco-cyber, please recheck when convenient.

[github-actions]

@rajiabdulrahmon2020-ui This PR now has merge conflicts with main, most likely because #199 (feat(contract): payee rights transfer: payee reassigns future payout to a new address) was just merged, so it can't be merged until it's rebased:

git fetch upstream            # upstream = https://github.com/DocForum/docforum-escrow.git
git rebase upstream/main
# resolve the conflicts, re-run the tests, then:
git push --force-with-lease

The usual culprits are shared docs like ROADMAP.md and ARCHITECTURE*.md. If the conflict is in the ROADMAP.md changelog, move your entry into a new file under changelog.d/ (see changelog.d/README.md) rather than resolving it in place, so it can't conflict again. CI re-runs when you push, and the needs-rebase label is removed automatically once the conflicts are resolved.

_{Automated message. It won't repeat unless the PR conflicts again after your next push.}