add _buildOptions

imua-xyz · Oct 28, 2024 · 5d5ca4c · 5d5ca4c
2 parents 8458152 + 5c1bdb2
commit 5d5ca4c
Showing 1 changed file with 31 additions and 0 deletions.
diff --git a/src/core/ExocoreGateway.sol b/src/core/ExocoreGateway.sol
@@ -525,7 +525,21 @@ contract ExocoreGateway is
         whenNotPaused
     {
         bytes memory payload = abi.encodePacked(act, actionArgs);
+<<<<<<< HEAD
         bytes memory options = _buildOptions(srcChainId, act);
+=======
+        bytes memory options = OptionsBuilder.newOptions();
+        if (srcChainId == SOLANA_DEVNET_CHAIN_ID || srcChainId == SOLANA_MAINNET_CHAIN_ID) {
+            if (act == Action.REQUEST_ADD_WHITELIST_TOKEN) {
+                options = options.addExecutorLzReceiveOption(DESTINATION_GAS_LIMIT, SOLANA_MSG_VALUE);
+            } else {
+                options = options.addExecutorLzReceiveOption(DESTINATION_GAS_LIMIT, DESTINATION_MSG_VALUE);
+            }
+        } else {
+            options = options.addExecutorLzReceiveOption(DESTINATION_GAS_LIMIT, DESTINATION_MSG_VALUE)
+                .addExecutorOrderedExecutionOption();
+        }
+>>>>>>> 5c1bdb2ca0ddf6be46bcb017c516313073d35ae8
 
         MessagingFee memory fee = _quote(srcChainId, payload, options, false);
 
@@ -537,8 +551,25 @@ contract ExocoreGateway is
 
     /// @inheritdoc IExocoreGateway
     function quote(uint32 srcChainId, bytes calldata _message) public view returns (uint256 nativeFee) {
+<<<<<<< HEAD
         Action act = Action(uint8(_message[0]));
         bytes memory options = _buildOptions(srcChainId, act);
+=======
+        bytes memory options = OptionsBuilder.newOptions();
+
+        if (srcChainId == SOLANA_DEVNET_CHAIN_ID || srcChainId == SOLANA_MAINNET_CHAIN_ID) {
+            Action act = Action(uint8(_message[0]));
+
+            if (act == Action.REQUEST_ADD_WHITELIST_TOKEN) {
+                options = options.addExecutorLzReceiveOption(DESTINATION_GAS_LIMIT, SOLANA_MSG_VALUE);
+            } else {
+                options = options.addExecutorLzReceiveOption(DESTINATION_GAS_LIMIT, DESTINATION_MSG_VALUE);
+            }
+        } else {
+            options = options.addExecutorLzReceiveOption(DESTINATION_GAS_LIMIT, DESTINATION_MSG_VALUE)
+                .addExecutorOrderedExecutionOption();
+        }
+>>>>>>> 5c1bdb2ca0ddf6be46bcb017c516313073d35ae8
 
         MessagingFee memory fee = _quote(srcChainId, _message, options, false);
         return fee.nativeFee;