Merge branch 'dev' into verification-workflow

Author: elvijsTDL

.github/workflows/call.deploy-dry-run.yml

@@ -6,9 +6,6 @@ on:
       network:
         required: true
         type: string
-      network-id:
-        required: true
-        type: string
       provider-url:
         required: true
         type: string
@@ -28,8 +25,11 @@ jobs:
           yarn install --frozen-lockfile
           yarn build-for-contracts-dev
 
-      - name: Start ganache
-        run: npx ganache --port 47545 --mnemonic --fork.url ${{ github.event.inputs.provider-url }} --network-id ${{ github.event.inputs.network-id }} --chain.chainId ${{ github.event.inputs.network-id }}
+      - name: Start hardhat node
+        run: |
+          cd ${{ env.ethereum-contracts-working-directory }}
+          npx hardhat node --port 47545 --fork ${{ github.event.inputs.provider-url }} &
+          sleep 5
 
       - name: Deploy framework
         run: |

.gitignore

@@ -30,3 +30,6 @@ package-lock.json
 # echidna litters
 crytic-export
 corpus
+
+/broadcast
+/.direnv

.gitmodules

@@ -5,3 +5,6 @@
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts.git
 	branch = release-v5.4
+[submodule "lib/aave-v3"]
+	path = lib/aave-v3
+	url = https://github.com/aave-dao/aave-v3-origin

README.md

@@ -57,7 +57,7 @@ For technical document, references and tutorials, etc, refer to the
   <a href="https://www.npmjs.com/package/@superfluid-finance/ethereum-contracts" target="_blank">
     <img alt="Version" src="https://img.shields.io/npm/v/@superfluid-finance/ethereum-contracts.svg">
   </a>
-  <a href="https://codecov.io/gh/superfluid-finance/protocol-monorepo/tree/dev/packages/ethereum-contracts">
+  <a href="https://codecov.io/gh/superfluid-org/protocol-monorepo/tree/dev/packages/ethereum-contracts">
     <img src="https://codecov.io/gh/superfluid-finance/protocol-monorepo/branch/dev/graph/badge.svg?token=LJW5NDGEJ9&flag=ethereum-contracts"/>
   </a>
   <a href="#" target="_blank">

flake.nix

@@ -92,7 +92,7 @@
           gnupg
         ];
 
-        # minimem development shell
+        # minimum development shell
         minimumDevInputs = commonDevInputs ++ ethDevInputs ++ defaultNodeDevInputs;
 
         # additional tooling for whitehat hackers

lib/aave-v3

@@ -33,7 +33,7 @@
         "nyc": "^17.0.0",
         "prettier": "^3.3.3",
         "prettier-eslint": "^16.3.0",
-        "solhint": "^5.0.3",
+        "solhint": "^6.0.2",
         "syncpack": "^13.0.0",
         "truffle": "^5.11.5",
         "ts-node": "^10.9.2",
@@ -52,7 +52,7 @@
     },
     "scripts": {
         "prepare": "husky && npm run git-submodule:init",
-        "postinstall": "ln -fs ../lib/openzeppelin-contracts node_modules/@openzeppelin-v5",
+        "postinstall": "ln -fs ../lib/openzeppelin-contracts node_modules/@openzeppelin-v5 && ln -fs ../lib/aave-v3 node_modules/aave-v3",
         "lint": "run-s -l lint:*",
         "lint:syncpack": "syncpack lint",
         "lint:shellcheck": "tasks/shellcheck-all-tasks.sh",

package.json

@@ -14,6 +14,16 @@
         "constructor-syntax": "error",
         "func-visibility": ["error", { "ignoreConstructors": true }],
         "quotes": ["error", "double"],
-        "max-line-length": ["error", 120]
+        "max-line-length": ["error", 120],
+        "use-natspec": "off",
+        "import-path-check": "off",
+        "gas-indexed-events": "off",
+        "gas-struct-packing": "off",
+        "gas-small-strings": "off",
+        "gas-increment-by-one": "off",
+        "gas-strict-inequalities": "off",
+        "gas-calldata-parameters": "off",
+        "function-max-lines": "off",
+        "contract-name-capwords": "off"
     }
 }

packages/automation-contracts/autowrap/.solhint.json

@@ -3,7 +3,7 @@ root = '../../../'
 libs = ['lib']
 src = 'packages/automation-contracts/autowrap'
 solc_version = "0.8.30"
-evm_version = 'shanghai'
+evm_version = 'cancun'
 optimizer = true
 optimizer_runs = 200
 remappings = [

packages/automation-contracts/autowrap/foundry.toml

@@ -3,7 +3,7 @@
     "description": "Open contracts that allow upgrading underlying token to supertokens based on running stream",
     "version": "0.3.0",
     "devDependencies": {
-        "@superfluid-finance/ethereum-contracts": "^1.14.0",
+        "@superfluid-finance/ethereum-contracts": "^1.14.1",
         "@superfluid-finance/metadata": "^1.6.2"
     },
     "license": "MIT",