fix: Add missing initialization calls for OFTAdapter in RLCAdapter and RLCOFT contracts

Author: Le-Caignec

Makefile

@@ -16,6 +16,7 @@ deploy-adapter:
 	forge script script/RLCAdapter.s.sol:Deploy \
 	--rpc-url $(SEPOLIA_RPC_URL) \
 	--account $(ACCOUNT) \
+	--ffi \
 	--broadcast \
 	-vvv 
 
@@ -24,6 +25,7 @@ deploy-oft:
 	forge script script/RLCOFT.s.sol:Deploy \
 		--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
 		--account $(ACCOUNT) \
+		--ffi \
 		--broadcast \
 		-vvv \
 

foundry.toml

@@ -6,6 +6,11 @@ fs_permissions = [{ access = "read-write", path = "./" }]
 optimizer = true
 optimizer_runs = 200
 
+## Needed by openzepplin upgrade plugin
+ast = true
+build_info = true
+extra_output = ["storageLayout"]
+
 remappings = [
     '@layerzerolabs/oft-evm-upgradeable/=lib/devtools/packages/oft-evm-upgradeable/',
     '@layerzerolabs/oft-evm/=lib/devtools/packages/oft-evm/',

src/RLCAdapter.sol

@@ -26,8 +26,8 @@ contract RLCAdapter is OFTAdapterUpgradeable, UUPSUpgradeable, AccessControlDefa
     /// @notice Initializes the contract
     /// @param _owner Address of the contract owner
     function initialize(address _owner) public initializer {
-        __OFTAdapter_init(_owner);
         __Ownable_init(_owner);
+        __OFTAdapter_init(_owner);
         __UUPSUpgradeable_init();
         __AccessControlDefaultAdminRules_init(0, _owner);
         _grantRole(UPGRADER_ROLE, _owner);

src/RLCOFT.sol

@@ -26,8 +26,8 @@ contract RLCOFT is OFTUpgradeable, UUPSUpgradeable, AccessControlDefaultAdminRul
     /// @param _symbol Symbol of the token
     /// @param _owner Address of the contract owner
     function initialize(string memory _name, string memory _symbol, address _owner) public initializer {
-        __OFT_init(_name, _symbol, _owner);
         __Ownable_init(_owner);
+        __OFT_init(_name, _symbol, _owner);
         __UUPSUpgradeable_init();
         __AccessControlDefaultAdminRules_init(0, _owner);
         _grantRole(UPGRADER_ROLE, _owner);