@keep-network/tbtc-v2 1.0.3-dev.1 → 1.0.3-dev.2

package/deploy/24_transfer_tbtc_ownership.ts

@@ -5,20 +5,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { getNamedAccounts, deployments, helpers } = hre
   const { deployer } = await getNamedAccounts()
 
-  if (hre.network.name === "hardhat") {
-    // Unit tests cover the path of the VendingMachine upgrade to TBTCVault.
-    // We transfer the ownership of TBTC token to the VendingMachine for Hardhat
-    // network used for unit tests to enable this path.
-    const VendingMachine = await deployments.get("VendingMachine")
-    await helpers.ownable.transferOwnership(
-      "TBTC",
-      VendingMachine.address,
-      deployer
-    )
-  } else {
-    // For all other environments (e.g. local dev, Goerli), we want the
-    // TBTCVault to be the owner of TBTC token. This simulates the final
-    // 1.0 version mainnet state.
+  // In unit tests we cover VendingMachine, VendingMachineV2, and TBTCVault
+  // contracts. All those tests require minting TBTC. To make the test setup
+  // easier, we leave the responsibility of transferring the TBTC ownership
+  // to the test. In system tests and on Goerli, TBTCVault is the owner of TBTC
+  // token, just like on v1.0 mainnet, after transferring the ownership from the
+  // VendingMachine.
+  if (hre.network.name !== "hardhat") {
     const TBTCVault = await deployments.get("TBTCVault")
     await helpers.ownable.transferOwnership("TBTC", TBTCVault.address, deployer)
   }

package/deploy/30_deploy_vending_machine_v2.ts

@@ -0,0 +1,34 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { DeployFunction } from "hardhat-deploy/types"
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployments, helpers, getNamedAccounts } = hre
+  const { deploy } = deployments
+  const { deployer } = await getNamedAccounts()
+
+  const TBTCToken = await deployments.get("TBTCToken")
+  const TBTC = await deployments.get("TBTC") // tBTC v2
+
+  const vendingMachineV2 = await deploy("VendingMachineV2", {
+    from: deployer,
+    args: [TBTCToken.address, TBTC.address],
+    log: true,
+    waitConfirmations: 1,
+  })
+
+  if (hre.network.tags.etherscan) {
+    await helpers.etherscan.verify(vendingMachineV2)
+  }
+
+  if (hre.network.tags.tenderly) {
+    await hre.tenderly.verify({
+      name: "VendingMachineV2",
+      address: vendingMachineV2.address,
+    })
+  }
+}
+
+export default func
+
+func.tags = ["VendingMachineV2"]
+func.dependencies = ["TBTCToken", "TBTC"]

package/deploy/31_deploy_vending_machine_v3.ts

@@ -0,0 +1,34 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { DeployFunction } from "hardhat-deploy/types"
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployments, helpers, getNamedAccounts } = hre
+  const { deploy } = deployments
+  const { deployer } = await getNamedAccounts()
+
+  const TBTCToken = await deployments.get("TBTCToken")
+  const TBTC = await deployments.get("TBTC") // tBTC v2
+
+  const vendingMachineV3 = await deploy("VendingMachineV3", {
+    from: deployer,
+    args: [TBTCToken.address, TBTC.address],
+    log: true,
+    waitConfirmations: 1,
+  })
+
+  if (hre.network.tags.etherscan) {
+    await helpers.etherscan.verify(vendingMachineV3)
+  }
+
+  if (hre.network.tags.tenderly) {
+    await hre.tenderly.verify({
+      name: "VendingMachineV",
+      address: vendingMachineV3.address,
+    })
+  }
+}
+
+export default func
+
+func.tags = ["VendingMachineV3"]
+func.dependencies = ["TBTCToken", "TBTC"]

package/deploy/32_transfer_vending_machine_v2_ownership.ts

@@ -0,0 +1,19 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { DeployFunction } from "hardhat-deploy/types"
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { getNamedAccounts, helpers } = hre
+  const { deployer, v1Redeemer } = await getNamedAccounts()
+
+  await helpers.ownable.transferOwnership(
+    "VendingMachineV2",
+    v1Redeemer,
+    deployer
+  )
+}
+
+export default func
+
+func.tags = ["TransferVendingMachineV2Ownership"]
+func.dependencies = ["VendingMachineV2"]
+func.runAtTheEnd = true

package/deploy/33_transfer_vending_machine_v3_ownership.ts

@@ -0,0 +1,19 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { DeployFunction } from "hardhat-deploy/types"
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { getNamedAccounts, helpers } = hre
+  const { deployer, governance } = await getNamedAccounts()
+
+  await helpers.ownable.transferOwnership(
+    "VendingMachineV3",
+    governance,
+    deployer
+  )
+}
+
+export default func
+
+func.tags = ["TransferVendingMachineV3Ownership"]
+func.dependencies = ["VendingMachineV3"]
+func.runAtTheEnd = true

package/export/artifacts/@keep-network/bitcoin-spv-sol/contracts/BTCUtils.sol/BTCUtils.json

@@ -109,32 +109,32 @@
         {
           "ast": {
             "nodeType": "YulBlock",
-            "src": "0:201:118",
+            "src": "0:201:120",
             "statements": [
               {
                 "nodeType": "YulBlock",
-                "src": "6:3:118",
+                "src": "6:3:120",
                 "statements": []
               },
               {
                 "body": {
                   "nodeType": "YulBlock",
-                  "src": "123:76:118",
+                  "src": "123:76:120",
                   "statements": [
                     {
                       "nodeType": "YulAssignment",
-                      "src": "133:26:118",
+                      "src": "133:26:120",
                       "value": {
                         "arguments": [
                           {
                             "name": "headStart",
                             "nodeType": "YulIdentifier",
-                            "src": "145:9:118"
+                            "src": "145:9:120"
                           },
                           {
                             "kind": "number",
                             "nodeType": "YulLiteral",
-                            "src": "156:2:118",
+                            "src": "156:2:120",
                             "type": "",
                             "value": "32"
                           }
@@ -142,16 +142,16 @@
                         "functionName": {
                           "name": "add",
                           "nodeType": "YulIdentifier",
-                          "src": "141:3:118"
+                          "src": "141:3:120"
                         },
                         "nodeType": "YulFunctionCall",
-                        "src": "141:18:118"
+                        "src": "141:18:120"
                       },
                       "variableNames": [
                         {
                           "name": "tail",
                           "nodeType": "YulIdentifier",
-                          "src": "133:4:118"
+                          "src": "133:4:120"
                         }
                       ]
                     },
@@ -161,24 +161,24 @@
                           {
                             "name": "headStart",
                             "nodeType": "YulIdentifier",
-                            "src": "175:9:118"
+                            "src": "175:9:120"
                           },
                           {
                             "name": "value0",
                             "nodeType": "YulIdentifier",
-                            "src": "186:6:118"
+                            "src": "186:6:120"
                           }
                         ],
                         "functionName": {
                           "name": "mstore",
                           "nodeType": "YulIdentifier",
-                          "src": "168:6:118"
+                          "src": "168:6:120"
                         },
                         "nodeType": "YulFunctionCall",
-                        "src": "168:25:118"
+                        "src": "168:25:120"
                       },
                       "nodeType": "YulExpressionStatement",
-                      "src": "168:25:118"
+                      "src": "168:25:120"
                     }
                   ]
                 },
@@ -188,13 +188,13 @@
                   {
                     "name": "headStart",
                     "nodeType": "YulTypedName",
-                    "src": "92:9:118",
+                    "src": "92:9:120",
                     "type": ""
                   },
                   {
                     "name": "value0",
                     "nodeType": "YulTypedName",
-                    "src": "103:6:118",
+                    "src": "103:6:120",
                     "type": ""
                   }
                 ],
@@ -202,16 +202,16 @@
                   {
                     "name": "tail",
                     "nodeType": "YulTypedName",
-                    "src": "114:4:118",
+                    "src": "114:4:120",
                     "type": ""
                   }
                 ],
-                "src": "14:185:118"
+                "src": "14:185:120"
               }
             ]
           },
           "contents": "{\n    { }\n    function abi_encode_tuple_t_uint256__to_t_uint256__fromStack_library_reversed(headStart, value0) -> tail\n    {\n        tail := add(headStart, 32)\n        mstore(headStart, value0)\n    }\n}",
-          "id": 118,
+          "id": 120,
           "language": "Yul",
           "name": "#utility.yul"
         }
@@ -219,7 +219,7 @@
       "immutableReferences": {},
       "linkReferences": {},
       "opcodes": "PUSH20 0x0 ADDRESS EQ PUSH1 0x80 PUSH1 0x40 MSTORE PUSH1 0x4 CALLDATASIZE LT PUSH1 0x51 JUMPI PUSH1 0x0 CALLDATALOAD PUSH1 0xE0 SHR DUP1 PUSH4 0x56E04EC EQ PUSH1 0x56 JUMPI DUP1 PUSH4 0x8CC71569 EQ PUSH1 0x71 JUMPI DUP1 PUSH4 0x8DB69E60 EQ PUSH1 0x79 JUMPI DUP1 PUSH4 0xD4258CA7 EQ PUSH1 0x81 JUMPI JUMPDEST PUSH1 0x0 DUP1 REVERT JUMPDEST PUSH1 0x5F PUSH3 0x127500 DUP2 JUMP JUMPDEST PUSH1 0x40 MLOAD SWAP1 DUP2 MSTORE PUSH1 0x20 ADD PUSH1 0x40 MLOAD DUP1 SWAP2 SUB SWAP1 RETURN JUMPDEST PUSH1 0x5F PUSH2 0x7E0 DUP2 JUMP JUMPDEST PUSH1 0x5F PUSH1 0x0 NOT DUP2 JUMP JUMPDEST PUSH1 0x5F PUSH28 0xFFFF0000000000000000000000000000000000000000000000000000 DUP2 JUMP INVALID LOG2 PUSH5 0x6970667358 0x22 SLT KECCAK256 0x21 0xD8 0x5F GT 0xF6 0x4E 0xD4 0x4F 0xFB 0xA5 SWAP12 0xFC PUSH12 0x4A327F00D51E8E91CA784A04 DUP14 CALLDATACOPY 0x29 0xDB ADD 0xB3 PUSH32 0x64736F6C63430008110033000000000000000000000000000000000000000000 ",
-      "sourceMap": "175:38691:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;443:62;;485:20;443:62;;;;;168:25:118;;;156:2;141:18;443:62:0;;;;;;;534:53;;583:4;534:53;;616:104;;-1:-1:-1;;616:104:0;;339:97;;378:58;339:97;"
+      "sourceMap": "175:38691:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;443:62;;485:20;443:62;;;;;168:25:120;;;156:2;141:18;443:62:0;;;;;;;534:53;;583:4;534:53;;616:104;;-1:-1:-1;;616:104:0;;339:97;;378:58;339:97;"
     },
     "gasEstimates": {
       "creation": {