removed claimant from originData

Author: mgretzke

src/allocators/ERC7683Allocator.sol

@@ -117,20 +117,9 @@ contract ERC7683Allocator is SimpleAllocator, IERC7683Allocator {
     }
 
     /// @inheritdoc IERC7683Allocator
-    function completeOriginData(bytes memory originData_, address claimant_)
-        external
-        pure
-        returns (bytes memory originData)
-    {
-        (
-            Claim memory claim,
-            Mandate memory mandate, /* empty receiver of the tokens */
-            ,
-            uint256 targetBlock,
-            uint256 maximumBlocksAfterTarget
-        ) = abi.decode(originData_, (Claim, Mandate, address, uint256, uint256));
-        originData = abi.encode(claim, mandate, claimant_, targetBlock, maximumBlocksAfterTarget);
-        return originData;
+    function createFillerData(address claimant_) external pure returns (bytes memory fillerData) {
+        fillerData = abi.encode(claimant_);
+        return fillerData;
     }
 
     function _open(OrderData memory orderData_, uint32 fillDeadline_, address sponsor_, bytes memory sponsorSignature_)
@@ -258,7 +247,7 @@ contract ERC7683Allocator is SimpleAllocator, IERC7683Allocator {
         fillInstructions[0] = FillInstruction({
             destinationChainId: orderData.chainId,
             destinationSettler: _addressToBytes32(orderData.tribunal),
-            originData: abi.encode(claim, mandate, address(0), orderData.targetBlock, orderData.maximumBlocksAfterTarget)
+            originData: abi.encode(claim, mandate, orderData.targetBlock, orderData.maximumBlocksAfterTarget)
         });
 
         Output memory spent = Output({

src/interfaces/IERC7683Allocator.sol

@@ -85,11 +85,7 @@ interface IERC7683Allocator is IOriginSettler {
     /// @dev The nonce is the most significant 96 bits. The least significant 160 bits must be the sponsor address
     function checkNonce(address sponsor_, uint256 nonce_) external view returns (bool nonceFree_);
 
-    /// @notice Completes the origin data by adding the filler as a claimant in the fillInstructions from the ResolvedCrossChainOrder
-    /// @param originData_ The origin data from the open event
+    /// @notice Creates the filler data for the open event to be used on the IDestinationSettler
     /// @param claimant_ The address claiming the origin tokens after a successful fill (typically the address of the filler)
-    function completeOriginData(bytes memory originData_, address claimant_)
-        external
-        pure
-        returns (bytes memory completeOriginData);
+    function createFillerData(address claimant_) external pure returns (bytes memory fillerData);
 }

test/ERC7683Allocator.t.sol

@@ -533,7 +533,7 @@ contract ERC7683Allocator_openFor is GaslessCrossChainOrderData {
         fillInstructions[0] = IOriginSettler.FillInstruction({
             destinationChainId: defaultOutputChainId,
             destinationSettler: bytes32(uint256(uint160(tribunal))),
-            originData: abi.encode(claim, _getMandate(), address(0), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
+            originData: abi.encode(claim, _getMandate(), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
         });
 
         IOriginSettler.ResolvedCrossChainOrder memory resolvedCrossChainOrder = IOriginSettler.ResolvedCrossChainOrder({
@@ -588,7 +588,7 @@ contract ERC7683Allocator_openFor is GaslessCrossChainOrderData {
         fillInstructions[0] = IOriginSettler.FillInstruction({
             destinationChainId: defaultOutputChainId,
             destinationSettler: bytes32(uint256(uint160(tribunal))),
-            originData: abi.encode(claim, _getMandate(), address(0), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
+            originData: abi.encode(claim, _getMandate(), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
         });
 
         IOriginSettler.ResolvedCrossChainOrder memory resolvedCrossChainOrder = IOriginSettler.ResolvedCrossChainOrder({
@@ -749,7 +749,7 @@ contract ERC7683Allocator_open is OnChainCrossChainOrderData {
         fillInstructions[0] = IOriginSettler.FillInstruction({
             destinationChainId: defaultOutputChainId,
             destinationSettler: bytes32(uint256(uint160(tribunal))),
-            originData: abi.encode(claim, _getMandate(), address(0), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
+            originData: abi.encode(claim, _getMandate(), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
         });
 
         IOriginSettler.ResolvedCrossChainOrder memory resolvedCrossChainOrder = IOriginSettler.ResolvedCrossChainOrder({
@@ -914,7 +914,7 @@ contract ERC7683Allocator_resolveFor is GaslessCrossChainOrderData {
         fillInstructions[0] = IOriginSettler.FillInstruction({
             destinationChainId: defaultOutputChainId,
             destinationSettler: bytes32(uint256(uint160(tribunal))),
-            originData: abi.encode(claim, _getMandate(), address(0), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
+            originData: abi.encode(claim, _getMandate(), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
         });
 
         IOriginSettler.ResolvedCrossChainOrder memory resolvedCrossChainOrder = IOriginSettler.ResolvedCrossChainOrder({
@@ -980,7 +980,7 @@ contract ERC7683Allocator_resolve is OnChainCrossChainOrderData {
         fillInstructions[0] = IOriginSettler.FillInstruction({
             destinationChainId: defaultOutputChainId,
             destinationSettler: bytes32(uint256(uint160(tribunal))),
-            originData: abi.encode(claim, _getMandate(), address(0), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
+            originData: abi.encode(claim, _getMandate(), defaultTargetBlock, defaultMaximumBlocksAfterTarget)
         });
 
         IOriginSettler.ResolvedCrossChainOrder memory resolvedCrossChainOrder = IOriginSettler.ResolvedCrossChainOrder({