Merge branch 'master' into unify-mailbox-ttl

Author: Arowolokehinde

.github/CONTRIBUTING.md

@@ -12,7 +12,7 @@ As such, contributions are greatly valued, necessary, and impactful: whether it'
 
 ## Communication Channels
 
-Most discussion about Payjoin research and development happens on [Discord](https://discord.gg/X8RRV2VS), or in Github [issues](https://github.com/payjoin/rust-payjoin/issues) or [pull requests](https://github.com/payjoin/rust-payjoin/pulls).
+Most discussion about Payjoin research and development happens on [Discord](https://discord.gg/6rJD9R684h), or in Github [issues](https://github.com/payjoin/rust-payjoin/issues) or [pull requests](https://github.com/payjoin/rust-payjoin/pulls).
 
 ---
 
@@ -67,6 +67,23 @@ RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --all-features --document-private
 echo "▶  ./contrib/test_local.sh"
 ./contrib/test_local.sh
 
+# -------- 4. lock file verification --------
+changed_tomls=$(git diff --cached --name-only --diff-filter=ACMR | grep -E '(^|/)Cargo\.toml$' || true)
+
+if [ -n "$changed_tomls" ]; then
+    echo "▶  Checking if lockfiles need updating…"
+    ./contrib/update-lock-files.sh
+    stale_locks=$(git diff --name-only -- Cargo-minimal.lock Cargo-recent.lock)
+    if [ -n "$stale_locks" ]; then
+        git checkout -- Cargo-minimal.lock Cargo-recent.lock
+        echo "pre-commit: Cargo.toml changed and lockfiles are stale!"
+        echo "Stale lockfiles:"
+        echo "$stale_locks"
+        echo "Run './contrib/update-lock-files.sh' and stage the lockfiles."
+        exit 1
+    fi
+fi
+
 echo "✓  Pre-commit hook passed"
 ```
 

.github/scripts/create_standup_discussion.py

@@ -39,6 +39,7 @@
     "payjoin/multiparty-protocol-docs",
     "payjoin/btsim",
     "payjoin/tx-indexer",
+    "Uniffi-Dart/uniffi-dart",
 ]
 
 REPO_FILTER = " ".join(f"repo:{r}" for r in REPOS)
@@ -120,6 +121,66 @@ def add_discussion_comment(discussion_id, body):
     )
 
 
+def find_latest_checkin():
+    """Find the most recent Weekly Check-in Discussion."""
+    owner, name = REPO.split("/")
+    data = graphql(
+        """
+        query($owner: String!, $name: String!) {
+          repository(owner: $owner, name: $name) {
+            discussions(first: 10, orderBy: {field: CREATED_AT, direction: DESC}) {
+              nodes {
+                id
+                title
+              }
+            }
+          }
+        }
+        """,
+        {"owner": owner, "name": name},
+    )
+    for discussion in data["repository"]["discussions"]["nodes"]:
+        if discussion["title"].startswith("Weekly Check-in:"):
+            return discussion
+    return None
+
+
+def get_discussion_comments(discussion_id):
+    """Fetch top-level comments for a Discussion."""
+    data = graphql(
+        """
+        query($id: ID!) {
+          node(id: $id) {
+            ... on Discussion {
+              comments(first: 50) {
+                nodes {
+                  body
+                  url
+                }
+              }
+            }
+          }
+        }
+        """,
+        {"id": discussion_id},
+    )
+    return data["node"]["comments"]["nodes"]
+
+
+def get_previous_thread_links():
+    """Map contributors to the previous check-in thread created for them."""
+    discussion = find_latest_checkin()
+    if not discussion:
+        return {}
+
+    links = {}
+    for comment in get_discussion_comments(discussion["id"]):
+        user = next((u for u in CONTRIBUTORS if f"@{u}" in comment["body"]), None)
+        if user:
+            links[user] = comment["url"]
+    return links
+
+
 SEARCH_QUERY = """
 query($q: String!) {
   search(query: $q, type: ISSUE, first: 30) {
@@ -128,18 +189,28 @@ def add_discussion_comment(discussion_id, body):
         id
         title
         url
+        number
+        repository {
+          nameWithOwner
+        }
         author { login }
       }
       ... on Issue {
         id
         title
         url
+        number
+        repository {
+          nameWithOwner
+        }
         author { login }
       }
     }
   }
 }
 """
+# This avoids refetching review history for the same PR multiple times in one run.
+PR_REVIEWS_CACHE = {}
 
 
 def search_issues(query):
@@ -155,6 +226,8 @@ def search_issues(query):
                 "id": node["id"],
                 "title": node["title"],
                 "html_url": node["url"],
+                "number": node["number"],
+                "repository": node["repository"]["nameWithOwner"],
                 "user": {
                     "login": node["author"]["login"] if node.get("author") else ""
                 },
@@ -163,17 +236,91 @@ def search_issues(query):
     return items
 
 
+def parse_github_datetime(value):
+    """Parse a GitHub ISO 8601 timestamp into an aware datetime."""
+    return datetime.fromisoformat(value.replace("Z", "+00:00"))
+
+
+def get_paginated(url, params=None):
+    """GET a paginated REST collection and return all items."""
+    items = []
+    next_url = url
+    next_params = params or {}
+    while next_url:
+        for attempt in range(5):
+            resp = requests.get(
+                next_url,
+                headers=HEADERS,
+                params=next_params,
+                timeout=30,
+            )
+            if resp.status_code in {403, 429} or 500 <= resp.status_code < 600:
+                wait = 2**attempt
+                print(
+                    f"REST request failed ({resp.status_code}), retrying in {wait}s..."
+                )
+                time.sleep(wait)
+                continue
+            resp.raise_for_status()
+            break
+        else:
+            resp.raise_for_status()
+        items.extend(resp.json())
+        next_url = resp.links.get("next", {}).get("url")
+        next_params = None
+    return items
+
+
+def get_pull_request_reviews(pr):
+    """Return all submitted reviews for a pull request."""
+    cache_key = (pr["repository"], pr["number"])
+    if cache_key in PR_REVIEWS_CACHE:
+        return PR_REVIEWS_CACHE[cache_key]
+
+    reviews = get_paginated(
+        f"{API}/repos/{pr['repository']}/pulls/{pr['number']}/reviews",
+        {"per_page": 100},
+    )
+    PR_REVIEWS_CACHE[cache_key] = reviews
+    return reviews
+
+
+def latest_reviewed_at(pr, reviewer):
+    """Return the reviewer's latest submitted review timestamp for a PR."""
+    latest = None
+    for review in get_pull_request_reviews(pr):
+        if review.get("user", {}).get("login") != reviewer:
+            continue
+        submitted_at = review.get("submitted_at")
+        if not submitted_at:
+            continue
+        submitted = parse_github_datetime(submitted_at)
+        if latest is None or submitted > latest:
+            latest = submitted
+    return latest
+
+
 def gather_activity(user, since_date):
     """Gather a contributor's past-week activity across the org."""
     since = since_date.strftime("%Y-%m-%d")
 
     # PRs merged (authored)
     merged_prs = search_issues(f"author:{user} type:pr merged:>{since}")
 
-    # PRs reviewed
-    reviewed_prs = search_issues(f"reviewed-by:{user} type:pr updated:>{since}")
-    # Exclude PRs the user authored (already counted above)
-    reviewed_prs = [pr for pr in reviewed_prs if pr["user"]["login"] != user]
+    # PRs reviewed use search  to find candidate PRs then confirm
+    # the reviewer actually submitted a review during the standup window.
+    review_candidates = search_issues(
+        f"reviewed-by:{user} type:pr updated:>{since} sort:updated-desc"
+    )
+    seen_ids = set()
+    reviewed_prs = []
+    for pr in review_candidates:
+        if pr["id"] in seen_ids or pr["user"]["login"] == user:
+            continue
+        reviewed_at = latest_reviewed_at(pr, user)
+        if reviewed_at and reviewed_at > since_date:
+            seen_ids.add(pr["id"])
+            reviewed_prs.append(pr)
 
     # Issues opened
     issues_opened = search_issues(f"author:{user} type:issue created:>{since}")
@@ -206,7 +353,7 @@ def gather_potential_bottlenecks(user, since_date):
 
 
 def format_contributor_comment(
-    user, merged_prs, reviewed_prs, issues_opened, bottlenecks
+    user, merged_prs, reviewed_prs, issues_opened, bottlenecks, previous_thread_url=None
 ):
     """Format the threaded reply for a contributor."""
     lines = [f"## {user}", "", f"@{user}", ""]
@@ -234,6 +381,16 @@ def format_contributor_comment(
     else:
         lines.append("_No activity found._")
 
+    lines.append("")
+    lines.append("### Last Week")
+    if previous_thread_url:
+        lines.append("")
+        lines.append(
+            f"Review your previous thread: [Last week's thread]({previous_thread_url})"
+        )
+    else:
+        lines.append("_No previous thread found._")
+
     if bottlenecks:
         lines.append("")
         lines.append("_Auto-detected signals:_")
@@ -246,6 +403,7 @@ def main():
     today = datetime.now(timezone.utc)
     week_label = today.strftime("Week of %Y-%m-%d")
     since_date = today - timedelta(days=7)
+    previous_thread_links = get_previous_thread_links()
 
     dry_run = os.environ.get("DRY_RUN")
 
@@ -255,7 +413,12 @@ def main():
         merged_prs, reviewed_prs, issues_opened = gather_activity(user, since_date)
         bottlenecks = gather_potential_bottlenecks(user, since_date)
         comment_body = format_contributor_comment(
-            user, merged_prs, reviewed_prs, issues_opened, bottlenecks
+            user,
+            merged_prs,
+            reviewed_prs,
+            issues_opened,
+            bottlenecks,
+            previous_thread_links.get(user),
         )
         comments.append((user, comment_body))
 

.github/workflows/dart.yml

@@ -35,8 +35,5 @@ jobs:
       - name: "Use cache"
         uses: Swatinem/rust-cache@v2
 
-      - name: Generate bindings and binaries
-        run: bash ./scripts/generate_bindings.sh
-
-      - name: Run tests
-        run: dart test
+      - name: "Build and test"
+        run: bash ./contrib/test.sh

.github/workflows/javascript.yml

@@ -41,11 +41,5 @@ jobs:
       - name: Install wasm-bindgen
         run: cargo install --locked wasm-bindgen-cli --version 0.2.108
 
-      - name: "Install dependencies"
-        run: npm ci
-
-      - name: Generate bindings and binaries
-        run: bash ./scripts/generate_bindings.sh
-
-      - name: Run tests
-        run: npm test
+      - name: "Build and test"
+        run: bash ./contrib/test.sh

.github/workflows/python.yml

@@ -41,17 +41,5 @@ jobs:
           version: "0.8.2"
           enable-cache: true
 
-      - name: "uv sync"
-        run: uv sync --all-extras
-
-      - name: "Generate payjoin-ffi.py and binaries"
-        run: bash ./scripts/generate_bindings.sh
-
-      - name: "Build wheel"
-        run: uv build --wheel
-
-      - name: "Install wheel"
-        run: uv run pip install ./dist/*.whl
-
-      - name: "Run tests"
-        run: uv run python -m unittest --verbose
+      - name: "Build and test"
+        run: bash ./contrib/test.sh