@keep-network/tbtc-v2 1.0.1-dev.0 → 1.0.1-dev.2

package/export/deploy/80_upgrade_bridge_v2.js

@@ -0,0 +1,169 @@
+"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 };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var func = function (hre) {
+    return __awaiter(this, void 0, void 0, function () {
+        var ethers, helpers, deployments, getNamedAccounts, get, _a, deployer, treasury, Bank, LightRelay, WalletRegistry, ReimbursementPool, txProofDifficultyFactor, Deposit, DepositSweep, Redemption, Wallets, Fraud, MovingFunds, _b, bridge, proxyDeployment, _c, _d, _e;
+        var _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    ethers = hre.ethers, helpers = hre.helpers, deployments = hre.deployments, getNamedAccounts = hre.getNamedAccounts;
+                    get = deployments.get;
+                    return [4 /*yield*/, getNamedAccounts()];
+                case 1:
+                    _a = _h.sent(), deployer = _a.deployer, treasury = _a.treasury;
+                    return [4 /*yield*/, deployments.get("Bank")];
+                case 2:
+                    Bank = _h.sent();
+                    return [4 /*yield*/, deployments.get("LightRelay")];
+                case 3:
+                    LightRelay = _h.sent();
+                    return [4 /*yield*/, deployments.get("WalletRegistry")];
+                case 4:
+                    WalletRegistry = _h.sent();
+                    return [4 /*yield*/, deployments.get("ReimbursementPool")];
+                case 5:
+                    ReimbursementPool = _h.sent();
+                    txProofDifficultyFactor = 6;
+                    return [4 /*yield*/, get("Deposit")];
+                case 6:
+                    Deposit = _h.sent();
+                    return [4 /*yield*/, get("DepositSweep")];
+                case 7:
+                    DepositSweep = _h.sent();
+                    return [4 /*yield*/, get("Redemption")];
+                case 8:
+                    Redemption = _h.sent();
+                    return [4 /*yield*/, get("Wallets")];
+                case 9:
+                    Wallets = _h.sent();
+                    return [4 /*yield*/, get("Fraud")];
+                case 10:
+                    Fraud = _h.sent();
+                    return [4 /*yield*/, get("MovingFunds")];
+                case 11:
+                    MovingFunds = _h.sent();
+                    _d = (_c = helpers.upgrades).upgradeProxy;
+                    _e = ["Bridge",
+                        "Bridge"];
+                    _f = {
+                        contractName: "Bridge",
+                        initializerArgs: [
+                            Bank.address,
+                            LightRelay.address,
+                            treasury,
+                            WalletRegistry.address,
+                            ReimbursementPool.address,
+                            txProofDifficultyFactor,
+                        ]
+                    };
+                    _g = {};
+                    return [4 /*yield*/, ethers.getSigner(deployer)];
+                case 12: return [4 /*yield*/, _d.apply(_c, _e.concat([(_f.factoryOpts = (_g.signer = _h.sent(),
+                            _g.libraries = {
+                                Deposit: Deposit.address,
+                                DepositSweep: DepositSweep.address,
+                                Redemption: Redemption.address,
+                                Wallets: Wallets.address,
+                                Fraud: Fraud.address,
+                                MovingFunds: MovingFunds.address,
+                            },
+                            _g),
+                            _f.proxyOpts = {
+                                kind: "transparent",
+                                // Allow external libraries linking. We need to ensure manually that the
+                                // external  libraries we link are upgrade safe, as the OpenZeppelin plugin
+                                // doesn't perform such a validation yet.
+                                // See: https://docs.openzeppelin.com/upgrades-plugins/1.x/faq#why-cant-i-use-external-libraries
+                                unsafeAllow: ["external-library-linking"],
+                            },
+                            _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];
+                    // 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.
+                    return [4 /*yield*/, hre.run("verify", {
+                            address: proxyDeployment.address,
+                            constructorArgsParams: proxyDeployment.args,
+                        })];
+                case 14:
+                    // 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];
+                    return [4 /*yield*/, hre.tenderly.verify({
+                            name: "Bridge",
+                            address: bridge.address,
+                        })];
+                case 16:
+                    _h.sent();
+                    _h.label = 17;
+                case 17: return [2 /*return*/];
+            }
+        });
+    });
+};
+exports.default = func;
+func.tags = ["UpgradeBridge"];
+// When running an upgrade uncomment the skip below and run the command:
+// yarn deploy --tags UpgradeBridge --network <NETWORK>
+func.skip = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, true];
+}); }); };

package/export/hardhat.config.js

@@ -104,7 +104,7 @@ var config = {
             accounts: process.env.ACCOUNTS_PRIVATE_KEYS
                 ? process.env.ACCOUNTS_PRIVATE_KEYS.split(",")
                 : undefined,
-            tags: ["etherscan", "tenderly"],
+            tags: ["tenderly"],
         },
         mainnet: {
             url: process.env.CHAIN_API_URL || "",
@@ -164,39 +164,39 @@ var config = {
         },
         governance: {
             default: 2,
-            goerli: "0xCac19049825F370dB0836cB0d8E4D024F78eb2eB",
+            goerli: 0,
             mainnet: "0x9f6e831c8f8939dc0c830c6e492e7cef4f9c2f5f", // Threshold Council
         },
         chaosnetOwner: {
             default: 3,
-            goerli: "0xCac19049825F370dB0836cB0d8E4D024F78eb2eB", // Dev team
+            goerli: 0,
             // Not used for mainnet deployment scripts of `@keepn-network/tbtc-v2`.
             // Used by `@keep-network/random-beacon` and `@keep-network/ecdsa`
             // when deploying `SortitionPool`s.
         },
         esdm: {
             default: 4,
-            goerli: "0xCac19049825F370dB0836cB0d8E4D024F78eb2eB",
+            goerli: 0,
             mainnet: "0x9f6e831c8f8939dc0c830c6e492e7cef4f9c2f5f", // Threshold Council
         },
         keepTechnicalWalletTeam: {
             default: 5,
-            goerli: "0xCac19049825F370dB0836cB0d8E4D024F78eb2eB",
+            goerli: 0,
             mainnet: "0xB3726E69Da808A689F2607939a2D9E958724FC2A",
         },
         keepCommunityMultiSig: {
             default: 6,
-            goerli: "0xCac19049825F370dB0836cB0d8E4D024F78eb2eB",
+            goerli: 0,
             mainnet: "0x19FcB32347ff4656E4E6746b4584192D185d640d",
         },
         treasury: {
             default: 7,
-            goerli: "0xCac19049825F370dB0836cB0d8E4D024F78eb2eB",
+            goerli: 0,
             mainnet: "0x87F005317692D05BAA4193AB0c961c69e175f45f", // Token Holder DAO
         },
         spvMaintainer: {
             default: 8,
-            goerli: "0xCac19049825F370dB0836cB0d8E4D024F78eb2eB", // Dev team
+            goerli: 0,
             // We are not setting SPV maintainer for mainnet in deployment scripts.
         },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keep-network/tbtc-v2",
-  "version": "1.0.1-dev.0+main.b5d7f142b79b2c877bf6c073f2fee61a7d2b9d51",
+  "version": "1.0.1-dev.2+main.2b8297e3991b73f10a9923546d1fcb66752535d8",
   "license": "GPL-3.0-only",
   "files": [
     "artifacts/",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@keep-network/bitcoin-spv-sol": "3.4.0-solc-0.8",
-    "@keep-network/ecdsa": "2.1.0-dev.5",
+    "@keep-network/ecdsa": "2.1.0-dev.6",
     "@keep-network/random-beacon": "2.1.0-dev.5",
     "@keep-network/tbtc": "1.1.2-dev.1",
     "@openzeppelin/contracts": "^4.6.0",
@@ -41,12 +41,12 @@
   },
   "devDependencies": {
     "@defi-wonderland/smock": "^2.3.4",
-    "@keep-network/hardhat-helpers": "^0.6.0-pre.17",
+    "@keep-network/hardhat-helpers": "0.6.0-pre.18",
     "@keep-network/hardhat-local-networks-config": "^0.1.0-pre.4",
     "@nomiclabs/hardhat-ethers": "^2.0.6",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",
     "@nomiclabs/hardhat-waffle": "^2.0.2",
-    "@openzeppelin/hardhat-upgrades": "^1.22.0",
+    "@openzeppelin/hardhat-upgrades": "1.22.0",
     "@tenderly/hardhat-tenderly": ">=1.0.12 <1.2.0",
     "@thesis-co/eslint-config": "github:thesis/eslint-config",
     "@typechain/ethers-v5": "^8.0.5",