feat: New Adapter - Reimbursement

.gitignore

@@ -114,7 +114,7 @@ contracts-backup
 .coverage_artifacts
 .coverage_contracts
 
-.env
+.env*
 
 subgraph/docker/data
 artifacts

contracts/adapters/BankAdapter.sol

@@ -7,6 +7,7 @@ import "../extensions/bank/Bank.sol";
 import "../guards/AdapterGuard.sol";
 import "../adapters/interfaces/IVoting.sol";
 import "../helpers/DaoHelper.sol";
+import "./modifiers/Reimbursable.sol";
 
 /**
 MIT License
@@ -32,7 +33,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract BankAdapterContract is AdapterGuard {
+contract BankAdapterContract is AdapterGuard, Reimbursable {
     /**
      * @notice Allows the member/advisor of the DAO to withdraw the funds from their internal bank account.
      * @notice Only accounts that are not reserved can withdraw the funds.
@@ -45,7 +46,7 @@ contract BankAdapterContract is AdapterGuard {
         DaoRegistry dao,
         address payable account,
         address token
-    ) external reentrancyGuard(dao) {
+    ) external reimbursable(dao) {
         require(
             DaoHelper.isNotReservedAddress(account),
             "withdraw::reserved address"
@@ -74,9 +75,19 @@ contract BankAdapterContract is AdapterGuard {
     {
         // We do not need to check if the token is supported by the bank,
         // because if it is not, the balance will always be zero.
-        BankExtension bank = BankExtension(
-            dao.getExtensionAddress(DaoHelper.BANK)
+        BankExtension(dao.getExtensionAddress(DaoHelper.BANK)).updateToken(
+            token
         );
-        bank.updateToken(token);
+    }
+
+    /*
+     * @notice Allows anyone to send eth to the bank extension
+     * @param dao The DAO address.
+     */
+    function sendEth(DaoRegistry dao) external payable reimbursable(dao) {
+        require(msg.value > 0, "no eth sent!");
+        BankExtension(dao.getExtensionAddress(DaoHelper.BANK)).addToBalance{
+            value: msg.value
+        }(DaoHelper.GUILD, DaoHelper.ETH_TOKEN, msg.value);
     }
 }

contracts/adapters/Configuration.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import "../core/DaoRegistry.sol";
 import "../guards/AdapterGuard.sol";
+import "./modifiers/Reimbursable.sol";
 import "./interfaces/IConfiguration.sol";
 import "../adapters/interfaces/IVoting.sol";
 import "../helpers/DaoHelper.sol";
@@ -32,7 +33,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract ConfigurationContract is IConfiguration, AdapterGuard {
+contract ConfigurationContract is IConfiguration, AdapterGuard, Reimbursable {
     mapping(address => mapping(bytes32 => Configuration[]))
         private _configurations;
 
@@ -49,7 +50,7 @@ contract ConfigurationContract is IConfiguration, AdapterGuard {
         bytes32 proposalId,
         Configuration[] calldata configs,
         bytes calldata data
-    ) external override reentrancyGuard(dao) {
+    ) external override reimbursable(dao) {
         require(configs.length > 0, "missing configs");
 
         dao.submitProposal(proposalId);
@@ -92,7 +93,7 @@ contract ConfigurationContract is IConfiguration, AdapterGuard {
     function processProposal(DaoRegistry dao, bytes32 proposalId)
         external
         override
-        reentrancyGuard(dao)
+        reimbursable(dao)
     {
         dao.processProposal(proposalId);
 

contracts/adapters/CouponOnboarding.sol

@@ -5,6 +5,7 @@ pragma solidity ^0.8.0;
 import "../core/DaoRegistry.sol";
 import "../extensions/bank/Bank.sol";
 import "../guards/AdapterGuard.sol";
+import "./modifiers/Reimbursable.sol";
 import "../utils/Signatures.sol";
 import "../helpers/DaoHelper.sol";
 
@@ -32,7 +33,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract CouponOnboardingContract is AdapterGuard, Signatures {
+contract CouponOnboardingContract is Reimbursable, AdapterGuard, Signatures {
     struct Coupon {
         address authorizedMember;
         uint256 amount;
@@ -117,7 +118,7 @@ contract CouponOnboardingContract is AdapterGuard, Signatures {
             )
         );
 
-        return hashMessage(dao, block.chainid, address(this), message);
+        return hashMessage(dao, address(this), message);
     }
 
     /**
@@ -136,7 +137,7 @@ contract CouponOnboardingContract is AdapterGuard, Signatures {
         uint256 amount,
         uint256 nonce,
         bytes memory signature
-    ) external reentrancyGuard(dao) {
+    ) external reimbursable(dao) {
         uint256 currentFlag = _flags[address(dao)][nonce / 256];
         _flags[address(dao)][nonce / 256] = DaoHelper.setFlag(
             currentFlag,

contracts/adapters/Distribute.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import "../core/DaoRegistry.sol";
 import "../guards/AdapterGuard.sol";
+import "./modifiers/Reimbursable.sol";
 import "../adapters/interfaces/IVoting.sol";
 import "../adapters/interfaces/IDistribute.sol";
 import "../helpers/FairShareHelper.sol";
@@ -34,7 +35,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract DistributeContract is IDistribute, AdapterGuard {
+contract DistributeContract is IDistribute, AdapterGuard, Reimbursable {
     // Event to indicate the distribution process has been completed
     // if the unitHolder address is 0x0, then the amount were distributed to all members of the DAO.
     event Distributed(
@@ -95,7 +96,7 @@ contract DistributeContract is IDistribute, AdapterGuard {
         address token,
         uint256 amount,
         bytes calldata data
-    ) external override reentrancyGuard(dao) {
+    ) external override reimbursable(dao) {
         IVoting votingContract = IVoting(
             dao.getAdapterAddress(DaoHelper.VOTING)
         );
@@ -156,7 +157,7 @@ contract DistributeContract is IDistribute, AdapterGuard {
     function processProposal(DaoRegistry dao, bytes32 proposalId)
         external
         override
-        reentrancyGuard(dao)
+        reimbursable(dao)
     {
         dao.processProposal(proposalId);
 
@@ -224,7 +225,7 @@ contract DistributeContract is IDistribute, AdapterGuard {
     function distribute(DaoRegistry dao, uint256 toIndex)
         external
         override
-        reentrancyGuard(dao)
+        reimbursable(dao)
     {
         // Checks if the proposal does not exist or is not completed yet
         bytes32 ongoingProposalId = ongoingDistributions[address(dao)];

contracts/adapters/Financing.sol

@@ -7,6 +7,7 @@ import "../core/DaoRegistry.sol";
 import "../extensions/bank/Bank.sol";
 import "../adapters/interfaces/IVoting.sol";
 import "../guards/AdapterGuard.sol";
+import "./modifiers/Reimbursable.sol";
 import "../helpers/DaoHelper.sol";
 
 /**
@@ -33,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract FinancingContract is IFinancing, AdapterGuard {
+contract FinancingContract is IFinancing, AdapterGuard, Reimbursable {
     struct ProposalDetails {
         address applicant; // the proposal applicant address, can not be a reserved address
         uint256 amount; // the amount requested for funding
@@ -64,7 +65,7 @@ contract FinancingContract is IFinancing, AdapterGuard {
         address token,
         uint256 amount,
         bytes memory data
-    ) external override reentrancyGuard(dao) {
+    ) external override reimbursable(dao) {
         require(amount > 0, "invalid requested amount");
         BankExtension bank = BankExtension(
             dao.getExtensionAddress(DaoHelper.BANK)
@@ -107,7 +108,7 @@ contract FinancingContract is IFinancing, AdapterGuard {
     function processProposal(DaoRegistry dao, bytes32 proposalId)
         external
         override
-        reentrancyGuard(dao)
+        reimbursable(dao)
     {
         ProposalDetails memory details = proposals[address(dao)][proposalId];
 

contracts/adapters/GuildKick.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import "../core/DaoRegistry.sol";
 import "../guards/AdapterGuard.sol";
+import "./modifiers/Reimbursable.sol";
 import "./interfaces/IGuildKick.sol";
 import "../helpers/GuildKickHelper.sol";
 import "../adapters/interfaces/IVoting.sol";
@@ -34,7 +35,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract GuildKickContract is IGuildKick, AdapterGuard {
+contract GuildKickContract is IGuildKick, AdapterGuard, Reimbursable {
     // State of the guild kick proposal
     struct GuildKick {
         // The address of the member to kick out of the DAO.
@@ -61,7 +62,7 @@ contract GuildKickContract is IGuildKick, AdapterGuard {
         bytes32 proposalId,
         address memberToKick,
         bytes calldata data
-    ) external override reentrancyGuard(dao) {
+    ) external override reimbursable(dao) {
         IVoting votingContract = IVoting(
             dao.getAdapterAddress(DaoHelper.VOTING)
         );
@@ -115,7 +116,7 @@ contract GuildKickContract is IGuildKick, AdapterGuard {
     function processProposal(DaoRegistry dao, bytes32 proposalId)
         external
         override
-        reentrancyGuard(dao)
+        reimbursable(dao)
     {
         dao.processProposal(proposalId);
 

contracts/adapters/KycOnboarding.sol

@@ -9,6 +9,7 @@ import "../utils/Signatures.sol";
 import "../helpers/WETH.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "./modifiers/Reimbursable.sol";
 
 /**
 MIT License
@@ -34,7 +35,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract KycOnboardingContract is AdapterGuard, MemberGuard, Signatures {
+contract KycOnboardingContract is
+    AdapterGuard,
+    MemberGuard,
+    Signatures,
+    Reimbursable
+{
     using Address for address payable;
     using SafeERC20 for IERC20;
 
@@ -184,7 +190,7 @@ contract KycOnboardingContract is AdapterGuard, MemberGuard, Signatures {
             abi.encode(COUPON_MESSAGE_TYPEHASH, coupon.kycedMember)
         );
 
-        return hashMessage(dao, block.chainid, address(this), message);
+        return hashMessage(dao, address(this), message);
     }
 
     /**
@@ -234,7 +240,7 @@ contract KycOnboardingContract is AdapterGuard, MemberGuard, Signatures {
         address tokenAddr,
         uint256 amount,
         bytes memory signature
-    ) internal reentrancyGuard(dao) {
+    ) internal reimbursable(dao) {
         require(!isActiveMember(dao, kycedMember), "already member");
         uint256 maxMembers = dao.getConfiguration(
             _configKey(tokenAddr, MaxMembers)

contracts/adapters/LendNFT.sol

@@ -9,6 +9,7 @@ import "../extensions/token/erc20/InternalTokenVestingExtension.sol";
 import "../adapters/interfaces/IVoting.sol";
 import "../helpers/DaoHelper.sol";
 import "../guards/AdapterGuard.sol";
+import "./modifiers/Reimbursable.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 
@@ -36,7 +37,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract LendNFTContract is AdapterGuard, IERC1155Receiver, IERC721Receiver {
+contract LendNFTContract is
+    AdapterGuard,
+    Reimbursable,
+    IERC1155Receiver,
+    IERC721Receiver
+{
     using Address for address payable;
 
     struct ProcessProposal {
@@ -70,16 +76,18 @@ contract LendNFTContract is AdapterGuard, IERC1155Receiver, IERC721Receiver {
 
     /**
      * @notice Configures the adapter for a particular DAO.
-     * @notice Registers the DAO internal token UNITS with the DAO Bank.
+     * @notice Registers the DAO internal token with the DAO Bank.
      * @dev Only adapters registered to the DAO can execute the function call (or if the DAO is in creation mode).
      * @dev A DAO Bank extension must exist and be configured with proper access for this adapter.
      * @param dao The DAO address.
+     * @param token The token address that will be configured as internal token.
      */
-    function configureDao(DaoRegistry dao) external onlyAdapter(dao) {
-        BankExtension bank = BankExtension(
-            dao.getExtensionAddress(DaoHelper.BANK)
-        );
-        bank.registerPotentialNewInternalToken(DaoHelper.UNITS);
+    function configureDao(DaoRegistry dao, address token)
+        external
+        onlyAdapter(dao)
+    {
+        BankExtension(dao.getExtensionAddress(DaoHelper.BANK))
+            .registerPotentialNewInternalToken(token);
     }
 
     /**
@@ -104,7 +112,7 @@ contract LendNFTContract is AdapterGuard, IERC1155Receiver, IERC721Receiver {
         uint88 requestAmount,
         uint64 lendingPeriod,
         bytes memory data
-    ) external reentrancyGuard(dao) {
+    ) external reimbursable(dao) {
         require(
             DaoHelper.isNotReservedAddress(applicant),
             "applicant is reserved address"
@@ -228,7 +236,7 @@ contract LendNFTContract is AdapterGuard, IERC1155Receiver, IERC721Receiver {
     // slither-disable-next-line reentrancy-benign
     function sendNFTBack(DaoRegistry dao, bytes32 proposalId)
         external
-        reentrancyGuard(dao)
+        reimbursable(dao)
     {
         ProposalDetails storage proposal = proposals[address(dao)][proposalId];
         require(proposal.lendingStart > 0, "lending not started");
@@ -314,7 +322,7 @@ contract LendNFTContract is AdapterGuard, IERC1155Receiver, IERC721Receiver {
         address from,
         uint256 id,
         uint256 value
-    ) internal reentrancyGuard(dao) returns (bytes4) {
+    ) internal reimbursable(dao) returns (bytes4) {
         (
             ProposalDetails storage proposal,
             IVoting.VotingState voteResult
@@ -375,7 +383,7 @@ contract LendNFTContract is AdapterGuard, IERC1155Receiver, IERC721Receiver {
         bytes32 proposalId,
         address from,
         uint256 tokenId
-    ) internal reentrancyGuard(dao) returns (bytes4) {
+    ) internal reimbursable(dao) returns (bytes4) {
         (
             ProposalDetails storage proposal,
             IVoting.VotingState voteResult

contracts/adapters/Managing.sol

@@ -6,6 +6,7 @@ import "./interfaces/IManaging.sol";
 import "../core/DaoRegistry.sol";
 import "../adapters/interfaces/IVoting.sol";
 import "../guards/AdapterGuard.sol";
+import "./modifiers/Reimbursable.sol";
 import "../helpers/DaoHelper.sol";
 
 /**
@@ -32,7 +33,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-contract ManagingContract is IManaging, AdapterGuard {
+contract ManagingContract is IManaging, AdapterGuard, Reimbursable {
     // DAO => (ProposalID => ProposalDetails)
     mapping(address => mapping(bytes32 => ProposalDetails)) public proposals;
     // DAO => (ProposalId => Configuration[])
@@ -57,7 +58,7 @@ contract ManagingContract is IManaging, AdapterGuard {
         ProposalDetails calldata proposal,
         Configuration[] memory configs,
         bytes calldata data
-    ) external override reentrancyGuard(dao) {
+    ) external override reimbursable(dao) {
         require(
             proposal.keys.length == proposal.values.length,
             "must be an equal number of config keys and values"
@@ -120,7 +121,7 @@ contract ManagingContract is IManaging, AdapterGuard {
     function processProposal(DaoRegistry dao, bytes32 proposalId)
         external
         override
-        reentrancyGuard(dao)
+        reimbursable(dao)
     {
         ProposalDetails memory proposal = proposals[address(dao)][proposalId];