Merge branch 'main' into example-token-pause-key-clean

undefinedIsMyLife · web-flow · commit 33c68aa1fbda · 2025-11-28T22:50:15.000+05:30
Signed-off-by: undefinedIsMyLife &lt;shinetina169@gmail.com&gt;
diff --git a/.github/workflows/bot-office-hours.yml b/.github/workflows/bot-office-hours.yml
@@ -0,0 +1,73 @@
+name: PythonBot - Office Hour Reminder
+
+on:
+  # push:
+  schedule:
+    - cron: '0 10 * * 3'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  office-hour-reminder:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden the runner
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 
+        with:
+          egress-policy: audit
+
+      - name: Check Schedule and Notify
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          ANCHOR_DATE="2025-12-03"
+          MEETING_LINK="https://zoom-lfx.platform.linuxfoundation.org/meeting/99912667426?password=5b584a0e-1ed7-49d3-b2fc-dc5ddc888338"
+          CALENDAR_LINK="https://zoom-lfx.platform.linuxfoundation.org/meetings/hiero?view=week"
+
+          IS_MEETING_WEEK=$(python3 -c "from datetime import date; import os; d1=date.fromisoformat('$ANCHOR_DATE'); d2=date.today(); print('true' if (d2-d1).days % 14 == 0 else 'false')")
+
+          if [ "$IS_MEETING_WEEK" = "false" ]; then
+            echo "Not a fortnightly meeting week. Skipping execution."
+            exit 0
+          fi
+
+          echo "Meeting week detected. Proceeding to notify open PRs."
+
+          REPO="${{ github.repository }}"
+          PR_LIST=$(gh pr list --repo $REPO --state open --json number --jq '.[].number')
+
+          if [ -z "$PR_LIST" ]; then
+            echo "No open PRs found."
+            exit 0
+          fi
+
+          COMMENT_BODY=$(cat <<EOF
+          Hello, this is the Office Hour Bot.
+
+          This is a reminder that the Hiero Python SDK Office Hours are scheduled in approximately 4 hours (14:00 UTC).
+
+          This session provides an opportunity to ask questions regarding this Pull Request or receive assistance from a maintainer.
+
+          Details:
+          - Time: 14:00 UTC
+          - Join Link: [Zoom Meeting]($MEETING_LINK)
+
+          Disclaimer: This is an automated reminder. Please verify the schedule [here]($CALENDAR_LINK) to be notified of any changes.
+          EOF
+          )
+
+          for PR_NUM in $PR_LIST; do
+            echo "Processing PR #$PR_NUM"
+            
+            ALREADY_COMMENTED=$(gh pr view $PR_NUM --repo $REPO --json comments --jq '.comments[].body' | grep -F "Office Hour Bot" || true)
+
+            if [ -z "$ALREADY_COMMENTED" ]; then
+              gh pr comment $PR_NUM --repo $REPO --body "$COMMENT_BODY"
+              echo "Reminder posted to PR #$PR_NUM"
+            else
+              echo "PR #$PR_NUM already notified. Skipping."
+            fi
+          done
diff --git a/.github/workflows/bot-verified-commits.yml b/.github/workflows/bot-verified-commits.yml
@@ -38,8 +38,16 @@ jobs:
 
           echo "Unverified commits: $UNVERIFIED_COUNT"
 
+          EXISTING_BOT_COMMENT_COUNT=$(gh pr view $PR_NUMBER --repo $REPO --json comments | jq '[.comments[] | select(.author.login == "github-actions" and (.body | contains("[commit-verification-bot]")))] | length')
+
+          echo "Existing verification commit bot comments: $EXISTING_BOT_COMMENT_COUNT"
+    
           if [ "$UNVERIFIED_COUNT" -gt 0 ]; then
-            COMMENT=$(cat <<EOF
+            if [ "$EXISTING_BOT_COMMENT_COUNT" -ge 1 ]; then   
+              echo "VerificationBot already commented. Skipping additional comments."
+            else 
+              COMMENT=$(cat <<EOF
+            [commit-verification-bot]
             Hi, this is VerificationBot. 
             Your pull request cannot be merged as it has **unverified commits**. 
             View your commit verification status: [Commits Tab]($COMMITS_URL).
@@ -58,9 +66,11 @@ jobs:
           EOF
             )
 
-            gh pr view $PR_NUMBER --repo $REPO --json comments --jq '.comments[].body' | grep -F "PythonBot" >/dev/null || \
-            (gh pr comment $PR_NUMBER --repo $REPO --body "$COMMENT" && echo "Comment added to PR #$PR_NUMBER")
+              gh pr comment $PR_NUMBER --repo $REPO --body "$COMMENT"
+              echo "Comment added to PR #$PR_NUMBER"
+            fi
+
+            exit 1
           else
             echo "All commits in PR #$PR_NUMBER are verified."
           fi
- 
diff --git a/.github/workflows/merge-conflict-bot.yml b/.github/workflows/merge-conflict-bot.yml
@@ -0,0 +1,71 @@
+name: PythonBot - Check Merge Conflicts
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: read
+  pull-requests: write
+
+concurrency:
+  group: "check-conflicts-${{ github.event.pull_request.number }}"
+  cancel-in-progress: true
+
+jobs:
+  check-conflicts:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        with:
+          egress-policy: audit
+      
+      - name: Check for merge conflicts
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          REPO="${{ github.repository }}"
+
+          echo "Checking merge status for PR #$PR_NUMBER in repository $REPO..."
+
+          for i in {1..10}; do
+            PR_JSON=$(gh api repos/$REPO/pulls/$PR_NUMBER)
+            MERGEABLE_STATE=$(echo "$PR_JSON" | jq -r '.mergeable_state')
+
+            echo "Attempt $i: Current mergeable state: $MERGEABLE_STATE"
+
+            if [ "$MERGEABLE_STATE" != "unknown" ]; then
+              break
+            fi
+
+            echo "State is 'unknown', waiting 2 seconds..."
+            sleep 2
+          done
+
+          if [ "$MERGEABLE_STATE" = "dirty" ]; then
+            COMMENT=$(cat <<EOF
+            Hi, this is MergeConflictBot. 
+            Your pull request cannot be merged because it contains **merge conflicts**. 
+            
+            Please resolve these conflicts locally and push the changes.
+
+            To assist you, please read:
+            - [Resolving Merge Conflicts](docs/sdk_developers/merge_conflicts.md)
+            - [Rebasing Guide](docs/sdk_developers/rebasing.md)
+
+            Thank you for contributing!
+
+            From the Hiero Python SDK Team
+          EOF
+            )
+
+            gh pr view $PR_NUMBER --repo $REPO --json comments --jq '.comments[].body' | grep -F "MergeConflictBot" >/dev/null || \
+            (gh pr comment $PR_NUMBER --repo $REPO --body "$COMMENT" && echo "Comment added to PR #$PR_NUMBER")
+            
+            exit 1
+          else
+            echo "No merge conflicts detected (State: $MERGEABLE_STATE)."
+          fi
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -73,7 +73,9 @@ jobs:
           # List files in the PR and check for CHANGELOG.md (root or any path ending with /CHANGELOG.md)
           FILES_JSON="$(gh api repos/${{ github.repository }}/pulls/${PR_NUMBER}/files --paginate)"
           if ! echo "${FILES_JSON}" | jq -e '.[] | select(.filename | test("(^|/)CHANGELOG\\.md$"; "i"))' >/dev/null; then
-            echo "FAIL: CHANGELOG.md was not changed in this PR."
+            echo "❌ FAIL: CHANGELOG.md was not changed in this PR."
+            echo ""
+            echo "Please add an entry to CHANGELOG.md under the [Unreleased] section."
             exit 1
           fi
 
@@ -83,15 +85,84 @@ jobs:
 
           # If no patch is returned (very large file or API omission), treat presence as sufficient
           if [[ -z "${PATCH_CONTENT}" ]]; then
-            echo "CHANGELOG.md modified (no patch provided by API). Passing."
+            echo "✅ PASS: CHANGELOG.md modified (no patch provided by API)."
             exit 0
           fi
 
-          # Look for actual line changes (exclude diff headers +++/---)
-          if echo "${PATCH_CONTENT}" | awk '{print $0}' | grep -E '^[+-]' | grep -vE '^\+\+\+|^\-\-\-' >/dev/null; then
-            echo "PASS: CHANGELOG.md contains line-level changes."
+          # Extract only the added lines from the patch (lines starting with +, excluding +++ header)
+          ADDED_LINES="$(echo "${PATCH_CONTENT}" | grep -E '^\+' | grep -v '^\+\+\+' || true)"
+
+          # Check if there are any actual additions
+          if [[ -z "${ADDED_LINES}" ]]; then
+            echo "❌ FAIL: No line-level additions detected in CHANGELOG.md."
+            echo ""
+            echo "Please add an entry to CHANGELOG.md under the [Unreleased] section."
+            exit 1
+          fi
+
+          # Check if changes are under [Unreleased]
+          # Parse the patch to track which section we're in and validate additions
+          IN_UNRELEASED=false
+          IN_RELEASED_VERSION=false
+          FOUND_VALID_ADDITION=false
+          RELEASED_VERSION_FOUND=""
+
+          while IFS= read -r line; do
+            # Check for [Unreleased] header (context line or added line)
+            if [[ "$line" =~ \[Unreleased\] ]]; then
+              IN_UNRELEASED=true
+              IN_RELEASED_VERSION=false
+              RELEASED_VERSION_FOUND=""
+            fi
+
+            # Check for released version header pattern: ## [X.Y.Z] - DATE
+            # Match both context and added lines
+            if [[ "$line" =~ \[([0-9]+\.[0-9]+\.[0-9]+)\].*-.*[0-9]{4} ]]; then
+              # We found a released version header
+              RELEASED_VERSION_FOUND="${BASH_REMATCH[1]}"
+              IN_UNRELEASED=false
+              IN_RELEASED_VERSION=true
+            fi
+
+            # Check for added lines (starting with +, not +++)
+            if [[ "$line" =~ ^\+[^+] ]]; then
+              # Extract the actual content (remove the leading +)
+              ADDED_CONTENT="${line:1}"
+
+              # Skip empty lines and section headers
+              if [[ -n "$ADDED_CONTENT" && ! "$ADDED_CONTENT" =~ ^###\ ]]; then
+                if [[ "$IN_UNRELEASED" == true ]]; then
+                  FOUND_VALID_ADDITION=true
+                elif [[ "$IN_RELEASED_VERSION" == true && -n "$RELEASED_VERSION_FOUND" ]]; then
+                  # Found an addition under a released version - this is wrong
+                  echo "❌ FAIL: Changelog entry found under a released version, not under [Unreleased]."
+                  echo ""
+                  echo "You added content under version [$RELEASED_VERSION_FOUND] instead of [Unreleased]:"
+                  echo "  $ADDED_CONTENT"
+                  echo ""
+                  echo "📝 Please move your changes to the [Unreleased] section at the top of CHANGELOG.md"
+                  echo ""
+                  echo "Example structure:"
+                  echo "  ## [Unreleased]"
+                  echo "  ### Added"
+                  echo "  - Your new feature or fix here"
+                  exit 1
+                fi
+              fi
+            fi
+          done <<< "$PATCH_CONTENT"
+
+          if [[ "$FOUND_VALID_ADDITION" == true ]]; then
+            echo "✅ PASS: CHANGELOG.md contains valid additions under [Unreleased]."
             exit 0
           else
-            echo "FAIL: No line-level changes detected in CHANGELOG.md."
+            echo "❌ FAIL: No valid changelog entries found under [Unreleased]."
+            echo ""
+            echo "Please ensure your changes are added under the [Unreleased] section of CHANGELOG.md"
+            echo ""
+            echo "Example:"
+            echo "  ## [Unreleased]"
+            echo "  ### Added"
+            echo "  - Your feature/fix description"
             exit 1
           fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 
 ### Added
 - Add examples/token_create_transaction_pause_key.py example demonstrating token pause/unpause behavior and pause key usage (#820)
+
+- Add example demonstrating usage of `CustomFeeLimit` in `examples/transaction/custom_fee_limit.py`
+- Added `.github/workflows/merge-conflict-bot.yml` to automatically detect and notify users of merge conflicts in Pull Requests.
+- Added validation logic in `.github/workflows/pr-checks.yml` to detect when no new chnagelog entries are added under [Unreleased]
+
 ### Changed
 
 - Removed duplicate import of transaction_pb2 in transaction.py
@@ -18,6 +23,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 
 ### Added
 
+- Add a limit of one comment for PR to the commit verification bot. [#892]
 - Removed `actions/checkout@v4` from `bot-verified-commits.yml`
 - Add comprehensive documentation for `ReceiptStatusError` in `docs/sdk_developers/training/receipt_status_error.md`
 - Add practical example `examples/errors/receipt_status_error.py` demonstrating transaction error handling
@@ -68,7 +74,6 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - changed to add concurrency to workflow bot
 - feat: Refactor `TokenDissociateTransaction` to use set_token_ids method and update transaction fee to Hbar, also update `transaction.py` and expand `examples/token_dissociate.py`, `tests/unit/token_dissociate.py`.
 
-
 ### Fixed
 
 - chore: updated solo action to avoid v5
diff --git a/examples/transaction/custom_fee_limit.py b/examples/transaction/custom_fee_limit.py
