@keep-network/tbtc-v2 0.1.1-dev.112 → 0.1.1-dev.113

package/artifacts/WalletRegistryGovernance.json

@@ -1,5 +1,5 @@
 {
-  "address": "0xC76A71C4492c11bbaDC841342C4Cb470b5d12193",
+  "address": "0x1a6a3e7Bb246158dF31d8f924B84D961669Ba4e5",
   "abi": [
     {
       "inputs": [
@@ -1864,22 +1864,22 @@
       "type": "function"
     }
   ],
-  "transactionHash": "0xa1a76c689556d2e62e7ea08f90ef3bde3099a6d5210dbace1559ff8917c6571b",
+  "transactionHash": "0xb98b0ffbe79751e602f7d781c984f1299de7d21b8677bd3de5bdcde440a0dd95",
   "receipt": {
     "to": null,
     "from": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-    "contractAddress": "0xC76A71C4492c11bbaDC841342C4Cb470b5d12193",
+    "contractAddress": "0x1a6a3e7Bb246158dF31d8f924B84D961669Ba4e5",
     "transactionIndex": 0,
     "gasUsed": "3762365",
-    "logsBloom": "0x00000000000000000002000000000000000000000000000000800000000000000200000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000001000000000000000000000000000000000800020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000001000000000000000000000000000000",
-    "blockHash": "0x3db2c5e25548ea104a39ba01c49bbc1cb3e4114dd20f60e40b07317607cbb010",
-    "transactionHash": "0xa1a76c689556d2e62e7ea08f90ef3bde3099a6d5210dbace1559ff8917c6571b",
+    "logsBloom": "0x00000000000000000002000080000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000800020000000000000000001800000000000000000000000000000000400000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000001000000000000000000000000000000",
+    "blockHash": "0xe66320f7052cacdb411e241bc54588223fca336dd08fd4769af73a14b95d4582",
+    "transactionHash": "0xb98b0ffbe79751e602f7d781c984f1299de7d21b8677bd3de5bdcde440a0dd95",
     "logs": [
       {
         "transactionIndex": 0,
-        "blockNumber": 33,
-        "transactionHash": "0xa1a76c689556d2e62e7ea08f90ef3bde3099a6d5210dbace1559ff8917c6571b",
-        "address": "0xC76A71C4492c11bbaDC841342C4Cb470b5d12193",
+        "blockNumber": 45,
+        "transactionHash": "0xb98b0ffbe79751e602f7d781c984f1299de7d21b8677bd3de5bdcde440a0dd95",
+        "address": "0x1a6a3e7Bb246158dF31d8f924B84D961669Ba4e5",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -1887,16 +1887,16 @@
         ],
         "data": "0x",
         "logIndex": 0,
-        "blockHash": "0x3db2c5e25548ea104a39ba01c49bbc1cb3e4114dd20f60e40b07317607cbb010"
+        "blockHash": "0xe66320f7052cacdb411e241bc54588223fca336dd08fd4769af73a14b95d4582"
       }
     ],
-    "blockNumber": 33,
+    "blockNumber": 45,
     "cumulativeGasUsed": "3762365",
     "status": 1,
     "byzantium": true
   },
   "args": [
-    "0x677df0cb865368207999F2862Ece576dC56D8dF6",
+    "0x55cb3b67D9E65F0Cf4eABCAC84564a1bE6E3b06A",
     604800
   ],
   "numDeployments": 1,

package/artifacts/Wallets.json

@@ -1,5 +1,5 @@
 {
-  "address": "0x093e8F4d8f267d2CeEc9eB889E2054710d187beD",
+  "address": "0xA82ED5224ba72f2f776e09B11DC99E30Ee65Da8d",
   "abi": [
     {
       "anonymous": false,
@@ -103,18 +103,18 @@
       "type": "event"
     }
   ],
-  "transactionHash": "0x914de5112ec411a282839006aa106c030b5c9785f80818dd4ba5d4869079fd8d",
+  "transactionHash": "0xeeafc52f644dd43f3509d5b720d2073ce5bf2ff8afc0041d4cb71b279254946a",
   "receipt": {
     "to": null,
     "from": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-    "contractAddress": "0x093e8F4d8f267d2CeEc9eB889E2054710d187beD",
+    "contractAddress": "0xA82ED5224ba72f2f776e09B11DC99E30Ee65Da8d",
     "transactionIndex": 0,
     "gasUsed": "915419",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "blockHash": "0x871538d05ff6a0a8e9e06c1e984755fbd7466d8e96e37706165851833f2f725a",
-    "transactionHash": "0x914de5112ec411a282839006aa106c030b5c9785f80818dd4ba5d4869079fd8d",
+    "blockHash": "0x69f926273b5097e2c3eae95e4f9e41097f8e23674c9a01b5fb660904dfee6c29",
+    "transactionHash": "0xeeafc52f644dd43f3509d5b720d2073ce5bf2ff8afc0041d4cb71b279254946a",
     "logs": [],
-    "blockNumber": 46,
+    "blockNumber": 59,
     "cumulativeGasUsed": "915419",
     "status": 1,
     "byzantium": true

package/deploy/00_resolve_relay.ts

@@ -1,4 +1,4 @@
-import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { HardhatRuntimeEnvironment, HardhatNetworkConfig } from "hardhat/types"
 import { DeployFunction } from "hardhat-deploy/types"
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
@@ -10,7 +10,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   if (Relay && helpers.address.isValid(Relay.address)) {
     log(`using external Relay at ${Relay.address}`)
-  } else if (hre.network.name !== "hardhat") {
+  } else if (
+    !hre.network.tags.allowStubs ||
+    (hre.network.config as HardhatNetworkConfig)?.forking?.enabled
+  ) {
     throw new Error("deployed Relay contract not found")
   } else {
     log("deploying Relay stub")

package/deploy/00_resolve_tbtc_v1_token.ts

@@ -1,4 +1,4 @@
-import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { HardhatRuntimeEnvironment, HardhatNetworkConfig } from "hardhat/types"
 import { DeployFunction } from "hardhat-deploy/types"
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
@@ -10,7 +10,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   if (TBTCToken && helpers.address.isValid(TBTCToken.address)) {
     log(`using external TBTCToken at ${TBTCToken.address}`)
-  } else if (hre.network.name !== "hardhat") {
+  } else if (
+    !hre.network.tags.allowStubs ||
+    (hre.network.config as HardhatNetworkConfig)?.forking?.enabled
+  ) {
     throw new Error("deployed TBTCToken contract not found")
   } else {
     log("deploying TBTCToken stub")

package/deploy/05_deploy_bridge.ts

@@ -16,7 +16,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   // For local tests use `1`.
   const txProofDifficultyFactor =
-    deployments.getNetworkName() === "hardhat" ? 1 : 6
+    deployments.getNetworkName() === "hardhat" ||
+    deployments.getNetworkName() === "development"
+      ? 1
+      : 6
 
   const Deposit = await deploy("Deposit", { from: deployer, log: true })
   const DepositSweep = await deploy("DepositSweep", {

package/export/deploy/00_resolve_relay.js

@@ -37,24 +37,26 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var func = function (hre) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
         var getNamedAccounts, deployments, helpers, log, deployer, Relay;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     getNamedAccounts = hre.getNamedAccounts, deployments = hre.deployments, helpers = hre.helpers;
                     log = deployments.log;
                     return [4 /*yield*/, getNamedAccounts()];
                 case 1:
-                    deployer = (_a.sent()).deployer;
+                    deployer = (_c.sent()).deployer;
                     return [4 /*yield*/, deployments.getOrNull("Relay")];
                 case 2:
-                    Relay = _a.sent();
+                    Relay = _c.sent();
                     if (!(Relay && helpers.address.isValid(Relay.address))) return [3 /*break*/, 3];
                     log("using external Relay at ".concat(Relay.address));
                     return [3 /*break*/, 6];
                 case 3:
-                    if (!(hre.network.name !== "hardhat")) return [3 /*break*/, 4];
+                    if (!(!hre.network.tags.allowStubs ||
+                        ((_b = (_a = hre.network.config) === null || _a === void 0 ? void 0 : _a.forking) === null || _b === void 0 ? void 0 : _b.enabled))) return [3 /*break*/, 4];
                     throw new Error("deployed Relay contract not found");
                 case 4:
                     log("deploying Relay stub");
@@ -64,8 +66,8 @@ var func = function (hre) {
                             log: true,
                         })];
                 case 5:
-                    _a.sent();
-                    _a.label = 6;
+                    _c.sent();
+                    _c.label = 6;
                 case 6: return [2 /*return*/];
             }
         });

package/export/deploy/00_resolve_tbtc_v1_token.js

@@ -37,24 +37,26 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var func = function (hre) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
         var getNamedAccounts, deployments, helpers, log, deployer, TBTCToken;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     getNamedAccounts = hre.getNamedAccounts, deployments = hre.deployments, helpers = hre.helpers;
                     log = deployments.log;
                     return [4 /*yield*/, getNamedAccounts()];
                 case 1:
-                    deployer = (_a.sent()).deployer;
+                    deployer = (_c.sent()).deployer;
                     return [4 /*yield*/, deployments.getOrNull("TBTCToken")];
                 case 2:
-                    TBTCToken = _a.sent();
+                    TBTCToken = _c.sent();
                     if (!(TBTCToken && helpers.address.isValid(TBTCToken.address))) return [3 /*break*/, 3];
                     log("using external TBTCToken at ".concat(TBTCToken.address));
                     return [3 /*break*/, 6];
                 case 3:
-                    if (!(hre.network.name !== "hardhat")) return [3 /*break*/, 4];
+                    if (!(!hre.network.tags.allowStubs ||
+                        ((_b = (_a = hre.network.config) === null || _a === void 0 ? void 0 : _a.forking) === null || _b === void 0 ? void 0 : _b.enabled))) return [3 /*break*/, 4];
                     throw new Error("deployed TBTCToken contract not found");
                 case 4:
                     log("deploying TBTCToken stub");
@@ -64,8 +66,8 @@ var func = function (hre) {
                             log: true,
                         })];
                 case 5:
-                    _a.sent();
-                    _a.label = 6;
+                    _c.sent();
+                    _c.label = 6;
                 case 6: return [2 /*return*/];
             }
         });

package/export/deploy/05_deploy_bridge.js

@@ -63,7 +63,10 @@ var func = function (hre) {
                     ];
                 case 4:
                     WalletRegistry = _g.sent();
-                    txProofDifficultyFactor = deployments.getNetworkName() === "hardhat" ? 1 : 6;
+                    txProofDifficultyFactor = deployments.getNetworkName() === "hardhat" ||
+                        deployments.getNetworkName() === "development"
+                        ? 1
+                        : 6;
                     return [4 /*yield*/, deploy("Deposit", { from: deployer, log: true })];
                 case 5:
                     Deposit = _g.sent();

package/export/hardhat.config.js

@@ -80,16 +80,19 @@ var config = {
                 count: exports.testConfig.nonStakingAccountsCount +
                     exports.testConfig.stakingRolesCount * exports.testConfig.operatorsCount,
             },
-            tags: ["local"],
+            tags: ["allowStubs"],
             // we use higher gas price for tests to obtain more realistic results
             // for gas refund tests than when the default hardhat ~1 gwei gas price is
             // used
-            gasPrice: 200000000000, // 200 gwei
+            gasPrice: 200000000000,
+            // Ignore contract size on deployment to hardhat network, to be able to
+            // deploy stub contracts in tests.
+            allowUnlimitedContractSize: process.env.TEST_USE_STUBS_TBTC === "true",
         },
         development: {
             url: "http://localhost:8545",
             chainId: 1101,
-            tags: ["local"],
+            tags: ["allowStubs"],
         },
         ropsten: {
             url: process.env.CHAIN_API_URL || "",