Feat/issues 706 707 710 713

.github/workflows/auto-merge.yml

@@ -1,5 +1,132 @@
 name: Auto-Merge PRs
 
+<<<<<<< HEAD
+# Fires when a PR is opened/updated (to enable native auto-merge) and when a
+# check suite completes (to directly merge if every check went green and the
+# branch has no conflicts).
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    branches: [main]
+  check_suite:
+    types: [completed]
+
+permissions:
+  contents: write        # needed to merge
+  pull-requests: write   # needed to update PR auto-merge flag
+
+jobs:
+  # ── 1. Enable GitHub's built-in auto-merge the moment a PR is opened / updated
+  enable-auto-merge:
+    name: Enable auto-merge on PR
+    if: |
+      github.event_name == 'pull_request' &&
+      github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Enable squash auto-merge
+        # continue-on-error so a repo without branch-protection rules doesn't
+        # block the workflow; the merge-when-green job is the primary mechanism.
+        continue-on-error: true
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr merge --auto --squash \
+            --repo "${{ github.repository }}" \
+            "${{ github.event.pull_request.number }}"
+
+  # ── 2. Directly merge when ALL check runs on the suite pass ──────────────
+  merge-when-green:
+    name: Merge PR when all checks pass
+    if: |
+      github.event_name == 'check_suite' &&
+      github.event.check_suite.conclusion == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge passing, conflict-free PRs
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const headSha = context.payload.check_suite.head_sha;
+            const prs     = context.payload.check_suite.pull_requests ?? [];
+
+            if (prs.length === 0) {
+              core.info('No open PRs linked to this check suite — nothing to do.');
+              return;
+            }
+
+            for (const pr of prs) {
+              // Fetch the full PR object (includes mergeable + draft fields)
+              const { data: pull } = await github.rest.pulls.get({
+                owner:       context.repo.owner,
+                repo:        context.repo.repo,
+                pull_number: pr.number,
+              });
+
+              if (pull.draft) {
+                core.info(`PR #${pr.number} is a draft — skipping.`);
+                continue;
+              }
+
+              if (pull.state !== 'open') {
+                core.info(`PR #${pr.number} is already closed — skipping.`);
+                continue;
+              }
+
+              // GitHub computes mergeability asynchronously; poll once if null.
+              let mergeable = pull.mergeable;
+              if (mergeable === null) {
+                core.info(`PR #${pr.number}: mergeability not yet computed, waiting 6 s…`);
+                await new Promise(r => setTimeout(r, 6000));
+                const { data: refreshed } = await github.rest.pulls.get({
+                  owner:       context.repo.owner,
+                  repo:        context.repo.repo,
+                  pull_number: pr.number,
+                });
+                mergeable = refreshed.mergeable;
+              }
+
+              if (mergeable === false) {
+                core.info(`PR #${pr.number} has merge conflicts — skipping.`);
+                continue;
+              }
+
+              // Confirm every completed check run passed (or was neutral/skipped).
+              const { data: { check_runs } } = await github.rest.checks.listForRef({
+                owner:    context.repo.owner,
+                repo:     context.repo.repo,
+                ref:      headSha,
+                per_page: 100,
+              });
+
+              const failing = check_runs.filter(r =>
+                r.status === 'completed' &&
+                !['success', 'skipped', 'neutral'].includes(r.conclusion)
+              );
+
+              if (failing.length > 0) {
+                core.info(
+                  `PR #${pr.number} has failing checks ` +
+                  `(${failing.map(r => r.name).join(', ')}) — skipping.`
+                );
+                continue;
+              }
+
+              // Everything is green and conflict-free — merge!
+              try {
+                await github.rest.pulls.merge({
+                  owner:          context.repo.owner,
+                  repo:           context.repo.repo,
+                  pull_number:    pr.number,
+                  merge_method:   'squash',
+                  commit_title:   `${pull.title} (#${pr.number})`,
+                  commit_message: pull.body ?? '',
+                });
+                core.info(`✅  Auto-merged PR #${pr.number}: ${pull.title}`);
+              } catch (err) {
+                core.error(`Failed to merge PR #${pr.number}: ${err.message}`);
+=======
 # Merges open PRs once every check that ran for their head commit has gone green.
 #
 # Why `workflow_run` and not `check_suite`:
@@ -170,5 +297,6 @@ jobs:
                 // 405 = not mergeable right now, 409 = head moved. Both are
                 // transient; the next sweep retries.
                 core.warning(`#${number}: merge failed (${err.status}): ${err.message}`);
+>>>>>>> emwulrd/main
               }
             }

.github/workflows/changelog.yml

@@ -16,6 +16,20 @@ jobs:
 
     steps:
       - name: Checkout repository
+<<<<<<< HEAD
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Generate CHANGELOG.md
+        uses: orhun/git-cliff-action@v4
+        with:
+          config: cliff.toml
+          args: --verbose --output CHANGELOG.md
+
+      - name: Commit and push CHANGELOG.md
+        uses: stefanzweifel/git-auto-commit-action@v5
+=======
         uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           fetch-depth: 0
@@ -47,6 +61,7 @@ jobs:
 
       - name: Commit and push CHANGELOG.md
         uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5
+>>>>>>> emwulrd/main
         with:
           file_pattern: CHANGELOG.md
           commit_message: "chore(changelog): update changelog [skip ci]"

.github/workflows/contract-tests.yml

@@ -19,17 +19,29 @@ jobs:
 
     steps:
       - name: Checkout repository
+<<<<<<< HEAD
+        uses: actions/checkout@v4
+
+      - name: Install Rust stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+=======
         uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
 
       - name: Install Rust stable toolchain
         uses: dtolnay/rust-toolchain@2c7215f132e9ebf062739d9130488b56d53c060c # stable
         with:
           toolchain: stable
+>>>>>>> emwulrd/main
           components: clippy
           targets: wasm32-unknown-unknown
 
       - name: Cache Cargo dependencies
+<<<<<<< HEAD
+        uses: Swatinem/rust-cache@v2
+=======
         uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
+>>>>>>> emwulrd/main
         with:
           workspaces: Dechat/stellar-contracts -> target
 

.github/workflows/contracts.yml

@@ -14,6 +14,8 @@ on:
 permissions:
   contents: read
 
+<<<<<<< HEAD
+=======
 env:
   # Regression guard for the deployed contract only. Raised from the
   # previous 55000: that limit was never actually enforced (the old
@@ -23,6 +25,7 @@ env:
   # workflow level so the size-report job below stays in sync with it.
   MAX_WASM_BYTES: "98500"
 
+>>>>>>> emwulrd/main
 jobs:
   test:
     name: Test & Build
@@ -34,6 +37,12 @@ jobs:
 
     steps:
       - name: Checkout repository
+<<<<<<< HEAD
+        uses: actions/checkout@v4
+
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@stable
+=======
         uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           fetch-depth: 0
@@ -54,13 +63,18 @@ jobs:
 
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@2c7215f132e9ebf062739d9130488b56d53c060c # stable
+>>>>>>> emwulrd/main
         with:
           toolchain: stable
           components: clippy
           targets: wasm32-unknown-unknown
 
       - name: Cache Cargo registry
+<<<<<<< HEAD
+        uses: actions/cache@v4
+=======
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+>>>>>>> emwulrd/main
         with:
           path: |
             ~/.cargo/registry
@@ -78,6 +92,13 @@ jobs:
 
       - name: Check WASM size
         run: |
+<<<<<<< HEAD
+          ls -la target/wasm32-unknown-unknown/release/*.wasm
+          SIZE=$(ls -la target/wasm32-unknown-unknown/release/*.wasm | awk '{print $5}')
+          echo "Current WASM size: $SIZE bytes"
+          if [ $SIZE -gt 55000 ]; then
+            echo "Error: WASM size $SIZE bytes exceeds 55 KB limit"
+=======
           set -euo pipefail
           ARTIFACT=target/wasm32-unknown-unknown/release/stellar_contracts.wasm
 
@@ -94,11 +115,14 @@ jobs:
 
           if [ "$SIZE" -gt "$MAX_WASM_BYTES" ]; then
             echo "Error: WASM size $SIZE bytes exceeds ${MAX_WASM_BYTES} byte limit"
+>>>>>>> emwulrd/main
             exit 1
           fi
 
       - name: Run clippy (deny warnings)
         run: cargo clippy --all-targets --all-features -- -D warnings
+<<<<<<< HEAD
+=======
 
   deny:
     name: License & Advisory Check
@@ -200,3 +224,4 @@ jobs:
           name: wasm-size-report
           path: wasm-size-report.json
           retention-days: 7
+>>>>>>> emwulrd/main

.github/workflows/deploy-futurenet.yml

@@ -24,10 +24,17 @@ jobs:
 
     steps:
       - name: Checkout repository
+<<<<<<< HEAD
+        uses: actions/checkout@v4
+
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@stable
+=======
         uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
 
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@2c7215f132e9ebf062739d9130488b56d53c060c # stable
+>>>>>>> emwulrd/main
         with:
           toolchain: stable
           targets: wasm32-unknown-unknown
@@ -38,7 +45,11 @@ jobs:
           soroban --version
 
       - name: Cache Cargo registry
+<<<<<<< HEAD
+        uses: actions/cache@v4
+=======
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+>>>>>>> emwulrd/main
         with:
           path: |
             ~/.cargo/registry
@@ -68,15 +79,23 @@ jobs:
 
       - name: Upload contract ID artifact
         if: success()
+<<<<<<< HEAD
+        uses: actions/upload-artifact@v4
+=======
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+>>>>>>> emwulrd/main
         with:
           name: contract-deployment-${{ github.sha }}
           path: Dechat/stellar-contracts/contract_id_futurenet.txt
           retention-days: 90
 
       - name: Create deployment status
         if: always()
+<<<<<<< HEAD
+        uses: actions/github-script@v7
+=======
         uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+>>>>>>> emwulrd/main
         with:
           script: |
             const status = '${{ job.status }}' === 'success' ? 'success' : 'failure';