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

package/contracts/bank/Bank.sol

@@ -125,11 +125,16 @@ contract Bank is Ownable {
     ///      both the old and the new allowance by unfortunate transaction
     ///      ordering. Please use `increaseBalanceAllowance` and
     ///      `decreaseBalanceAllowance` to eliminate the risk.
-    function approveBalanceAndCall(address spender, uint256 amount) external {
+    function approveBalanceAndCall(
+        address spender,
+        uint256 amount,
+        bytes memory extraData
+    ) external {
         _approveBalance(msg.sender, spender, amount);
         IReceiveBalanceApproval(spender).receiveBalanceApproval(
             msg.sender,
-            amount
+            amount,
+            extraData
         );
     }
 

package/contracts/bank/IReceiveBalanceApproval.sol

@@ -29,6 +29,7 @@ interface IReceiveBalanceApproval {
     ///        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.
+    /// @param extraData The `extraData` passed to `Bank.approveBalanceAndCall`.
     // @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,
@@ -36,5 +37,9 @@ interface IReceiveBalanceApproval {
     ///      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;
+    function receiveBalanceApproval(
+        address owner,
+        uint256 amount,
+        bytes memory extraData
+    ) external;
 }

package/contracts/vault/DonationVault.sol

@@ -80,11 +80,11 @@ contract DonationVault is IVault {
     ///      - Can only be called by the Bank via `approveBalanceAndCall`,
     ///      - The `owner` balance in the Bank must be greater than or equal
     ///        to the `amount`.
-    function receiveBalanceApproval(address owner, uint256 amount)
-        external
-        override
-        onlyBank
-    {
+    function receiveBalanceApproval(
+        address owner,
+        uint256 amount,
+        bytes memory
+    ) external override onlyBank {
         require(
             bank.balanceOf(owner) >= amount,
             "Amount exceeds balance in the bank"

package/contracts/vault/TBTCVault.sol

@@ -107,11 +107,11 @@ contract TBTCVault is IVault, Governable {
     /// @dev Can only be called by the Bank via `approveBalanceAndCall`.
     /// @param owner The owner who approved their Bank balance.
     /// @param amount Amount of TBTC to mint.
-    function receiveBalanceApproval(address owner, uint256 amount)
-        external
-        override
-        onlyBank
-    {
+    function receiveBalanceApproval(
+        address owner,
+        uint256 amount,
+        bytes memory
+    ) external override onlyBank {
         require(
             bank.balanceOf(owner) >= amount,
             "Amount exceeds balance in the bank"

package/deploy/06_deploy_tbtc_vault.ts

@@ -0,0 +1,30 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { DeployFunction } from "hardhat-deploy/types"
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployments, getNamedAccounts } = hre
+  const { deploy } = deployments
+  const { deployer } = await getNamedAccounts()
+
+  const Bank = await deployments.get("Bank")
+  const TBTC = await deployments.get("TBTC")
+
+  const TBTCVault = await deploy("TBTCVault", {
+    contract: "TBTCVault",
+    from: deployer,
+    args: [Bank.address, TBTC.address],
+    log: true,
+  })
+
+  if (hre.network.tags.tenderly) {
+    await hre.tenderly.verify({
+      name: "TBTCVault",
+      address: TBTCVault.address,
+    })
+  }
+}
+
+export default func
+
+func.tags = ["TBTCVault"]
+func.dependencies = ["Bank", "TBTC"]

package/export.json

@@ -13377,6 +13377,11 @@
               "internalType": "uint256",
               "name": "amount",
               "type": "uint256"
+            },
+            {
+              "internalType": "bytes",
+              "name": "extraData",
+              "type": "bytes"
             }
           ],
           "name": "approveBalanceAndCall",
@@ -16779,6 +16784,282 @@
           ]
         }
       ]
+    },
+    "TBTCVault": {
+      "address": "0xDadd1125B8Df98A66Abd5EB302C0d9Ca5A061dC2",
+      "abi": [
+        {
+          "inputs": [
+            {
+              "internalType": "contract Bank",
+              "name": "_bank",
+              "type": "address"
+            },
+            {
+              "internalType": "contract TBTC",
+              "name": "_tbtcToken",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "nonpayable",
+          "type": "constructor"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "oldGovernance",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "newGovernance",
+              "type": "address"
+            }
+          ],
+          "name": "GovernanceTransferred",
+          "type": "event"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "to",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint256",
+              "name": "amount",
+              "type": "uint256"
+            }
+          ],
+          "name": "Minted",
+          "type": "event"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "from",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint256",
+              "name": "amount",
+              "type": "uint256"
+            }
+          ],
+          "name": "Redeemed",
+          "type": "event"
+        },
+        {
+          "inputs": [],
+          "name": "bank",
+          "outputs": [
+            {
+              "internalType": "contract Bank",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "governance",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint256",
+              "name": "amount",
+              "type": "uint256"
+            }
+          ],
+          "name": "mint",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "from",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amount",
+              "type": "uint256"
+            },
+            {
+              "internalType": "address",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "",
+              "type": "bytes"
+            }
+          ],
+          "name": "receiveApproval",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "owner",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amount",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes",
+              "name": "",
+              "type": "bytes"
+            }
+          ],
+          "name": "receiveBalanceApproval",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address[]",
+              "name": "depositors",
+              "type": "address[]"
+            },
+            {
+              "internalType": "uint256[]",
+              "name": "depositedAmounts",
+              "type": "uint256[]"
+            }
+          ],
+          "name": "receiveBalanceIncrease",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "contract IERC20",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "recipient",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amount",
+              "type": "uint256"
+            }
+          ],
+          "name": "recoverERC20",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "contract IERC721",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "recipient",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "tokenId",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "name": "recoverERC721",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint256",
+              "name": "amount",
+              "type": "uint256"
+            }
+          ],
+          "name": "redeem",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "tbtcToken",
+          "outputs": [
+            {
+              "internalType": "contract TBTC",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "newGovernance",
+              "type": "address"
+            }
+          ],
+          "name": "transferGovernance",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        }
+      ]
     }
   }
 }

package/package.json

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