ci happy

Author: Szooot

abis/Client.json

@@ -527,25 +527,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",

abis/PoRepMarket.json

@@ -658,6 +658,12 @@
         "indexed": true,
         "internalType": "address"
       },
+      {
+        "name": "actualSizeBytes",
+        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256"
+      },
       {
         "name": "provider",
         "type": "uint64",

script/Deploy.s.sol

@@ -53,7 +53,7 @@ contract Deploy is Script, DeployUtils {
         (validatorFactory, validatorFactoryImpl, validatorImpl) = _deployValidatorFactory(admin);
         (poRepMarket, poRepMarketImpl) = _deployPoRepMarket(admin, validatorFactory, spRegistry);
         (clientSmartContract, clientSmartContractImpl) =
-            _deployClientSmartContract(admin, terminationOracle, porepMarket);
+            _deployClientSmartContract(admin, terminationOracle, poRepMarket);
         (sliOracle, sliOracleImpl) = _deploySLIOracle(admin, oracleAddress);
         (sliScorer, sliScorerImpl) = _deploySliScorer(admin, sliOracle);
         (spRegistry, spRegistryImpl) = _deploySPRegistry(admin);

src/Client.sol

@@ -74,13 +74,6 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable, Ree
     event DatacapSpent(address indexed client, uint256 amount);
     // solhint-enable gas-indexed-events
 
-    /**
-     * @notice Emited when lockupPeriod is called
-     * @param dealId Deal id
-     * @param validator Validator address
-     */
-    event ValidatorLockupPeriodUpdated(uint256 indexed dealId, address indexed validator);
-
     /**
      * @notice Emitted when a datacap is successfully allocated to client contract
      * @param allowance Allowance amount

src/Validator.sol

@@ -4,8 +4,6 @@
 pragma solidity =0.8.25;
 
 import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
-import {CommonTypes} from "filecoin-solidity/v0.8/types/CommonTypes.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 contract Validator is AccessControlUpgradeable {
     function initialize(

src/ValidatorFactory.sol

@@ -157,7 +157,7 @@ contract ValidatorFactory is UUPSUpgradeable, AccessControlUpgradeable {
                 )
             )
         );
-
+        // forge-lint: disable-next-line(asm-keccak256)
         bytes32 salt = keccak256(abi.encode(admin, dealId));
         address proxy = Create2.computeAddress(salt, keccak256(initCode), address(this));
         $._instances[dealId] = proxy;

test/Client.t.sol

@@ -402,8 +402,6 @@ contract ClientTest is Test {
         // solhint-disable-next-line reentrancy
         transferParams.operator_data =
             hex"828286192710D82A5828000181E203922020F2B9A58BBC9D9856E52EAB85155C1BA298F7E8DF458BD20A3AD767E11572CA221908001A0007E9001A0050334019013186192710D82A5828000181E203922020F2B9A58BBC9D9856E52EAB85155C1BA298F7E8DF458BD20A3AD767E11572CA221950001A0007E9001A009C7E801901318183192710011A005034AC";
-        vm.expectEmit(true, true, true, true);
-        emit Client.ValidatorLockupPeriodUpdated(dealId, address(validatorMock));
         clientMock.transfer(transferParams, dealId, false);
 
         Client.Deal memory deal = clientMock.getDeal(dealId);
@@ -432,8 +430,6 @@ contract ClientTest is Test {
         // termMax + expiration -> 10256305
         transferParams.operator_data =
             hex"828286192710D82A5828000181E203922020F2B9A58BBC9D9856E52EAB85155C1BA298F7E8DF458BD20A3AD767E11572CA221908001A0007E9001A0050334019013186192710D82A5828000181E203922020F2B9A58BBC9D9856E52EAB85155C1BA298F7E8DF458BD20A3AD767E11572CA221950001A0007E9001A009C7E801901318183192710011A005034AC";
-        vm.expectEmit(true, true, true, true);
-        emit Client.ValidatorLockupPeriodUpdated(dealId, address(validatorMock));
         vm.prank(clientAddress);
         clientMock.transfer(transferParams, dealId, false);
 
@@ -483,7 +479,7 @@ contract ClientTest is Test {
             PoRepMarket.DealProposal({
                 dealId: 150,
                 client: clientAddress,
-                provider: SP2,
+                provider: SP1,
                 requirements: SLITypes.SLIThresholds({
                     retrievabilityPct: 80, bandwidthMbps: 500, latencyMs: 200, indexingPct: 90
                 }),
@@ -497,7 +493,7 @@ contract ClientTest is Test {
         reentrantValidatorMock.setAttackParams(address(client), transferParams, dealId);
         vm.prank(clientAddress);
         vm.expectRevert(abi.encodeWithSelector(ReentrancyGuard.ReentrancyGuardReentrantCall.selector));
-        client.transfer(transferParams, dealId, false);
+        client.transfer(transferParams, dealId, true);
     }
 
     function testShouldAddClaimExtensionIdsAfterTransfer() public {
@@ -528,8 +524,6 @@ contract ClientTest is Test {
         transferParams.operator_data =
             hex"828286192710D82A5828000181E203922020F2B9A58BBC9D9856E52EAB85155C1BA298F7E8DF458BD20A3AD767E11572CA221908001A0007E9001A0050334019013186192710D82A5828000181E203922020F2B9A58BBC9D9856E52EAB85155C1BA298F7E8DF458BD20A3AD767E11572CA221950001A0007E9001A009C7E801901318183192710041A005034AC";
         actorIdMock.setDataCapTransferResult(hex"834100410049838201808200808102");
-        vm.expectEmit(true, true, true, true);
-        emit Client.ValidatorLockupPeriodUpdated(dealId, address(validatorMock));
 
         vm.prank(clientAddress);
         clientMock.transfer(transferParams, dealId, false);
@@ -766,4 +760,36 @@ contract ClientTest is Test {
         vm.expectRevert(abi.encodeWithSelector(Client.ValidatorNotSet.selector, dealId));
         clientMock.isDataSizeMatching(dealId);
     }
+
+    function testShouldRevertWhenAlreadyRegisteredDealTransferIsCalledByNotTheClient() public {
+        vm.prank(clientAddress);
+        client.transfer(transferParams, dealId, false);
+
+        address notTheClient = vm.addr(0x523);
+        vm.prank(notTheClient);
+        vm.expectRevert(abi.encodeWithSelector(Client.InvalidClient.selector));
+        client.transfer(transferParams, dealId, false);
+    }
+
+    function testTransferEmitsDatacapSpent() public {
+        transferParams.operator_data =
+            hex"828186192710D82A5828000181E203922020F2B9A58BBC9D9856E52EAB85155C1BA298F7E8DF458BD20A3AD767E11572CA221908001A0007E9001A005033401901318183192710031A005034AC";
+
+        vm.expectEmit(true, false, false, true);
+        emit Client.DatacapSpent(clientAddress, 4096);
+
+        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);
+    }
 }

test/contracts/PoRepMarketMock.sol

@@ -17,7 +17,7 @@ contract PoRepMarketMock {
     }
 
     // solhint-disable-next-line no-empty-blocks
-    function completeDeal(uint256) external {
+    function completeDeal(uint256, uint256) external {
         //noop
     }
 }