From 66784a424a45295eb19c6857168fa58153977416 Mon Sep 17 00:00:00 2001 From: Jamie Pickett Date: Thu, 8 Aug 2024 09:12:56 -0400 Subject: [PATCH] fix: import path error after refactor --- script/ConfigReader.s.sol | 1 + script/deploy/single/06_DeployAtomicQueueV2.s.sol | 6 +++--- script/deploy/single/07_DeployAtomicSolverV4.s.sol | 6 +++--- script/deploy/single/08_DeployRolesAuthority.s.sol | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/script/ConfigReader.s.sol b/script/ConfigReader.s.sol index 6438830..d830cd0 100644 --- a/script/ConfigReader.s.sol +++ b/script/ConfigReader.s.sol @@ -52,6 +52,7 @@ library ConfigReader { address queue; bytes32 solverSalt; address solver; + address solverBot; } function toConfig(string memory _config, string memory _chainConfig) internal pure returns (Config memory config) { diff --git a/script/deploy/single/06_DeployAtomicQueueV2.s.sol b/script/deploy/single/06_DeployAtomicQueueV2.s.sol index bf651fb..7646015 100644 --- a/script/deploy/single/06_DeployAtomicQueueV2.s.sol +++ b/script/deploy/single/06_DeployAtomicQueueV2.s.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.21; -import { AtomicQueueV2 } from "./../../src/atomic-queue/AtomicQueueV2.sol"; -import { BaseScript } from "./../Base.s.sol"; +import { AtomicQueueV2 } from "./../../../src/atomic-queue/AtomicQueueV2.sol"; +import { BaseScript } from "../../Base.s.sol"; import { stdJson as StdJson } from "forge-std/StdJson.sol"; import { ConfigReader } from "../../ConfigReader.s.sol"; @@ -20,7 +20,7 @@ contract DeployAtomicQueueV2 is BaseScript { // Create Contract bytes memory creationCode = type(AtomicQueueV2).creationCode; - queue = AtomicQueueV2(CREATEX.deployCreate3(config.queueSalt, abi.encodePacked(creationCode))); + AtomicQueueV2 queue = AtomicQueueV2(CREATEX.deployCreate3(config.queueSalt, abi.encodePacked(creationCode))); return address(queue); } diff --git a/script/deploy/single/07_DeployAtomicSolverV4.s.sol b/script/deploy/single/07_DeployAtomicSolverV4.s.sol index 4a03aae..116a8e0 100644 --- a/script/deploy/single/07_DeployAtomicSolverV4.s.sol +++ b/script/deploy/single/07_DeployAtomicSolverV4.s.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.21; -import { AtomicSolverV4 } from "./../../src/atomic-queue/AtomicSolverV4.sol"; -import { BaseScript } from "./../Base.s.sol"; +import { AtomicSolverV4 } from "./../../../src/atomic-queue/AtomicSolverV4.sol"; +import { BaseScript } from "../../Base.s.sol"; import { stdJson as StdJson } from "forge-std/StdJson.sol"; import { ConfigReader } from "../../ConfigReader.s.sol"; @@ -20,7 +20,7 @@ contract DeployAtomicSolverV4 is BaseScript { // Create Contract bytes memory creationCode = type(AtomicSolverV4).creationCode; - solver = AtomicSolverV4( + AtomicSolverV4 solver = AtomicSolverV4( CREATEX.deployCreate3(config.solverSalt, abi.encodePacked(creationCode, abi.encode(broadcaster))) ); diff --git a/script/deploy/single/08_DeployRolesAuthority.s.sol b/script/deploy/single/08_DeployRolesAuthority.s.sol index e377c30..e7a6683 100644 --- a/script/deploy/single/08_DeployRolesAuthority.s.sol +++ b/script/deploy/single/08_DeployRolesAuthority.s.sol @@ -6,7 +6,7 @@ import { ManagerWithMerkleVerification } from "./../../../src/base/Roles/Manager import { BoringVault } from "./../../../src/base/BoringVault.sol"; import { TellerWithMultiAssetSupport } from "./../../../src/base/Roles/TellerWithMultiAssetSupport.sol"; import { AccountantWithRateProviders } from "./../../../src/base/Roles/AccountantWithRateProviders.sol"; -import { AtomicSolverV4 } from "./../../src/atomic-queue/AtomicSolverV4.sol"; +import { AtomicSolverV4 } from "./../../../src/atomic-queue/AtomicSolverV4.sol"; import { BaseScript } from "../../Base.s.sol"; import { ConfigReader } from "../../ConfigReader.s.sol"; import { CrossChainTellerBase } from "../../../src/base/Roles/CrossChain/CrossChainTellerBase.sol";