diff --git a/.gitmodules b/.gitmodules index a2ad802..8f5f886 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,7 @@ path = lib/forge-std url = https://github.com/foundry-rs/forge-std shallow = true + branch = v1.8.2 [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts diff --git a/lib/forge-std b/lib/forge-std index b6a506d..d44c4fb 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit b6a506db2262cad5ff982a87789ee6d1558ec861 +Subproject commit d44c4fbbb9ff054fb334babbdd34f9b6e899b3d6 diff --git a/lib/solady b/lib/solady index d457831..183a5c9 160000 --- a/lib/solady +++ b/lib/solady @@ -1 +1 @@ -Subproject commit d457831578c0714d648ef19b599f9d7172113816 +Subproject commit 183a5c9cc3ca982492ae5fcca9e7ed6668ddb6ac diff --git a/remappings.txt b/remappings.txt index 952eae5..8712794 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1 +1 @@ -foundry-deployment-kit/=script/ \ No newline at end of file +@fdk/=script/ \ No newline at end of file diff --git a/script/ArtifactFactory.sol b/script/ArtifactFactory.sol index 2628800..a13fd99 100644 --- a/script/ArtifactFactory.sol +++ b/script/ArtifactFactory.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.19; import { Vm } from "../lib/forge-std/src/Vm.sol"; import { stdJson } from "../lib/forge-std/src/StdJson.sol"; import { StdStyle } from "../lib/forge-std/src/StdStyle.sol"; -import { console2 as console } from "../lib/forge-std/src/console2.sol"; +import { console } from "../lib/forge-std/src/console.sol"; import { LibString } from "../lib/solady/src/utils/LibString.sol"; import { JSONParserLib } from "../lib/solady/src/utils/JSONParserLib.sol"; import { IArtifactFactory } from "./interfaces/IArtifactFactory.sol"; diff --git a/script/BaseGeneralConfig.sol b/script/BaseGeneralConfig.sol index 8b5687e..8858b3a 100644 --- a/script/BaseGeneralConfig.sol +++ b/script/BaseGeneralConfig.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.19; import { Vm, VmSafe } from "../lib/forge-std/src/Vm.sol"; import { StdStyle } from "../lib/forge-std/src/StdStyle.sol"; -import { console2 as console } from "../lib/forge-std/src/console2.sol"; +import { console } from "../lib/forge-std/src/console.sol"; import { WalletConfig } from "./configs/WalletConfig.sol"; import { RuntimeConfig } from "./configs/RuntimeConfig.sol"; import { MigrationConfig } from "./configs/MigrationConfig.sol"; diff --git a/script/BaseMigration.s.sol b/script/BaseMigration.s.sol index d0fb3d2..2ede9f4 100644 --- a/script/BaseMigration.s.sol +++ b/script/BaseMigration.s.sol @@ -238,7 +238,7 @@ abstract contract BaseMigration is ScriptExtended { } else { console.log( StdStyle.yellow( - "`ProxyAdmin:upgrade` failed!. Retrying with `ProxyAdmin:upgradeAndCall` with emty args..." + "`ProxyAdmin:upgrade` failed!. Retrying with `ProxyAdmin:upgradeAndCall` with empty args..." ) ); vm.prank(owner); @@ -283,7 +283,7 @@ abstract contract BaseMigration is ScriptExtended { } } else { console.log( - "`ProxyAdmin:upgrade` failed!. Retrying with `ProxyAdmin:upgradeAndCall` with emty args...".yellow() + "`ProxyAdmin:upgrade` failed!. Retrying with `ProxyAdmin:upgradeAndCall` with empty args...".yellow() ); if (owner.code.length != 0) { _cheatUpgradeAndCall(owner, wProxyAdmin, iProxy, logic, args); diff --git a/script/OnchainExecutor.s.sol b/script/OnchainExecutor.s.sol index 44997fa..d324c63 100644 --- a/script/OnchainExecutor.s.sol +++ b/script/OnchainExecutor.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.19; import { StdStyle } from "../lib/forge-std/src/StdStyle.sol"; -import { console2 as console } from "../lib/forge-std/src/console2.sol"; +import { console } from "../lib/forge-std/src/console.sol"; import { ScriptExtended } from "./extensions/ScriptExtended.s.sol"; import { BaseGeneralConfig } from "./BaseGeneralConfig.sol"; import { LibErrorHandler } from "../lib/contract-libs/src/LibErrorHandler.sol"; diff --git a/script/configs/ContractConfig.sol b/script/configs/ContractConfig.sol index d38b3f4..4605896 100644 --- a/script/configs/ContractConfig.sol +++ b/script/configs/ContractConfig.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.19; import { EnumerableSet } from "../../lib/openzeppelin-contracts/contracts/utils/structs/EnumerableSet.sol"; import { Vm, VmSafe } from "../../lib/forge-std/src/Vm.sol"; -import { console2 as console } from "../../lib/forge-std/src/console2.sol"; +import { console } from "../../lib/forge-std/src/console.sol"; import { StdStyle } from "../../lib/forge-std/src/StdStyle.sol"; import { LibString } from "../../lib/solady/src/utils/LibString.sol"; import { IContractConfig } from "../interfaces/configs/IContractConfig.sol"; @@ -47,7 +47,7 @@ abstract contract ContractConfig is IContractConfig { ); } - function getContractTypeFromCurrentNetwok(address contractAddr) public view virtual returns (TContract contractType) { + function getContractTypeFromCurrentNetwork(address contractAddr) public view virtual returns (TContract contractType) { return getContractTypeByRawData(block.chainid, contractAddr); } diff --git a/script/configs/NetworkConfig.sol b/script/configs/NetworkConfig.sol index cf444f9..062722e 100644 --- a/script/configs/NetworkConfig.sol +++ b/script/configs/NetworkConfig.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.19; import { Vm } from "../../lib/forge-std/src/Vm.sol"; import { StdStyle } from "../../lib/forge-std/src/StdStyle.sol"; -import { console2 as console } from "../../lib/forge-std/src/console2.sol"; +import { console } from "../../lib/forge-std/src/console.sol"; import { INetworkConfig } from "../interfaces/configs/INetworkConfig.sol"; import { LibSharedAddress } from "../libraries/LibSharedAddress.sol"; import { TNetwork } from "../types/Types.sol"; diff --git a/script/configs/RuntimeConfig.sol b/script/configs/RuntimeConfig.sol index 2025a1a..59af52b 100644 --- a/script/configs/RuntimeConfig.sol +++ b/script/configs/RuntimeConfig.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.19; import { StdStyle } from "../../lib/forge-std/src/StdStyle.sol"; -import { console2 as console } from "../../lib/forge-std/src/console2.sol"; +import { console } from "../../lib/forge-std/src/console.sol"; import { LibString } from "../../lib/solady/src/utils/LibString.sol"; import { IRuntimeConfig } from "../interfaces/configs/IRuntimeConfig.sol"; diff --git a/script/interfaces/configs/IContractConfig.sol b/script/interfaces/configs/IContractConfig.sol index 4d91aa7..f2055ea 100644 --- a/script/interfaces/configs/IContractConfig.sol +++ b/script/interfaces/configs/IContractConfig.sol @@ -11,7 +11,7 @@ interface IContractConfig { function label(uint256 chainId, address contractAddr, string memory contractName) external; - function getContractTypeFromCurrentNetwok(address contractAddr) external view returns (TContract contractType); + function getContractTypeFromCurrentNetwork(address contractAddr) external view returns (TContract contractType); function getContractName(TContract contractType) external view returns (string memory name); diff --git a/script/sample/SampleGeneralConfig.sol b/script/sample/SampleGeneralConfig.sol index 3466e4f..5c23bd6 100644 --- a/script/sample/SampleGeneralConfig.sol +++ b/script/sample/SampleGeneralConfig.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import { BaseGeneralConfig } from "foundry-deployment-kit/BaseGeneralConfig.sol"; +import { BaseGeneralConfig } from "@fdk/BaseGeneralConfig.sol"; import { Contract } from "./utils/Contract.sol"; contract SampleGeneralConfig is BaseGeneralConfig { @@ -9,11 +9,11 @@ contract SampleGeneralConfig is BaseGeneralConfig { function _setUpContracts() internal virtual override { _contractNameMap[Contract.Sample.key()] = Contract.Sample.name(); - // {SamepleClone} share same logic as {Sample} + // {SampleClone} share same logic as {Sample} _contractNameMap[Contract.SampleClone.key()] = Contract.Sample.name(); _contractNameMap[Contract.SampleProxy.key()] = Contract.SampleProxy.name(); - // allow diffrent contracts to share same logic + // allow different contracts to share same logic _contractNameMap[Contract.tSLP.key()] = "Token"; _contractNameMap[Contract.tAXS.key()] = "Token"; _contractNameMap[Contract.tWETH.key()] = "Token"; diff --git a/script/sample/SampleMigration.s.sol b/script/sample/SampleMigration.s.sol index 6817bcc..8215b66 100644 --- a/script/sample/SampleMigration.s.sol +++ b/script/sample/SampleMigration.s.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import { BaseMigration } from "foundry-deployment-kit/BaseMigration.s.sol"; -import { DefaultNetwork } from "foundry-deployment-kit/utils/DefaultNetwork.sol"; +import { BaseMigration } from "@fdk/BaseMigration.s.sol"; +import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol"; import { SampleGeneralConfig } from "./SampleGeneralConfig.sol"; import { ISharedArgument } from "./interfaces/ISharedArgument.sol"; diff --git a/script/sample/interfaces/ISharedArgument.sol b/script/sample/interfaces/ISharedArgument.sol index 5d12e63..89efc16 100644 --- a/script/sample/interfaces/ISharedArgument.sol +++ b/script/sample/interfaces/ISharedArgument.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import { IGeneralConfig } from "foundry-deployment-kit/interfaces/IGeneralConfig.sol"; +import { IGeneralConfig } from "@fdk/interfaces/IGeneralConfig.sol"; interface ISharedArgument is IGeneralConfig { struct SharedParameter { @@ -10,7 +10,7 @@ interface ISharedArgument is IGeneralConfig { address mFactory; address testnetFactory; bytes32 mPairCodeHash; - bytes32 testnetpairCodeHash; + bytes32 testnetPairCodeHash; address mWRON; address mSLP; address mAXS; diff --git a/script/sample/ronin-mainnet/xxxxyyzz_DeploySample/xxxxyyzz_DeploySample.s.sol b/script/sample/ronin-mainnet/xxxxyyzz_DeploySample/xxxxyyzz_DeploySample.s.sol index 23564e8..b161d79 100644 --- a/script/sample/ronin-mainnet/xxxxyyzz_DeploySample/xxxxyyzz_DeploySample.s.sol +++ b/script/sample/ronin-mainnet/xxxxyyzz_DeploySample/xxxxyyzz_DeploySample.s.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import { DefaultNetwork } from "foundry-deployment-kit/utils/DefaultNetwork.sol"; +import { DefaultNetwork } from "@fdk/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"; 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 index b3a1fd7..99a48c9 100644 --- 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 @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import { console2 as console } from "forge-std/console2.sol"; -import { DefaultNetwork } from "foundry-deployment-kit/utils/DefaultNetwork.sol"; +import { console } from "forge-std/console.sol"; +import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol"; import { Contract } from "../../utils/Contract.sol"; import { ISharedArgument, SampleMigration } from "../../SampleMigration.s.sol"; import { Token } from "../../../../src/Token.sol"; diff --git a/script/sample/ronin-testnet/xxxxyyzz-DeploySample/xxxxyyzz_DeploySample.s.sol b/script/sample/ronin-testnet/xxxxyyzz-DeploySample/xxxxyyzz_DeploySample.s.sol index 035afc6..064a94e 100644 --- a/script/sample/ronin-testnet/xxxxyyzz-DeploySample/xxxxyyzz_DeploySample.s.sol +++ b/script/sample/ronin-testnet/xxxxyyzz-DeploySample/xxxxyyzz_DeploySample.s.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import { DefaultNetwork } from "foundry-deployment-kit/utils/DefaultNetwork.sol"; +import { DefaultNetwork } from "@fdk/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"; diff --git a/script/sample/utils/Contract.sol b/script/sample/utils/Contract.sol index 9a0de1a..d428cfb 100644 --- a/script/sample/utils/Contract.sol +++ b/script/sample/utils/Contract.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.19; import { LibString } from "lib/solady/src/utils/LibString.sol"; -import { TContract } from "foundry-deployment-kit/types/Types.sol"; +import { TContract } from "@fdk/types/Types.sol"; enum Contract { tSLP,