BM-1515: Solidity code import clean up (#1043)

After upgrading `forge` to `1.3.2-stable` I've noticed too many warnings
and a few errors. This PR addresses those without affecting its
functionality

Author: capossele

contracts/scripts/Config.s.sol

@@ -6,7 +6,7 @@
 pragma solidity ^0.8.20;
 
 import {Vm} from "forge-std/Vm.sol";
-import "forge-std/Test.sol";
+import {console2, stdToml} from "forge-std/Test.sol";
 
 struct DeploymentConfig {
     string name;

contracts/scripts/Deploy.s.sol

@@ -6,10 +6,8 @@
 pragma solidity ^0.8.20;
 
 import {Script, console2} from "forge-std/Script.sol";
-import "forge-std/Test.sol";
 import {IRiscZeroSelectable} from "risc0/IRiscZeroSelectable.sol";
 import {IRiscZeroVerifier} from "risc0/IRiscZeroVerifier.sol";
-import {ControlID, RiscZeroGroth16Verifier} from "risc0/groth16/RiscZeroGroth16Verifier.sol";
 import {RiscZeroSetVerifier} from "risc0/RiscZeroSetVerifier.sol";
 import {RiscZeroVerifierRouter} from "risc0/RiscZeroVerifierRouter.sol";
 import {RiscZeroCheats} from "risc0/test/RiscZeroCheats.sol";

contracts/scripts/Manage.s.sol

@@ -8,13 +8,10 @@ pragma solidity ^0.8.9;
 import {Script} from "forge-std/Script.sol";
 import {console2} from "forge-std/console2.sol";
 import {Strings} from "openzeppelin/contracts/utils/Strings.sol";
-import {RiscZeroVerifierRouter} from "risc0/RiscZeroVerifierRouter.sol";
-import {RiscZeroVerifierEmergencyStop} from "risc0/RiscZeroVerifierEmergencyStop.sol";
 import {IRiscZeroVerifier} from "risc0/IRiscZeroVerifier.sol";
-import {RiscZeroSetVerifier} from "risc0/RiscZeroSetVerifier.sol";
 import {BoundlessMarket} from "../src/BoundlessMarket.sol";
 import {BoundlessMarketLib} from "../src/libraries/BoundlessMarketLib.sol";
-import {ConfigLoader, DeploymentConfig, ConfigParser} from "./Config.s.sol";
+import {ConfigLoader, DeploymentConfig} from "./Config.s.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
 import {Options as UpgradeOptions} from "openzeppelin-foundry-upgrades/Options.sol";
@@ -108,8 +105,8 @@ contract DeployBoundlessMarket is BoundlessScript {
         // Verify the deployment
         BoundlessMarket market = BoundlessMarket(marketAddress);
         require(market.VERIFIER() == IRiscZeroVerifier(deploymentConfig.verifier), "verifier does not match");
-        (bytes32 assessor_id, string memory guestUrl) = market.imageInfo();
-        require(assessor_id == deploymentConfig.assessorImageId, "assessor image ID does not match");
+        (bytes32 assessorId, string memory guestUrl) = market.imageInfo();
+        require(assessorId == deploymentConfig.assessorImageId, "assessor image ID does not match");
         require(
             keccak256(bytes(guestUrl)) == keccak256(bytes(deploymentConfig.assessorGuestUrl)),
             "assessor guest URL does not match"
@@ -120,7 +117,7 @@ contract DeployBoundlessMarket is BoundlessScript {
         console2.log("BoundlessMarket admin is %s", deploymentConfig.admin);
         console2.log("BoundlessMarket stake token contract at %s", deploymentConfig.stakeToken);
         console2.log("BoundlessMarket verifier contract at %s", deploymentConfig.verifier);
-        console2.log("BoundlessMarket assessor image ID %s", Strings.toHexString(uint256(assessor_id), 32));
+        console2.log("BoundlessMarket assessor image ID %s", Strings.toHexString(uint256(assessorId), 32));
         console2.log("BoundlessMarket assessor guest URL %s", guestUrl);
 
         address boundlessMarketImpl = address(uint160(uint256(vm.load(marketAddress, IMPLEMENTATION_SLOT))));
@@ -161,7 +158,7 @@ contract UpgradeBoundlessMarket is BoundlessScript {
 
         // Get the current assessor image ID and guest URL
         BoundlessMarket market = BoundlessMarket(marketAddress);
-        (bytes32 currentImageID, string memory currentGuestUrl) = market.imageInfo();
+        (bytes32 currentImageId, string memory currentGuestUrl) = market.imageInfo();
 
         // Use the assessor image ID recorded in deployment.toml
         bytes32 assessorImageId = deploymentConfig.assessorImageId.required("assessor-image-id");
@@ -187,7 +184,7 @@ contract UpgradeBoundlessMarket is BoundlessScript {
         // Otherwise, we don't include it to save gas.
         vm.startBroadcast(admin);
         if (
-            assessorImageId != currentImageID || keccak256(bytes(assessorGuestUrl)) != keccak256(bytes(currentGuestUrl))
+            assessorImageId != currentImageId || keccak256(bytes(assessorGuestUrl)) != keccak256(bytes(currentGuestUrl))
         ) {
             Upgrades.upgradeProxy(
                 marketAddress,
@@ -207,8 +204,8 @@ contract UpgradeBoundlessMarket is BoundlessScript {
             upgradedMarket.VERIFIER() == IRiscZeroVerifier(deploymentConfig.verifier),
             "upgraded market verifier does not match"
         );
-        (bytes32 assessor_id, string memory upgradedGuestUrl) = upgradedMarket.imageInfo();
-        require(assessor_id == deploymentConfig.assessorImageId, "upgraded market assessor image ID does not match");
+        (bytes32 assessorId, string memory upgradedGuestUrl) = upgradedMarket.imageInfo();
+        require(assessorId == deploymentConfig.assessorImageId, "upgraded market assessor image ID does not match");
         require(
             keccak256(bytes(upgradedGuestUrl)) == keccak256(bytes(deploymentConfig.assessorGuestUrl)),
             "upgraded market assessor guest URL does not match"
@@ -226,7 +223,7 @@ contract UpgradeBoundlessMarket is BoundlessScript {
         console2.log("Upgraded BoundlessMarket impl contract at %s", boundlessMarketImpl);
         console2.log("Upgraded BoundlessMarket stake token contract at %s", deploymentConfig.stakeToken);
         console2.log("Upgraded BoundlessMarket verifier contract at %s", deploymentConfig.verifier);
-        console2.log("Upgraded BoundlessMarket assessor image ID %s", Strings.toHexString(uint256(assessor_id), 32));
+        console2.log("Upgraded BoundlessMarket assessor image ID %s", Strings.toHexString(uint256(assessorId), 32));
         console2.log("Upgraded BoundlessMarket assessor guest URL %s", upgradedGuestUrl);
 
         string[] memory args = new string[](6);
@@ -277,8 +274,8 @@ contract RollbackBoundlessMarket is BoundlessScript {
             upgradedMarket.VERIFIER() == IRiscZeroVerifier(deploymentConfig.verifier),
             "upgraded market verifier does not match"
         );
-        (bytes32 assessor_id, string memory upgradedGuestUrl) = upgradedMarket.imageInfo();
-        require(assessor_id == deploymentConfig.assessorImageId, "upgraded market assessor image ID does not match");
+        (bytes32 assessorId, string memory upgradedGuestUrl) = upgradedMarket.imageInfo();
+        require(assessorId == deploymentConfig.assessorImageId, "upgraded market assessor image ID does not match");
         require(
             keccak256(bytes(upgradedGuestUrl)) == keccak256(bytes(deploymentConfig.assessorGuestUrl)),
             "upgraded market assessor guest URL does not match"
@@ -293,7 +290,7 @@ contract RollbackBoundlessMarket is BoundlessScript {
         console2.log("Upgraded BoundlessMarket proxy contract at %s", marketAddress);
         console2.log("Upgraded BoundlessMarket stake token contract at %s", deploymentConfig.stakeToken);
         console2.log("Upgraded BoundlessMarket verifier contract at %s", deploymentConfig.verifier);
-        console2.log("Upgraded BoundlessMarket assessor image ID %s", Strings.toHexString(uint256(assessor_id), 32));
+        console2.log("Upgraded BoundlessMarket assessor image ID %s", Strings.toHexString(uint256(assessorId), 32));
         console2.log("Upgraded BoundlessMarket assessor guest URL %s", upgradedGuestUrl);
 
         address currentImplementation = address(uint160(uint256(vm.load(marketAddress, IMPLEMENTATION_SLOT))));

contracts/src/BoundlessMarket.sol

@@ -27,7 +27,7 @@ import {AssessorCommitment} from "./types/AssessorCommitment.sol";
 import {Fulfillment} from "./types/Fulfillment.sol";
 import {AssessorReceipt} from "./types/AssessorReceipt.sol";
 import {ProofRequest} from "./types/ProofRequest.sol";
-import {LockRequest, LockRequestLibrary} from "./types/LockRequest.sol";
+import {LockRequestLibrary} from "./types/LockRequest.sol";
 import {RequestId} from "./types/RequestId.sol";
 import {RequestLock} from "./types/RequestLock.sol";
 import {FulfillmentContext, FulfillmentContextLibrary} from "./types/FulfillmentContext.sol";

contracts/src/HitPoints.sol

@@ -15,11 +15,11 @@
 pragma solidity ^0.8.20;
 
 import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
-import "./IHitPoints.sol";
+import {IHitPoints} from "./IHitPoints.sol";
 
 /// @title HitPoints ERC20
 /// @notice Implementation of a restricted transfer token using ERC20

contracts/src/types/AssessorReceipt.sol

@@ -6,7 +6,6 @@ pragma solidity ^0.8.20;
 
 import {AssessorCallback} from "./AssessorCallback.sol";
 import {Selector} from "./Selector.sol";
-import {RequestId} from "./RequestId.sol";
 
 /// @title AssessorReceipt Struct and Library
 /// @notice Represents the output of the assessor and proof of correctness, allowing request fulfillment.

contracts/src/types/LockRequest.sol

@@ -5,15 +5,11 @@
 pragma solidity ^0.8.20;
 
 import {ProofRequest, ProofRequestLibrary} from "./ProofRequest.sol";
-import {Account} from "./Account.sol";
-import {Callback, CallbackLibrary} from "./Callback.sol";
-import {Offer, OfferLibrary} from "./Offer.sol";
-import {Predicate, PredicateLibrary} from "./Predicate.sol";
-import {Input, InputType, InputLibrary} from "./Input.sol";
-import {Requirements, RequirementsLibrary} from "./Requirements.sol";
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import {IBoundlessMarket} from "../IBoundlessMarket.sol";
-import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
+import {CallbackLibrary} from "./Callback.sol";
+import {OfferLibrary} from "./Offer.sol";
+import {PredicateLibrary} from "./Predicate.sol";
+import {InputLibrary} from "./Input.sol";
+import {RequirementsLibrary} from "./Requirements.sol";
 
 using LockRequestLibrary for LockRequest global;
 

contracts/src/types/Offer.sol

@@ -7,7 +7,6 @@ pragma solidity ^0.8.20;
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 import {IBoundlessMarket} from "../IBoundlessMarket.sol";
-import {RequestId} from "./RequestId.sol";
 
 using OfferLibrary for Offer global;
 

contracts/src/types/ProofRequest.sol

@@ -5,15 +5,11 @@
 pragma solidity ^0.8.20;
 
 import {RequestId} from "./RequestId.sol";
-import {Account} from "./Account.sol";
-import {Callback, CallbackLibrary} from "./Callback.sol";
+import {CallbackLibrary} from "./Callback.sol";
 import {Offer, OfferLibrary} from "./Offer.sol";
-import {Predicate, PredicateLibrary} from "./Predicate.sol";
-import {Input, InputType, InputLibrary} from "./Input.sol";
+import {PredicateLibrary} from "./Predicate.sol";
+import {Input, InputLibrary} from "./Input.sol";
 import {Requirements, RequirementsLibrary} from "./Requirements.sol";
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import {IBoundlessMarket} from "../IBoundlessMarket.sol";
-import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
 
 using ProofRequestLibrary for ProofRequest global;