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

package/export/deploy/06_deploy_bridge.js

@@ -153,7 +153,29 @@ var func = function (hre) {
                             _f)]))];
                 case 13:
                     _b = __read.apply(void 0, [_h.sent(), 2]), bridge = _b[0], proxyDeployment = _b[1];
-                    if (!hre.network.tags.etherscan) return [3 /*break*/, 15];
+                    if (!hre.network.tags.etherscan) return [3 /*break*/, 21];
+                    return [4 /*yield*/, helpers.etherscan.verify(Deposit)];
+                case 14:
+                    _h.sent();
+                    return [4 /*yield*/, helpers.etherscan.verify(DepositSweep)];
+                case 15:
+                    _h.sent();
+                    return [4 /*yield*/, helpers.etherscan.verify(Redemption)];
+                case 16:
+                    _h.sent();
+                    return [4 /*yield*/, helpers.etherscan.verify(Wallets)];
+                case 17:
+                    _h.sent();
+                    return [4 /*yield*/, helpers.etherscan.verify(Fraud)];
+                case 18:
+                    _h.sent();
+                    return [4 /*yield*/, helpers.etherscan.verify(MovingFunds)
+                        // We use `verify` instead of `verify:verify` as the `verify` task is defined
+                        // in "@openzeppelin/hardhat-upgrades" to perform Etherscan verification
+                        // of Proxy and Implementation contracts.
+                    ];
+                case 19:
+                    _h.sent();
                     // We use `verify` instead of `verify:verify` as the `verify` task is defined
                     // in "@openzeppelin/hardhat-upgrades" to perform Etherscan verification
                     // of Proxy and Implementation contracts.
@@ -161,22 +183,22 @@ var func = function (hre) {
                             address: proxyDeployment.address,
                             constructorArgsParams: proxyDeployment.args,
                         })];
-                case 14:
+                case 20:
                     // We use `verify` instead of `verify:verify` as the `verify` task is defined
                     // in "@openzeppelin/hardhat-upgrades" to perform Etherscan verification
                     // of Proxy and Implementation contracts.
                     _h.sent();
-                    _h.label = 15;
-                case 15:
-                    if (!hre.network.tags.tenderly) return [3 /*break*/, 17];
+                    _h.label = 21;
+                case 21:
+                    if (!hre.network.tags.tenderly) return [3 /*break*/, 23];
                     return [4 /*yield*/, hre.tenderly.verify({
                             name: "Bridge",
                             address: bridge.address,
                         })];
-                case 16:
+                case 22:
                     _h.sent();
-                    _h.label = 17;
-                case 17: return [2 /*return*/];
+                    _h.label = 23;
+                case 23: return [2 /*return*/];
             }
         });
     });

package/export/deploy/09_deploy_bridge_governance.js

@@ -72,24 +72,28 @@ var func = function (hre) {
                         })];
                 case 4:
                     bridgeGovernance = _a.sent();
-                    if (!hre.network.tags.etherscan) return [3 /*break*/, 6];
-                    return [4 /*yield*/, helpers.etherscan.verify(bridgeGovernance)];
+                    if (!hre.network.tags.etherscan) return [3 /*break*/, 7];
+                    return [4 /*yield*/, helpers.etherscan.verify(bridgeGovernanceParameters)];
                 case 5:
                     _a.sent();
-                    _a.label = 6;
+                    return [4 /*yield*/, helpers.etherscan.verify(bridgeGovernance)];
                 case 6:
-                    if (!hre.network.tags.tenderly) return [3 /*break*/, 8];
+                    _a.sent();
+                    _a.label = 7;
+                case 7:
+                    if (!hre.network.tags.tenderly) return [3 /*break*/, 9];
                     return [4 /*yield*/, hre.tenderly.verify({
                             name: "BridgeGovernance",
                             address: bridgeGovernance.address,
                         })];
-                case 7:
+                case 8:
                     _a.sent();
-                    _a.label = 8;
-                case 8: return [2 /*return*/];
+                    _a.label = 9;
+                case 9: return [2 /*return*/];
             }
         });
     });
 };
 exports.default = func;
 func.tags = ["BridgeGovernance"];
+func.dependencies = ["Bridge"];

package/export/deploy/24_transfer_tbtc_ownership.js

@@ -38,30 +38,30 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var func = function (hre) {
     return __awaiter(this, void 0, void 0, function () {
-        var getNamedAccounts, deployments, helpers, deployer, VendingMachine, TBTCVault;
+        var getNamedAccounts, deployments, helpers, deployer, TBTCVault;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     getNamedAccounts = hre.getNamedAccounts, deployments = hre.deployments, helpers = hre.helpers;
-                    return [4 /*yield*/, getNamedAccounts()];
+                    return [4 /*yield*/, getNamedAccounts()
+                        // 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.
+                    ];
                 case 1:
                     deployer = (_a.sent()).deployer;
-                    if (!(hre.network.name === "hardhat")) return [3 /*break*/, 4];
-                    return [4 /*yield*/, deployments.get("VendingMachine")];
+                    if (!(hre.network.name !== "hardhat")) return [3 /*break*/, 4];
+                    return [4 /*yield*/, deployments.get("TBTCVault")];
                 case 2:
-                    VendingMachine = _a.sent();
-                    return [4 /*yield*/, helpers.ownable.transferOwnership("TBTC", VendingMachine.address, deployer)];
-                case 3:
-                    _a.sent();
-                    return [3 /*break*/, 7];
-                case 4: return [4 /*yield*/, deployments.get("TBTCVault")];
-                case 5:
                     TBTCVault = _a.sent();
                     return [4 /*yield*/, helpers.ownable.transferOwnership("TBTC", TBTCVault.address, deployer)];
-                case 6:
+                case 3:
                     _a.sent();
-                    _a.label = 7;
-                case 7: return [2 /*return*/];
+                    _a.label = 4;
+                case 4: return [2 /*return*/];
             }
         });
     });

package/export/deploy/30_deploy_vending_machine_v2.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var func = function (hre) {
+    return __awaiter(this, void 0, void 0, function () {
+        var deployments, helpers, getNamedAccounts, deploy, deployer, TBTCToken, TBTC, vendingMachineV2;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    deployments = hre.deployments, helpers = hre.helpers, getNamedAccounts = hre.getNamedAccounts;
+                    deploy = deployments.deploy;
+                    return [4 /*yield*/, getNamedAccounts()];
+                case 1:
+                    deployer = (_a.sent()).deployer;
+                    return [4 /*yield*/, deployments.get("TBTCToken")];
+                case 2:
+                    TBTCToken = _a.sent();
+                    return [4 /*yield*/, deployments.get("TBTC")]; // tBTC v2
+                case 3:
+                    TBTC = _a.sent() // tBTC v2
+                    ;
+                    return [4 /*yield*/, deploy("VendingMachineV2", {
+                            from: deployer,
+                            args: [TBTCToken.address, TBTC.address],
+                            log: true,
+                            waitConfirmations: 1,
+                        })];
+                case 4:
+                    vendingMachineV2 = _a.sent();
+                    if (!hre.network.tags.etherscan) return [3 /*break*/, 6];
+                    return [4 /*yield*/, helpers.etherscan.verify(vendingMachineV2)];
+                case 5:
+                    _a.sent();
+                    _a.label = 6;
+                case 6:
+                    if (!hre.network.tags.tenderly) return [3 /*break*/, 8];
+                    return [4 /*yield*/, hre.tenderly.verify({
+                            name: "VendingMachineV2",
+                            address: vendingMachineV2.address,
+                        })];
+                case 7:
+                    _a.sent();
+                    _a.label = 8;
+                case 8: return [2 /*return*/];
+            }
+        });
+    });
+};
+exports.default = func;
+func.tags = ["VendingMachineV2"];
+func.dependencies = ["TBTCToken", "TBTC"];

package/export/deploy/31_deploy_vending_machine_v3.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var func = function (hre) {
+    return __awaiter(this, void 0, void 0, function () {
+        var deployments, helpers, getNamedAccounts, deploy, deployer, TBTCToken, TBTC, vendingMachineV3;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    deployments = hre.deployments, helpers = hre.helpers, getNamedAccounts = hre.getNamedAccounts;
+                    deploy = deployments.deploy;
+                    return [4 /*yield*/, getNamedAccounts()];
+                case 1:
+                    deployer = (_a.sent()).deployer;
+                    return [4 /*yield*/, deployments.get("TBTCToken")];
+                case 2:
+                    TBTCToken = _a.sent();
+                    return [4 /*yield*/, deployments.get("TBTC")]; // tBTC v2
+                case 3:
+                    TBTC = _a.sent() // tBTC v2
+                    ;
+                    return [4 /*yield*/, deploy("VendingMachineV3", {
+                            from: deployer,
+                            args: [TBTCToken.address, TBTC.address],
+                            log: true,
+                            waitConfirmations: 1,
+                        })];
+                case 4:
+                    vendingMachineV3 = _a.sent();
+                    if (!hre.network.tags.etherscan) return [3 /*break*/, 6];
+                    return [4 /*yield*/, helpers.etherscan.verify(vendingMachineV3)];
+                case 5:
+                    _a.sent();
+                    _a.label = 6;
+                case 6:
+                    if (!hre.network.tags.tenderly) return [3 /*break*/, 8];
+                    return [4 /*yield*/, hre.tenderly.verify({
+                            name: "VendingMachineV",
+                            address: vendingMachineV3.address,
+                        })];
+                case 7:
+                    _a.sent();
+                    _a.label = 8;
+                case 8: return [2 /*return*/];
+            }
+        });
+    });
+};
+exports.default = func;
+func.tags = ["VendingMachineV3"];
+func.dependencies = ["TBTCToken", "TBTC"];

package/export/deploy/32_transfer_vending_machine_v2_ownership.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var func = function (hre) {
+    return __awaiter(this, void 0, void 0, function () {
+        var getNamedAccounts, helpers, _a, deployer, v1Redeemer;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    getNamedAccounts = hre.getNamedAccounts, helpers = hre.helpers;
+                    return [4 /*yield*/, getNamedAccounts()];
+                case 1:
+                    _a = _b.sent(), deployer = _a.deployer, v1Redeemer = _a.v1Redeemer;
+                    return [4 /*yield*/, helpers.ownable.transferOwnership("VendingMachineV2", v1Redeemer, deployer)];
+                case 2:
+                    _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+};
+exports.default = func;
+func.tags = ["TransferVendingMachineV2Ownership"];
+func.dependencies = ["VendingMachineV2"];
+func.runAtTheEnd = true;

package/export/deploy/33_transfer_vending_machine_v3_ownership.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var func = function (hre) {
+    return __awaiter(this, void 0, void 0, function () {
+        var getNamedAccounts, helpers, _a, deployer, governance;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    getNamedAccounts = hre.getNamedAccounts, helpers = hre.helpers;
+                    return [4 /*yield*/, getNamedAccounts()];
+                case 1:
+                    _a = _b.sent(), deployer = _a.deployer, governance = _a.governance;
+                    return [4 /*yield*/, helpers.ownable.transferOwnership("VendingMachineV3", governance, deployer)];
+                case 2:
+                    _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+};
+exports.default = func;
+func.tags = ["TransferVendingMachineV3Ownership"];
+func.dependencies = ["VendingMachineV3"];
+func.runAtTheEnd = true;

package/export/hardhat.config.js

@@ -161,6 +161,7 @@ var config = {
         deployer: {
             default: 1,
             goerli: 0,
+            mainnet: 0, // "0x123694886DBf5Ac94DDA07135349534536D14cAf"
         },
         governance: {
             default: 2,
@@ -199,6 +200,11 @@ var config = {
             goerli: 0,
             // We are not setting SPV maintainer for mainnet in deployment scripts.
         },
+        v1Redeemer: {
+            default: 9,
+            goerli: 0,
+            mainnet: "0x8Bac178fA95Cb56D11A94d4f1b2B1F5Fc48A30eA",
+        },
     },
     dependencyCompiler: {
         paths: [

package/export/typechain/VendingMachineV2.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/export/typechain/VendingMachineV3.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });