From 524286e32a7461ae36a4ab91578c05e4f89f20bb Mon Sep 17 00:00:00 2001
From: Altynbek Orumbayev <altynbek.orumbayev@makerx.com.au>
Date: Wed, 21 Feb 2024 17:52:28 +0100
Subject: [PATCH] chore: merge conflicts

---
 .../production_puya/.github/workflows/checks.yaml |  3 +++
 examples/production_puya/.gitignore               |  2 ++
 examples/production_puya/.pre-commit-config.yaml  | 10 ++++++++++
 examples/production_puya/.vscode/tasks.json       | 15 +++++++++++++++
 .../starter_puya/.github/workflows/checks.yaml    |  3 +++
 examples/starter_puya/.gitignore                  |  2 ++
 examples/starter_puya/.pre-commit-config.yaml     | 10 ++++++++++
 examples/starter_puya/.vscode/tasks.json          | 15 +++++++++++++++
 8 files changed, 60 insertions(+)

diff --git a/examples/production_puya/.github/workflows/checks.yaml b/examples/production_puya/.github/workflows/checks.yaml
index f6d0102..d5550b5 100644
--- a/examples/production_puya/.github/workflows/checks.yaml
+++ b/examples/production_puya/.github/workflows/checks.yaml
@@ -67,6 +67,9 @@ jobs:
       - name: Build smart contracts
         run: poetry run python -m smart_contracts build
 
+      - name: Scan TEAL files for issues
+        run: algokit task analyze .algokit --recursive --force # add --diff flag if you want output stability checks instead
+
       - name: Check output stability of the smart contracts
         shell: bash
         run: |
diff --git a/examples/production_puya/.gitignore b/examples/production_puya/.gitignore
index 4a926bb..e5f0b9e 100644
--- a/examples/production_puya/.gitignore
+++ b/examples/production_puya/.gitignore
@@ -176,3 +176,5 @@ node_modules
 
 # AlgoKit
 debug_traces/
+
+.algokit/static-analysis/tealer/
diff --git a/examples/production_puya/.pre-commit-config.yaml b/examples/production_puya/.pre-commit-config.yaml
index 93bfff5..8862f86 100644
--- a/examples/production_puya/.pre-commit-config.yaml
+++ b/examples/production_puya/.pre-commit-config.yaml
@@ -36,3 +36,13 @@ repos:
         minimum_pre_commit_version: '2.9.2'
         files: '^(src|tests)/'
       
+      - id: tealer
+        name: tealer
+        description: "Run AlgoKit `Tealer` for TEAL static analysis"
+        entry: algokit
+        language: system
+        args: [task, analyze, ".algokit", "--recursive", "--force"]
+        require_serial: false
+        additional_dependencies: []
+        minimum_pre_commit_version: "0"
+        files: '^.*\.teal$'
diff --git a/examples/production_puya/.vscode/tasks.json b/examples/production_puya/.vscode/tasks.json
index 9ad4d5a..eb1e767 100644
--- a/examples/production_puya/.vscode/tasks.json
+++ b/examples/production_puya/.vscode/tasks.json
@@ -59,6 +59,21 @@
         "cwd": "${workspaceFolder}"
       },
       "problemMatcher": []
+    },
+    {
+      "label": "Analyze TEAL contracts with AlgoKit Tealer integration",
+      "command": "algokit",
+      "args": [
+        "task",
+        "analyze",
+        "${workspaceFolder}/.algokit",
+        "--recursive",
+        "--force"
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "problemMatcher": []
     }
   ]
 }
diff --git a/examples/starter_puya/.github/workflows/checks.yaml b/examples/starter_puya/.github/workflows/checks.yaml
index f6d0102..d5550b5 100644
--- a/examples/starter_puya/.github/workflows/checks.yaml
+++ b/examples/starter_puya/.github/workflows/checks.yaml
@@ -67,6 +67,9 @@ jobs:
       - name: Build smart contracts
         run: poetry run python -m smart_contracts build
 
+      - name: Scan TEAL files for issues
+        run: algokit task analyze .algokit --recursive --force # add --diff flag if you want output stability checks instead
+
       - name: Check output stability of the smart contracts
         shell: bash
         run: |
diff --git a/examples/starter_puya/.gitignore b/examples/starter_puya/.gitignore
index 4a926bb..e5f0b9e 100644
--- a/examples/starter_puya/.gitignore
+++ b/examples/starter_puya/.gitignore
@@ -176,3 +176,5 @@ node_modules
 
 # AlgoKit
 debug_traces/
+
+.algokit/static-analysis/tealer/
diff --git a/examples/starter_puya/.pre-commit-config.yaml b/examples/starter_puya/.pre-commit-config.yaml
index 93bfff5..8862f86 100644
--- a/examples/starter_puya/.pre-commit-config.yaml
+++ b/examples/starter_puya/.pre-commit-config.yaml
@@ -36,3 +36,13 @@ repos:
         minimum_pre_commit_version: '2.9.2'
         files: '^(src|tests)/'
       
+      - id: tealer
+        name: tealer
+        description: "Run AlgoKit `Tealer` for TEAL static analysis"
+        entry: algokit
+        language: system
+        args: [task, analyze, ".algokit", "--recursive", "--force"]
+        require_serial: false
+        additional_dependencies: []
+        minimum_pre_commit_version: "0"
+        files: '^.*\.teal$'
diff --git a/examples/starter_puya/.vscode/tasks.json b/examples/starter_puya/.vscode/tasks.json
index 9ad4d5a..eb1e767 100644
--- a/examples/starter_puya/.vscode/tasks.json
+++ b/examples/starter_puya/.vscode/tasks.json
@@ -59,6 +59,21 @@
         "cwd": "${workspaceFolder}"
       },
       "problemMatcher": []
+    },
+    {
+      "label": "Analyze TEAL contracts with AlgoKit Tealer integration",
+      "command": "algokit",
+      "args": [
+        "task",
+        "analyze",
+        "${workspaceFolder}/.algokit",
+        "--recursive",
+        "--force"
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "problemMatcher": []
     }
   ]
 }