@keep-network/tbtc-v2 0.1.1-dev.77 → 0.1.1-dev.78

package/contracts/bank/Bank.sol

@@ -17,6 +17,7 @@ pragma solidity ^0.8.9;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 
+import "./IReceiveBalanceApproval.sol";
 import "../vault/IVault.sol";
 
 /// @title Bitcoin Bank
@@ -114,19 +115,22 @@ contract Bank is Ownable {
         _approveBalance(msg.sender, spender, amount);
     }
 
-    /// @notice Sets `amount` as the allowance of a smart contract `vault` over
-    ///         the caller's balance and calls the vault via
+    /// @notice Sets the `amount` as an allowance of a smart contract `spender`
+    ///         over the caller's balance and calls the `spender` via
     ///         `receiveBalanceApproval`.
-    /// @dev If the `amount` is set to `type(uint256).max` then the logic in
-    ///     `receiveBalanceApproval` or later call to `transferBalanceFrom` by
-    ///      the vault will not reduce an allowance. Beware that changing an
-    ///      allowance with this function brings the risk that vault may use
+    /// @dev If the `amount` is set to `type(uint256).max`, the potential
+    ///     `transferBalanceFrom` executed in `receiveBalanceApproval` of
+    ///      `spender` will not reduce an allowance. Beware that changing an
+    ///      allowance with this function brings the risk that `spender` may use
     ///      both the old and the new allowance by unfortunate transaction
     ///      ordering. Please use `increaseBalanceAllowance` and
     ///      `decreaseBalanceAllowance` to eliminate the risk.
-    function approveBalanceAndCall(address vault, uint256 amount) external {
-        _approveBalance(msg.sender, vault, amount);
-        IVault(vault).receiveBalanceApproval(msg.sender, amount);
+    function approveBalanceAndCall(address spender, uint256 amount) external {
+        _approveBalance(msg.sender, spender, amount);
+        IReceiveBalanceApproval(spender).receiveBalanceApproval(
+            msg.sender,
+            amount
+        );
     }
 
     /// @notice Atomically increases the balance allowance granted to `spender`

package/contracts/bank/IReceiveBalanceApproval.sol

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: MIT
+
+// ██████████████     ▐████▌     ██████████████
+// ██████████████     ▐████▌     ██████████████
+//               ▐████▌    ▐████▌
+//               ▐████▌    ▐████▌
+// ██████████████     ▐████▌     ██████████████
+// ██████████████     ▐████▌     ██████████████
+//               ▐████▌    ▐████▌
+//               ▐████▌    ▐████▌
+//               ▐████▌    ▐████▌
+//               ▐████▌    ▐████▌
+//               ▐████▌    ▐████▌
+//               ▐████▌    ▐████▌
+
+pragma solidity ^0.8.9;
+
+/// @title IReceiveBalanceApproval
+/// @notice `IReceiveBalanceApproval` is an interface for a smart contract
+///         consuming Bank balances approved to them in the same transaction by
+///         other contracts or externally owned accounts (EOA).
+interface IReceiveBalanceApproval {
+    /// @notice Called by the Bank in `approveBalanceAndCall` function after
+    ///         the balance `owner` approved `amount` of their balance in the
+    ///         Bank for the contract. This way, the depositor can approve
+    ///         balance and call the contract to use the approved balance in
+    ///         a single transaction.
+    /// @param owner Address of the Bank balance owner who approved their
+    ///        balance to be used by the contract.
+    /// @param amount The amount of the Bank balance approved by the owner
+    ///        to be used by the contract.
+    // @dev The implementation must ensure this function can only be called
+    ///      by the Bank. The Bank does _not_ guarantee that the `amount`
+    ///      approved by the `owner` currently exists on their balance. That is,
+    ///      the `owner` could approve more balance than they currently have.
+    ///      This works the same as `Bank.approve` function. The contract must
+    ///      ensure the actual balance is checked before performing any action
+    ///      based on it.
+    function receiveBalanceApproval(address owner, uint256 amount) external;
+}

package/contracts/vault/IVault.sol

@@ -15,28 +15,12 @@
 
 pragma solidity ^0.8.9;
 
+import "../bank/IReceiveBalanceApproval.sol";
+
 /// @title Bank Vault interface
 /// @notice `IVault` is an interface for a smart contract consuming Bank
 ///         balances of other contracts or externally owned accounts (EOA).
-interface IVault {
-    /// @notice Called by the Bank in `approveBalanceAndCall` function after
-    ///         the balance `owner` approved `amount` of their balance in the
-    ///         Bank for the vault. This way, the depositor can approve balance
-    ///         and call the vault to use the approved balance in a single
-    ///         transaction.
-    /// @param owner Address of the Bank balance owner who approved their
-    ///        balance to be used by the vault.
-    /// @param amount The amount of the Bank balance approved by the owner
-    ///        to be used by the vault.
-    // @dev The implementation must ensure this function can only be called
-    ///      by the Bank. The Bank does _not_ guarantee that the `amount`
-    ///      approved by the `owner` currently exists on their balance. That is,
-    ///      the `owner` could approve more balance than they currently have.
-    ///      This works the same as `Bank.approve` function. The vault must
-    ///      ensure the actual balance is checked before performing any action
-    ///      based on it.
-    function receiveBalanceApproval(address owner, uint256 amount) external;
-
+interface IVault is IReceiveBalanceApproval {
     /// @notice Called by the Bank in `increaseBalanceAndCall` function after
     ///         increasing the balance in the Bank for the vault. It happens in
     ///         the same transaction in which deposits were swept by the Bridge.

package/export.json

@@ -13370,7 +13370,7 @@
           "inputs": [
             {
               "internalType": "address",
-              "name": "vault",
+              "name": "spender",
               "type": "address"
             },
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keep-network/tbtc-v2",
-  "version": "0.1.1-dev.77+main.c3a36916b8eca0df33c55bba10cb1c930ff7abef",
+  "version": "0.1.1-dev.78+main.848fc0ed817dd4c96dd6e364913c03d9784c23fc",
   "license": "MIT",
   "files": [
     "artifacts/",