feat: deployment engine

scripts/deploy/AaveV4DeployBatchBase.s.sol

@@ -36,6 +36,7 @@ abstract contract AaveV4DeployBatchBaseScript is Script, InputUtils {
     (, address deployer, ) = vm.readCallers();
     inputs = _loadWarningsAndSanitizeInputs(logger, inputs, deployer);
 
+    logger.log('CHAIN ID = ', block.chainid);
     logger.log('...Starting Aave V4 Batch Deployment...');
     vm.startBroadcast(deployer);
     OrchestrationReports.FullDeploymentReport memory report = AaveV4DeployOrchestration
@@ -52,84 +53,69 @@ abstract contract AaveV4DeployBatchBaseScript is Script, InputUtils {
     FullDeployInputs memory inputs,
     address deployer
   ) internal virtual returns (FullDeployInputs memory) {
+    string memory header = 'WARNING: ';
+    string memory message = ' is zero address';
+    string memory outcome = '; defaulting to deployer';
+
     FullDeployInputs memory sanitizedInputs = inputs;
     bool hadWarnings = false;
     if (inputs.grantRoles) {
-      _logAndAppend(logger, 'WARNING: Roles are being set');
+      _logAndAppend(logger, string.concat(header, 'Roles are being set'));
       hadWarnings = true;
       if (inputs.accessManagerAdmin == address(0)) {
-        _logAndAppend(
-          logger,
-          'WARNING: Access Manager Admin is zero address; role will be granted to deployer by default'
-        );
+        _logAndAppend(logger, string.concat(header, 'Access Manager Admin', message, outcome));
         sanitizedInputs.accessManagerAdmin = deployer;
       }
       if (inputs.hubConfiguratorOwner == address(0)) {
-        _logAndAppend(
-          logger,
-          'WARNING: Hub Configurator Owner is zero address; role will be granted to deployer by default'
-        );
+        _logAndAppend(logger, string.concat(header, 'Hub Configurator Owner', message, outcome));
         sanitizedInputs.hubConfiguratorOwner = deployer;
       }
       if (inputs.spokeConfiguratorOwner == address(0)) {
-        _logAndAppend(
-          logger,
-          'WARNING: Spoke Configurator Owner is zero address; role will be granted to deployer by default'
-        );
+        _logAndAppend(logger, string.concat(header, 'Spoke Configurator Owner', message, outcome));
         sanitizedInputs.spokeConfiguratorOwner = deployer;
       }
       if (inputs.spokeProxyAdminOwner == address(0)) {
-        _logAndAppend(
-          logger,
-          'WARNING: Spoke Proxy Admin Owner is zero address; role will be granted to deployer by default'
-        );
+        _logAndAppend(logger, string.concat(header, 'Spoke Proxy Admin Owner', message, outcome));
         sanitizedInputs.spokeProxyAdminOwner = deployer;
       }
       if (inputs.treasurySpokeOwner == address(0)) {
-        _logAndAppend(
-          logger,
-          'WARNING: Treasury Spoke Owner is zero address; role will be granted to deployer by default'
-        );
+        _logAndAppend(logger, string.concat(header, 'Treasury Spoke Owner', message, outcome));
         sanitizedInputs.treasurySpokeOwner = deployer;
       }
       if (inputs.spokeAdmin == address(0)) {
-        _logAndAppend(
-          logger,
-          'WARNING: Spoke Admin is zero address; spoke admin roles will be granted to deployer by default'
-        );
+        _logAndAppend(logger, string.concat(header, 'Spoke Admin', message, outcome));
         sanitizedInputs.spokeAdmin = deployer;
       }
       if (inputs.hubAdmin == address(0)) {
-        _logAndAppend(
-          logger,
-          'WARNING: Hub Admin is zero address; hub admin roles will be granted to deployer by default'
-        );
+        _logAndAppend(logger, string.concat(header, 'Hub Admin', message, outcome));
         sanitizedInputs.hubAdmin = deployer;
       }
     }
     if (inputs.hubLabels.length == 0) {
-      _logAndAppend(logger, 'WARNING: Hub will not be deployed');
+      _logAndAppend(logger, string.concat(header, 'Hub will not be deployed'));
       hadWarnings = true;
       sanitizedInputs.hubLabels = new string[](0);
     }
     if (inputs.spokeLabels.length == 0) {
-      _logAndAppend(logger, 'WARNING: Spoke will not be deployed');
+      _logAndAppend(logger, string.concat(header, 'Spoke will not be deployed'));
       hadWarnings = true;
       sanitizedInputs.spokeLabels = new string[](0);
     }
     if (inputs.nativeWrapper == address(0)) {
       _logAndAppend(
         logger,
-        'WARNING: Native wrapper zero address; NativeTokenGateway & SignatureGateway will not be deployed'
+        string.concat(
+          header,
+          'Native wrapper',
+          message,
+          "; NativeTokenGateway & SignatureGateway will not be deployed'"
+        )
       );
       hadWarnings = true;
       sanitizedInputs.nativeWrapper = address(0);
     }
     if (inputs.gatewayOwner == address(0)) {
-      _logAndAppend(
-        logger,
-        'WARNING: Gateway owner zero address; role will be granted to deployer by default'
-      );
+      _logAndAppend(logger, string.concat(header, 'Gateway owner', message, outcome));
       hadWarnings = true;
       sanitizedInputs.gatewayOwner = deployer;
     }

snapshots/Hub.Operations.json

@@ -14,5 +14,5 @@
   "restore: full - with transfer": "173415",
   "restore: partial": "89137",
   "restore: partial - with transfer": "147439",
-  "transferShares": "71180"
+  "transferShares": "71192"
 }

snapshots/SignatureGateway.Operations.json

@@ -2,9 +2,9 @@
   "borrowWithSig": "215605",
   "repayWithSig": "188872",
   "setSelfAsUserPositionManagerWithSig": "75402",
-  "setUsingAsCollateralWithSig": "85053",
+  "setUsingAsCollateralWithSig": "85065",
   "supplyWithSig": "153205",
   "updateUserDynamicConfigWithSig": "62769",
   "updateUserRiskPremiumWithSig": "61579",
-  "withdrawWithSig": "131696"
+  "withdrawWithSig": "131686"
 }

snapshots/Spoke.Operations.ZeroRiskPremium.json

@@ -6,7 +6,7 @@
   "liquidationCall: full": "310468",
   "liquidationCall: partial": "310186",
   "permitReserve + repay (multicall)": "166029",
-  "permitReserve + supply (multicall)": "146850",
+  "permitReserve + supply (multicall)": "146862",
   "permitReserve + supply + enable collateral (multicall)": "160573",
   "repay: full": "126094",
   "repay: partial": "130983",

snapshots/Spoke.Operations.json

@@ -6,7 +6,7 @@
   "liquidationCall: full": "344031",
   "liquidationCall: partial": "343749",
   "permitReserve + repay (multicall)": "163273",
-  "permitReserve + supply (multicall)": "146850",
+  "permitReserve + supply (multicall)": "146862",
   "permitReserve + supply + enable collateral (multicall)": "160573",
   "repay: full": "120256",
   "repay: partial": "139545",

src/deployments/batches/AaveV4SpokeInstanceBatch.sol

@@ -3,13 +3,13 @@
 pragma solidity ^0.8.0;
 
 import {BatchReports} from 'src/deployments/libraries/BatchReports.sol';
-import {Utils} from 'src/deployments/utils/libraries/Utils.sol';
 import {
   AaveV4AaveOracleDeployProcedure
 } from 'src/deployments/procedures/deploy/spoke/AaveV4AaveOracleDeployProcedure.sol';
 import {
   AaveV4SpokeDeployProcedure
 } from 'src/deployments/procedures/deploy/spoke/AaveV4SpokeDeployProcedure.sol';
+import {Create2Utils} from 'src/deployments/utils/libraries/Create2Utils.sol';
 
 import {ISpoke} from 'src/spoke/interfaces/ISpoke.sol';
 import {IAaveOracle} from 'src/spoke/interfaces/IAaveOracle.sol';
@@ -23,11 +23,16 @@ contract AaveV4SpokeInstanceBatch is AaveV4SpokeDeployProcedure, AaveV4AaveOracl
     uint8 oracleDecimals_,
     string memory oracleDescription_
   ) {
-    // additional 2 nonces for AaveOracle, SpokeInstance, starting from contract nonce of 1
-    address predictedSpokeInstance = Utils.computeCreateAddress(address(this), 3);
-
+    // starting from contract nonce of 1
+    address predictedOracle = Create2Utils.computeCreateAddress(address(this), 1);
+    address predictedSpokeProxy = _computeSpokeInstanceAddress(
+      SALT,
+      predictedOracle,
+      spokeProxyAdminOwner_,
+      accessManager_
+    );
     address aaveOracle = _deployAaveOracle(
-      predictedSpokeInstance,
+      predictedSpokeProxy,
       oracleDecimals_,
       oracleDescription_
     );
@@ -37,7 +42,8 @@ contract AaveV4SpokeInstanceBatch is AaveV4SpokeDeployProcedure, AaveV4AaveOracl
       oracle: aaveOracle
     });
 
-    require(spokeProxy == predictedSpokeInstance, InvalidParam('predicted spoke instance'));
+    require(aaveOracle == predictedOracle, InvalidParam('predicted oracle'));
+    require(spokeProxy == predictedSpokeProxy, InvalidParam('predicted spoke instance'));
     require(ISpoke(spokeProxy).ORACLE() == aaveOracle, InvalidParam('spoke oracle'));
     require(IAaveOracle(aaveOracle).SPOKE() == spokeProxy, InvalidParam('aave oracle spoke'));
 

src/deployments/procedures/AaveV4DeployProcedureBase.sol

@@ -2,8 +2,11 @@
 // Copyright (c) 2025 Aave Labs
 pragma solidity ^0.8.0;
 
+import {Create2Utils} from 'src/deployments/utils/libraries/Create2Utils.sol';
 contract AaveV4DeployProcedureBase {
   error InvalidParam(string errorMessage);
+
+  bytes32 public constant SALT = bytes32('v1');
   function _validateZeroAddress(address addr, string memory errorMessage) internal pure {
     require(addr != address(0), InvalidParam(errorMessage));
   }

src/deployments/procedures/deploy/hub/AaveV4HubConfiguratorDeployProcedure.sol

@@ -3,10 +3,17 @@
 pragma solidity ^0.8.0;
 
 import {HubConfigurator} from 'src/hub/HubConfigurator.sol';
-import {AaveV4DeployProcedureBase} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
+import {
+  Create2Utils,
+  AaveV4DeployProcedureBase
+} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
 contract AaveV4HubConfiguratorDeployProcedure is AaveV4DeployProcedureBase {
   function _deployHubConfigurator(address owner) internal returns (address) {
     _validateZeroAddress(owner, 'owner');
-    return address(new HubConfigurator({owner_: owner}));
+    return
+      Create2Utils.create2Deploy(
+        SALT,
+        abi.encodePacked(type(HubConfigurator).creationCode, abi.encode(owner))
+      );
   }
 }

src/deployments/procedures/deploy/hub/AaveV4HubDeployProcedure.sol

@@ -3,10 +3,17 @@
 pragma solidity ^0.8.0;
 
 import {Hub} from 'src/hub/Hub.sol';
-import {AaveV4DeployProcedureBase} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
+import {
+  Create2Utils,
+  AaveV4DeployProcedureBase
+} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
 contract AaveV4HubDeployProcedure is AaveV4DeployProcedureBase {
   function _deployHub(address accessManager) internal returns (address) {
     _validateZeroAddress(accessManager, 'access manager');
-    return address(new Hub({authority_: accessManager}));
+    return
+      Create2Utils.create2Deploy(
+        SALT,
+        abi.encodePacked(type(Hub).creationCode, abi.encode(accessManager))
+      );
   }
 }

src/deployments/procedures/deploy/hub/AaveV4InterestRateStrategyDeployProcedure.sol

@@ -3,10 +3,17 @@
 pragma solidity ^0.8.0;
 
 import {AssetInterestRateStrategy} from 'src/hub/AssetInterestRateStrategy.sol';
-import {AaveV4DeployProcedureBase} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
+import {
+  Create2Utils,
+  AaveV4DeployProcedureBase
+} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
 contract AaveV4InterestRateStrategyDeployProcedure is AaveV4DeployProcedureBase {
   function _deployInterestRateStrategy(address hub) internal returns (address) {
     require(hub != address(0), InvalidParam('hub'));
-    return address(new AssetInterestRateStrategy({hub_: hub}));
+    return
+      Create2Utils.create2Deploy(
+        SALT,
+        abi.encodePacked(type(AssetInterestRateStrategy).creationCode, abi.encode(hub))
+      );
   }
 }

src/deployments/procedures/deploy/position-manager/AaveV4NativeTokenGatewayDeployProcedure.sol

@@ -3,14 +3,21 @@
 pragma solidity ^0.8.0;
 
 import {NativeTokenGateway} from 'src/position-manager/NativeTokenGateway.sol';
-import {AaveV4DeployProcedureBase} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
+import {
+  Create2Utils,
+  AaveV4DeployProcedureBase
+} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
 contract AaveV4NativeTokenGatewayDeployProcedure is AaveV4DeployProcedureBase {
   function _deployNativeTokenGateway(
     address nativeWrapper,
     address owner
   ) internal returns (address) {
     _validateZeroAddress(nativeWrapper, 'native wrapper');
     _validateZeroAddress(owner, 'owner');
-    return address(new NativeTokenGateway({nativeWrapper_: nativeWrapper, initialOwner_: owner}));
+    return
+      Create2Utils.create2Deploy(
+        SALT,
+        abi.encodePacked(type(NativeTokenGateway).creationCode, abi.encode(nativeWrapper, owner))
+      );
   }
 }

src/deployments/procedures/deploy/position-manager/AaveV4SignatureGatewayDeployProcedure.sol

@@ -3,10 +3,17 @@
 pragma solidity ^0.8.0;
 
 import {SignatureGateway} from 'src/position-manager/SignatureGateway.sol';
-import {AaveV4DeployProcedureBase} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
+import {
+  Create2Utils,
+  AaveV4DeployProcedureBase
+} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
 contract AaveV4SignatureGatewayDeployProcedure is AaveV4DeployProcedureBase {
   function _deploySignatureGateway(address owner) internal returns (address) {
     _validateZeroAddress(owner, 'owner');
-    return address(new SignatureGateway({initialOwner_: owner}));
+    return
+      Create2Utils.create2Deploy(
+        SALT,
+        abi.encodePacked(type(SignatureGateway).creationCode, abi.encode(owner))
+      );
   }
 }

src/deployments/procedures/deploy/spoke/AaveV4AaveOracleDeployProcedure.sol

@@ -13,6 +13,7 @@ contract AaveV4AaveOracleDeployProcedure is AaveV4DeployProcedureBase {
     _validateZeroAddress(spoke_, 'spoke');
     require(decimals_ > 0, InvalidParam('oracle decimals'));
     require(bytes(description_).length > 0, InvalidParam('oracle description'));
+    // AaveOracle must be deployed via create to compute the predicted address via without inputs
     return
       address(new AaveOracle({spoke_: spoke_, decimals_: decimals_, description_: description_}));
   }

src/deployments/procedures/deploy/spoke/AaveV4SpokeConfiguratorDeployProcedure.sol

@@ -3,11 +3,18 @@
 pragma solidity ^0.8.0;
 
 import {SpokeConfigurator} from 'src/spoke/SpokeConfigurator.sol';
-import {AaveV4DeployProcedureBase} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
+import {
+  Create2Utils,
+  AaveV4DeployProcedureBase
+} from 'src/deployments/procedures/AaveV4DeployProcedureBase.sol';
 
 contract AaveV4SpokeConfiguratorDeployProcedure is AaveV4DeployProcedureBase {
   function _deploySpokeConfigurator(address owner) internal returns (address) {
     _validateZeroAddress(owner, 'owner');
-    return address(new SpokeConfigurator({owner_: owner}));
+    return
+      Create2Utils.create2Deploy(
+        SALT,
+        abi.encodePacked(type(SpokeConfigurator).creationCode, abi.encode(owner))
+      );
   }
 }