chore: pump oz version, forge std version, remove unused remappings, …

…adapt new forge version when generating storage layout
axieinfinity · Jan 2, 2025 · 67dc02f · 67dc02f
1 parent 4f4ab78
commit 67dc02f
Show file tree

Hide file tree

Showing 43 changed files with 130 additions and 117 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -29,9 +29,9 @@ ronin-testnet = "https://saigon-archive.roninchain.com/rpc"
 localhost = "http://localhost:8545"
 
 [dependencies]
-"forge-std" = { version = "1.9.3", url = "https://github.com/foundry-rs/forge-std/archive/refs/tags/v1.9.3.zip" }
+"forge-std" = { version = "1.9.5", url = "https://github.com/foundry-rs/forge-std/archive/refs/tags/v1.9.5.zip" }
 "solady" = { version = "0.0.228", url = "https://github.com/Vectorized/solady/archive/refs/tags/v0.0.228.zip" }
-"openzeppelin" = { version = "5.0.2", url = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v5.0.2.zip" }
+"openzeppelin-v5" = { version = "5.1.0", url = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v5.1.0.zip" }
 "openzeppelin-v4" = { version = "4.9.5", url = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v4.9.5.zip" }
 
 [soldeer]

diff --git a/remappings.txt b/remappings.txt
diff --git a/script/BaseGeneralConfig.sol b/script/BaseGeneralConfig.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { StdStyle } from "../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { Vm, VmSafe } from "../dependencies/forge-std-1.9.3/src/Vm.sol";
-import { console } from "../dependencies/forge-std-1.9.3/src/console.sol";
+import { StdStyle } from "../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { Vm, VmSafe } from "../dependencies/forge-std-1.9.5/src/Vm.sol";
+import { console } from "../dependencies/forge-std-1.9.5/src/console.sol";
 
 import { ContractConfig, EnumerableSet, TContract } from "./configs/ContractConfig.sol";
 import { MigrationConfig } from "./configs/MigrationConfig.sol";

diff --git a/script/BaseMigration.s.sol b/script/BaseMigration.s.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { StdStyle } from "../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { Vm } from "../dependencies/forge-std-1.9.3/src/Vm.sol";
-import { console } from "../dependencies/forge-std-1.9.3/src/console.sol";
+import { StdStyle } from "../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { Vm } from "../dependencies/forge-std-1.9.5/src/Vm.sol";
+import { console } from "../dependencies/forge-std-1.9.5/src/console.sol";
 import { LibString } from "../dependencies/solady-0.0.228/src/utils/LibString.sol";
 import { RoninTransparentProxy } from "../src/RoninTransparentProxy.sol";
 import { TransparentProxyOZv4_9_5 } from "../src/TransparentProxyOZv4_9_5.sol";
@@ -345,7 +345,7 @@ abstract contract BaseMigration is ScriptExtended {
    */
   function _precompileProxyContracts() internal pure virtual {
     bytes memory dummy;
-		dummy = type(RoninTransparentProxy).creationCode;
+    dummy = type(RoninTransparentProxy).creationCode;
     dummy = type(TransparentProxyOZv4_9_5).creationCode;
   }
 }
diff --git a/script/OnchainExecutor.s.sol b/script/OnchainExecutor.s.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { StdStyle } from "../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { console } from "../dependencies/forge-std-1.9.3/src/console.sol";
+import { StdStyle } from "../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { console } from "../dependencies/forge-std-1.9.5/src/console.sol";
 
 import { BaseGeneralConfig } from "./BaseGeneralConfig.sol";
 import { ScriptExtended } from "./extensions/ScriptExtended.s.sol";

diff --git a/script/configs/ContractConfig.sol b/script/configs/ContractConfig.sol
@@ -2,10 +2,10 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { StdStyle } from "../../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { Vm, VmSafe } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
-import { console } from "../../dependencies/forge-std-1.9.3/src/console.sol";
-import { EnumerableSet } from "../../dependencies/openzeppelin-5.0.2/contracts/utils/structs/EnumerableSet.sol";
+import { StdStyle } from "../../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { Vm, VmSafe } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
+import { console } from "../../dependencies/forge-std-1.9.5/src/console.sol";
+import { EnumerableSet } from "../../dependencies/openzeppelin-v5-5.1.0/contracts/utils/structs/EnumerableSet.sol";
 
 import { LibString } from "../../dependencies/solady-0.0.228/src/utils/LibString.sol";
 import { IContractConfig } from "../interfaces/configs/IContractConfig.sol";

diff --git a/script/configs/NetworkConfig.sol b/script/configs/NetworkConfig.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { StdStyle } from "../../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { Vm } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
-import { console } from "../../dependencies/forge-std-1.9.3/src/console.sol";
+import { StdStyle } from "../../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { Vm } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
+import { console } from "../../dependencies/forge-std-1.9.5/src/console.sol";
 
 import { IGeneralConfig } from "../interfaces/IGeneralConfig.sol";
 import { INetworkConfig } from "../interfaces/configs/INetworkConfig.sol";

diff --git a/script/configs/RuntimeConfig.sol b/script/configs/RuntimeConfig.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { StdStyle } from "../../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { Vm } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
-import { console } from "../../dependencies/forge-std-1.9.3/src/console.sol";
+import { StdStyle } from "../../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { Vm } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
+import { console } from "../../dependencies/forge-std-1.9.5/src/console.sol";
 import { LibString } from "../../dependencies/solady-0.0.228/src/utils/LibString.sol";
 
 import { IRuntimeConfig } from "../interfaces/configs/IRuntimeConfig.sol";

diff --git a/script/configs/WalletConfig.sol b/script/configs/WalletConfig.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { CommonBase } from "../../dependencies/forge-std-1.9.3/src/Base.sol";
+import { CommonBase } from "../../dependencies/forge-std-1.9.5/src/Base.sol";
 import { LibString } from "../../dependencies/solady-0.0.228/src/utils/LibString.sol";
 import { IWalletConfig } from "../interfaces/configs/IWalletConfig.sol";
 

diff --git a/script/extensions/ScriptExtended.s.sol b/script/extensions/ScriptExtended.s.sol
@@ -2,10 +2,10 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { Script, console } from "../../dependencies/forge-std-1.9.3/src/Script.sol";
-import { StdAssertions } from "../../dependencies/forge-std-1.9.3/src/StdAssertions.sol";
-import { StdStyle } from "../../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { VmSafe } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
+import { Script, console } from "../../dependencies/forge-std-1.9.5/src/Script.sol";
+import { StdAssertions } from "../../dependencies/forge-std-1.9.5/src/StdAssertions.sol";
+import { StdStyle } from "../../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { VmSafe } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
 
 import { IScriptExtended } from "../interfaces/IScriptExtended.sol";
 import { IVme } from "../interfaces/IVme.sol";

diff --git a/script/libraries/LibArtifact.sol b/script/libraries/LibArtifact.sol
@@ -2,11 +2,11 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { stdJson } from "../../dependencies/forge-std-1.9.3/src/StdJson.sol";
+import { stdJson } from "../../dependencies/forge-std-1.9.5/src/StdJson.sol";
 
-import { StdStyle } from "../../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { Vm } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
-import { console } from "../../dependencies/forge-std-1.9.3/src/console.sol";
+import { StdStyle } from "../../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { Vm } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
+import { console } from "../../dependencies/forge-std-1.9.5/src/console.sol";
 
 import { LibString } from "../../dependencies/solady-0.0.228/src/utils/LibString.sol";
 import { IGeneralConfig } from "../interfaces/IGeneralConfig.sol";

diff --git a/script/libraries/LibDeploy.sol b/script/libraries/LibDeploy.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { StdStyle } from "../../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { console } from "../../dependencies/forge-std-1.9.3/src/console.sol";
+import { StdStyle } from "../../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { console } from "../../dependencies/forge-std-1.9.5/src/console.sol";
 
 import { IEIP173 } from "../interfaces/IEIP173.sol";
 import { vm, vme } from "../utils/Constants.sol";

diff --git a/script/libraries/LibInitializeGuard.sol b/script/libraries/LibInitializeGuard.sol
@@ -2,10 +2,10 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { StdStyle } from "../../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { Vm, VmSafe } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
-import { Math } from "../../dependencies/openzeppelin-5.0.2/contracts/utils/math/Math.sol";
-import { EnumerableSet } from "../../dependencies/openzeppelin-5.0.2/contracts/utils/structs/EnumerableSet.sol";
+import { StdStyle } from "../../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { Vm, VmSafe } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
+import { Math } from "../../dependencies/openzeppelin-v5-5.1.0/contracts/utils/math/Math.sol";
+import { EnumerableSet } from "../../dependencies/openzeppelin-v5-5.1.0/contracts/utils/structs/EnumerableSet.sol";
 import { JSONParserLib } from "../../dependencies/solady-0.0.228/src/utils/JSONParserLib.sol";
 import { LibString } from "../../dependencies/solady-0.0.228/src/utils/LibString.sol";
 
@@ -305,11 +305,12 @@ library LibInitializeGuard {
     initSlot.nBit = N_BIT_INIT_V5;
     initSlot.slot = INITIALIZABLE_STORAGE_OZV5;
 
-    string[] memory inputs = new string[](4);
+    string[] memory inputs = new string[](5);
     inputs[0] = "forge";
     inputs[1] = "inspect";
     inputs[2] = _getContractAbsolutePath($cache._chainInfo[proxy].forkId, proxy);
     inputs[3] = "storage";
+    inputs[4] = "--json";
 
     string memory ret = string(vm.ffi(inputs));
     JSONParserLib.Item memory layout = ret.parse().at('"storage"');

diff --git a/script/libraries/LibProxy.sol b/script/libraries/LibProxy.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { Vm } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
+import { Vm } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
 import { LibSharedAddress } from "./LibSharedAddress.sol";
 
 library LibProxy {

diff --git a/script/sample/SampleGeneralConfig.sol b/script/sample/SampleGeneralConfig.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
+import { BaseGeneralConfig } from "../BaseGeneralConfig.sol";
 import { Contract } from "./utils/Contract.sol";
-import { BaseGeneralConfig } from "@fdk/BaseGeneralConfig.sol";
 
 contract SampleGeneralConfig is BaseGeneralConfig {
   constructor() BaseGeneralConfig("", "deployments/") { }

diff --git a/script/sample/SampleMigration.s.sol b/script/sample/SampleMigration.s.sol
@@ -2,10 +2,10 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
+import { BaseMigration } from "../BaseMigration.s.sol";
+import { DefaultNetwork } from "../utils/DefaultNetwork.sol";
 import { SampleGeneralConfig } from "./SampleGeneralConfig.sol";
 import { ISharedArgument } from "./interfaces/ISharedArgument.sol";
-import { BaseMigration } from "@fdk/BaseMigration.s.sol";
-import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol";
 
 contract SampleMigration is BaseMigration {
   ISharedArgument public constant config = ISharedArgument(address(vme));

diff --git a/script/sample/interfaces/ISharedArgument.sol b/script/sample/interfaces/ISharedArgument.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { IGeneralConfig } from "@fdk/interfaces/IGeneralConfig.sol";
+import { IGeneralConfig } from "../../interfaces/IGeneralConfig.sol";
 
 interface ISharedArgument is IGeneralConfig {
   struct SharedParameter {

diff --git a/script/sample/ronin-mainnet/xxxxyyzz_DeploySample/xxxxyyzz_DeploySample.s.sol b/script/sample/ronin-mainnet/xxxxyyzz_DeploySample/xxxxyyzz_DeploySample.s.sol
@@ -2,10 +2,10 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
+import { DefaultNetwork } from "../../../utils/DefaultNetwork.sol";
 import { ISharedArgument, SampleMigration } from "../../SampleMigration.s.sol";
 import { Sample, SampleDeploy } from "../../contracts/SampleDeploy.s.sol";
 import { SampleProxy, SampleProxyDeploy } from "../../contracts/SampleProxyDeploy.s.sol";
-import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol";
 
 contract Migration__XXXXYYZZ_DeploySample is SampleMigration {
   function _sharedArguments() internal virtual override returns (bytes memory args) {

diff --git a/script/sample/ronin-testnet/20231204-DeployMockERC20.s.sol/20231204_DeployMockERC20.s.sol b/script/sample/ronin-testnet/20231204-DeployMockERC20.s.sol/20231204_DeployMockERC20.s.sol
@@ -2,13 +2,14 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { console } from "../../../../dependencies/forge-std-1.9.3/src/console.sol";
+import { console } from "../../../../dependencies/forge-std-1.9.5/src/console.sol";
 
 import { Token } from "../../../../src/mocks/Token.sol";
 import { WNT } from "../../../../src/mocks/WNT.sol";
+
+import { DefaultNetwork } from "../../../utils/DefaultNetwork.sol";
 import { ISharedArgument, SampleMigration } from "../../SampleMigration.s.sol";
 import { Contract } from "../../utils/Contract.sol";
-import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol";
 
 contract Migration__20231204_DeployMockERC20 is SampleMigration {
   function _sharedArguments() internal virtual override returns (bytes memory args) {

diff --git a/script/sample/ronin-testnet/xxxxyyzz-DeploySample/xxxxyyzz_DeploySample.s.sol b/script/sample/ronin-testnet/xxxxyyzz-DeploySample/xxxxyyzz_DeploySample.s.sol
@@ -2,10 +2,10 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
+import { DefaultNetwork } from "../../../utils/DefaultNetwork.sol";
 import { ISharedArgument, SampleMigration } from "../../SampleMigration.s.sol";
 import { Sample, SampleDeploy } from "../../contracts/SampleDeploy.s.sol";
 import { SampleProxy, SampleProxyDeploy } from "../../contracts/SampleProxyDeploy.s.sol";
-import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol";
 
 contract Migration__XXXXYYZZ_DeploySample is SampleMigration {
   function _sharedArguments() internal virtual override returns (bytes memory args) {

diff --git a/script/sample/ronin-testnet/xxxxyyzz-UpgradeSampleProxy/xxxxyyzz_UpgradeSampleProxy.s.sol b/script/sample/ronin-testnet/xxxxyyzz-UpgradeSampleProxy/xxxxyyzz_UpgradeSampleProxy.s.sol
@@ -4,8 +4,8 @@ pragma experimental ABIEncoderV2;
 
 import { SampleMigration } from "../../SampleMigration.s.sol";
 
+import { DefaultNetwork } from "../../../utils/DefaultNetwork.sol";
 import { Contract } from "../../utils/Contract.sol";
-import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol";
 import { SampleProxy } from "src/mocks/SampleProxy.sol";
 
 contract Migration__XXXXYYZZ_UpgradeSampleProxy is SampleMigration {

diff --git a/script/sample/utils/Contract.sol b/script/sample/utils/Contract.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
 import { LibString } from "../../../dependencies/solady-0.0.228/src/utils/LibString.sol";
-import { TContract } from "@fdk/types/Types.sol";
+import { TContract } from "../../types/Types.sol";
 
 enum Contract {
   tSLP,

diff --git a/script/types/TNetwork.sol b/script/types/TNetwork.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { Vm } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
+import { Vm } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
 import { LibString } from "../../dependencies/solady-0.0.228/src/utils/LibString.sol";
 import { LibSharedAddress } from "../libraries/LibSharedAddress.sol";
 

diff --git a/script/utils/Constants.sol b/script/utils/Constants.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { Vm } from "../../dependencies/forge-std-1.9.3/src/Vm.sol";
+import { Vm } from "../../dependencies/forge-std-1.9.5/src/Vm.sol";
 import { IGeneralConfig } from "../interfaces/IGeneralConfig.sol";
 import { LibSharedAddress } from "../libraries/LibSharedAddress.sol";
 

diff --git a/script/utils/Helpers.sol b/script/utils/Helpers.sol
@@ -2,11 +2,11 @@
 pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import { stdJson } from "../../dependencies/forge-std-1.9.3/src/StdJson.sol";
-import { StdStorage, stdStorage } from "../../dependencies/forge-std-1.9.3/src/StdStorage.sol";
+import { stdJson } from "../../dependencies/forge-std-1.9.5/src/StdJson.sol";
+import { StdStorage, stdStorage } from "../../dependencies/forge-std-1.9.5/src/StdStorage.sol";
 
-import { StdStyle } from "../../dependencies/forge-std-1.9.3/src/StdStyle.sol";
-import { console } from "../../dependencies/forge-std-1.9.3/src/console.sol";
+import { StdStyle } from "../../dependencies/forge-std-1.9.5/src/StdStyle.sol";
+import { console } from "../../dependencies/forge-std-1.9.5/src/console.sol";
 
 import { JSONParserLib } from "../../dependencies/solady-0.0.228/src/utils/JSONParserLib.sol";
 import { LibString } from "../../dependencies/solady-0.0.228/src/utils/LibString.sol";

diff --git a/soldeer.lock b/soldeer.lock
@@ -1,27 +1,27 @@
 [[dependencies]]
 name = "forge-std"
-version = "1.9.3"
-source = "https://github.com/foundry-rs/forge-std/archive/refs/tags/v1.9.3.zip"
-checksum = "cc61148ae1a47f2415956a95ada670501b10ebd7f65cc00eda6ea7025770f42b"
-integrity = "d53734fbd7201cd9e44de730ae045ed8958dd2c7b9493c30b322f6e6c21ca8b2"
-
-[[dependencies]]
-name = "openzeppelin"
-version = "5.0.2"
-source = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v5.0.2.zip"
-checksum = "ca49e0776066328da0087977864dfaef0d5e54a0ea9859236a7cd9ad02abb9e5"
-integrity = "55fe084dbf45643d367163b4a6750cf63cabf58ac2678d5f919ab47ca4fe1f67"
+version = "1.9.5"
+url = "https://github.com/foundry-rs/forge-std/archive/refs/tags/v1.9.5.zip"
+checksum = "c21ef9ee2c952e0022fb1a860c5cbc37ace13229c4efbdf0db918098905d1e2d"
+integrity = "bb422d1016ef60c6362bbb0d64894caba8ae936b83658eff5d73358d008c22f7"
 
 [[dependencies]]
 name = "openzeppelin-v4"
 version = "4.9.5"
-source = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v4.9.5.zip"
+url = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v4.9.5.zip"
 checksum = "fe249a9cb37b7a6664f8bfe61a9633873fbbb895e5d4c3fac78db50fd9af3a73"
-integrity = "57a77366cd0ae010b93ce7a3759c7dd0ccd181a3becd599a1c57aab331fb685f"
+integrity = "590ed70cbd82f6a8ea6512d136626c3aa02a22433a4bf84664faaa463c397574"
+
+[[dependencies]]
+name = "openzeppelin-v5"
+version = "5.1.0"
+url = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v5.1.0.zip"
+checksum = "30600e9dc4dd7d9089c5f2ae78aedfdb764349ae15647190c792afd07123e2c2"
+integrity = "cb412b382c03069b2eb43beda83d3be86c9efcf3724368cb884d527357341366"
 
 [[dependencies]]
 name = "solady"
 version = "0.0.228"
-source = "https://github.com/Vectorized/solady/archive/refs/tags/v0.0.228.zip"
+url = "https://github.com/Vectorized/solady/archive/refs/tags/v0.0.228.zip"
 checksum = "90c6c562403b67338e3fa5fbad36a80b129df333d89db6759c5fd3ed15d4f0da"
 integrity = "f5bcf42b85af46cb672a86c6df1674706bf59c53195d09fedb97041cb1f85410"
diff --git a/src/RoninTransparentProxy.sol b/src/RoninTransparentProxy.sol
@@ -2,10 +2,8 @@
 // OpenZeppelin Contracts (last updated v5.0.0) (proxy/transparent/TransparentUpgradeableProxy.sol)
 pragma solidity ^0.8.20;
 
-import { ERC1967Proxy } from "../dependencies/openzeppelin-5.0.2/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import { ERC1967Utils } from "../dependencies/openzeppelin-5.0.2/contracts/proxy/ERC1967/ERC1967Utils.sol";
-import { ITransparentUpgradeableProxy } from
-  "../dependencies/openzeppelin-5.0.2/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import { ERC1967Proxy } from "../dependencies/openzeppelin-v5-5.1.0/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import { ERC1967Utils } from "../dependencies/openzeppelin-v5-5.1.0/contracts/proxy/ERC1967/ERC1967Utils.sol";
 
 import { IRoninTransparentProxy } from "./interfaces/IRoninTransparentProxy.sol";
 
@@ -89,7 +87,7 @@ contract RoninTransparentProxy is ERC1967Proxy {
       if (msg.sig == IRoninTransparentProxy.changeAdmin.selector) {
         // Change the admin of the proxy
         ret = _dispatchChangeAdmin();
-      } else if (msg.sig == ITransparentUpgradeableProxy.upgradeToAndCall.selector) {
+      } else if (msg.sig == IRoninTransparentProxy.upgradeToAndCall.selector) {
         // Upgrade the implementation of the proxy and call a function
         ret = _dispatchUpgradeToAndCall();
       } else if (msg.sig == IRoninTransparentProxy.upgradeTo.selector) {