Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix functions and code comment errors #402

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix functions and code comment errors #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3dbb5b9
StorageLayoutCheck.s.sol
offensif Feb 10, 2025
6ad779a
UpgradeExecutor.s.sol
offensif Feb 10, 2025
deaed1a
00-deploy-main.ts
offensif Feb 10, 2025
49b3346
AccessController.t.sol
offensif Feb 10, 2025
31100b0
AccessController.t.sol
offensif Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions script/foundry/utils/upgrades/StorageLayoutCheck.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ contract StorageLayoutChecker is Script {


/// @notice Runs the storage layout check
/// @dev For simplicity and efficiency, we check all the upgradeablecontracts in the project
/// @dev For simplicity and efficiency, we check all the upgradeable contracts in the project
/// instead of going 1 by 1 using ffi.
function _validate() internal {
string[] memory inputs = _buildValidateCommand();
Expand Down Expand Up @@ -62,4 +62,4 @@ contract StorageLayoutChecker is Script {

return inputs;
}
}
}
2 changes: 1 addition & 1 deletion script/foundry/utils/upgrades/UpgradeExecutor.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ abstract contract UpgradeExecutor is Script, BroadcastManager, JsonDeploymentHan
} else {
revert("Invalid mode");
}
// If output is JSON, write the batch txx to file
// If output is JSON, write the batch txs to file
if (outputType == Output.BATCH_TX_JSON) {
string memory action;
if (mode == UpgradeModes.SCHEDULE) {
Expand Down
4 changes: 2 additions & 2 deletions script/hardhat/deployment/00-deploy-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ async function deployMain() {
)

await _saveStateBeforeDeploy(provider)
await _deployLibaries(deployLibrary)
await _deployLibraries(deployLibrary)
await _deployContracts(deployContract)
// await _verifyAll()
await _postDeploy()
Expand All @@ -78,7 +78,7 @@ async function _saveStateBeforeDeploy(provider: JsonRpcProvider) {
fs.writeFileSync(checkpointPath, JSON.stringify({ checkpoint }, null, 2))
}

async function _deployLibaries(deployLibrary: any) {
async function _deployLibraries(deployLibrary: any) {
// do one by one to keep nonce in order
await deployLibrary("AccessPermission")
await deployLibrary("Errors")
Expand Down
4 changes: 2 additions & 2 deletions test/foundry/access/AccessController.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ contract AccessControllerTest is BaseTest {
// test non owner cannot set specific permission
// test permission overrides
// test wildcard permission
// test whilelist permission
// test whitelist permission
// test blacklist permission
// module call ipAccount call module
// ipAccount call module
Expand Down Expand Up @@ -1128,7 +1128,7 @@ contract AccessControllerTest is BaseTest {
);
}

function test_AccessController_revert_setBatchPermissionsButCallerisNotIPAccount() public {
function test_AccessController_revert_setBatchPermissionsButCallerIsNotIPAccount() public {
address signer = vm.addr(2);

AccessPermission.Permission[] memory permissionList = new AccessPermission.Permission[](3);
Expand Down