Merge pull request #357 from LIT-Protocol/feature/morpho-fee

Fee Diamond Contract with Morpho and Aave

Author: glitch003

.github/workflows/ci.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
   pull_request:
+  workflow_dispatch:
 
 permissions:
   actions: read

.github/workflows/contract_tests.yml

@@ -0,0 +1,61 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+env:
+  FOUNDRY_PROFILE: ci
+
+jobs:
+  check:
+    strategy:
+      fail-fast: true
+
+    name: Contract Blockchain Tests
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./packages/libs/contracts-sdk
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10.7.0
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Run Forge fmt
+        run: |
+          forge fmt --check
+        id: fmt
+
+      - name: Install dependencies
+        run: |
+          pnpm install
+
+      - name: Run Forge build
+        run: |
+          forge build --sizes
+        id: build
+
+      - name: Run Regular Forge tests
+        run: |
+          forge test --ffi -vvv --no-match-path 'test/**/*ForkTest*.t.sol'
+        id: test
+
+      - name: Run Forked Forge tests
+        env:
+          BASE_RPC_URL: ${{ secrets.BASE_RPC_URL }}
+        run: |
+          forge test --ffi -vvv --match-path 'test/**/*ForkTest*.t.sol' --fork-url "$BASE_RPC_URL"
+        id: test-forked

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/libs/contracts-sdk/lib/forge-std"]
+	path = packages/libs/contracts-sdk/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

package.json

@@ -27,8 +27,8 @@
     "typedoc:build": "pnpm typedoc --skipErrorChecking --logLevel Verbose --options ./typedoc.site.config.js",
     "typedoc:serve": "node scripts/typedocServer.mjs",
     "typedoc:watch": "chokidar 'docs/src/**/*' 'docs/custom.css' './typedoc.site.config.js' './packages/libs/**/docs/json' --initial --await-write-finish --delay 250 -c 'pnpm typedoc:build'",
-    "install:contracts": "cd packages/lib/contracts-sdk && forge install",
-    "make:contracts": "cd packages/lib/contracts-sdk && make",
+    "install:contracts": "cd packages/libs/contracts-sdk && forge install",
+    "make:contracts": "cd packages/libs/contracts-sdk && make",
     "gen:contracts": "bun run make:contracts get-abis run-postbuild-scripts",
     "clean": "nx reset && nx run-many --target=clean --all && rm -Rf node_modules bun.lock",
     "prepare": "husky",

packages/libs/contracts-sdk/.github/workflows/test.yml

@@ -99,4 +99,15 @@ get-abis: ## Get human-readable ABIs for all facets
 	@forge inspect VincentUserFacet abi --json > abis/VincentUserFacet.abi.json
 	@echo "Getting ABI for VincentUserViewFacet..."
 	@forge inspect VincentUserViewFacet abi --json > abis/VincentUserViewFacet.abi.json
-	@echo "ABIs written to abis/*.abi.json"
+
+	@echo "Merging facet ABIs into abis/FeeDiamond.abi.json..."
+	@jq -s '[.[].abi] | add | unique_by(.type, .name, ((.inputs // []) | map(.type) | join(",")))' \
+		out/OwnershipFacet.sol/OwnershipFacet.json \
+		out/FeeViewsFacet.sol/FeeViewsFacet.json \
+		out/FeeAdminFacet.sol/FeeAdminFacet.json \
+		out/MorphoPerfFeeFacet.sol/MorphoPerfFeeFacet.json \
+		out/AavePerfFeeFacet.sol/AavePerfFeeFacet.json \
+		> abis/FeeDiamond.abi.json
+	@echo "✅ Combined ABI written to abis/FeeDiamond.abi.json"
+
+	@echo "ABIs written to abis/*.abi.json"