Removing integrationProxy from Proxyable (Synthetixio#1521)

Author: jj

contracts/Proxyable.sol

@@ -12,7 +12,6 @@ contract Proxyable is Owned {
 
     /* The proxy this contract exists behind. */
     Proxy public proxy;
-    Proxy public integrationProxy;
 
     /* The caller of the proxy, passed through to this contract.
      * Note that every function using this member must apply the onlyProxy or
@@ -32,10 +31,6 @@ contract Proxyable is Owned {
         emit ProxyUpdated(_proxy);
     }
 
-    function setIntegrationProxy(address payable _integrationProxy) external onlyOwner {
-        integrationProxy = Proxy(_integrationProxy);
-    }
-
     function setMessageSender(address sender) external onlyProxy {
         messageSender = sender;
     }
@@ -46,7 +41,7 @@ contract Proxyable is Owned {
     }
 
     function _onlyProxy() private view {
-        require(Proxy(msg.sender) == proxy || Proxy(msg.sender) == integrationProxy, "Only the proxy can call");
+        require(Proxy(msg.sender) == proxy, "Only the proxy can call");
     }
 
     modifier optionalProxy {
@@ -55,7 +50,7 @@ contract Proxyable is Owned {
     }
 
     function _optionalProxy() private {
-        if (Proxy(msg.sender) != proxy && Proxy(msg.sender) != integrationProxy && messageSender != msg.sender) {
+        if (Proxy(msg.sender) != proxy && messageSender != msg.sender) {
             messageSender = msg.sender;
         }
     }
@@ -67,7 +62,7 @@ contract Proxyable is Owned {
 
     // solhint-disable-next-line func-name-mixedcase
     function _optionalProxy_onlyOwner() private {
-        if (Proxy(msg.sender) != proxy && Proxy(msg.sender) != integrationProxy && messageSender != msg.sender) {
+        if (Proxy(msg.sender) != proxy && messageSender != msg.sender) {
             messageSender = msg.sender;
         }
         require(messageSender == owner, "Owner only function");

publish/deployed/mainnet/deployment.json

@@ -99,9 +99,9 @@
 		},
 		"ProxysUSD": {
 			"name": "ProxysUSD",
-			"address": "0x57Ab1E02fEE23774580C119740129eAC7081e9D3",
+			"address": "0x57Ab1ec28D129707052df4dF418D58a2D46d5f51",
 			"source": "Proxy",
-			"link": "https://etherscan.io/address/0x57Ab1E02fEE23774580C119740129eAC7081e9D3",
+			"link": "https://etherscan.io/address/0x57Ab1ec28D129707052df4dF418D58a2D46d5f51",
 			"txn": "",
 			"network": "mainnet"
 		},
@@ -116,9 +116,9 @@
 		},
 		"ProxySynthetix": {
 			"name": "ProxySynthetix",
-			"address": "0xC011A72400E58ecD99Ee497CF89E3775d4bd732F",
+			"address": "0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F",
 			"source": "Proxy",
-			"link": "https://etherscan.io/address/0xC011A72400E58ecD99Ee497CF89E3775d4bd732F",
+			"link": "https://etherscan.io/address/0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F",
 			"network": "mainnet"
 		},
 		"SafeDecimalMath": {

publish/src/commands/deploy/configure-legacy-settings.js

@@ -223,19 +223,6 @@ module.exports = async ({
 		});
 	}
 
-	if (useOvm && SynthetixState && FeePool) {
-		// The SynthetixStateLimitedSetup) contract has FeePool to appendAccountIssuanceRecord
-		await runStep({
-			contract: 'SynthetixState',
-			target: SynthetixState,
-			read: 'feePool',
-			expected: input => input === addressOf(FeePool),
-			write: 'setFeePool',
-			writeArg: addressOf(FeePool),
-			comment: 'Ensure the FeePool contract can write to the SynthetixState contract',
-		});
-	}
-
 	if (RewardEscrow && Synthetix) {
 		await runStep({
 			contract: 'RewardEscrow',