diff --git a/ethereum/contracts/Onboarding.sol b/ethereum/contracts/Onboarding.sol index 2678ddd..371c55f 100644 --- a/ethereum/contracts/Onboarding.sol +++ b/ethereum/contracts/Onboarding.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Unlicense pragma solidity ^0.8.24; -import "./DAO.sol"; +import "./core/DAO.sol"; import "./core/Forum.sol"; import "./WorkContract.sol"; import "./interfaces/IOnValidate.sol"; diff --git a/ethereum/contracts/Proposals.sol b/ethereum/contracts/Proposals.sol index 39037dc..eac50e2 100644 --- a/ethereum/contracts/Proposals.sol +++ b/ethereum/contracts/Proposals.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Unlicense pragma solidity ^0.8.24; -import "./DAO.sol"; +import "./core/DAO.sol"; import "./interfaces/IOnValidate.sol"; import "./interfaces/IOnProposalAccepted.sol"; diff --git a/ethereum/contracts/Work1.sol b/ethereum/contracts/Work1.sol index 8a76118..75d9a87 100644 --- a/ethereum/contracts/Work1.sol +++ b/ethereum/contracts/Work1.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Unlicense pragma solidity ^0.8.24; -import "./DAO.sol"; +import "./core/DAO.sol"; import "./WorkContract.sol"; import "./Proposals.sol"; diff --git a/ethereum/contracts/WorkContract.sol b/ethereum/contracts/WorkContract.sol index 8d9515e..f038012 100644 --- a/ethereum/contracts/WorkContract.sol +++ b/ethereum/contracts/WorkContract.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Unlicense pragma solidity ^0.8.24; -import "./DAO.sol"; -import "./Proposals.sol"; +import "./core/DAO.sol"; import "./core/Forum.sol"; +import "./Proposals.sol"; import "./interfaces/IAcceptAvailability.sol"; import "./interfaces/IOnProposalAccepted.sol"; import "hardhat/console.sol"; diff --git a/ethereum/contracts/DAO.sol b/ethereum/contracts/core/DAO.sol similarity index 78% rename from ethereum/contracts/DAO.sol rename to ethereum/contracts/core/DAO.sol index b26a4e7..bc0c042 100644 --- a/ethereum/contracts/DAO.sol +++ b/ethereum/contracts/core/DAO.sol @@ -2,15 +2,15 @@ pragma solidity ^0.8.24; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; -import "./core/Reputation.sol"; -import "./core/ValidationPools.sol"; -import "./core/Forum.sol"; -import "./interfaces/IAcceptAvailability.sol"; +import "./Reputation.sol"; +import "./ValidationPools.sol"; +import "./Forum.sol"; +import "../interfaces/IAcceptAvailability.sol"; import "hardhat/console.sol"; // TODO: consider dynamically constructing contract instances rather than merging at build time contract DAO is Reputation, Forum, ValidationPools { - /// Transfer REP to a contract, and call that contract's receiveTransfer method + /// Authorize a contract to transfer REP, and call that contract's receiveTransfer method function stakeAvailability( address to, uint256 value,