Repository navigation
Conversation
|
@Bkizzy16 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! 🚀 |
|
This PR has merge conflicts with |
|
@Bkizzy16 Thanks for the PR. It can't be merged yet. To unblock it: Merge conflicts: this branch conflicts with Push to this same branch and CI will re-run. Once it's green and conflict-free, it'll be reviewed for merge. |
Malware scan: passed, with notes for the reviewerNothing malicious was detected in
|
|
@afeezorobsco-cyber I resolved the conflicts with current main and updated the factory and escrow integration. The workspace contract tests, doctests, escrow WASM build, and generated SDK binding check pass. The PR description includes |
|
@Bkizzy16 CI is failing on this branch (after it was updated with the latest All 3 new |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared files like Automated message. It won't repeat unless the PR conflicts again after your next push. |
# Conflicts: # ARCHITECTURE_ESSENTIALS.md # README.md # sdk/src/generated/contract-client.ts
|
@afeezorobsco-cyber I resolved the current-main conflicts and fixed the payee-acceptance fixture constructor arguments reported by CI. Please review and merge when the checks pass. The PR description still includes Closes #49. |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
@Bkizzy16 CI is failing on this branch against the latest Soroban contract (test + wasm build) SDK bindings match contract WASM A
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( This PR also conflicts with |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
1 similar comment
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
@Bkizzy16 This PR conflicts with git fetch upstream
git rebase upstream/main
# fix the conflicts, then
git push --force-with-leaseIf the conflict is in |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
1 similar comment
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
@Bkizzy16 This PR conflicts with git fetch upstream
git rebase upstream/main
# fix the conflicts, then
git push --force-with-leaseIf the conflict is in |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
Note for maintainers: the ADR was renumbered from 0008 to 0012, because main already uses 0008 and 0011. The contract interface changed (integrator argument). Bindings are regenerated and the drift check passes. Tests pass for the escrow, factory and releaser-account crates. |
Add a factory contract that pins the escrow WASM hash and deploys one deterministic, immutable escrow per integrator (issue DocForum#49, ADR 0012). The escrow constructor takes an optional integrator recorded as informational metadata. Workspace builds, isolation tests, regenerated bindings, and changelog/changeset entries are included. Merged origin/main (pooled escrows, payee acceptance, releaser rotation) and resolved: escrow DataKey and Cargo.toml conflicts, duplicate ADR 0008 renumbered to 0012, error codes unchanged (no new escrow errors).
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
ad3666d to
cea1ecc
Compare
Keep upstream's resource_profile bench target on the escrow crate; the release profile stays at the new workspace root.
|
fix CI. failure |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
|
@Bkizzy16 CI is failing. The Go SDK integration (local quickstart) job fails when deploying the contract: The deploy step passes constructor arguments that no longer match Please fix and push. |
|
@afeezorobsco-cyber The current head still conflicts with |
|
@afeezorobsco-cyber I resolved the current-main conflict on this PR and updated the factory child constructor for the current fee/liability API. The full Rust contract workspace, formatting check, release WASM build, generated-binding check, and resource-baseline check pass locally. PR #146 is currently mergeable, and the refreshed malware scan passed. The Go quickstart deploy failure from the prior run needs a fresh CI result on this head. I added docs/audit/delta-issue-49-escrow-factory.md and request the independent delta review required for this contract change. |
|
@Bkizzy16 (cc @SABA-SOL) The factory merge looks good. One blocker remains: #154 merged first and moved Please bump |
|
@Bkizzy16 Heads-up: #268 just changed how contract PRs work in this repo. Your PR changes
This should also make your next merge from |
|
@Bkizzy16 This PR now has merge conflicts with 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-leaseThe usual culprits are shared docs like Automated message. It won't repeat unless the PR conflicts again after your next push. |
Summary
Closes #49
Verification