Remove read-only proxy from contract addresses and migrations

packages/contract-addresses/src/index.ts

@@ -18,7 +18,6 @@ export interface ContractAddresses {
     erc1155Proxy: string;
     devUtils: string;
     zrxVault: string;
-    readOnlyProxy: string;
     staking: string;
     stakingProxy: string;
 }
@@ -51,7 +50,6 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         staticCallProxy: '0x3517b88c19508c08650616019062b898ab65ed29',
         erc1155Proxy: '0x7eefbd48fd63d441ec7435d024ec7c5131019add',
         zrxVault: NULL_ADDRESS,
-        readOnlyProxy: NULL_ADDRESS,
         staking: NULL_ADDRESS,
         stakingProxy: NULL_ADDRESS,
         devUtils: NULL_ADDRESS,
@@ -74,7 +72,6 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         erc1155Proxy: '0x19bb6caa3bc34d39e5a23cedfa3e6c7e7f3c931d',
         devUtils: '0x3dfd5157eec10eb1a357c1074de30787ce92cb43',
         zrxVault: '0xffd161026865ad8b4ab28a76840474935eec4dfa',
-        readOnlyProxy: '0x8e1dfaf747b804d041adaed79d68dcef85b8de85',
         staking: '0xb2ca5824630e526f0f3181a4ea0447c795a84411',
         stakingProxy: '0x5d751aa855a1aee5fe44cf5350ed25b5727b66ae',
     },
@@ -96,7 +93,6 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         erc1155Proxy: '0x19bb6caa3bc34d39e5a23cedfa3e6c7e7f3c931d',
         devUtils: '0xcfc66b8e75e8f075c3e1d61e6487d73dfe35d808',
         zrxVault: '0xa5bf6ac73bc40790fc6ffc9dbbbce76c9176e224',
-        readOnlyProxy: '0xffd161026865ad8b4ab28a76840474935eec4dfa',
         staking: '0x8ec5a989a06432dace637c8d592727627a45a592',
         stakingProxy: '0xb2ca5824630e526f0f3181a4ea0447c795a84411',
     },
@@ -118,7 +114,6 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         erc1155Proxy: '0x64517fa2b480ba3678a2a3c0cf08ef7fd4fad36f',
         devUtils: '0xb1863ac46ae23ec55d6eeb8ecc8815655ee638a8',
         zrxVault: '0xf36eabdfe986b35b62c8fd5a98a7f2aebb79b291',
-        readOnlyProxy: '0x25397d8aa7e6844dae70ee658fe072d45d6cf528',
         staking: '0xd67f2f346f6e85db70632d9f18f50e04192ab54d',
         stakingProxy: '0x9e7eef766702c3d9056a3de779e5d9d976bc3bdb',
     },
@@ -141,7 +136,6 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         staticCallProxy: '0x6dfff22588be9b3ef8cf0ad6dc9b84796f9fb45f',
         devUtils: '0x38ef19fdf8e8415f18c307ed71967e19aac28ba1',
         zrxVault: NULL_ADDRESS,
-        readOnlyProxy: NULL_ADDRESS,
         staking: NULL_ADDRESS,
         stakingProxy: NULL_ADDRESS,
     },

packages/migrations/src/test_contract_configs.ts

@@ -214,12 +214,6 @@ async function testContractConfigsAsync(provider: SupportedProvider): Promise<vo
         const stakingLogicAddress = await stakingProxy.stakingContract.callAsync();
         warnIfMismatch(stakingLogicAddress, addresses.staking, 'Unexpected Staking contract attached to StakingProxy');
 
-        const readOnlyProxy = await stakingProxy.readOnlyProxy.callAsync();
-        warnIfMismatch(readOnlyProxy, addresses.readOnlyProxy, 'Unexpected ReadOnlyProxy set in StakingProxy');
-
-        const readOnlyCallee = await stakingProxy.readOnlyProxyCallee.callAsync();
-        warnIfMismatch(readOnlyCallee, addresses.staking, 'Unexpected readOnlyProxyCallee');
-
         const zrxVaultAddress = await stakingContract.getZrxVault.callAsync();
         warnIfMismatch(zrxVaultAddress, addresses.zrxVault, 'Unexpected ZrxVault set in Staking contract');
 

packages/migrations/src/testnet_migrations.ts

@@ -3,7 +3,6 @@ import { artifacts as exchangeArtifacts, ExchangeContract } from '@0x/contracts-
 import { artifacts, ZeroExGovernorContract, ZeroExGovernorSubmissionEventArgs } from '@0x/contracts-multisig';
 import {
     artifacts as stakingArtifacts,
-    ReadOnlyProxyContract,
     StakingContract,
     StakingProxyContract,
     ZrxVaultContract,
@@ -66,20 +65,12 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
         chainId,
     );
 
-    const readOnlyProxy = await ReadOnlyProxyContract.deployFrom0xArtifactAsync(
-        stakingArtifacts.ReadOnlyProxy,
-        provider,
-        txDefaults,
-        stakingArtifacts,
-    );
-
     const stakingProxy = await StakingProxyContract.deployFrom0xArtifactAsync(
         stakingArtifacts.StakingProxy,
         provider,
         txDefaults,
         stakingArtifacts,
         stakingLogic.address,
-        readOnlyProxy.address,
     );
 
     const authorizableInterface = new IAuthorizableContract(constants.NULL_ADDRESS, provider, txDefaults);
@@ -126,11 +117,6 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
             functionSelector: authorizableInterface.removeAuthorizedAddressAtIndex.getSelector(),
             secondsTimeLocked: constants.ZERO_AMOUNT,
         },
-        {
-            destination: deployedAddresses.stakingProxy,
-            functionSelector: stakingProxy.setReadOnlyMode.getSelector(),
-            secondsTimeLocked: constants.ZERO_AMOUNT,
-        },
         {
             destination: deployedAddresses.zrxVault,
             functionSelector: zrxVault.enterCatastrophicFailure.getSelector(),