feat : update crosschain scripts (#64)

Co-authored-by: Robin Le Caignec <72495599+Le-Caignec@users.noreply.github.com>
Co-authored-by: Zied <26070035+zguesmi@users.noreply.github.com>
Co-authored-by: Le-Caignec <robinlecaignec@yahoo.fr>

Author: 3 people

.env.template

@@ -12,3 +12,4 @@ ANVIL_ARBITRUM_SEPOLIA_RPC_URL=http://localhost:8546
 # Account to be used for script execution.
 # Account name in Foundry keystore
 ACCOUNT=<your-account-name>
+RECIPIENT_ADDRESS=<recipient-address> # for cross-chain transfers scripts

Makefile

@@ -155,15 +155,17 @@ upgrade-layerzero-bridge: # CHAIN, RPC_URL
 
 send-tokens-to-arbitrum-sepolia:
 	@echo "Sending tokens cross-chain... from SEPOLIA to Arbitrum SEPOLIA"
-	forge script script/SendEthereumToArbitrum.s.sol:SendTokensToArbitrumSepolia \
+	SOURCE_CHAIN=sepolia TARGET_CHAIN=arbitrum_sepolia \
+	forge script script/SendFromEthereumToArbitrum.s.sol:SendTokensFromEthereumToArbitrum \
 		--rpc-url $(SEPOLIA_RPC_URL) \
 		--account $(ACCOUNT) \
 		--broadcast \
 		-vvv
 
 send-tokens-to-sepolia:
 	@echo "Sending tokens cross-chain... from Arbitrum SEPOLIA to SEPOLIA"
-	forge script script/SendArbitrumToEthereum.s.sol:SendTokensToSepolia \
+	SOURCE_CHAIN=arbitrum_sepolia TARGET_CHAIN=sepolia \
+	forge script script/SendFromArbitrumToEthereum.s.sol:SendTokensFromArbitrumToEthereum \
 		--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
 		--account $(ACCOUNT) \
 		--broadcast \

script/SendArbitrumToEthereum.s.sol script/SendFromArbitrumToEthereum.s.solscript/SendArbitrumToEthereum.s.sol renamed to script/SendFromArbitrumToEthereum.s.sol

@@ -6,10 +6,9 @@ import {Script, console} from "forge-std/Script.sol";
 import {SendParam} from "@layerzerolabs/oft-evm/contracts/interfaces/IOFT.sol";
 import {MessagingFee} from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
 import {IexecLayerZeroBridge} from "../src/bridges/layerZero/IexecLayerZeroBridge.sol";
-
 import {ConfigLib} from "./lib/ConfigLib.sol";
 
-contract SendTokensToSepolia is Script {
+contract SendTokensFromArbitrumToEthereum is Script {
     /**
      * @dev Converts an address to bytes32.
      * @param _addr The address to convert.
@@ -31,29 +30,23 @@ contract SendTokensToSepolia is Script {
 
         // Transfer parameters
         uint16 destinationChainId = uint16(targetParams.lzChainId); // LayerZero chain ID for Ethereum Sepolia
-        address recipientAddress = sourceParams.initialAdmin; // TODO read recipient address from env variables.
+        address recipientAddress = vm.envAddress("RECIPIENT_ADDRESS");
         console.log("Recipient: %s", recipientAddress);
 
-        uint256 amount = 5 * 10 ** 18; // RLC tokens (adjust the amount as needed)
+        uint256 amount = 5 * 10 ** 9; // RLC tokens (adjust the amount as needed)
 
         // Send tokens cross-chain
         IexecLayerZeroBridge iexecLayerZeroBridge = IexecLayerZeroBridge(iexecLayerZeroBridgeAddress);
         console.log("Sending %s RLC to Ethereum Sepolia", amount / 10 ** 9);
 
-        // Estimate gas for the OFT endpoint
-        // TODO extract in function and document
-        bytes memory _extraOptions =
-            abi.encodePacked(uint16(3), uint8(1), uint16(33), uint8(1), uint128(65000), uint128(0));
-
-        vm.startBroadcast();
         SendParam memory sendParam = SendParam(
-            destinationChainId,
-            addressToBytes32(recipientAddress),
-            amount,
-            amount * 9 / 10, // minAmount (allowing 10% slippage)
-            _extraOptions,
-            "",
-            ""
+            destinationChainId, // Destination endpoint ID.
+            addressToBytes32(recipientAddress), // Recipient address.
+            amount, // amount (in local decimals, e.g., 5 RLC = 5 * 10 ** 9)
+            amount * 99 / 100, // minAmount (allowing 1% slippage)
+            "", // Extra options, not used in this case, already setup using `setEnforcedOptions`
+            "", // Composed message, not used in this case
+            "" // OFT command to be executed, unused in default OFT implementations.
         );
 
         // Get the fee for the transfer

script/SendEthereumToArbitrum.s.sol script/SendFromEthereumToArbitrum.s.solscript/SendEthereumToArbitrum.s.sol renamed to script/SendFromEthereumToArbitrum.s.sol

@@ -10,7 +10,7 @@ import {SendParam} from "@layerzerolabs/oft-evm/contracts/interfaces/IOFT.sol";
 import {MessagingFee} from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
 import {ConfigLib} from "./lib/ConfigLib.sol";
 
-contract SendTokensToArbitrumSepolia is Script {
+contract SendTokensFromEthereumToArbitrum is Script {
     /**
      * @dev Converts an address to bytes32.
      * @param _addr The address to convert.
@@ -29,36 +29,32 @@ contract SendTokensToArbitrumSepolia is Script {
 
         // Contract addresses
         address iexecLayerZeroBridgeAddress = sourceParams.iexecLayerZeroBridgeAddress;
-        address liquidityUnifierAddress = sourceParams.rlcLiquidityUnifierAddress;
-        address rlcTokenAddress = sourceParams.rlcToken;
+        address rlcMainnetTokenAddress = sourceParams.rlcToken;
 
         // Transfer parameters
         uint16 destinationChainId = uint16(targetParams.lzChainId);
-        address recipientAddress = targetParams.initialAdmin; // TODO read recipient address from env variables.
+        address recipientAddress = vm.envAddress("RECIPIENT_ADDRESS");
         uint256 amount = 5 * 10 ** 9; //  RLC tokens (adjust the amount as needed)
 
         vm.startBroadcast();
         // First, approve the adapter to spend your tokens
-        IERC20 rlcToken = IERC20(rlcTokenAddress);
-        console.log("Approving RLCLiquidityUnifier contract to spend %s RLC", amount / 10 ** 9);
-        rlcToken.approve(liquidityUnifierAddress, amount);
+        IERC20 rlcToken = IERC20(rlcMainnetTokenAddress);
+        console.log("Approving IexecLayerZeroBridge contract to spend %s RLC", amount / 10 ** 9);
+        rlcToken.approve(iexecLayerZeroBridgeAddress, amount);
 
         // Then, send tokens cross-chain
         IexecLayerZeroBridge adapter = IexecLayerZeroBridge(iexecLayerZeroBridgeAddress);
         console.log("Sending %s RLC to Arbitrum Sepolia", amount / 10 ** 9);
         console.log("Recipient: %s", recipientAddress);
 
-        // bytes memory _extraOptions = OptionsBuilder.newOptions().addExecutorLzReceiveOption(65000, 0);
-        bytes memory _extraOptions =
-            abi.encodePacked(uint16(3), uint8(1), uint16(33), uint8(1), uint128(65000), uint128(0));
         SendParam memory sendParam = SendParam(
-            destinationChainId, // You can also make this dynamic if needed
-            addressToBytes32(recipientAddress),
-            amount,
-            amount * 9 / 10,
-            _extraOptions,
-            "",
-            ""
+            destinationChainId, // Destination endpoint ID.
+            addressToBytes32(recipientAddress), // Recipient address.
+            amount, // Amount to send in local decimals.
+            amount * 99 / 100, // Minimum amount to send in local decimals (allowing 1% slippage).
+            "", // Extra options, not used in this case, already setup using `setEnforcedOptions`
+            "", // Composed message for the send() operation, unused in this context.
+            "" // OFT command to be executed, unused in default OFT implementations.
         );
 
         MessagingFee memory fee = adapter.quoteSend(sendParam, false);

script/bridges/layerZero/IexecLayerZeroBridge.s.sol

@@ -4,8 +4,12 @@ pragma solidity ^0.8.22;
 
 import {Script} from "forge-std/Script.sol";
 import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
+import {EnforcedOptionParam} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OAppOptionsType3.sol";
+import {OptionsBuilder} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OptionsBuilder.sol";
 import {ConfigLib} from "./../../lib/ConfigLib.sol";
 import {IexecLayerZeroBridge} from "../../../src/bridges/layerZero/IexecLayerZeroBridge.sol";
+import {RLCLiquidityUnifier} from "../../../src/RLCLiquidityUnifier.sol";
+import {RLCCrosschainToken} from "../../../src/RLCCrosschainToken.sol";
 import {UUPSProxyDeployer} from "../../lib/UUPSProxyDeployer.sol";
 import {UpgradeUtils} from "../../lib/UpgradeUtils.sol";
 
@@ -56,6 +60,8 @@ contract Deploy is Script {
 }
 
 contract Configure is Script {
+    using OptionsBuilder for bytes;
+
     function run() external {
         string memory sourceChain = vm.envString("SOURCE_CHAIN");
         string memory targetChain = vm.envString("TARGET_CHAIN");
@@ -66,6 +72,21 @@ contract Configure is Script {
         sourceBridge.setPeer(
             targetParams.lzChainId, bytes32(uint256(uint160(targetParams.iexecLayerZeroBridgeAddress)))
         );
+        EnforcedOptionParam[] memory enforcedOptions = new EnforcedOptionParam[](1);
+        bytes memory _extraOptions = OptionsBuilder.newOptions().addExecutorLzReceiveOption(70_000, 0); // 70_000 gas limit for the receiving executor and 0 for the executor's value
+        enforcedOptions[0] = EnforcedOptionParam(targetParams.lzChainId, 2, _extraOptions);
+        sourceBridge.setEnforcedOptions(enforcedOptions);
+        // Authorize bridge in the relevant contract.
+        if (sourceParams.approvalRequired) {
+            RLCLiquidityUnifier rlcLiquidityUnifier = RLCLiquidityUnifier(sourceParams.rlcLiquidityUnifierAddress);
+            bytes32 bridgeTokenRoleId = rlcLiquidityUnifier.TOKEN_BRIDGE_ROLE();
+            rlcLiquidityUnifier.grantRole(bridgeTokenRoleId, address(sourceBridge));
+        } else {
+            RLCCrosschainToken rlcCrosschainToken = RLCCrosschainToken(sourceParams.rlcCrosschainTokenAddress);
+            bytes32 bridgeTokenRoleId = rlcCrosschainToken.TOKEN_BRIDGE_ROLE();
+            rlcCrosschainToken.grantRole(bridgeTokenRoleId, address(sourceBridge));
+        }
+
         vm.stopBroadcast();
     }
 }