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

package/artifacts/TokenholderGovernor.json

@@ -1269,7 +1269,7 @@
     "transactionIndex": 0,
     "gasUsed": "3456607",
     "logsBloom": "0x00002004000000000102000000001000000040000000000000000000000008000000000020000000000000000000000000000000000000000000000400400000000000000000000000000000000000000000000000000000000010000000000010000800020000000002000000000800000000000000000000000000000000001000002000000000200002000040000000000000000008000000000000000202000000001040000000000000000000000000000004000000001000000000000000000000000000000000000040000000000000001000000100080000800020000000000000000000000000000000000001000000000000000000000000002000",
-    "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2",
+    "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d",
     "transactionHash": "0xcb02a40eb220a8d0cb30392196f3c3bf58a283a200727b0b3c79983870bddab5",
     "logs": [
       {
@@ -1282,7 +1282,7 @@
         ],
         "data": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000096",
         "logIndex": 0,
-        "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2"
+        "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d"
       },
       {
         "transactionIndex": 0,
@@ -1294,7 +1294,7 @@
         ],
         "data": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000019",
         "logIndex": 1,
-        "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2"
+        "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d"
       },
       {
         "transactionIndex": 0,
@@ -1306,7 +1306,7 @@
         ],
         "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000033ec",
         "logIndex": 2,
-        "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2"
+        "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d"
       },
       {
         "transactionIndex": 0,
@@ -1318,7 +1318,7 @@
         ],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001039d",
         "logIndex": 3,
-        "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2"
+        "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d"
       },
       {
         "transactionIndex": 0,
@@ -1330,7 +1330,7 @@
         ],
         "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000033ec",
         "logIndex": 4,
-        "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2"
+        "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d"
       },
       {
         "transactionIndex": 0,
@@ -1342,7 +1342,7 @@
         ],
         "data": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c7c905b505f0cf40ab6600d05e677f717916f6b",
         "logIndex": 5,
-        "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2"
+        "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d"
       },
       {
         "transactionIndex": 0,
@@ -1357,7 +1357,7 @@
         ],
         "data": "0x",
         "logIndex": 6,
-        "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2"
+        "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d"
       },
       {
         "transactionIndex": 0,
@@ -1372,7 +1372,7 @@
         ],
         "data": "0x",
         "logIndex": 7,
-        "blockHash": "0x66d8422510f04dbe3061d86101951b9996ce2ec6ae1353a476660ed791ffb8d2"
+        "blockHash": "0xde8a79af6da6c064e325490b6342be0f9bf1edf86afe472d782ddbbf8c7af30d"
       }
     ],
     "blockNumber": 19,

package/artifacts/TokenholderTimelock.json

@@ -750,7 +750,7 @@
     "transactionIndex": 0,
     "gasUsed": "1617384",
     "logsBloom": "0x000000040000000008020000000000000a0000000000000080000000000000000000000000000000000000000001000000000000000000000200000010600000000000000000000000000000000000000010000000000000000000000001000000000800020000400000000000000800000000000000000000020000000000000000000000000000000000000000000000000000000008080000000000000000000000000020000000000000000000000000000004000000001000000000000000000000000000004000000000000000000200000000000100000000000020000000000000001000000000000000000001400000000000000000000000000000",
-    "blockHash": "0xf4347b44bf8ec8b4232b01f96a2b88fdf3740076b54348c74074d3412e6dd890",
+    "blockHash": "0x4110e4520a0d199ef6fded57ad99f7a1285e4ccfe83ce843839706dea1fd3ef9",
     "transactionHash": "0xebcda2c70b5e49631d4a83bd96710fd1541e6dcd4236db8bb70b69e3fee9addc",
     "logs": [
       {
@@ -766,7 +766,7 @@
         ],
         "data": "0x",
         "logIndex": 0,
-        "blockHash": "0xf4347b44bf8ec8b4232b01f96a2b88fdf3740076b54348c74074d3412e6dd890"
+        "blockHash": "0x4110e4520a0d199ef6fded57ad99f7a1285e4ccfe83ce843839706dea1fd3ef9"
       },
       {
         "transactionIndex": 0,
@@ -781,7 +781,7 @@
         ],
         "data": "0x",
         "logIndex": 1,
-        "blockHash": "0xf4347b44bf8ec8b4232b01f96a2b88fdf3740076b54348c74074d3412e6dd890"
+        "blockHash": "0x4110e4520a0d199ef6fded57ad99f7a1285e4ccfe83ce843839706dea1fd3ef9"
       },
       {
         "transactionIndex": 0,
@@ -796,7 +796,7 @@
         ],
         "data": "0x",
         "logIndex": 2,
-        "blockHash": "0xf4347b44bf8ec8b4232b01f96a2b88fdf3740076b54348c74074d3412e6dd890"
+        "blockHash": "0x4110e4520a0d199ef6fded57ad99f7a1285e4ccfe83ce843839706dea1fd3ef9"
       },
       {
         "transactionIndex": 0,
@@ -811,7 +811,7 @@
         ],
         "data": "0x",
         "logIndex": 3,
-        "blockHash": "0xf4347b44bf8ec8b4232b01f96a2b88fdf3740076b54348c74074d3412e6dd890"
+        "blockHash": "0x4110e4520a0d199ef6fded57ad99f7a1285e4ccfe83ce843839706dea1fd3ef9"
       },
       {
         "transactionIndex": 0,
@@ -826,7 +826,7 @@
         ],
         "data": "0x",
         "logIndex": 4,
-        "blockHash": "0xf4347b44bf8ec8b4232b01f96a2b88fdf3740076b54348c74074d3412e6dd890"
+        "blockHash": "0x4110e4520a0d199ef6fded57ad99f7a1285e4ccfe83ce843839706dea1fd3ef9"
       },
       {
         "transactionIndex": 0,
@@ -841,7 +841,7 @@
         ],
         "data": "0x",
         "logIndex": 5,
-        "blockHash": "0xf4347b44bf8ec8b4232b01f96a2b88fdf3740076b54348c74074d3412e6dd890"
+        "blockHash": "0x4110e4520a0d199ef6fded57ad99f7a1285e4ccfe83ce843839706dea1fd3ef9"
       },
       {
         "transactionIndex": 0,
@@ -853,7 +853,7 @@
         ],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a300",
         "logIndex": 6,
-        "blockHash": "0xf4347b44bf8ec8b4232b01f96a2b88fdf3740076b54348c74074d3412e6dd890"
+        "blockHash": "0x4110e4520a0d199ef6fded57ad99f7a1285e4ccfe83ce843839706dea1fd3ef9"
       }
     ],
     "blockNumber": 18,

package/artifacts/VendingMachine.json

@@ -517,7 +517,7 @@
     "transactionIndex": 0,
     "gasUsed": "1456351",
     "logsBloom": "0x00000000000000000002000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000800020000000000000000000800000000000000000000000000000000400080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002010000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000001000000000000000000000000000000",
-    "blockHash": "0x6d0e2dee6e6c72b49fc855df968f4187ba5c99f010fbb3871958145d06883fe4",
+    "blockHash": "0xa7cfca36711c145f045328b6750f1a6b812396d71642fd4960c6d5210d15fe82",
     "transactionHash": "0x29bb982ec127fc62fca6d1244b0ba6e91ee96b738babbc439bf41fcf8810330d",
     "logs": [
       {
@@ -532,7 +532,7 @@
         ],
         "data": "0x",
         "logIndex": 0,
-        "blockHash": "0x6d0e2dee6e6c72b49fc855df968f4187ba5c99f010fbb3871958145d06883fe4"
+        "blockHash": "0xa7cfca36711c145f045328b6750f1a6b812396d71642fd4960c6d5210d15fe82"
       }
     ],
     "blockNumber": 57,

package/artifacts/VendingMachineKeep.json

@@ -272,7 +272,7 @@
     "transactionIndex": 0,
     "gasUsed": "804148",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "blockHash": "0x9c7dbf986be40e221de1ca207cbae87a4ba3df0d5dbabb462fa4104b1dfc3508",
+    "blockHash": "0x9189dfc12f7e9a19bdd7ccb3d0c31cf443b9919a1c47bbece174d279f87a7957",
     "transactionHash": "0x1fa2edd54ffe85f0c76ff2a5c2242c208fe52f4144b5a916cf7be8efa5dc44d4",
     "logs": [],
     "blockNumber": 10,

package/artifacts/VendingMachineNuCypher.json

@@ -272,7 +272,7 @@
     "transactionIndex": 0,
     "gasUsed": "804160",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "blockHash": "0x38479027c174c9c7fe8addb5f9cff59349c3bea1a4cba49a90f846ef77c74b84",
+    "blockHash": "0xf814a9001a374a339576247a594c78d963fdc18c06e7bcf54b72dff2e1446dcb",
     "transactionHash": "0xdc9a0b9fe0ff91fb7ccf6bc9f4d48430e56764f684f2d527e5ba8e327ade9260",
     "logs": [],
     "blockNumber": 11,

package/artifacts/WalletRegistry.json

@@ -1891,7 +1891,7 @@
     "transactionIndex": 0,
     "gasUsed": "1047233",
     "logsBloom": "0x00000000000000000000000000000000400000004040000000000000000000200040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000800000000000000000000000000000000000000000000000000000000800000000008000008000000000000000000000000000000000000000000000000000080000000000000800000000000000000000000000000000400000000000000000000000000000000000000000020000000020000000000040000000000000400000000000000000000000000000000000000000800000000000000000000000000000000000000000000",
-    "blockHash": "0x0aea126ec1a978ef33fda634842729ce65b0987b0df1836428bb67567daf8d3d",
+    "blockHash": "0x6353bfd4f51ed8a6c26b6784e80910015dd1dbb66a34d3c072231e12b308df01",
     "transactionHash": "0xd3807c6b6cb8d9004608d9d265db4ac1e40471b222356e454cb20ddc93230319",
     "logs": [
       {
@@ -1905,7 +1905,7 @@
         ],
         "data": "0x",
         "logIndex": 0,
-        "blockHash": "0x0aea126ec1a978ef33fda634842729ce65b0987b0df1836428bb67567daf8d3d"
+        "blockHash": "0x6353bfd4f51ed8a6c26b6784e80910015dd1dbb66a34d3c072231e12b308df01"
       },
       {
         "transactionIndex": 0,
@@ -1917,7 +1917,7 @@
         ],
         "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c8",
         "logIndex": 1,
-        "blockHash": "0x0aea126ec1a978ef33fda634842729ce65b0987b0df1836428bb67567daf8d3d"
+        "blockHash": "0x6353bfd4f51ed8a6c26b6784e80910015dd1dbb66a34d3c072231e12b308df01"
       },
       {
         "transactionIndex": 0,
@@ -1929,7 +1929,7 @@
         ],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logIndex": 2,
-        "blockHash": "0x0aea126ec1a978ef33fda634842729ce65b0987b0df1836428bb67567daf8d3d"
+        "blockHash": "0x6353bfd4f51ed8a6c26b6784e80910015dd1dbb66a34d3c072231e12b308df01"
       },
       {
         "transactionIndex": 0,
@@ -1941,7 +1941,7 @@
         ],
         "data": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000afdacd509e73115ea1654b1a770f1a807e7c9c0",
         "logIndex": 3,
-        "blockHash": "0x0aea126ec1a978ef33fda634842729ce65b0987b0df1836428bb67567daf8d3d"
+        "blockHash": "0x6353bfd4f51ed8a6c26b6784e80910015dd1dbb66a34d3c072231e12b308df01"
       }
     ],
     "blockNumber": 44,

package/artifacts/WalletRegistryGovernance.json

@@ -1963,7 +1963,7 @@
     "transactionIndex": 0,
     "gasUsed": "3938527",
     "logsBloom": "0x00000000000000000002000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000002000800020000000000000000000800000000000000000000000000000000400000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000001000002000000000000000000000000",
-    "blockHash": "0x205d4263e83bdb21e1bc1e126c09d8d3eae737328fa1c52eaf128eb19db9fa96",
+    "blockHash": "0x789ceb57bbc5022a2c919af2f55b907329989eb7bfb6bf2640be653272c4f85b",
     "transactionHash": "0xd74f80e4f5e2effb2c65d08d07dd067de2196118911bc5019a89b375ffeac7c7",
     "logs": [
       {
@@ -1978,7 +1978,7 @@
         ],
         "data": "0x",
         "logIndex": 0,
-        "blockHash": "0x205d4263e83bdb21e1bc1e126c09d8d3eae737328fa1c52eaf128eb19db9fa96"
+        "blockHash": "0x789ceb57bbc5022a2c919af2f55b907329989eb7bfb6bf2640be653272c4f85b"
       }
     ],
     "blockNumber": 48,

package/artifacts/Wallets.json

@@ -111,7 +111,7 @@
     "transactionIndex": 0,
     "gasUsed": "911756",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "blockHash": "0x5706c20cb226618022bf7e63418fd96843f24f260efc2d204127566c85cfb90b",
+    "blockHash": "0x6cb8035f15c9981ec4c03dccaefaa61b21b0d09ebb9dae2711aaa161bd3f6ae6",
     "transactionHash": "0x91eefa42384be6bb7c89615046eaf4ee22a40e4a2fe8252374af9febe43ea332",
     "logs": [],
     "blockNumber": 63,

package/deploy/80_upgrade_bridge_v2.ts

@@ -0,0 +1,85 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { DeployFunction } from "hardhat-deploy/types"
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { ethers, helpers, deployments, getNamedAccounts } = hre
+  const { get } = deployments
+  const { deployer, treasury } = await getNamedAccounts()
+
+  const Bank = await deployments.get("Bank")
+  const LightRelay = await deployments.get("LightRelay")
+  const WalletRegistry = await deployments.get("WalletRegistry")
+  const ReimbursementPool = await deployments.get("ReimbursementPool")
+
+  const txProofDifficultyFactor = 6
+
+  // WARNING: This script expects no changes in the external libraries and uses
+  // `get` function to load the ones that were already published before.
+  // If there are any changes in the external libraries make sure to deploy fresh
+  // versions of the libraries and link them to the implementation.
+  const Deposit = await get("Deposit")
+  const DepositSweep = await get("DepositSweep")
+  const Redemption = await get("Redemption")
+  const Wallets = await get("Wallets")
+  const Fraud = await get("Fraud")
+  const MovingFunds = await get("MovingFunds")
+
+  const [bridge, proxyDeployment] = await helpers.upgrades.upgradeProxy(
+    "Bridge",
+    "Bridge",
+    {
+      contractName: "Bridge",
+      initializerArgs: [
+        Bank.address,
+        LightRelay.address,
+        treasury,
+        WalletRegistry.address,
+        ReimbursementPool.address,
+        txProofDifficultyFactor,
+      ],
+      factoryOpts: {
+        signer: await ethers.getSigner(deployer),
+        libraries: {
+          Deposit: Deposit.address,
+          DepositSweep: DepositSweep.address,
+          Redemption: Redemption.address,
+          Wallets: Wallets.address,
+          Fraud: Fraud.address,
+          MovingFunds: MovingFunds.address,
+        },
+      },
+      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"],
+      },
+    }
+  )
+
+  if (hre.network.tags.etherscan) {
+    // 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.
+    await hre.run("verify", {
+      address: proxyDeployment.address,
+      constructorArgsParams: proxyDeployment.args,
+    })
+  }
+
+  if (hre.network.tags.tenderly) {
+    await hre.tenderly.verify({
+      name: "Bridge",
+      address: bridge.address,
+    })
+  }
+}
+
+export 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 = async () => true

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.1+main.0c72e3d097a114b6ae4919139eb2ac054385da4f",
   "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",