Merge branch 'main' into v3.3.0

aave-dao · Feb 10, 2025 · b466cad · b466cad
2 parents 55a6396 + 551ad6c
commit b466cad
Show file tree

Hide file tree

Showing 11 changed files with 647 additions and 193 deletions.
diff --git a/audits/2025-01-20_Certora_CollectorRev6.pdf b/audits/2025-01-20_Certora_CollectorRev6.pdf
diff --git a/lib/solidity-utils b/lib/solidity-utils
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "prettier-plugin-solidity": "^1.1.1"
   },
   "dependencies": {
-    "@bgd-labs/aave-cli": "^1.1.14",
+    "@bgd-labs/aave-cli": "^1.1.17",
     "catapulta-verify": "^1.3.0"
   }
 }
diff --git a/src/contracts/extensions/stata-token/StataTokenFactory.sol b/src/contracts/extensions/stata-token/StataTokenFactory.sol
@@ -39,6 +39,7 @@ contract StataTokenFactory is Initializable, IStataTokenFactory {
     ITransparentProxyFactory transparentProxyFactory,
     address stataTokenImpl
   ) {
+    _disableInitializers();
     POOL = pool;
     INITIAL_OWNER = initialOwner;
     TRANSPARENT_PROXY_FACTORY = transparentProxyFactory;
+1 −0		src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol
+7 −0		src/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol