Skip to content

Commit

Permalink
cleaning up
Browse files Browse the repository at this point in the history
  • Loading branch information
zeroknots committed Apr 23, 2024
1 parent 7066672 commit 7cb599a
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 34 deletions.
Empty file removed accounts/safe7579/notes.txt
Empty file.
4 changes: 2 additions & 2 deletions accounts/safe7579/src/ISafe7579.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.25;
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;

import "./DataTypes.sol";
import { IERC7579Account } from "./interfaces//IERC7579Account.sol";
Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/Safe7579.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity ^0.8.25;
pragma solidity ^0.8.20;

import { IERC7579Account, Execution } from "./interfaces/IERC7579Account.sol";
import {
Expand Down
6 changes: 3 additions & 3 deletions accounts/safe7579/src/Safe7579Launchpad.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.22;
// SPDX-License-Identifier: GPL-3.0
pragma solidity ^0.8.20;

import { IAccount, PackedUserOperation } from "account-abstraction/interfaces/IAccount.sol";
import { ISafe } from "./interfaces/ISafe.sol";
Expand All @@ -17,7 +17,7 @@ import { SafeStorage } from "@safe-global/safe-contracts/contracts/libraries/Saf
* Check Readme.md for more information.
* Special thanks to [nlordell (Safe)](https://github.com/nlordell), who came up with [this
* technique](https://github.com/safe-global/safe-modules/pull/184)
* @author rhinestone | zeroknots.eth
* @author rhinestone | zeroknots.eth. Concept by nlordell (Safe)
*/
contract Safe7579Launchpad is IAccount, SafeStorage {
event ModuleInstalled(uint256 moduleTypeId, address module);
Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/core/AccessControl.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.20;

import { HandlerContext } from "@safe-global/safe-contracts/contracts/handler/HandlerContext.sol";
import { AccountBase } from "erc7579/core/AccountBase.sol";
Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/core/ExecutionHelper.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.20;

import { Safe7579DCUtil, Safe7579DCUtilSetup } from "./SetupDCUtil.sol";
import { BatchedExecUtil } from "../utils/DCUtil.sol";
Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/core/Initializer.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.20;

import { ISafe7579 } from "../ISafe7579.sol";
import "../DataTypes.sol";
Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/core/ModuleManager.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.20;

import { SentinelListLib } from "sentinellist/SentinelList.sol";
import { SentinelList4337Lib } from "sentinellist/SentinelList4337.sol";
Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/core/RegistryAdapter.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.20;

import { IERC7484 } from "../interfaces/IERC7484.sol";
import { ExecutionHelper } from "./ExecutionHelper.sol";
Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/core/SetupDCUtil.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.25;
pragma solidity ^0.8.20;

import { Safe7579DCUtil } from "../utils/DCUtil.sol";

Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/interfaces/IERC1271.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: LGPL-3.0-only
pragma solidity ^0.8.23;
pragma solidity ^0.8.20;

interface IERC1271 {
/**
Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/interfaces/IERC7579Account.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.21;
pragma solidity ^0.8.20;

import { CallType, ExecType, ModeCode } from "../lib/ModeLib.sol";

Expand Down
2 changes: 1 addition & 1 deletion accounts/safe7579/src/interfaces/IERC7579Module.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.8.21;
pragma solidity ^0.8.20;

import { PackedUserOperation } from "account-abstraction/interfaces/PackedUserOperation.sol";

Expand Down
19 changes: 0 additions & 19 deletions accounts/safe7579/src/interfaces/ISafe7579Init.sol.bak

This file was deleted.

1 change: 1 addition & 0 deletions accounts/safe7579/src/lib/ExecutionLib.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Execution } from "../interfaces/IERC7579Account.sol";
/**
* Helper Library for decoding Execution calldata
* malloc for memory allocation is bad for gas. use this assembly instead
* @author rhinestone | zeroknots.eth, Konrad Kopp (@kopy-kat)
*/
library ExecutionLib {
function decodeBatch(bytes calldata callData)
Expand Down
1 change: 1 addition & 0 deletions accounts/safe7579/src/lib/ModeLib.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pragma solidity ^0.8.23;

/**
* @title ModeLib
* @author rhinestone | zeroknots.eth, Konrad Kopp (@kopy-kat)
* To allow smart accounts to be very simple, but allow for more complex execution, A custom mode
* encoding is used.
* Function Signature of execute function:
Expand Down

0 comments on commit 7cb599a

Please sign in to comment.