@gearbox-protocol/deploy-tools 2.3.0 → 2.4.0

package/dist/index.js

@@ -266296,9 +266296,11 @@ var require_ProviderBase = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ProviderBase = void 0;
+    var promises_1 = require("fs/promises");
     var deploy_suite_1 = require_dist2();
     var sdk_gov_1 = require_lib224();
     var api_kit_1 = __importDefault2(require_src8());
+    var ethers_1 = require_lib2();
     var log_1 = __importDefault2(require_log());
     var providers_1 = require_providers2();
     var utilityContracts = {
@@ -266312,17 +266314,23 @@ var require_ProviderBase = __commonJS({
       VETO_ADMIN: sdk_gov_1.VETO_ADMIN,
       TREASURY: sdk_gov_1.TREASURY
     };
-    var _service, _initialized, _provider, _network, _chainId;
+    var _service, _initialized, _provider, _network, _chainId, _overrides, _options;
     var ProviderBase2 = class {
-      constructor(rpcUrl) {
+      constructor(opts) {
         __publicField(this, "logger", log_1.default.getSubLogger());
         __privateAdd(this, _service, void 0);
         __privateAdd(this, _initialized, false);
         __privateAdd(this, _provider, void 0);
         __privateAdd(this, _network, void 0);
         __privateAdd(this, _chainId, void 0);
-        __privateSet(this, _provider, new providers_1.RetryProvider(rpcUrl));
+        __privateAdd(this, _overrides, {});
+        __privateAdd(this, _options, void 0);
+        __privateSet(this, _provider, new providers_1.RetryProvider(opts.rpcUrl));
         __privateGet(this, _provider)._isProvider = true;
+        __privateSet(this, _options, opts);
+        if (opts.addressProvider) {
+          __privateGet(this, _overrides).ADDRESS_PROVIDER = opts.addressProvider;
+        }
       }
       async init() {
         __privateSet(this, _network, await (0, sdk_gov_1.detectNetwork)(__privateGet(this, _provider)));
@@ -266330,6 +266338,17 @@ var require_ProviderBase = __commonJS({
         __privateSet(this, _service, new api_kit_1.default({
           chainId: BigInt(__privateGet(this, _chainId))
         }));
+        if (__privateGet(this, _options).governanceJson) {
+          this.logger.debug(`reading governance json ${__privateGet(this, _options).governanceJson}`);
+          const gov = await (0, promises_1.readFile)(__privateGet(this, _options).governanceJson, "utf-8").then(JSON.parse);
+          if (gov.network !== this.network) {
+            throw new Error(`governance file network mismatch: expected ${this.network}, got ${gov.network}`);
+          }
+          __privateGet(this, _overrides).GOVERNOR = gov.governorAddress;
+          __privateGet(this, _overrides).CREATE2FACTORY = gov.create2FactoryAddress;
+          __privateGet(this, _overrides).TIMELOCK = gov.timelockAddress;
+          this.logger.debug(`overrides: ${__privateGet(this, _overrides)}`);
+        }
         __privateSet(this, _initialized, true);
         this.logger.info(`initialized with network ${__privateGet(this, _network)} and chain id ${__privateGet(this, _chainId)}`);
       }
@@ -266367,9 +266386,14 @@ var require_ProviderBase = __commonJS({
         return __privateGet(this, _service);
       }
       address(contract) {
+        const overridden = __privateGet(this, _overrides)[contract];
+        if ((0, ethers_1.isAddress)(overridden)) {
+          this.logger.debug(`using override for ${contract}`);
+          return overridden;
+        }
         const addr = utilityContracts[contract][this.network];
-        if (addr === sdk_gov_1.NOT_DEPLOYED) {
-          throw new Error(`${contract} is not deployed on ${this.network}`);
+        if (!(0, ethers_1.isAddress)(addr)) {
+          throw new Error(`${contract} is not deployed on ${this.network}: address ${addr}`);
         }
         return addr;
       }
@@ -266379,6 +266403,8 @@ var require_ProviderBase = __commonJS({
     _provider = new WeakMap();
     _network = new WeakMap();
     _chainId = new WeakMap();
+    _overrides = new WeakMap();
+    _options = new WeakMap();
     exports2.ProviderBase = ProviderBase2;
   }
 });
@@ -266436,7 +266462,7 @@ var require_Deployer2 = __commonJS({
     var _tenderly, _governor, _testnetExecutor, _deployerAddress, _bypassEta, _sandboxDir, _deploy, deploy_fn, _init, init_fn;
     var _Deployer = class _Deployer extends ProviderBase_1.ProviderBase {
       constructor(options) {
-        super(options.rpcUrl);
+        super(options);
         /**
          * Executes all found pending transactions, returns array of safe tx hashes
          */
@@ -292541,7 +292567,7 @@ var require_GearboxAddressTree = __commonJS({
     var _etherscan, _verifier, _auditor, _options, _outFile, _cachePolicy, _queue, _visited, _create2, _loadCache, loadCache_fn, _saveCache, saveCache_fn, _process, process_fn, _addToQueue, addToQueue_fn;
     var _GearboxAddressTree = class _GearboxAddressTree extends ProviderBase_1.ProviderBase {
       constructor(options) {
-        super(options.rpcUrl);
+        super(options);
         __privateAdd(this, _loadCache);
         __privateAdd(this, _saveCache);
         __privateAdd(this, _process);
@@ -292588,6 +292614,7 @@ var require_GearboxAddressTree = __commonJS({
               contract: "ADDRESS_PROVIDER_V3",
               version: 300,
               discoveryBlock: 18433056
+              // TODO: network dependent
             },
             {
               address: this.address("CREATE2FACTORY"),
@@ -309874,7 +309901,7 @@ var require_UpdateParser = __commonJS({
     var _sandboxDir, _output2, _parseSafeTxHashes, parseSafeTxHashes_fn, _parseBatchRepoDir, parseBatchRepoDir_fn, _parseBatchDir, parseBatchDir_fn, _parseNormalizedBatch, parseNormalizedBatch_fn, _parseNormalizedTx, parseNormalizedTx_fn, _collectCreate2Addresses, collectCreate2Addresses_fn;
     var UpdateParser2 = class extends ProviderBase_1.ProviderBase {
       constructor(options) {
-        super(options.rpcUrl);
+        super(options);
         __privateAdd(this, _parseSafeTxHashes);
         __privateAdd(this, _parseBatchRepoDir);
         __privateAdd(this, _parseBatchDir);
@@ -355511,7 +355538,7 @@ var require_package3 = __commonJS({
     module2.exports = {
       name: "@gearbox-protocol/deploy-tools",
       description: "Gearbox deploy tools",
-      version: "2.2.4",
+      version: "2.3.0",
       homepage: "https://gearbox.fi",
       keywords: [
         "gearbox"
@@ -356809,6 +356836,16 @@ program2.commands.forEach((cmd) => {
     new Option("--etherscan-api-key [key]", "etherscan api key").env(
       "ETHERSCAN_API_KEY"
     )
+  ).addOption(
+    new Option(
+      "--address-provider [address]",
+      "address provider address override"
+    ).env("ADDRESS_PROVIDER")
+  ).addOption(
+    new Option(
+      "--governance-json [file]",
+      "file with addresses for governance contract overrides"
+    )
   );
 });
 program2.parse();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"