chore: merge dev

.github/workflows/e2e.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [master, dev]
+    branches: [dev]
   pull_request:
 
 env:
@@ -43,6 +43,11 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Your Name"
 
+          # Depending on the STATE_TREE_DEPTH param, there 
+          # might be changes in the EmptyBallotRoots.sol file
+          git add contracts/contracts/trees/EmptyBallotRoots.sol
+          git diff --staged --quiet || git commit -m "Commit changes before publishing"
+
           lerna version 0.0.0-ci.$(git rev-parse --short HEAD) --no-push --yes
           lerna publish from-git --dist-tag ci --yes
         env:

.github/workflows/release.yml

@@ -41,6 +41,11 @@ jobs:
 
       - name: Publish NPM
         run: |
+          # Depending on the STATE_TREE_DEPTH param, there 
+          # might be changes in the EmptyBallotRoots.sol file
+          git add contracts/contracts/trees/EmptyBallotRoots.sol
+          git diff --staged --quiet || git commit -m "Commit changes before publishing"
+
           npx lerna publish from-git --yes
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

cli/.env.template

@@ -2,6 +2,10 @@
 ## and that none of these values are mandatory for testing 
 ## purposes
 
+# Ethereum provider, replace with your own 
+# needed if running in production against
+# a test network
+ETH_PROVIDER="the_eth_provider_url"
 # Ethereum secret key, replace with your own 
 # needed if running in production against
 # a test network

cli/hardhat.config.ts

@@ -1,11 +1,14 @@
 import "@nomicfoundation/hardhat-toolbox";
+import { config as envConfig } from "dotenv";
 
 import path from "path";
 
 import type { HardhatUserConfig } from "hardhat/config";
 
 import { DEFAULT_ETH_SK, DEFAULT_ETH_PROVIDER } from "./ts/utils/defaults";
 
+envConfig();
+
 const parentDir = __dirname.includes("build") ? ".." : "";
 
 const config: HardhatUserConfig = {

package.json

@@ -26,7 +26,7 @@
   "devDependencies": {
     "@commitlint/cli": "^18.4.4",
     "@commitlint/config-conventional": "^18.4.3",
-    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
     "conventional-changelog-conventionalcommits": "^7.0.2",
     "cz-conventional-changelog": "^3.3.0",
@@ -47,7 +47,7 @@
     "lint-staged": "^15.1.0",
     "prettier": "^3.1.1",
     "prettier-plugin-solidity": "^1.3.1",
-    "solhint": "^4.0.0",
+    "solhint": "^4.1.1",
     "typedoc": "^0.25.4",
     "typedoc-plugin-markdown": "^3.17.1",
     "typescript": "^5.3.3"