fixes

Author: SyedAsadKazmi

.github/workflows/test.yml

@@ -6,6 +6,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  FOUNDRY_PROFILE: ci
+
 # Set default permissions as restrictive as possible
 permissions:
   actions: write    # Required for upload-artifact
@@ -27,14 +30,12 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
-      # Only cache node_modules, let setup-node handle npm cache
       - name: Cache node_modules
         uses: actions/cache@v4
         id: cache-node-modules
         continue-on-error: true
         with:
-          path: |
-            node_modules
+          path: node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
 
       - name: Install Dependencies
@@ -58,20 +59,21 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
-      # Install Foundry
-      - uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de # v1.4.0
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@50d5a8956f2e319df19e6b57539d7e2acb9f8c1e # v1.5
         with:
-          version: stable   # or nightly
+          version: stable
+          cache: false
+
+      - name: Show Forge version
+        run: forge --version
 
-      # Restore node_modules
       - name: Restore node_modules
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         continue-on-error: true
         with:
           path: node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-
 
       - name: Ensure Dependencies
         run: |
@@ -80,15 +82,14 @@ jobs:
             npm ci --prefer-offline --no-audit
           fi
 
+      - name: Check Solidity Formatting
+        run: npm run sol:fmt:check
+
       - name: Check Solidity Compilation
-        run: |
-          echo "Running Solidity compilation with cache..."
-          npm run sol:compile
+        run: forge build --sizes
 
-      - name: Check Solidity Solhint
-        run: |
-          echo "Running Solhint..."
-          npm run lint-solc
+      - name: Check Solidity Linting
+        run: npm run lint-solc
 
   # Job 2: Check ESLint
   eslint:
@@ -105,16 +106,12 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
-      # Restore node_modules from setup job
       - name: Restore node_modules
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         continue-on-error: true
         with:
-          path: |
-            node_modules
+          path: node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-
 
       - name: Ensure Dependencies
         run: |
@@ -148,16 +145,12 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
-      # Restore node_modules from setup job
       - name: Restore node_modules
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         continue-on-error: true
         with:
-          path: |
-            node_modules
+          path: node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-
 
       - name: Ensure Dependencies
         run: |
@@ -184,16 +177,12 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
-      # Restore node_modules from setup job
       - name: Restore node_modules
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         continue-on-error: true
         with:
-          path: |
-            node_modules
+          path: node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-
 
       - name: Ensure Dependencies
         run: |
@@ -232,16 +221,12 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
-      # Restore node_modules from setup job
       - name: Restore node_modules
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         continue-on-error: true
         with:
-          path: |
-            node_modules
+          path: node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-
 
       - name: Ensure Dependencies
         run: |

.prettierrc

@@ -12,16 +12,6 @@
         "parser": "astro"
       }
     },
-    {
-      "files": "*.sol",
-      "options": {
-        "printWidth": 80,
-        "tabWidth": 4,
-        "useTabs": false,
-        "singleQuote": false,
-        "bracketSpacing": false
-      }
-    },
     {
       "files": "public/samples/ChainlinkFunctions/*.js",
       "options": {

.solhint.json

@@ -1,22 +1,39 @@
 {
   "extends": "solhint:recommended",
-  "plugins": ["prettier", "chainlink-solidity"],
+  "plugins": ["chainlink-solidity"],
   "rules": {
-    "prettier/prettier": "error",
-    "compiler-version": ["error", ">=0.4.24"],
+    "compiler-version": ["off", "^0.8.0"],
     "const-name-snakecase": "off",
-    "constructor-syntax": "error",
     "var-name-mixedcase": "off",
     "func-named-parameters": "off",
     "immutable-vars-naming": "off",
     "no-inline-assembly": "off",
+    "contract-name-capwords": "off",
+    "use-natspec": "off",
+    "gas-indexed-events": "off",
+    "function-max-lines": "off",
+    "gas-strict-inequalities": "off",
+    "gas-increment-by-one": "off",
+    "gas-calldata-parameters": "off",
+    "gas-small-strings": "off",
+    "not-rely-on-time": "off",
+    "no-empty-blocks": "off",
     "no-unused-import": "error",
-    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "import-path-check": "off",
+    "func-visibility": [
+      "error",
+      {
+        "ignoreConstructors": true
+      }
+    ],
     "quotes": ["error", "double"],
-    "reason-string": ["warn", { "maxLength": 64 }],
     "chainlink-solidity/prefix-internal-functions-with-underscore": "warn",
     "chainlink-solidity/prefix-private-functions-with-underscore": "warn",
     "chainlink-solidity/prefix-storage-variables-with-s-underscore": "warn",
-    "chainlink-solidity/prefix-immutable-variables-with-i": "warn"
+    "chainlink-solidity/prefix-immutable-variables-with-i": "warn",
+    "chainlink-solidity/all-caps-constant-storage-variables": "warn",
+    "chainlink-solidity/no-hardhat-imports": "warn",
+    "chainlink-solidity/inherited-constructor-args-not-in-contract-definition": "warn",
+    "chainlink-solidity/explicit-returns": "warn"
   }
 }

.vscode/extensions.json

@@ -2,10 +2,10 @@
   "recommendations": [
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
-    "NomicFoundation.hardhat-solidity",
+    "JuanBlanco.solidity",
     "astro-build.astro-vscode",
     "unifiedjs.vscode-mdx",
     "streetsidesoftware.code-spell-checker"
   ],
-  "unwantedRecommendations": []
+  "unwantedRecommendations": ["NomicFoundation.hardhat-solidity"]
 }

.vscode/settings.json

@@ -3,10 +3,13 @@
     "*.mdx": "mdx"
   },
   "editor.formatOnSave": true,
-  "solidity.formatter": "prettier", // This is the default so it might be missing.
   "prettier.documentSelectors": ["**/*.astro"],
+  // Solidity settings for Foundry
+  "solidity.formatter": "forge",
+  "solidity.packageDefaultDependenciesContractsDirectory": "public/samples",
+  "solidity.packageDefaultDependenciesDirectory": "node_modules",
   "[solidity]": {
-    "editor.defaultFormatter": "NomicFoundation.hardhat-solidity"
+    "editor.defaultFormatter": "JuanBlanco.solidity"
   },
   "[astro]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -17,7 +20,11 @@
   "[mdx]": {
     "editor.wordWrap": "on"
   },
-  "cSpell.enableFiletypes": ["astro", "mdx", "solidity"],
+  "cSpell.enabledFileTypes": {
+    "astro": true,
+    "mdx": true,
+    "solidity": true
+  },
   "cSpell.words": [
     "AGOR",
     "Alfajores",

foundry.toml

@@ -1,17 +1,37 @@
 # This configuration file sets up the paths and compilers so we can test our solidity samples
 [profile.default]
+# Let Forge download/choose solc per file's pragma automatically
+auto_detect_solc = true
+evm_version = 'paris'
 
 src = "public/samples"
-
 out = ".test/artifacts"
 cache_path = ".test/cache"
-
 libs = ["lib", "node_modules"]
 
-# Let Forge download/choose solc per file's pragma automatically
-auto_detect_solc = true
+# Optimization settings
+optimizer = true
+optimizer_runs = 1_000_000
+
+# Test environment defaults
+bytecode_hash = "none"
+ffi = false
+gas_price = 1
+block_timestamp = 1234567890
+block_number = 12345
+
+[profile.ci]
+verbosity = 2
+
+[fmt]
+tab_width = 2
+multiline_func_header = "params_first"
+sort_imports = true
+single_line_statement_blocks = "preserve"
+number_underscore = "thousands"
+wrap_comments = true
 
 [lint]
 lint_on_build = false
-# If you ever want to pin a single version for all files, uncomment:
-# solc_version = "0.8.24"
+
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config

knip.json

@@ -6,7 +6,6 @@
     "astro.config.ts",
     "src/content.config.ts",
     "src/integrations/**/*.ts",
-    "hardhat.config.cts",
     "codegen.ts",
     "jest.config.cjs",
     "src/**/__tests__/**/*.test.ts",
@@ -16,15 +15,8 @@
     "entry": ["src/**/__tests__/**/*.test.ts", "src/**/*.test.ts"]
   },
   "project": ["src/**/*.{ts,tsx,astro}", "!src/**/*.d.ts"],
-  "ignore": [
-    "src/types/**/*.d.ts",
-    "public/**/*",
-    "src/__mocks__/**/*",
-    "templates/**/*",
-    "typechain-types/**/*",
-    "dist/**/*"
-  ],
-  "ignoreDependencies": ["@types/*", "prettier*", "@astrojs/*", "hardhat*", "solhint*", "jest*", "@project-serum/*"],
+  "ignore": ["src/types/**/*.d.ts", "public/**/*", "src/__mocks__/**/*", "templates/**/*", "dist/**/*"],
+  "ignoreDependencies": ["@types/*", "prettier*", "@astrojs/*", "solhint*", "jest*", "@project-serum/*"],
   "ignoreExportsUsedInFile": {
     "interface": true,
     "type": true,