fix: Update import paths for OpenZeppelin contracts and adjust proxy deployment in RLCAdapter and RLCOFT scripts

Author: Le-Caignec

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "lib/openzeppelin-foundry-upgrades"]
 	path = lib/openzeppelin-foundry-upgrades
 	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts

foundry.toml

@@ -19,7 +19,9 @@ remappings = [
     '@layerzerolabs/oapp-evm-upgradeable/=lib/devtools/packages/oapp-evm-upgradeable/',
     '@layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/',
     '@layerzerolabs/lz-evm-protocol-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/protocol',
-    '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/'
+    '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/',
+    '@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/',
+    '@openzeppelin-foundry/contracts/=lib/openzeppelin-foundry-upgrades/src/',
 ]
 
 

lib/openzeppelin-contracts

@@ -3,7 +3,8 @@
 pragma solidity ^0.8.22;
 
 import {Script, console} from "forge-std/Script.sol";
-import {Upgrades, Options} from "openzeppelin-foundry-upgrades/Upgrades.sol";
+import {Upgrades, Options} from "@openzeppelin-foundry/contracts/Upgrades.sol";
+import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {RLCAdapter} from "../src/RLCAdapter.sol";
 import {EnvUtils} from "./UpdateEnvUtils.sol";
 
@@ -15,19 +16,20 @@ contract Deploy is Script {
         address lzEndpoint = vm.envAddress("LAYER_ZERO_SEPOLIA_ENDPOINT_ADDRESS"); // LayerZero sepolia endpoint
         address ownerAddress = vm.envAddress("OWNER_ADDRESS"); // Your actual wallet address
 
-        Options memory options;
-        options.constructorData = abi.encode(rlcToken, lzEndpoint);
+        // Deploy the RLCAdapter contract
+        RLCAdapter rlcAdapterImplementation = new RLCAdapter(rlcToken, lzEndpoint);
+        console.log("RLCAdapter implementation deployed at:", address(rlcAdapterImplementation));
 
-        string memory unsafeAllow = "constructor,state-variable-immutable,missing-initializer-call"; // comma-separated if multiple allowed
-        options.unsafeAllow = unsafeAllow;
-
-        address rlcAdapterProxy =
-            Upgrades.deployUUPSProxy("RLCAdapter.sol", abi.encodeCall(RLCAdapter.initialize, (ownerAddress)), options);
-        console.log("RLCAdapterProxy deployed at:", rlcAdapterProxy);
+        // Deploy the proxy contract
+        ERC1967Proxy rlcAdapterProxy = new ERC1967Proxy(
+            address(rlcAdapterImplementation),
+            abi.encodeWithSelector(rlcAdapterImplementation.initialize.selector, ownerAddress)
+        );
+        console.log("RLCAdapter proxy deployed at:", address(rlcAdapterProxy));
 
         vm.stopBroadcast();
 
-        EnvUtils.updateEnvVariable("RLC_SEPOLIA_ADAPTER_ADDRESS", rlcAdapterProxy);
+        EnvUtils.updateEnvVariable("RLC_SEPOLIA_ADAPTER_ADDRESS", address(rlcAdapterProxy));
     }
 }
 

script/RLCAdapter.s.sol

@@ -6,6 +6,7 @@ import {Script, console} from "forge-std/Script.sol";
 import {Upgrades, Options} from "openzeppelin-foundry-upgrades/Upgrades.sol";
 import {RLCOFT} from "../src/RLCOFT.sol";
 import {EnvUtils} from "./UpdateEnvUtils.sol";
+import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 
 contract Deploy is Script {
     function run() external {
@@ -16,20 +17,19 @@ contract Deploy is Script {
         address lzEndpoint = vm.envAddress("LAYER_ZERO_ARBITRUM_SEPOLIA_ENDPOINT_ADDRESS");
         address delegate = vm.envAddress("OWNER_ADDRESS");
 
-        Options memory options;
-        options.constructorData = abi.encode(lzEndpoint);
+        RLCOFT rlcOFTImplementation = new RLCOFT(lzEndpoint);
+        console.log("RLCOFT implementation deployed at:", address(rlcOFTImplementation));
 
-        string memory unsafeAllow = "constructor,state-variable-immutable,missing-initializer-call"; // comma-separated if multiple allowed
-        options.unsafeAllow = unsafeAllow;
-
-        address rlcOFTProxy = Upgrades.deployUUPSProxy(
-            "RLCOFT.sol", abi.encodeCall(RLCOFT.initialize, (name, symbol, delegate)), options
+        // Deploy the proxy contract
+        ERC1967Proxy rlcOFTProxy = new ERC1967Proxy(
+            address(rlcOFTImplementation),
+            abi.encodeWithSelector(rlcOFTImplementation.initialize.selector, name, symbol, delegate)
         );
-        console.log("rlcOFTProxy deployed at:", rlcOFTProxy);
+        console.log("RLCOFT proxy deployed at:", address(rlcOFTProxy));
 
         vm.stopBroadcast();
 
-        EnvUtils.updateEnvVariable("RLC_ARBITRUM_SEPOLIA_OFT_ADDRESS", rlcOFTProxy);
+        EnvUtils.updateEnvVariable("RLC_ARBITRUM_SEPOLIA_OFT_ADDRESS", address(rlcOFTProxy));
     }
 }