From e3587fcae62e1832135fdbfb425064b49ecf1c46 Mon Sep 17 00:00:00 2001 From: Julien Niset Date: Tue, 7 Apr 2020 17:15:38 +0200 Subject: [PATCH] addressing more review comments --- deployment/1_setup_test_environment.js | 3 ++- deployment/7_upgrade_1_6.js | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deployment/1_setup_test_environment.js b/deployment/1_setup_test_environment.js index b314ddeb6..bf98c6274 100644 --- a/deployment/1_setup_test_environment.js +++ b/deployment/1_setup_test_environment.js @@ -56,6 +56,7 @@ const deploy = async (network) => { const { configurator } = manager; const { deployer } = manager; + const { gasPrice } = deployer.defaultOverrides; const { config } = configurator; @@ -77,7 +78,7 @@ const deploy = async (network) => { const UniswapFactoryWrapper = await deployer.deploy(UniswapFactory); configurator.updateUniswapFactory(UniswapFactoryWrapper.contractAddress); const UniswapExchangeTemplateWrapper = await deployer.deploy(UniswapExchange); - const initializeFactoryTx = await UniswapFactoryWrapper.initializeFactory(UniswapExchangeTemplateWrapper.contractAddress); + const initializeFactoryTx = await UniswapFactoryWrapper.contract.initializeFactory(UniswapExchangeTemplateWrapper.contractAddress, { gasPrice }); await UniswapFactoryWrapper.verboseWaitForTransaction(initializeFactoryTx, "Initializing UniswapFactory"); } diff --git a/deployment/7_upgrade_1_6.js b/deployment/7_upgrade_1_6.js index dbced49cf..bf60d720b 100644 --- a/deployment/7_upgrade_1_6.js +++ b/deployment/7_upgrade_1_6.js @@ -59,9 +59,9 @@ const deploy = async (network) => { const MakerRegistryWrapper = await deployer.deploy(MakerRegistry); const ScdMcdMigrationWrapper = await deployer.wrapDeployedContract(ScdMcdMigration, config.defi.maker.migration); const wethJoinAddress = await ScdMcdMigrationWrapper.wethJoin(); - const addCollateralTransaction = await MakerRegistryWrapper.addCollateral(wethJoinAddress); + const addCollateralTransaction = await MakerRegistryWrapper.contract.addCollateral(wethJoinAddress, { gasPrice }); await MakerRegistryWrapper.verboseWaitForTransaction(addCollateralTransaction, `Adding join adapter ${wethJoinAddress} to the MakerRegistry`); - const changeMakerRegistryOwnerTx = await MakerRegistryWrapper.changeOwner(config.contracts.MultiSigWallet); + const changeMakerRegistryOwnerTx = await MakerRegistryWrapper.contract.changeOwner(config.contracts.MultiSigWallet, { gasPrice }); await MakerRegistryWrapper.verboseWaitForTransaction(changeMakerRegistryOwnerTx, "Set the MultiSig as the owner of the MakerRegistry"); // ////////////////////////////////// @@ -155,10 +155,10 @@ const deploy = async (network) => { // Change the owner of TokenPriceProvider // //////////////////////////////////////////////////// - const TokenPriceProviderRevokeManagerTx = await TokenPriceProviderWrapper.contract.revokeManager(deploymentWallet.address); + const TokenPriceProviderRevokeManagerTx = await TokenPriceProviderWrapper.contract.revokeManager(deploymentWallet.address, { gasPrice }); await TokenPriceProviderWrapper.verboseWaitForTransaction(TokenPriceProviderRevokeManagerTx, `Revoke ${deploymentWallet.address} as the manager of the TokenPriceProvider`); - const changeOwnerTx = await TokenPriceProviderWrapper.contract.changeOwner(config.contracts.MultiSigWallet); + const changeOwnerTx = await TokenPriceProviderWrapper.contract.changeOwner(config.contracts.MultiSigWallet, { gasPrice }); await TokenPriceProviderWrapper.verboseWaitForTransaction(changeOwnerTx, "Set the MultiSig as the owner of TokenPriceProvider"); // //////////////////////////////////