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.

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

feat: downgrade solc version #160

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions foundry.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[profile.default]
solc_version = "0.8.23"
evm_version = "cancun"
src = "src"
out = "out"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@ERC4337/account-abstraction-v0.6": "github:eth-infinitism/account-abstraction#v0.6.0",
"@prb/math": "^4.0.2",
"@rhinestone/erc4337-validation": "^0.0.4",
"@rhinestone/module-bases": "github:rhinestonewtf/module-bases#d048ec28c8ea8b4155db3ce4f027bc64cd41f9a7",
"@rhinestone/module-bases": "github:rhinestonewtf/module-bases#1ea072eb328dd4bb1a540a52432ef98562314121",
"@rhinestone/safe7579": "github:rhinestonewtf/safe7579#v1.0.0",
"@rhinestone/sentinellist": "github:rhinestonewtf/sentinellist",
"@rhinestone/registry": "github:rhinestonewtf/registry#v1.0",
Expand Down
90 changes: 56 additions & 34 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Accounts.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
import { Execution, IERC7579Account } from "./external/ERC7579.sol";
2 changes: 1 addition & 1 deletion src/Core.sol
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;
2 changes: 1 addition & 1 deletion src/Helpers.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
import { ERC4337Helpers } from "./test/utils/ERC4337Helpers.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/Integrations.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
import { ERC20Integration } from "./integrations/ERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/Interfaces.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
/*//////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/Mocks.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
/*//////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/ModuleKit.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
import {
Expand Down
2 changes: 1 addition & 1 deletion src/Modules.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
import { ERC7579ValidatorBase } from "module-bases/ERC7579ValidatorBase.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/erc7579/ERC7579Factory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

import "../../external/ERC7579.sol";
import { IAccountFactory } from "src/accounts/interface/IAccountFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/interface/IAccountFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

interface IAccountFactory {
function init() external;
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/kernel/KernelFactory.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

import { KernelFactory as KernelAccountFactory } from "kernel/factory/KernelFactory.sol";
import { Kernel } from "kernel/Kernel.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/nexus/NexusFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;
pragma solidity >=0.8.0 <0.9.0;

// Interfaces
import { IAccountFactory } from "src/accounts/interface/IAccountFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/nexus/interfaces/INexusAccountFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;
pragma solidity >=0.8.0 <0.9.0;

interface INexusAccountFactory {
/// @notice Creates a new Nexus account with the provided initialization data.
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/nexus/interfaces/INexusBootstrap.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;
pragma solidity >=0.8.0 <0.9.0;

import { IERC7579Module } from "src/external/ERC7579.sol";
import { IERC7484 } from "src/Interfaces.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/safe/SafeFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

import { Safe7579, ISafe7579 } from "safe7579/Safe7579.sol";
import { Safe } from "@safe-global/safe-contracts/contracts/Safe.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/template/FactoryTemplate.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

abstract contract FactoryTemplate {
constructor() {
Expand Down
2 changes: 1 addition & 1 deletion src/deployment/RegistryDeployer.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

import { IRegistry, IExternalResolver } from "registry/IRegistry.sol";
import {
Expand Down Expand Up @@ -112,7 +112,7 @@
)
public
{
require(isContract(mockAttester), "MockAttester is not deployed on this network");

Check warning on line 115 in src/deployment/RegistryDeployer.sol

View workflow job for this annotation

GitHub Actions / lint / forge-lint

Error message for require is too long: 44 counted / 32 allowed

Check warning on line 115 in src/deployment/RegistryDeployer.sol

View workflow job for this annotation

GitHub Actions / lint / forge-lint

GC: Use Custom Errors instead of require statements

SchemaUID _schemaUID = findSchema();
AttestationRequest memory request = AttestationRequest({
Expand All @@ -130,7 +130,7 @@
)
);

require(success, "Mock attestation failed");

Check warning on line 133 in src/deployment/RegistryDeployer.sol

View workflow job for this annotation

GitHub Actions / lint / forge-lint

GC: Use Custom Errors instead of require statements
}

function isModuleAttestedMock(address module) public view returns (bool) {
Expand Down Expand Up @@ -190,7 +190,7 @@
// <---- OTHER ---->
function isContract(address _addr) internal view returns (bool _isContract) {
uint32 size;
assembly {

Check warning on line 193 in src/deployment/RegistryDeployer.sol

View workflow job for this annotation

GitHub Actions / lint / forge-lint

Avoid to use inline assembly. It is acceptable only in rare cases
size := extcodesize(_addr)
}
return (size > 0);
Expand Down
2 changes: 1 addition & 1 deletion src/external/ERC4337.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
import { PackedUserOperation } from
Expand Down
2 changes: 1 addition & 1 deletion src/external/ERC7579.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

/* solhint-disable no-unused-import */
import { MSAFactory as ERC7579AccountFactory } from "erc7579/MSAFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/integrations/ERC20.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

import { IERC20 } from "forge-std/interfaces/IERC20.sol";
import { Execution } from "../Accounts.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/integrations/ERC4626.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;
pragma solidity >=0.8.0 <0.9.0;

import { IERC4626 } from "forge-std/interfaces/IERC4626.sol";
import { Execution } from "../Accounts.sol";
Expand Down
Loading
Loading