[FIL-1353] Client Contract adjustments and clenup (#21)

* FIL-1353 Client Contract adjustments and clenup

* completed deal check

---------

Co-authored-by: Szooot <michalos277@gmail.com>

Author: Filip-L

.env.example

@@ -10,6 +10,7 @@ PRIVATE_KEY_MAINNET=<your_private_key>
 
 FILECOIN_PAY=<filecoin_pay_address>
 ALLOCATOR=<llocator_address>
+SP_REGISTRY=<sp_registry_address>
 TERMINATION_ORACLE=<termination_oracle_address>
 ORACLE=<oracle_address>
 META_ALLOCATOR=<metaallocator_address>

abis/Client.json

@@ -4,19 +4,6 @@
     "inputs": [],
     "stateMutability": "nonpayable"
   },
-  {
-    "type": "function",
-    "name": "ALLOCATOR_ROLE",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bytes32",
-        "internalType": "bytes32"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "DEFAULT_ADMIN_ROLE",
@@ -210,11 +197,6 @@
         "type": "address",
         "internalType": "address"
       },
-      {
-        "name": "allocator",
-        "type": "address",
-        "internalType": "address"
-      },
       {
         "name": "terminationOracle",
         "type": "address",
@@ -537,25 +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": "error",
     "name": "AccessControlBadConfirmation",
@@ -634,11 +597,6 @@
     "name": "InvalidAllocationRequest",
     "inputs": []
   },
-  {
-    "type": "error",
-    "name": "InvalidAllocatorAddress",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "InvalidCaller",

abis/PoRepMarket.json

@@ -77,6 +77,11 @@
         "name": "dealId",
         "type": "uint256",
         "internalType": "uint256"
+      },
+      {
+        "name": "actualSizeBytes",
+        "type": "uint256",
+        "internalType": "uint256"
       }
     ],
     "outputs": [],
@@ -689,6 +694,12 @@
         "indexed": true,
         "internalType": "address"
       },
+      {
+        "name": "actualSizeBytes",
+        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256"
+      },
       {
         "name": "provider",
         "type": "uint64",

script/Deploy.s.sol

@@ -36,7 +36,6 @@ contract Deploy is Script, DeployUtils {
     address internal spRegistry;
     address internal filecoinPay;
     address internal admin;
-    address internal allocator;
     address internal terminationOracle;
     address internal oracleAddress;
     address internal poRepService;
@@ -47,7 +46,6 @@ contract Deploy is Script, DeployUtils {
 
     function run() external {
         admin = vm.addr(vm.envUint("PRIVATE_KEY_TEST"));
-        allocator = vm.envAddress("ALLOCATOR");
         terminationOracle = vm.envAddress("TERMINATION_ORACLE");
         filecoinPay = vm.envAddress("FILECOIN_PAY");
         oracleAddress = vm.envAddress("ORACLE");
@@ -60,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);
@@ -109,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);
     }
@@ -160,9 +157,9 @@ 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);
         string memory output = json.serialize("TerminationOracle", terminationOracle);
 
         save(output);