Skip to content
Merged
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
14 changes: 14 additions & 0 deletions foundry.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"lib/forge-std": {
"rev": "3b20d60d14b343ee4f908cb8079495c07f5e8981"
},
"lib/safe-smart-account": {
"rev": "bf943f80fec5ac647159d26161446ac5d716a294"
},
"lib/solidity-http": {
"rev": "0e15051882932d4cd9f46730f1bafef8c360d1b3"
},
"lib/solidity-stringutils": {
"rev": "4b2fcc43fa0426e19ce88b1f1ec16f5903a2e461"
}
}
3 changes: 3 additions & 0 deletions remappings.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
safe-smart-account/=lib/safe-smart-account/contracts/
solidity-http/=lib/solidity-http/src/
solidity-stringutils/=lib/solidity-stringutils/src/
2 changes: 1 addition & 1 deletion src/ISafeSmartAccount.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.13;

import {Enum} from "../lib/safe-smart-account/contracts/common/Enum.sol";
import {Enum} from "safe-smart-account/common/Enum.sol";

interface ISafeSmartAccount {
function nonce() external view returns (uint256);
Expand Down
7 changes: 4 additions & 3 deletions src/Safe.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
pragma solidity ^0.8.13;

import {Vm} from "forge-std/Vm.sol";
import {HTTP} from "../lib/solidity-http/src/HTTP.sol";
import {MultiSendCallOnly} from "../lib/safe-smart-account/contracts/libraries/MultiSendCallOnly.sol";
import {Enum} from "../lib/safe-smart-account/contracts/common/Enum.sol";
import {HTTP} from "solidity-http/HTTP.sol";
import {MultiSendCallOnly} from "safe-smart-account/libraries/MultiSendCallOnly.sol";
import {Enum} from "safe-smart-account/common/Enum.sol";
import {ISafeSmartAccount} from "./ISafeSmartAccount.sol";

library Safe {
using HTTP for *;

/// forge-lint: disable-next-line(screaming-snake-case-const)
Vm constant vm = Vm(address(bytes20(uint160(uint256(keccak256("hevm cheat code"))))));

// https://github.com/safe-global/safe-smart-account/blob/release/v1.4.1/contracts/libraries/SafeStorage.sol
Expand Down
2 changes: 1 addition & 1 deletion test/Safe.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.13;

import {Test, console} from "forge-std/Test.sol";
import {Safe} from "../src/Safe.sol";
import {strings} from "../lib/solidity-stringutils/src/strings.sol";
import {strings} from "solidity-stringutils/strings.sol";
import {IWETH} from "./interfaces/IWETH.sol";

contract SafeTest is Test {
Expand Down