feat: public allocator deployment

Author: kasperpawlowski

script/20_EulerEarnFactory.s.sol

@@ -5,33 +5,47 @@ pragma solidity ^0.8.0;
 import {ScriptUtils} from "./utils/ScriptUtils.s.sol";
 
 contract EulerEarnFactoryDeployer is ScriptUtils {
-    function run() public broadcast returns (address eulerEarnfactory) {
+    function run() public broadcast returns (address eulerEarnfactory, address eulerEarnPublicAllocator) {
         string memory inputScriptFileName = "21_EulerEarnFactory_input.json";
         string memory outputScriptFileName = "21_EulerEarnFactory_output.json";
         string memory json = getScriptFile(inputScriptFileName);
         address evc = vm.parseJsonAddress(json, ".evc");
         address permit2 = vm.parseJsonAddress(json, ".permit2");
         address perspective = vm.parseJsonAddress(json, ".perspective");
 
-        eulerEarnfactory = execute(evc, permit2, perspective);
+        (eulerEarnfactory, eulerEarnPublicAllocator) = execute(evc, permit2, perspective);
 
         string memory object;
         object = vm.serializeAddress("factory", "eulerEarnfactory", eulerEarnfactory);
+        object = vm.serializeAddress("publicAllocator", "eulerEarnPublicAllocator", eulerEarnPublicAllocator);
 
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
-    function deploy(address evc, address permit2, address perspective) public broadcast returns (address factory) {
-        factory = execute(evc, permit2, perspective);
+    function deploy(address evc, address permit2, address perspective)
+        public
+        broadcast
+        returns (address factory, address publicAllocator)
+    {
+        (factory, publicAllocator) = execute(evc, permit2, perspective);
     }
 
-    function execute(address evc, address permit2, address perspective) public returns (address factory) {
+    function execute(address evc, address permit2, address perspective)
+        public
+        returns (address factory, address publicAllocator)
+    {
         bytes memory bytecode = abi.encodePacked(
             vm.getCode("out-euler-earn/EulerEarnFactory.sol/EulerEarnFactory.json"),
             abi.encode(getDeployer(), evc, permit2, perspective)
         );
         assembly {
             factory := create(0, add(bytecode, 0x20), mload(bytecode))
         }
+
+        bytecode =
+            abi.encodePacked(vm.getCode("out-euler-earn/PublicAllocator.sol/PublicAllocator.json"), abi.encode(evc));
+        assembly {
+            publicAllocator := create(0, add(bytecode, 0x20), mload(bytecode))
+        }
     }
 }

script/50_CoreAndPeriphery.s.sol

@@ -856,13 +856,13 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             console.log("- EulerUngovernedNzxPerspective already deployed. Skipping...");
         }
 
-        if (coreAddresses.eulerEarnFactory == address(0)) {
-            console.log("+ Deploying EulerEarn factory...");
+        if (coreAddresses.eulerEarnFactory == address(0) && peripheryAddresses.eulerEarnPublicAllocator == address(0)) {
+            console.log("+ Deploying EulerEarn factory and public allocator...");
             EulerEarnFactoryDeployer deployer = new EulerEarnFactoryDeployer();
-            coreAddresses.eulerEarnFactory =
+            (coreAddresses.eulerEarnFactory, peripheryAddresses.eulerEarnPublicAllocator) =
                 deployer.deploy(coreAddresses.evc, coreAddresses.permit2, peripheryAddresses.evkFactoryPerspective);
         } else {
-            console.log("- EulerEarn factory already deployed. Skipping...");
+            console.log("- EulerEarn factory and public allocator already deployed. Skipping...");
             if (vm.isDir("out-euler-earn")) vm.removeDir("out-euler-earn", true);
         }
 

script/utils/ScriptUtils.s.sol

@@ -89,6 +89,7 @@ abstract contract PeripheryAddressesLib is ScriptExtended {
         address termsOfUseSigner;
         address governorAccessControlEmergencyFactory;
         address capRiskStewardFactory;
+        address eulerEarnPublicAllocator;
     }
 
     function serializePeripheryAddresses(PeripheryAddresses memory Addresses) internal returns (string memory result) {
@@ -131,6 +132,8 @@ abstract contract PeripheryAddressesLib is ScriptExtended {
             Addresses.governorAccessControlEmergencyFactory
         );
         result = vm.serializeAddress("peripheryAddresses", "capRiskStewardFactory", Addresses.capRiskStewardFactory);
+        result =
+            vm.serializeAddress("peripheryAddresses", "eulerEarnPublicAllocator", Addresses.eulerEarnPublicAllocator);
     }
 
     function deserializePeripheryAddresses(string memory json) internal pure returns (PeripheryAddresses memory) {
@@ -157,7 +160,8 @@ abstract contract PeripheryAddressesLib is ScriptExtended {
             edgeFactoryPerspective: getAddressFromJson(json, ".edgeFactoryPerspective"),
             termsOfUseSigner: getAddressFromJson(json, ".termsOfUseSigner"),
             governorAccessControlEmergencyFactory: getAddressFromJson(json, ".governorAccessControlEmergencyFactory"),
-            capRiskStewardFactory: getAddressFromJson(json, ".capRiskStewardFactory")
+            capRiskStewardFactory: getAddressFromJson(json, ".capRiskStewardFactory"),
+            eulerEarnPublicAllocator: getAddressFromJson(json, ".eulerEarnPublicAllocator")
         });
     }
 }

script/utils/verifyContracts.sh

@@ -199,7 +199,7 @@ function verify_broadcast {
         elif [[ $transactionType == "CREATE" && $verificationSuccessful != true ]]; then
             local initCode=$(echo $tx | jq -r '.transaction.input')
 
-            if [ -d "out-euler-earn" ] && [ $eulerEarnIndex -le 1 ]; then
+            if [ -d "out-euler-earn" ] && [ $eulerEarnIndex -le 2 ]; then
                 # try to verify as EulerEarn contracts
                 local src="lib/euler-earn/src"
                 local verificationOptions="--via-ir --num-of-optimizations 200 --compiler-version 0.8.26 --root lib/euler-earn"
@@ -212,6 +212,11 @@ function verify_broadcast {
                             contractName=EulerEarnFactory
                             constructorBytesSize=128
                             ;;
+                        1)
+                            # try to verify as PublicAllocator
+                            contractName=PublicAllocator
+                            constructorBytesSize=32
+                            ;;
                         *)
                             break
                             ;;