conflicts resolve

Author: Szooot

abis/Client.json

@@ -399,19 +399,6 @@
     "outputs": [],
     "stateMutability": "payable"
   },
-  {
-    "type": "event",
-    "name": "DatacapAllocated",
-    "inputs": [
-      {
-        "name": "allowance",
-        "type": "uint256",
-        "indexed": true,
-        "internalType": "uint256"
-      }
-    ],
-    "anonymous": false
-  },
   {
     "type": "event",
     "name": "DatacapSpent",
@@ -532,44 +519,6 @@
     ],
     "anonymous": false
   },
-  {
-    "type": "event",
-    "name": "ValidatorLockupPeriodUpdated",
-    "inputs": [
-      {
-        "name": "dealId",
-        "type": "uint256",
-        "indexed": true,
-        "internalType": "uint256"
-      },
-      {
-        "name": "validator",
-        "type": "address",
-        "indexed": true,
-        "internalType": "address"
-      }
-    ],
-    "anonymous": false
-  },
-  {
-    "type": "event",
-    "name": "VerifiedClientAdded",
-    "inputs": [
-      {
-        "name": "client",
-        "type": "address",
-        "indexed": true,
-        "internalType": "address"
-      },
-      {
-        "name": "allowance",
-        "type": "uint256",
-        "indexed": true,
-        "internalType": "uint256"
-      }
-    ],
-    "anonymous": false
-  },
   {
     "type": "error",
     "name": "AccessControlBadConfirmation",
@@ -648,11 +597,6 @@
     "name": "InvalidAllocationRequest",
     "inputs": []
   },
-  {
-    "type": "error",
-    "name": "InvalidAllocatorAddress",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "InvalidCaller",

script/Deploy.s.sol

@@ -58,7 +58,7 @@ contract Deploy is Script, DeployUtils {
         (validatorFactory, validatorFactoryImpl, validatorImpl) = _deployValidatorFactory(admin);
         (poRepMarket, poRepMarketImpl) = _deployPoRepMarket(admin, validatorFactory, spRegistry);
         (clientSmartContract, clientSmartContractImpl) =
-            _deployClientSmartContract(admin, allocator, terminationOracle, poRepMarket, metaAllocator);
+            _deployClientSmartContract(admin, terminationOracle, poRepMarket, metaAllocator);
         (sliOracle, sliOracleImpl) = _deploySLIOracle(admin, oracleAddress);
         (sliScorer, sliScorerImpl) = _deploySliScorer(admin, sliOracle);
         (spRegistry, spRegistryImpl) = _deploySPRegistry(admin);
@@ -107,14 +107,13 @@ contract Deploy is Script, DeployUtils {
 
     function _deployClientSmartContract(
         address _admin,
-        address _allocator,
         address _terminationOracle,
         address _porepMarket,
         address _metaAllocator
     ) internal returns (address proxy, address impl) {
         Client _impl = new Client();
         bytes memory init =
-            abi.encodeCall(Client.initialize, (_admin, _allocator, _terminationOracle, _porepMarket, _metaAllocator));
+            abi.encodeCall(Client.initialize, (_admin, _terminationOracle, _porepMarket, _metaAllocator));
         proxy = createProxy(init, address(_impl));
         impl = address(_impl);
     }
@@ -158,7 +157,6 @@ contract Deploy is Script, DeployUtils {
         json.serialize("ValidatorBeacon", validatorBeacon);
         json.serialize("ValidatorImpl", validatorImpl);
         json.serialize("FilecoinPay", filecoinPay);
-        json.serialize("Allocator", allocator);
         json.serialize("PoRepService", poRepService);
         json.serialize("MetaAllocator", metaAllocator);
         json.serialize("SPRegistry", spRegistry);

src/Client.sol

@@ -76,12 +76,6 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable, Ree
     event DatacapSpent(address indexed client, uint256 amount);
     // solhint-enable gas-indexed-events
 
-    /**
-     * @notice Emitted when a datacap is successfully allocated to client contract
-     * @param allowance Allowance amount
-     */
-    event DatacapAllocated(uint256 indexed allowance);
-
     /**
      * @notice Thrown if sender is not proposed client
      */
@@ -147,11 +141,6 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable, Ree
      */
     error InvalidAdminAddress();
 
-    /**
-     * @notice Error thrown when invalid allocator address is provided
-     */
-    error InvalidAllocatorAddress();
-
     /**
      * @notice Error thrown when invalid termination oracle address is provided
      */
@@ -204,12 +193,11 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable, Ree
      */
     function initialize(
         address admin,
-        address allocator,
         address terminationOracle,
         address _poRepMarketContract,
         address _metaAllocatorContract
     ) public initializer {
-        _validateInitializeAddresses(admin, allocator, terminationOracle, _poRepMarketContract, _metaAllocatorContract);
+        _validateInitializeAddresses(admin, terminationOracle, _poRepMarketContract, _metaAllocatorContract);
 
         __AccessControl_init();
         _grantRole(DEFAULT_ADMIN_ROLE, admin);
@@ -224,24 +212,19 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable, Ree
     /**
      * @notice Validates the addresses passed to the initialize function
      * @param admin Contract owner
-     * @param allocator Address of the allocator contract that can increase and decrease allowances
      * @param terminationOracle Address of the Termination Oracle
      * @param poRepMarketContract Address of the PoRepMarket contract
      * @param metaAllocatorContract Address of the MetaAllocator contract
      */
     function _validateInitializeAddresses(
         address admin,
-        address allocator,
         address terminationOracle,
         address poRepMarketContract,
         address metaAllocatorContract
     ) internal pure {
         if (admin == address(0)) {
             revert InvalidAdminAddress();
         }
-        if (allocator == address(0)) {
-            revert InvalidAllocatorAddress();
-        }
         if (terminationOracle == address(0)) {
             revert InvalidTerminationOracleAddress();
         }
@@ -279,7 +262,7 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable, Ree
         uint256 sizeOfAllocations = _verifyAndRegisterAllocations(dealId, allocations);
         uint256 sizeOfClaims = _verifyAndRegisterClaimExtensions(dealId, claimExtensions);
         uint256 allocationsAndClaimsSize = sizeOfAllocations + sizeOfClaims;
-         $._metaAllocatorContract
+        $._metaAllocatorContract
             .addVerifiedClient(FilAddresses.fromEthAddress(address(this)).data, allocationsAndClaimsSize);
 
         emit DatacapSpent(msg.sender, allocationsAndClaimsSize);

test/Client.t.sol

@@ -134,8 +134,7 @@ contract ClientTest is Test {
     function setupProxy(address impl) public returns (address) {
         // solhint-disable-next-line gas-small-strings
         bytes memory initData = abi.encodeCall(
-            Client.initialize,
-            (address(this), allocator, terminationOracle, address(poRepMarketMock), address(metaAllocatorMock))
+            Client.initialize, (address(this), terminationOracle, address(poRepMarketMock), address(metaAllocatorMock))
         );
         ERC1967Proxy proxy = new ERC1967Proxy(address(impl), initData);
         return address(proxy);
@@ -821,24 +820,7 @@ contract ClientTest is Test {
         Client c = Client(address(proxy));
 
         vm.expectRevert(abi.encodeWithSelector(Client.InvalidAdminAddress.selector));
-        c.initialize(
-            address(0),
-            address(metaAllocatorMock),
-            terminationOracle,
-            address(poRepMarketMock),
-            address(metaAllocatorMock)
-        );
-    }
-
-    function testInitializeRevertsWhenAllocatorIsZero() public {
-        Client impl = new Client();
-        ERC1967Proxy proxy = new ERC1967Proxy(address(impl), "");
-        Client c = Client(address(proxy));
-
-        vm.expectRevert(abi.encodeWithSelector(Client.InvalidAllocatorAddress.selector));
-        c.initialize(
-            address(clientAddress), address(0), terminationOracle, address(poRepMarketMock), address(metaAllocatorMock)
-        );
+        c.initialize(address(0), terminationOracle, address(poRepMarketMock), address(metaAllocatorMock));
     }
 
     function testInitializeRevertsWhenTerminationOracleIsZero() public {
@@ -847,13 +829,7 @@ contract ClientTest is Test {
         Client c = Client(address(proxy));
 
         vm.expectRevert(abi.encodeWithSelector(Client.InvalidTerminationOracleAddress.selector));
-        c.initialize(
-            address(clientAddress),
-            address(metaAllocatorMock),
-            address(0),
-            address(poRepMarketMock),
-            address(metaAllocatorMock)
-        );
+        c.initialize(address(clientAddress), address(0), address(poRepMarketMock), address(metaAllocatorMock));
     }
 
     function testInitializeRevertsWhenPoRepMarketIsZero() public {
@@ -862,13 +838,7 @@ contract ClientTest is Test {
         Client c = Client(address(proxy));
 
         vm.expectRevert(abi.encodeWithSelector(Client.InvalidPoRepMarketContractAddress.selector));
-        c.initialize(
-            address(clientAddress),
-            address(metaAllocatorMock),
-            terminationOracle,
-            address(0),
-            address(metaAllocatorMock)
-        );
+        c.initialize(address(clientAddress), terminationOracle, address(0), address(metaAllocatorMock));
     }
 
     function testInitializeRevertsWhenMetaAllocatorIsZero() public {
@@ -877,11 +847,9 @@ contract ClientTest is Test {
         Client c = Client(address(proxy));
 
         vm.expectRevert(abi.encodeWithSelector(Client.InvalidMetaAllocatorContractAddress.selector));
-        c.initialize(
-            address(clientAddress), address(metaAllocatorMock), terminationOracle, address(poRepMarketMock), address(0)
-        );
+        c.initialize(address(clientAddress), terminationOracle, address(poRepMarketMock), address(0));
     }
-    
+
     function testShouldRevertWhenAlreadyRegisteredDealTransferIsCalledByNotTheClient() public {
         vm.prank(clientAddress);
         client.transfer(transferParams, dealId, false);
@@ -902,15 +870,4 @@ contract ClientTest is Test {
         vm.prank(clientAddress);
         client.transfer(transferParams, dealId, false);
     }
-
-    function testTransferEmitsDatacapAllocated() public {
-        transferParams.operator_data =
-            hex"828186192710D82A5828000181E203922020F2B9A58BBC9D9856E52EAB85155C1BA298F7E8DF458BD20A3AD767E11572CA221908001A0007E9001A005033401901318183192710031A005034AC";
-
-        vm.expectEmit(true, false, false, false);
-        emit Client.DatacapAllocated(4096);
-
-        vm.prank(clientAddress);
-        client.transfer(transferParams, dealId, false);
-    }
 }