Refactor multiSend function to simplify parameter passing and improve…

… code readability
ringecosystem · Jan 17, 2024 · 835c2b5 · 835c2b5
1 parent afb1e0b
commit 835c2b5
Showing 1 changed file with 11 additions and 25 deletions.
diff --git a/src/lines/MultiLine.sol b/src/lines/MultiLine.sol
@@ -45,17 +45,6 @@ contract MultiLine is Ownable2Step, Application, BaseMessageLine, LineLookup {
         uint256[] fees;
     }
 
-    struct MultiSendArgs {
-        address[] lines;
-        uint256 toChainId;
-        address toDapp;
-        uint256 nonce;
-        uint256 expiration;
-        bytes message;
-        bytes[] params;
-        uint256[] fees;
-    }
-
     struct LineMsg {
         uint256 fromChainId;
         uint256 toChainId;
@@ -141,51 +130,48 @@ contract MultiLine is Ownable2Step, Application, BaseMessageLine, LineLookup {
         return fromLineLookup[fromChainId];
     }
 
-    function _send(address, uint256 toChainId, address toDapp, bytes calldata message, bytes calldata params)
+    function _send(address fromDapp, uint256 toChainId, address toDapp, bytes calldata message, bytes calldata params)
         internal
         override
     {
         RemoteCallArgs memory args = abi.decode(params, (RemoteCallArgs));
-        multiSend(
-            MultiSendArgs(args.lines, toChainId, toDapp, args.nonce, args.expiration, message, args.params, args.fees)
-        );
-    }
 
-    function multiSend(MultiSendArgs memory args) public payable {
         uint256 len = args.lines.length;
-        require(args.toChainId != LOCAL_CHAINID(), "!toChainId");
+        require(toChainId != LOCAL_CHAINID(), "!toChainId");
         require(len == args.params.length, "!len");
         require(len == args.fees.length, "!len");
         if (block.timestamp > args.expiration || block.timestamp + MAX_MESSAGE_EXPIRATION < args.expiration) {
             revert("!expiration");
         }
 
-        address fromDapp = msg.sender;
         LineMsg memory lineMsg = LineMsg({
             fromChainId: LOCAL_CHAINID(),
-            toChainId: args.toChainId,
+            toChainId: toChainId,
             fromDapp: fromDapp,
-            toDapp: args.toDapp,
+            toDapp: toDapp,
             nonce: args.nonce,
             expiration: args.expiration,
-            message: args.message
+            message: message
         });
         bytes memory encoded = abi.encodeWithSelector(MultiLine.multiRecv.selector, lineMsg);
         bytes32 lineMsgId = hash(lineMsg);
 
-        bool[] memory sentResult = _multiSend(args, encoded);
+        bool[] memory sentResult = _multiSend(args, toChainId, encoded);
         emit LineMessageSent(lineMsgId, lineMsg, sentResult);
     }
 
-    function _multiSend(MultiSendArgs memory args, bytes memory encoded) internal returns (bool[] memory) {
+    function _multiSend(RemoteCallArgs memory args, uint256 toChainId, bytes memory encoded)
+        internal
+        returns (bool[] memory)
+    {
         uint256 len = args.lines.length;
         uint256 totalFee = 0;
         bool[] memory sentResult = new bool[](len);
         for (uint256 i = 0; i < len; i++) {
             uint256 fee = args.fees[i];
             address line = args.lines[i];
             require(isTrustedLine(line), "!trusted");
-            sentResult[i] = _sendMessage(line, fee, args.toChainId, encoded, args.params[i]);
+            sentResult[i] = _sendMessage(line, fee, toChainId, encoded, args.params[i]);
             totalFee += fee;
         }