chore: merge conflicts

algorandfoundation · Feb 21, 2024 · 524286e · 524286e
1 parent 192e65f
commit 524286e
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": []
     }
   ]
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -176,3 +176,5 @@ node_modules

		# AlgoKit
		debug_traces/

		.algokit/static-analysis/tealer/