diff --git a/contracts/WitnetOracle.sol b/contracts/WitnetOracle.sol index 69c06cf4..42d61897 100644 --- a/contracts/WitnetOracle.sol +++ b/contracts/WitnetOracle.sol @@ -4,8 +4,8 @@ pragma solidity >=0.7.0 <0.9.0; import "./WitnetRequestBytecodes.sol"; import "./WitnetRequestFactory.sol"; -import "./interfaces/V2/IWitnetOracle.sol"; -import "./interfaces/V2/IWitnetOracleEvents.sol"; +import "./interfaces/IWitnetOracle.sol"; +import "./interfaces/IWitnetOracleEvents.sol"; /// @title Witnet Request Board functionality base contract. /// @author The Witnet Foundation. diff --git a/contracts/WitnetPriceFeeds.sol b/contracts/WitnetPriceFeeds.sol index 7eaed478..575c23e6 100644 --- a/contracts/WitnetPriceFeeds.sol +++ b/contracts/WitnetPriceFeeds.sol @@ -4,8 +4,8 @@ pragma solidity >=0.7.0 <0.9.0; import "./apps/WitnetFeeds.sol"; -import "./interfaces/V2/IWitnetPriceFeeds.sol"; -import "./interfaces/V2/IWitnetPriceSolverDeployer.sol"; +import "./interfaces/IWitnetPriceFeeds.sol"; +import "./interfaces/IWitnetPriceSolverDeployer.sol"; /// @title WitnetPriceFeeds: Price Feeds live repository reliant on the Witnet Oracle blockchain. /// @author The Witnet Foundation. diff --git a/contracts/WitnetRequestBytecodes.sol b/contracts/WitnetRequestBytecodes.sol index 6993db34..15b64715 100644 --- a/contracts/WitnetRequestBytecodes.sol +++ b/contracts/WitnetRequestBytecodes.sol @@ -3,7 +3,7 @@ pragma solidity >=0.7.0 <0.9.0; pragma experimental ABIEncoderV2; -import "./interfaces/V2/IWitnetRequestBytecodes.sol"; +import "./interfaces/IWitnetRequestBytecodes.sol"; abstract contract WitnetRequestBytecodes is diff --git a/contracts/WitnetRequestFactory.sol b/contracts/WitnetRequestFactory.sol index 378a01ac..d222d727 100644 --- a/contracts/WitnetRequestFactory.sol +++ b/contracts/WitnetRequestFactory.sol @@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2; import "./WitnetRequestBytecodes.sol"; import "./WitnetOracle.sol"; -import "./interfaces/V2/IWitnetRequestFactory.sol"; +import "./interfaces/IWitnetRequestFactory.sol"; abstract contract WitnetRequestFactory is diff --git a/contracts/apps/WitnetConsumer.sol b/contracts/apps/WitnetConsumer.sol index c0029b64..32250928 100644 --- a/contracts/apps/WitnetConsumer.sol +++ b/contracts/apps/WitnetConsumer.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; import "./UsingWitnet.sol"; -import "../interfaces/V2/IWitnetConsumer.sol"; +import "../interfaces/IWitnetConsumer.sol"; abstract contract WitnetConsumer is diff --git a/contracts/apps/WitnetFeeds.sol b/contracts/apps/WitnetFeeds.sol index 0d0e4c9d..97462e64 100644 --- a/contracts/apps/WitnetFeeds.sol +++ b/contracts/apps/WitnetFeeds.sol @@ -2,9 +2,9 @@ pragma solidity >=0.7.0 <0.9.0; -import "../interfaces/V2/IFeeds.sol"; -import "../interfaces/V2/IWitnetFeeds.sol"; -import "../interfaces/V2/IWitnetFeedsAdmin.sol"; +import "../interfaces/IFeeds.sol"; +import "../interfaces/IWitnetFeeds.sol"; +import "../interfaces/IWitnetFeedsAdmin.sol"; import "ado-contracts/contracts/interfaces/IERC2362.sol"; diff --git a/contracts/apps/WitnetPriceSolverBase.sol b/contracts/apps/WitnetPriceSolverBase.sol index c76de2cb..b79c48ed 100644 --- a/contracts/apps/WitnetPriceSolverBase.sol +++ b/contracts/apps/WitnetPriceSolverBase.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0; import "../data/WitnetPriceFeedsData.sol"; -import "../interfaces/V2/IWitnetPriceFeeds.sol"; +import "../interfaces/IWitnetPriceFeeds.sol"; abstract contract WitnetPriceSolverBase is diff --git a/contracts/core/defaults/WitnetRequestBoardTrustableBase.sol b/contracts/core/defaults/WitnetRequestBoardTrustableBase.sol index ef96d7af..46e6dc74 100644 --- a/contracts/core/defaults/WitnetRequestBoardTrustableBase.sol +++ b/contracts/core/defaults/WitnetRequestBoardTrustableBase.sol @@ -10,8 +10,8 @@ import "../../WitnetRequestFactory.sol"; import "../../data/WitnetRequestBoardDataACLs.sol"; import "../../interfaces/IWitnetRequest.sol"; import "../../interfaces/IWitnetRequestBoardAdminACLs.sol"; -import "../../interfaces/V2/IWitnetRequestBoardReporter.sol"; -import "../../interfaces/V2/IWitnetConsumer.sol"; +import "../../interfaces/IWitnetRequestBoardReporter.sol"; +import "../../interfaces/IWitnetConsumer.sol"; import "../../libs/WitnetErrorsLib.sol"; import "../../patterns/Payable.sol"; diff --git a/contracts/interfaces/V2/IFeeds.sol b/contracts/interfaces/IFeeds.sol similarity index 100% rename from contracts/interfaces/V2/IFeeds.sol rename to contracts/interfaces/IFeeds.sol diff --git a/contracts/interfaces/V2/IWitnetConsumer.sol b/contracts/interfaces/IWitnetConsumer.sol similarity index 98% rename from contracts/interfaces/V2/IWitnetConsumer.sol rename to contracts/interfaces/IWitnetConsumer.sol index 7d1b953e..3f84c13c 100644 --- a/contracts/interfaces/V2/IWitnetConsumer.sol +++ b/contracts/interfaces/IWitnetConsumer.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; -import "../../libs/Witnet.sol"; +import "../libs/Witnet.sol"; interface IWitnetConsumer { diff --git a/contracts/interfaces/V2/IWitnetFeeds.sol b/contracts/interfaces/IWitnetFeeds.sol similarity index 96% rename from contracts/interfaces/V2/IWitnetFeeds.sol rename to contracts/interfaces/IWitnetFeeds.sol index 77ffd551..e5e42ba2 100644 --- a/contracts/interfaces/V2/IWitnetFeeds.sol +++ b/contracts/interfaces/IWitnetFeeds.sol @@ -2,8 +2,8 @@ pragma solidity >=0.8.0 <0.9.0; -import "../../WitnetRequestBytecodes.sol"; -import "../../WitnetOracle.sol"; +import "../WitnetOracle.sol"; +import "../WitnetRequestBytecodes.sol"; interface IWitnetFeeds { diff --git a/contracts/interfaces/V2/IWitnetFeedsAdmin.sol b/contracts/interfaces/IWitnetFeedsAdmin.sol similarity index 92% rename from contracts/interfaces/V2/IWitnetFeedsAdmin.sol rename to contracts/interfaces/IWitnetFeedsAdmin.sol index 9388cdda..87190fb3 100644 --- a/contracts/interfaces/V2/IWitnetFeedsAdmin.sol +++ b/contracts/interfaces/IWitnetFeedsAdmin.sol @@ -2,8 +2,8 @@ pragma solidity >=0.8.0 <0.9.0; -import "../../libs/WitnetV2.sol"; -import "../../WitnetRequest.sol"; +import "../libs/WitnetV2.sol"; +import "../WitnetRequest.sol"; interface IWitnetFeedsAdmin { function acceptOwnership() external; diff --git a/contracts/interfaces/V2/IWitnetOracle.sol b/contracts/interfaces/IWitnetOracle.sol similarity index 99% rename from contracts/interfaces/V2/IWitnetOracle.sol rename to contracts/interfaces/IWitnetOracle.sol index c737e8ab..2478bd3d 100644 --- a/contracts/interfaces/V2/IWitnetOracle.sol +++ b/contracts/interfaces/IWitnetOracle.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.7.0 <0.9.0; -import "../../libs/WitnetV2.sol"; +import "../libs/WitnetV2.sol"; interface IWitnetOracle { diff --git a/contracts/interfaces/V2/IWitnetOracleEvents.sol b/contracts/interfaces/IWitnetOracleEvents.sol similarity index 96% rename from contracts/interfaces/V2/IWitnetOracleEvents.sol rename to contracts/interfaces/IWitnetOracleEvents.sol index d16d103e..7f3148df 100644 --- a/contracts/interfaces/V2/IWitnetOracleEvents.sol +++ b/contracts/interfaces/IWitnetOracleEvents.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.7.0 <0.9.0; -import "../../libs/WitnetV2.sol"; +import "../libs/WitnetV2.sol"; interface IWitnetOracleEvents { diff --git a/contracts/interfaces/V2/IWitnetPriceFeeds.sol b/contracts/interfaces/IWitnetPriceFeeds.sol similarity index 100% rename from contracts/interfaces/V2/IWitnetPriceFeeds.sol rename to contracts/interfaces/IWitnetPriceFeeds.sol diff --git a/contracts/interfaces/V2/IWitnetPriceSolver.sol b/contracts/interfaces/IWitnetPriceSolver.sol similarity index 94% rename from contracts/interfaces/V2/IWitnetPriceSolver.sol rename to contracts/interfaces/IWitnetPriceSolver.sol index 342c7b97..294f3cd8 100644 --- a/contracts/interfaces/V2/IWitnetPriceSolver.sol +++ b/contracts/interfaces/IWitnetPriceSolver.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.0 <0.9.0; -import "../../libs/WitnetV2.sol"; +import "../libs/WitnetV2.sol"; interface IWitnetPriceSolver { struct Price { diff --git a/contracts/interfaces/V2/IWitnetPriceSolverDeployer.sol b/contracts/interfaces/IWitnetPriceSolverDeployer.sol similarity index 100% rename from contracts/interfaces/V2/IWitnetPriceSolverDeployer.sol rename to contracts/interfaces/IWitnetPriceSolverDeployer.sol diff --git a/contracts/interfaces/V2/IWitnetRequestBoardReporter.sol b/contracts/interfaces/IWitnetRequestBoardReporter.sol similarity index 100% rename from contracts/interfaces/V2/IWitnetRequestBoardReporter.sol rename to contracts/interfaces/IWitnetRequestBoardReporter.sol diff --git a/contracts/interfaces/V2/IWitnetRequestBytecodes.sol b/contracts/interfaces/IWitnetRequestBytecodes.sol similarity index 98% rename from contracts/interfaces/V2/IWitnetRequestBytecodes.sol rename to contracts/interfaces/IWitnetRequestBytecodes.sol index 5d1f5198..e4be2f24 100644 --- a/contracts/interfaces/V2/IWitnetRequestBytecodes.sol +++ b/contracts/interfaces/IWitnetRequestBytecodes.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.0 <0.9.0; -import "../../libs/Witnet.sol"; +import "../libs/Witnet.sol"; interface IWitnetRequestBytecodes { diff --git a/contracts/interfaces/V2/IWitnetRequestFactory.sol b/contracts/interfaces/IWitnetRequestFactory.sol similarity index 100% rename from contracts/interfaces/V2/IWitnetRequestFactory.sol rename to contracts/interfaces/IWitnetRequestFactory.sol diff --git a/contracts/libs/WitnetPriceFeedsLib.sol b/contracts/libs/WitnetPriceFeedsLib.sol index c46d5163..d6445892 100644 --- a/contracts/libs/WitnetPriceFeedsLib.sol +++ b/contracts/libs/WitnetPriceFeedsLib.sol @@ -3,8 +3,8 @@ pragma solidity >=0.7.0 <0.9.0; pragma experimental ABIEncoderV2; -import "../interfaces/V2/IWitnetPriceSolver.sol"; -import "../interfaces/V2/IWitnetPriceSolverDeployer.sol"; +import "../interfaces/IWitnetPriceSolver.sol"; +import "../interfaces/IWitnetPriceSolverDeployer.sol"; import "../libs/Slices.sol"; diff --git a/src/index.js b/src/index.js index f7cef85f..cea57647 100644 --- a/src/index.js +++ b/src/index.js @@ -37,7 +37,7 @@ module.exports = { WitnetRequestFactory: require("../artifacts/contracts/WitnetRequestFactory.sol/WitnetRequestFactory.json"), WitnetRequestTemplate: require("../artifacts/contracts/WitnetRequestTemplate.sol/WitnetRequestTemplate.json"), WitnetUpgradableBase: require("../artifacts/contracts/core/WitnetUpgradableBase.sol/WitnetUpgradableBase.json"), - IWitnetPriceSolver: require("../artifacts/contracts/interfaces/V2/IWitnetPriceSolver.sol/IWitnetPriceSolver.json"), + IWitnetPriceSolver: require("../artifacts/contracts/interfaces/IWitnetPriceSolver.sol/IWitnetPriceSolver.json"), }, settings: require("../settings"), utils,