Merge pull request #132 from SocketDotTech/staging

Folder rearrange

Author: ameeshaagrawal

contracts/protocol/AddressResolver.sol renamed to contracts/evmx/AddressResolver.sol

@@ -5,7 +5,7 @@ import {Ownable} from "solady/auth/Ownable.sol";
 import {LibClone} from "solady/utils/LibClone.sol";
 import {UpgradeableBeacon} from "solady/utils/UpgradeableBeacon.sol";
 import {Initializable} from "solady/utils/Initializable.sol";
-import "../interfaces/IAddressResolver.sol";
+import "./interfaces/IAddressResolver.sol";
 import {Forwarder} from "./Forwarder.sol";
 import {AsyncPromise} from "./AsyncPromise.sol";
 

contracts/protocol/utils/AddressResolverUtil.sol renamed to contracts/evmx/AddressResolverUtil.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.21;
 
-import "../../interfaces/IAddressResolver.sol";
-import "../../interfaces/IMiddleware.sol";
-import "../../interfaces/IWatcherPrecompile.sol";
-import "../../interfaces/IWatcherPrecompileConfig.sol";
-import "../../interfaces/IWatcherPrecompileLimits.sol";
-import "../../interfaces/IFeesManager.sol";
+import "./interfaces/IAddressResolver.sol";
+import "./interfaces/IMiddleware.sol";
+import "./interfaces/IWatcherPrecompile.sol";
+import "./interfaces/IWatcherPrecompileConfig.sol";
+import "./interfaces/IWatcherPrecompileLimits.sol";
+import "./interfaces/IFeesManager.sol";
 
 /// @title AddressResolverUtil
 /// @notice Utility contract for resolving system contract addresses

contracts/protocol/AsyncPromise.sol renamed to contracts/evmx/AsyncPromise.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.21;
 
-import {AddressResolverUtil} from "./utils/AddressResolverUtil.sol";
-import {IPromise} from "../interfaces/IPromise.sol";
-import {IAppGateway} from "../interfaces/IAppGateway.sol";
 import {Initializable} from "solady/utils/Initializable.sol";
-import {AsyncPromiseState} from "./utils/common/Structs.sol";
-import {MAX_COPY_BYTES} from "./utils/common/Constants.sol";
 import {LibCall} from "solady/utils/LibCall.sol";
+import {IPromise} from "./interfaces/IPromise.sol";
+import {IAppGateway} from "./interfaces/IAppGateway.sol";
+import {AddressResolverUtil} from "./AddressResolverUtil.sol";
+import {AsyncPromiseState} from "../utils/common/Structs.sol";
+import {MAX_COPY_BYTES} from "../utils/common/Constants.sol";
 
 abstract contract AsyncPromiseStorage is IPromise {
     // slots [0-49] reserved for gap

contracts/protocol/Forwarder.sol renamed to contracts/evmx/Forwarder.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.21;
 
-import "../interfaces/IAddressResolver.sol";
-import "../interfaces/IMiddleware.sol";
-import "../interfaces/IAppGateway.sol";
-import "../interfaces/IPromise.sol";
-import "../interfaces/IForwarder.sol";
-import {AddressResolverUtil} from "./utils/AddressResolverUtil.sol";
-import {AsyncModifierNotUsed, NoAsyncPromiseFound, PromiseCallerMismatch, RequestCountMismatch, DeliveryHelperNotSet} from "./utils/common/Errors.sol";
+import "./interfaces/IAddressResolver.sol";
+import "./interfaces/IMiddleware.sol";
+import "./interfaces/IAppGateway.sol";
+import "./interfaces/IPromise.sol";
+import "./interfaces/IForwarder.sol";
+import {AddressResolverUtil} from "./AddressResolverUtil.sol";
+import {AsyncModifierNotUsed, NoAsyncPromiseFound, PromiseCallerMismatch, RequestCountMismatch, DeliveryHelperNotSet} from "../utils/common/Errors.sol";
 import "solady/utils/Initializable.sol";
 
 /// @title Forwarder Storage

contracts/base/AppGatewayBase.sol renamed to contracts/evmx/base/AppGatewayBase.sol

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.21;
 
-import "../protocol/utils/AddressResolverUtil.sol";
+import "../AddressResolverUtil.sol";
 import "../interfaces/IAppGateway.sol";
 import "../interfaces/IForwarder.sol";
 import "../interfaces/IMiddleware.sol";
 import "../interfaces/IPromise.sol";
 
-import {InvalidPromise, FeesNotSet, AsyncModifierNotUsed} from "../protocol/utils/common/Errors.sol";
-import {FAST} from "../protocol/utils/common/Constants.sol";
+import {InvalidPromise, FeesNotSet, AsyncModifierNotUsed} from "../../utils/common/Errors.sol";
+import {FAST} from "../../utils/common/Constants.sol";
 
 /// @title AppGatewayBase
 /// @notice Abstract contract for the app gateway

contracts/base/ProxyFactory.sol renamed to contracts/evmx/helpers/ProxyFactory.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.21;
 
-import {Read, Parallel, QueuePayloadParams, OverrideParams, CallType, WriteFinality, PayloadParams} from "../protocol/utils/common/Structs.sol";
+import {Read, Parallel, QueuePayloadParams, OverrideParams, WriteFinality, PayloadParams} from "../../utils/common/Structs.sol";
 
 /// @title IAppGateway
 /// @notice Interface for the app gateway

contracts/helpers/TestUSDC.sol renamed to contracts/evmx/helpers/TestUSDC.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.21;
 
-import {Bid, RequestMetadata, RequestParams} from "../protocol/utils/common/Structs.sol";
+import {Bid, RequestMetadata, RequestParams} from "../../utils/common/Structs.sol";
 
 interface IAuctionManager {
     /// @notice Bids for an auction