dasm integration

contracts/script/EigenDADeployer.s.sol

@@ -14,7 +14,7 @@ import {StakeRegistry, IStrategy} from "eigenlayer-middleware/StakeRegistry.sol"
 import {IStakeRegistry, IDelegationManager} from "eigenlayer-middleware/interfaces/IStakeRegistry.sol";
 import {IServiceManager} from "eigenlayer-middleware/interfaces/IServiceManager.sol";
 import {IBLSApkRegistry} from "eigenlayer-middleware/interfaces/IBLSApkRegistry.sol";
-
+import {IEigenDAPaymentManager} from "../src/interfaces/IEigenDAPaymentManager.sol";
 import {EigenDAServiceManager, IAVSDirectory, IPaymentCoordinator} from "../src/core/EigenDAServiceManager.sol";
 import {EigenDAHasher} from "../src/libraries/EigenDAHasher.sol";
 
@@ -189,7 +189,8 @@ contract EigenDADeployer is DeployOpenEigenLayer {
             IAVSDirectory(address(avsDirectory)),
             IPaymentCoordinator(address(0)),
             registryCoordinator,
-            stakeRegistry
+            stakeRegistry,
+            IEigenDAPaymentManager(address(0))
         );
 
         address[] memory confirmers = new address[](1);

contracts/src/core/EigenDAServiceManager.sol

@@ -4,13 +4,14 @@ pragma solidity ^0.8.9;
 import {Pausable} from "eigenlayer-core/contracts/permissions/Pausable.sol";
 import {IPauserRegistry} from "eigenlayer-core/contracts/interfaces/IPauserRegistry.sol";
 
-import {ServiceManagerBase, IAVSDirectory, IPaymentCoordinator} from "eigenlayer-middleware/ServiceManagerBase.sol";
+import {ServiceManagerBase, IAVSDirectory, IPaymentCoordinator, IServiceManager} from "eigenlayer-middleware/ServiceManagerBase.sol";
 import {BLSSignatureChecker} from "eigenlayer-middleware/BLSSignatureChecker.sol";
 import {IRegistryCoordinator} from "eigenlayer-middleware/interfaces/IRegistryCoordinator.sol";
 import {IStakeRegistry} from "eigenlayer-middleware/interfaces/IStakeRegistry.sol";
 
 import {EigenDAServiceManagerStorage} from "./EigenDAServiceManagerStorage.sol";
 import {EigenDAHasher} from "../libraries/EigenDAHasher.sol";
+import {IEigenDAPaymentManager} from "../interfaces/IEigenDAPaymentManager.sol";
 
 /**
  * @title Primary entrypoint for procuring services from EigenDA.
@@ -36,8 +37,10 @@ contract EigenDAServiceManager is EigenDAServiceManagerStorage, ServiceManagerBa
         IAVSDirectory __avsDirectory,
         IPaymentCoordinator __paymentCoordinator,
         IRegistryCoordinator __registryCoordinator,
-        IStakeRegistry __stakeRegistry
+        IStakeRegistry __stakeRegistry,
+        IEigenDAPaymentManager __paymentManager
     )
+        EigenDAServiceManagerStorage(__paymentManager)
         BLSSignatureChecker(__registryCoordinator)
         ServiceManagerBase(__avsDirectory, __paymentCoordinator, __registryCoordinator, __stakeRegistry)
     {
@@ -124,6 +127,19 @@ contract EigenDAServiceManager is EigenDAServiceManagerStorage, ServiceManagerBa
         batchId = batchIdMemory + 1;
     }
 
+    function payForRange(
+        IPaymentCoordinator.RangePayment[] calldata rangePayments
+    ) public override(ServiceManagerBase, IServiceManager) {
+        require(msg.sender == address(paymentManager), "EigenDAServiceManager.payForRange: only payment manager can pay for range");
+
+        for (uint256 i = 0; i < rangePayments.length; ++i) {
+            rangePayments[i].token.transferFrom(msg.sender, address(this), rangePayments[i].amount);
+            rangePayments[i].token.approve(address(_paymentCoordinator), rangePayments[i].amount);
+        }
+
+        _paymentCoordinator.payForRange(rangePayments);
+    }
+
     /// @notice This function is used for changing the batch confirmer
     function setBatchConfirmer(address _batchConfirmer) external onlyOwner() {
         _setBatchConfirmer(_batchConfirmer);

contracts/src/core/EigenDAServiceManagerStorage.sol

@@ -2,13 +2,18 @@
 pragma solidity ^0.8.9;
 
 import {IEigenDAServiceManager} from "../interfaces/IEigenDAServiceManager.sol";
+import {IEigenDAPaymentManager} from "../interfaces/IEigenDAPaymentManager.sol";
 
 /**
  * @title Storage variables for the `EigenDAServiceManager` contract.
  * @author Layr Labs, Inc.
  * @notice This storage contract is separate from the logic to simplify the upgrade process.
  */
 abstract contract EigenDAServiceManagerStorage is IEigenDAServiceManager {
+
+    /// @notice The payment manager contract for the EigenDA AVS
+    IEigenDAPaymentManager public immutable paymentManager;
+
     // CONSTANTS
     uint256 public constant THRESHOLD_DENOMINATOR = 100;
 
@@ -57,6 +62,10 @@ abstract contract EigenDAServiceManagerStorage is IEigenDAServiceManager {
      */
     bytes public constant quorumNumbersRequired = hex"00";
 
+    constructor(IEigenDAPaymentManager _paymentManager) {
+        paymentManager = _paymentManager;
+    }
+
     /// @notice The current batchId
     uint32 public batchId;
 

contracts/test/unit/EigenDABlobUtils.t.sol

@@ -11,7 +11,7 @@ import {EigenDAHasher} from "../../src/libraries/EigenDAHasher.sol";
 import {EigenDABlobUtilsHarness} from "../harnesses/EigenDABlobUtilsHarness.sol";
 import {EigenDAServiceManager} from "../../src/core/EigenDAServiceManager.sol";
 import {IEigenDAServiceManager} from "../../src/interfaces/IEigenDAServiceManager.sol";
-
+import {IEigenDAPaymentManager} from "../../src/interfaces/IEigenDAPaymentManager.sol";
 
 import "forge-std/StdStorage.sol";
 
@@ -46,7 +46,8 @@ contract EigenDABlobUtilsUnit is BLSMockAVSDeployer {
             avsDirectory,
             IPaymentCoordinator(address(0)),
             registryCoordinator,
-            stakeRegistry
+            stakeRegistry,
+            IEigenDAPaymentManager(address(0))
         );
 
         address[] memory confirmers = new address[](1);

contracts/test/unit/EigenDAServiceManagerUnit.t.sol

@@ -8,7 +8,7 @@ import {EigenDAServiceManager, IPaymentCoordinator} from "../../src/core/EigenDA
 import {EigenDAHasher} from "../../src/libraries/EigenDAHasher.sol";
 import {EigenDAServiceManager} from "../../src/core/EigenDAServiceManager.sol";
 import {IEigenDAServiceManager} from "../../src/interfaces/IEigenDAServiceManager.sol";
-
+import {IEigenDAPaymentManager} from "../../src/interfaces/IEigenDAPaymentManager.sol";
 
 contract EigenDAServiceManagerUnit is BLSMockAVSDeployer {
     using BN254 for BN254.G1Point;
@@ -35,7 +35,8 @@ contract EigenDAServiceManagerUnit is BLSMockAVSDeployer {
             avsDirectory,
             IPaymentCoordinator(address(0)),
             registryCoordinator,
-            stakeRegistry
+            stakeRegistry,
+            IEigenDAPaymentManager(address(0))
         );
 
         address[] memory confirmers = new address[](1);

contracts/test/unit/MockRollup.t.sol

@@ -11,6 +11,7 @@ import {EigenDAServiceManager, IPaymentCoordinator} from "../../src/core/EigenDA
 import {IEigenDAServiceManager} from "../../src/interfaces/IEigenDAServiceManager.sol";
 import {EigenDARollupUtils} from "../../src/libraries/EigenDARollupUtils.sol";
 import {BN254} from "eigenlayer-middleware/libraries/BN254.sol";
+import {IEigenDAPaymentManager} from "../../src/interfaces/IEigenDAPaymentManager.sol";
 
 import "forge-std/StdStorage.sol";
 
@@ -56,7 +57,8 @@ contract MockRollupTest is BLSMockAVSDeployer {
             avsDirectory,
             IPaymentCoordinator(address(0)),
             registryCoordinator,
-            stakeRegistry
+            stakeRegistry,
+            IEigenDAPaymentManager(address(0)) 
         );
 
         address[] memory confirmers = new address[](1);