✂️ Organize into directories

Author: KimlikDAO-bot

contracts/AvalancheTokens.sol avalanche/addresses.sol

@@ -2,10 +2,13 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20Permit} from "./IERC20Permit.sol";
+import {IERC20Permit} from "../erc/IERC20Permit.sol";
 
 IERC20Permit constant TRYB = IERC20Permit(0x564A341Df6C126f90cf3ECB92120FD7190ACb401);
+address constant TRYB_DEPLOYER = 0xEE34DcaF2f48F3158Ef0BE8d0A2D37078cC9729b;
 
 IERC20Permit constant USDC = IERC20Permit(0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E);
+address constant USDC_DEPLOYER = 0xcb9968Cb0d6612e1167e445774997C63a0792dbF;
 
 IERC20Permit constant USDT = IERC20Permit(0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7);
+address constant USDT_DEPLOYER = 0x503560430E4b5814Dda09Ac789C3508Bb41b24B2;

contracts/ERC1967.sol erc/ERC1967.sol

@@ -3,7 +3,7 @@ sort_imports = true
 single_line_statement_blocks = "single"
 
 [profile.default]
-src = 'contracts'
+test = "./"
 remappings = ['forge-std/=lib/forge-std/src/']
 
 [profile.ethereum]

contracts/IERC165.sol erc/IERC165.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {uint128x2} from "./uint128x2.sol";
+import {uint128x2} from "types/uint128x2.sol";
 
 struct Signature {
     bytes32 r;

contracts/IERC20.sol erc/IERC20.sol

@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.0;
 
-import {PROTOCOL_FUND} from "./addresses.sol";
-import {amountAddr} from "./amountAddr.sol";
+import {PROTOCOL_FUND} from "kimlikdao/addresses.sol";
+import {amountAddr} from "types/amountAddr.sol";
 
 interface IProtocolFund {
     /**

contracts/IERC20Permit.sol erc/IERC20Permit.sol

@@ -2,7 +2,6 @@
 
 pragma solidity ^0.8.0;
 
-import {applyL1ToL2Alias, computeCreateAddress as computeZkSyncCreateAddress} from "contracts/IZkSync.sol";
 import {
     KDAOL,
     KDAOL_DEPLOYER,
@@ -19,8 +18,9 @@ import {
     PROTOCOL_FUND_DEPLOYER,
     PROTOCOL_FUND_ZKSYNC,
     PROTOCOL_FUND_ZKSYNC_DEPLOYER
-} from "contracts/addresses.sol";
+} from "./addresses.sol";
 import {Test} from "forge-std/Test.sol";
+import {applyL1ToL2Alias, computeCreateAddress as computeZkSyncCreateAddress} from "zksync/IZkSync.sol";
 
 contract AddressesTest is Test {
     function testDeployerConsistency() public pure {

contracts/IERC20Snapshot3.sol erc/IERC20Snapshot3.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {CODE_SLOT, setCodeSlot} from "../ERC1967.sol";
+import {CODE_SLOT, setCodeSlot} from "erc/ERC1967.sol";
 
 contract MockProtocolFund {
     constructor() {

contracts/IERC721.sol erc/IERC721.sol

@@ -2,12 +2,12 @@
 
 pragma solidity ^0.8.0;
 
-import {setCodeSlot} from "../ERC1967.sol";
-import {DistroStage} from "../IDistroStage.sol";
-import {IProtocolFund} from "../IProtocolFund.sol";
-import {IUpgradable} from "../IUpgradable.sol";
-import {amountAddr} from "../amountAddr.sol";
+import {setCodeSlot} from "erc/ERC1967.sol";
 import {console} from "forge-std/console.sol";
+import {DistroStage} from "kimlikdao/IDistroStage.sol";
+import {IProtocolFund} from "kimlikdao/IProtocolFund.sol";
+import {IUpgradable} from "kimlikdao/IUpgradable.sol";
+import {amountAddr} from "types/amountAddr.sol";
 
 contract MockProtocolFundV1 is IProtocolFund, IUpgradable {
     function redeem(amountAddr aaddr) external override {

foundry.toml

@@ -2,14 +2,11 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20Permit} from "../IERC20Permit.sol";
+import {TRYB_DEPLOYER, USDC_DEPLOYER, USDT_DEPLOYER} from "avalanche/addresses.sol";
+import {IERC20Permit} from "erc/IERC20Permit.sol";
 import {Vm} from "forge-std/Vm.sol";
 import {console2} from "forge-std/console2.sol";
 
-address constant TRYB_DEPLOYER = 0xEE34DcaF2f48F3158Ef0BE8d0A2D37078cC9729b;
-address constant USDC_DEPLOYER = 0xcb9968Cb0d6612e1167e445774997C63a0792dbF;
-address constant USDT_DEPLOYER = 0x503560430E4b5814Dda09Ac789C3508Bb41b24B2;
-
 function DeployMockTokens() {
     Vm vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
 

contracts/IDIDSigners.sol kimlikdao/IDIDSigners.sol

@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.0;
 
+import {amountAddr, amountAddrFrom} from "./amountAddr.sol";
 import {Test} from "forge-std/Test.sol";
-import {amountAddr, amountAddrFrom} from "contracts/amountAddr.sol";
 
 contract amountAddrTest is Test {
     function testAccessors() public pure {

contracts/IDistroStage.sol kimlikdao/IDistroStage.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {uint128x2, uint128x2From} from "contracts/uint128x2.sol";
+import {uint128x2, uint128x2From} from "./uint128x2.sol";
 import {Test} from "forge-std/Test.sol";
 
 contract uint128x2Test is Test {

contracts/IProtocolFund.sol kimlikdao/IProtocolFund.sol

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+interface IL2Messenger {
+    function sendL2ToL1Log(bool isService, bytes32 key, bytes32 value) external returns (uint256 logIdInMerkleTree);
+}

contracts/IUpgradable.sol kimlikdao/IUpgradable.sol

@@ -127,8 +127,5 @@ interface IZkSync {
     ) external view returns (bool);
 }
 
-IZkSync constant ZkSync = IZkSync(0xaBEA9132b05A70803a4E85094fD0e1800777fBEF);
-
-interface IL2Messenger {
-    function sendL2ToL1Log(bool isService, bytes32 key, bytes32 value) external returns (uint256 logIdInMerkleTree);
-}
+address constant ZKSYNC = 0xaBEA9132b05A70803a4E85094fD0e1800777fBEF;
+IZkSync constant ZkSync = IZkSync(ZKSYNC);