From a4a2bfdf351b9cb31678cb1aee637955e46f60de Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Thu, 7 Nov 2019 08:14:12 -0800
Subject: [PATCH] Finish ZrxVault and StakingProxy configs without batch
 transaction

---
 packages/migrations/src/testnet_migrations.ts   | 17 +++++++----------
 .../migrations/src/utils/configs_by_chain.ts    |  4 ++++
 packages/migrations/src/utils/timelocks.ts      |  4 ++++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/migrations/src/testnet_migrations.ts b/packages/migrations/src/testnet_migrations.ts
index 398a772040..bc5f73a0eb 100644
--- a/packages/migrations/src/testnet_migrations.ts
+++ b/packages/migrations/src/testnet_migrations.ts
@@ -150,11 +150,18 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
     logUtils.log('ERC20BridgeProxy configured!');
 
     logUtils.log('Configuring ZrxVault...');
+    await zrxVault.addAuthorizedAddress.awaitTransactionSuccessAsync(txDefaults.from);
+    await zrxVault.setStakingProxy.awaitTransactionSuccessAsync(stakingProxy.address);
+    await zrxVault.removeAuthorizedAddress.awaitTransactionSuccessAsync(txDefaults.from);
     await zrxVault.addAuthorizedAddress.awaitTransactionSuccessAsync(governor.address);
     await zrxVault.transferOwnership.awaitTransactionSuccessAsync(governor.address);
     logUtils.log('ZrxVault configured!');
 
     logUtils.log('Configuring StakingProxy...');
+    await stakingProxy.addAuthorizedAddress.awaitTransactionSuccessAsync(txDefaults.from);
+    const staking = new StakingContract(stakingProxy.address, provider, txDefaults);
+    await staking.addExchangeAddress.awaitTransactionSuccessAsync(exchange.address);
+    await stakingProxy.removeAuthorizedAddress.awaitTransactionSuccessAsync(txDefaults.from);
     await stakingProxy.addAuthorizedAddress.awaitTransactionSuccessAsync(governor.address);
     await stakingProxy.transferOwnership.awaitTransactionSuccessAsync(governor.address);
     logUtils.log('StakingProxy configured!');
@@ -189,16 +196,6 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
     logUtils.log('Ownership transferred!');
 
     const functionCalls = [
-        // ZrxVault configs
-        {
-            destination: zrxVault.address,
-            data: zrxVault.setStakingProxy.getABIEncodedTransactionData(stakingProxy.address),
-        },
-        // Staking configs
-        {
-            destination: stakingProxy.address,
-            data: stakingLogic.addExchangeAddress.getABIEncodedTransactionData(exchange.address),
-        },
         // AssetProxy configs
         {
             destination: deployedAddresses.erc20Proxy,
diff --git a/packages/migrations/src/utils/configs_by_chain.ts b/packages/migrations/src/utils/configs_by_chain.ts
index f6b8466122..7aed7d9b5e 100644
--- a/packages/migrations/src/utils/configs_by_chain.ts
+++ b/packages/migrations/src/utils/configs_by_chain.ts
@@ -14,6 +14,10 @@ export interface ConfigsByChain {
 }
 
 // tslint:disable custom-no-magic-numbers
+/**
+ * Gets configs that correspond to the given chainId.
+ * @param chainId Id of the netowrk.
+ */
 export function getConfigsByChainId(chainId: number): ConfigsByChain {
     const mainnetConfigs = {
         zeroExGovernor: {
diff --git a/packages/migrations/src/utils/timelocks.ts b/packages/migrations/src/utils/timelocks.ts
index 2f5590eb58..dff5c7a5d6 100644
--- a/packages/migrations/src/utils/timelocks.ts
+++ b/packages/migrations/src/utils/timelocks.ts
@@ -14,6 +14,10 @@ export interface TimelockRegistration {
     secondsTimeLocked: BigNumber;
 }
 
+/**
+ * Gets the custom timelock configs that correspond the the network of the given provider.
+ * @param provider Web3 provider instance.
+ */
 export async function getTimelockRegistrationsAsync(provider: SupportedProvider): Promise<TimelockRegistration[]> {
     const web3Wrapper = new Web3Wrapper(provider);
     const chainId = await web3Wrapper.getChainIdAsync();