Merge pull request #162 from valory-xyz/packages

chore: updating packages

.github/workflows/workflow.yaml

@@ -20,10 +20,8 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Get a specific Node.js version such that hardhat does not hang periodically
+      - name: Install Node.js
         uses: actions/setup-node@v3
-        with:
-          node-version: "18.15.0"
 
       # Install modules
       - name: Install modules
@@ -62,7 +60,7 @@ jobs:
         with:
           go-version: "1.17.7"
       - run: |
-          wget https://github.com/zricethezav/gitleaks/releases/download/v8.10.1/gitleaks_8.10.1_linux_x64.tar.gz && \
-          tar -xzf gitleaks_8.10.1_linux_x64.tar.gz && \
+          wget https://github.com/gitleaks/gitleaks/releases/download/v8.21.2/gitleaks_8.21.2_linux_x64.tar.gz && \
+          tar -xzf gitleaks_8.21.2_linux_x64.tar.gz && \
           sudo install gitleaks /usr/bin && \
           gitleaks detect --report-format json --report-path leak_report -v

.gitleaksignore

@@ -59,3 +59,4 @@ fa17ac186753911eb9d2ae0a4ab59db5f7e8e563:scripts/deployment/bridges/solana/test/
 4c142e987f5f2528a567c57f6de0258e5007548c:scripts/deployment/globals_mainnet.json:generic-api-key:2
 9fe74d22fc7a98851616d58985e0355914662552:scripts/deployment/globals_mainnet.json:generic-api-key:1
 9fe74d22fc7a98851616d58985e0355914662552:scripts/deployment/globals_mainnet.json:generic-api-key:2
+391af0ca125e1e7f03149195d4bd04d023bb8b0f:scripts/deployment/globals_mainnet.json:generic-api-key:1

hardhat.config.js

@@ -12,7 +12,6 @@ require("@nomicfoundation/hardhat-toolbox");
 
 const ALCHEMY_API_KEY_MAINNET = process.env.ALCHEMY_API_KEY_MAINNET;
 const ALCHEMY_API_KEY_MATIC = process.env.ALCHEMY_API_KEY_MATIC;
-const ALCHEMY_API_KEY_GOERLI = process.env.ALCHEMY_API_KEY_GOERLI;
 const ALCHEMY_API_KEY_SEPOLIA = process.env.ALCHEMY_API_KEY_SEPOLIA;
 const ALCHEMY_API_KEY_AMOY = process.env.ALCHEMY_API_KEY_AMOY;
 let TESTNET_MNEMONIC = process.env.TESTNET_MNEMONIC;
@@ -83,11 +82,6 @@ module.exports = {
             accounts: accounts,
             chainId: 34443,
         },
-        goerli: {
-            url: "https://eth-goerli.g.alchemy.com/v2/" + ALCHEMY_API_KEY_GOERLI,
-            chainId: 5,
-            accounts: accounts,
-        },
         sepolia: {
             url: "https://eth-sepolia.g.alchemy.com/v2/" + ALCHEMY_API_KEY_SEPOLIA,
             accounts: accounts,
@@ -237,7 +231,6 @@ module.exports = {
             optimistic: OPSCAN_API_KEY,
             base: BASESCAN_API_KEY,
             celo: CELOSCAN_API_KEY,
-            goerli: ETHERSCAN_API_KEY,
             sepolia: ETHERSCAN_API_KEY,
             polygonAmoy: POLYGONSCAN_API_KEY,
             chiado: GNOSISSCAN_API_KEY,

hardhat.config.js.fork

@@ -16,9 +16,9 @@ const accounts = {
 };
 
 const ALCHEMY_API_KEY = process.env.ALCHEMY_API_KEY;
-let GOERLI_MNEMONIC = process.env.GOERLI_MNEMONIC;
-if (!GOERLI_MNEMONIC) {
-    GOERLI_MNEMONIC = accounts.mnemonic;
+let TESTNET_MNEMONIC = process.env.TESTNET_MNEMONIC;
+if (!TESTNET_MNEMONIC) {
+    TESTNET_MNEMONIC = accounts.mnemonic;
 }
 const ETHERSCAN_API_KEY = process.env.ETHERSCAN_API_KEY;
 
@@ -31,17 +31,6 @@ module.exports = {
             url: "https://eth-mainnet.g.alchemy.com/v2/" + ALCHEMY_API_KEY,
             chainId: 1,
         },
-        goerli: {
-            url: "https://eth-goerli.alchemyapi.io/v2/" + ALCHEMY_API_KEY,
-            chainId: 5,
-            accounts: {
-                mnemonic: GOERLI_MNEMONIC,
-                path: "m/44'/60'/0'/0",
-                initialIndex: 0,
-                count: 20,
-                passphrase: "",
-            },
-        },
         hardhat: {
             allowUnlimitedContractSize: true,
             accounts,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "autonolas-governance",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Set of governance contracts for Autonolas",
   "main": "index.js",
   "scripts": {
@@ -26,20 +26,20 @@
     "@nomicfoundation/hardhat-ethers": "^3.0.5",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",
-    "hardhat": "^2.22.13",
-    "@typechain/hardhat": "^9.1.0",
-    "ethers": "^5.7.2",
     "@typechain/ethers-v5": "^11.1.2",
-    "@types/mocha": "^10.0.6",
-    "chai": "^4.3.7",
+    "@typechain/hardhat": "^9.1.0",
+    "@types/mocha": "^10.0.9",
+    "chai": "^4.5.0",
     "eslint": "^8.57.0",
-    "solhint": "^4.1.1",
+    "solhint": "^5.0.3",
+    "ethers": "^5.7.2",
+    "hardhat": "^2.22.15",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-deploy": "^0.12.1",
     "hardhat-deploy-ethers": "^0.4.1",
     "hardhat-gas-reporter": "^1.0.10",
     "hardhat-tracer": "^2.8.1",
-    "solidity-coverage": "^0.8.10"
+    "solidity-coverage": "^0.8.13"
   },
   "dependencies": {
     "@openzeppelin/contracts": "=4.8.3",

scripts/deployment/README.md

@@ -2,7 +2,7 @@
 This folder contains the scripts to deploy Autonolas governance. These scripts correspond to the steps in the full deployment procedure (as described in [deployment.md](https://github.com/valory-xyz/autonolas-governance/blob/main/docs/deployment.md)).
 
 ## Observations
-- There are several files with global parameters based on the corresponding network. In order to work with the configuration, please copy `gobals_network.json` file to file the `gobals.json` one, where `network` is the corresponding network. For example: `cp gobals_goerli.json gobals.json`.
+- There are several files with global parameters based on the corresponding network. In order to work with the configuration, please copy `gobals_network.json` file to file the `gobals.json` one, where `network` is the corresponding network. For example: `cp gobals_mainnet.json gobals.json`.
 - The Valory multisig (Valory) is a Gnosis Safe contract with 3 signers and 2 threshold that already exists.
 - The community multisig (CM) of the DAO is a Gnosis Safe contract with 9 signers and 6 threshold that already exists.
 - Please note: if you encounter the `Unknown Error 0x6b0c`, then it is likely because the ledger is not connected or logged in.
@@ -21,7 +21,7 @@ npx hardhat compile
 command as described in the [main readme](https://github.com/valory-xyz/autonolas-governance/blob/main/README.md).
 
 
-Create a `globals.json` file in the root folder, or copy it from the file with pre-defined parameters (i.e., `scripts/deployment/globals_goerli.json` for the goerli testnet).
+Create a `globals.json` file in the root folder, or copy it from the file with pre-defined parameters (i.e., `scripts/deployment/globals_mainnet.json` for the mainnet).
 
 Parameters of the `globals.json` file:
 - `contractVerification`: a flag for verifying contracts in deployment scripts (`true`) or skipping it (`false`);

scripts/deployment/deploy_16_wveolas.js

@@ -32,8 +32,8 @@ async function main() {
     console.log("You are signing the following transaction: wveOLAS.connect(EOA).deploy(parsedData.veOLASAddress, parsedData.olasAddress)");
     const wveOLAS = await WVE.connect(EOA).deploy(parsedData.veOLASAddress, parsedData.olasAddress);
     const result = await wveOLAS.deployed();
-    // If on goerli, wait a minute for the transaction completion
-    if (providerName === "goerli") {
+    // If on sepolia, wait a minute for the transaction completion
+    if (providerName === "sepolia") {
         await new Promise(r => setTimeout(r, 60000));
     }
 

scripts/deployment/deploy_18_guardCM.js

@@ -37,8 +37,8 @@ async function main() {
     console.log("Contract address:", guardCM.address);
     console.log("Transaction:", result.deployTransaction.hash);
 
-    // If on goerli, wait a minute for the transaction completion
-    if (providerName === "goerli") {
+    // If on sepolia, wait a minute for the transaction completion
+    if (providerName === "sepolia") {
         await new Promise(r => setTimeout(r, 60000));
     }