Skip to content

docs(integrators): publish trust model and condition_ref privacy warnings (#15) - #226

Open
Salome-Agu wants to merge 2 commits into
DocForum:mainfrom
Salome-Agu:docs/15-integrator-trust-model
Open

Salome-Agu wants to merge 2 commits into
DocForum:mainfrom
Salome-Agu:docs/15-integrator-trust-model

Conversation

@Salome-Agu

Copy link
Copy Markdown

…
Closes #15
Closes #13
Closes #8
Closes #14

What changed

Which ROADMAP.md item does this close/progress?

(required — see AGENTS.md doc-update rules)

Docs updated in this PR (check all that apply)

  • ROADMAP.md
  • ARCHITECTURE.md
  • ARCHITECTURE_ESSENTIALS.md
  • PRD.md
  • N/A for this change

@drips-wave

drips-wave Bot commented Oct 21, 2026

Copy link
Copy Markdown

@Salome-Agu 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

@github-actions github-actions Bot added the needs-rebase Has merge conflicts with main; the author needs to rebase label Oct 21, 2026
@github-actions

Copy link
Copy Markdown

@Salome-Agu This PR now has merge conflicts with main, most likely because #215 (feat(e6): React hooks, Wallets Kit signer, Go SDK and OTel hooks) 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.

@afeezorobsco-cyber

Copy link
Copy Markdown
Contributor

@Salome-Agu 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/15-docs-integrators-publish-trust-model-and.md:

    bump: minor
    ---
    Issue #15: 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. If you add any new Error variants, give them provisional codes (issue number × 100 + n, e.g. 1500) and never renumber existing ones.

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

@afeezorobsco-cyber

Copy link
Copy Markdown
Contributor

@Salome-Agu The new contract check (#268) fails because contracts/escrow/src/lib.rs changed without a fragment. Add contract-changes.d/15-integrator-trust-model.md (bump: minor or patch, then ---, then a one-paragraph summary). See contract-changes.d/README.md.

The SDK build also fails after the merge from main:

src/index.ts(1146,29): error TS2339: Property 'invoke' does not exist on type 'EscrowClient'.
src/index.ts(1162,18): error TS2551: Property 'create_escrow' does not exist on type 'Client'. Did you mean 'get_escrow'?
src/index.ts(1193,12): error TS2339: Property 'spanAttributesIfEnabled' does not exist on type 'EscrowClient'.

sdk/src/index.ts now calls helpers that main's EscrowClient no longer has (or names them differently), and the generated bindings are out of date. Please regenerate sdk/src/generated/contract-client.ts with stellar CLI 28.1.0, adapt index.ts to main's client, run npm run build && npm test in sdk/, and push.

@github-actions github-actions Bot added needs-rebase Has merge conflicts with main; the author needs to rebase and removed needs-rebase Has merge conflicts with main; the author needs to rebase labels Oct 28, 2026
@github-actions

Copy link
Copy Markdown

@Salome-Agu This PR now has merge conflicts with main, most likely because #270 (chore(contract): fold contract changes into 2.4.0 and fold changelog) 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-rebase Has merge conflicts with main; the author needs to rebase

Projects

None yet

2 participants