Atria release v2.55 (Synthetixio#1620)

Author: jjgonecrypto

contracts/WrapperFactory.sol

@@ -93,9 +93,6 @@ contract WrapperFactory is Owned, MixinResolver, IWrapperFactory {
             // Transfer sUSD to the fee pool
             bool success = synthsUSD().transfer(feePool().FEE_ADDRESS(), amountSUSD);
             require(success, "Transfer did not succeed");
-
-            // this is supposed to be done automatically by `transfer` but for some reason that doesn't happen
-            feePool().recordFeePaid(amountSUSD);
         }
     }
 

contracts/test-helpers/MockSynth.sol

@@ -2,13 +2,18 @@ pragma solidity ^0.5.16;
 
 import "../ExternStateToken.sol";
 import "../interfaces/ISystemStatus.sol";
+import "../interfaces/IAddressResolver.sol";
+import "../interfaces/IFeePool.sol";
 
 // Mock synth that also adheres to system status
 
 contract MockSynth is ExternStateToken {
-    ISystemStatus private systemStatus;
+    IAddressResolver private addressResolver;
     bytes32 public currencyKey;
 
+    // Where fees are pooled in sUSD
+    address public constant FEE_ADDRESS = 0xfeEFEEfeefEeFeefEEFEEfEeFeefEEFeeFEEFEeF;
+
     constructor(
         address payable _proxy,
         TokenState _tokenState,
@@ -21,18 +26,49 @@ contract MockSynth is ExternStateToken {
         currencyKey = _currencyKey;
     }
 
-    // Allow SystemStatus to be passed in directly
-    function setSystemStatus(ISystemStatus _status) external {
-        systemStatus = _status;
+    function setAddressResolver(IAddressResolver _resolver) external {
+        addressResolver = _resolver;
     }
 
     // Used for PurgeableSynth to test removal
     function setTotalSupply(uint256 _totalSupply) external {
         totalSupply = _totalSupply;
     }
 
+    /**
+     * @notice _transferToFeeAddress function
+     * non-sUSD synths are exchanged into sUSD via synthInitiatedExchange
+     * notify feePool to record amount as fee paid to feePool */
+    function _transferToFeeAddress(address to, uint value) internal returns (bool) {
+        uint amountInUSD;
+
+        // sUSD can be transferred to FEE_ADDRESS directly
+        if (currencyKey == "sUSD") {
+            amountInUSD = value;
+            _transferByProxy(messageSender, to, value);
+        } else {
+            // for now, do nothing
+        }
+
+        // Notify feePool to record sUSD to distribute as fees
+        IFeePool(addressResolver.getAddress("FeePool")).recordFeePaid(amountInUSD);
+
+        return true;
+    }
+
     function transfer(address to, uint value) external optionalProxy returns (bool) {
-        systemStatus.requireSynthActive(currencyKey);
+        ISystemStatus(addressResolver.getAddress("SystemStatus")).requireSynthActive(currencyKey);
+
+        // transfers to FEE_ADDRESS will be exchanged into sUSD and recorded as fee
+        if (to == FEE_ADDRESS) {
+            return _transferToFeeAddress(to, value);
+        }
+
+        // transfers to 0x address will be burned
+        if (to == address(0)) {
+            this.burn(messageSender, value);
+            return true;
+        }
 
         return _transferByProxy(messageSender, to, value);
     }
@@ -42,7 +78,7 @@ contract MockSynth is ExternStateToken {
         address to,
         uint value
     ) external optionalProxy returns (bool) {
-        systemStatus.requireSynthActive(currencyKey);
+        ISystemStatus(addressResolver.getAddress("SystemStatus")).requireSynthActive(currencyKey);
 
         return _transferFromByProxy(messageSender, from, to, value);
     }

index.js

@@ -492,7 +492,7 @@ const getUsers = ({ network = 'mainnet', user, useOvm = false } = {}) => {
 		kovan: Object.assign({}, base),
 		'kovan-ovm': Object.assign({}, base),
 		'mainnet-ovm': Object.assign({}, base, {
-			owner: '0xDe910777C787903F78C89e7a0bf7F4C435cBB1Fe',
+			owner: '0x6d4a64C57612841c2C6745dB2a4E4db34F002D20',
 		}),
 		rinkeby: Object.assign({}, base),
 		ropsten: Object.assign({}, base),

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "synthetix",
-	"version": "2.54.0",
+	"version": "2.55.0-alpha",
 	"license": "MIT",
 	"author": "Synthetix",
 	"description": "The smart contracts which make up the Synthetix system. (synthetix.io)",

package.json

@@ -922,8 +922,9 @@
 			},
 			"WrapperFactory": {
 				"address": "0xcc079BCb1dAe79C4494776f096BEff683Cd571CE",
-				"status": "current",
-				"keccak256": "0x0a16f80beda8876e3b17af0e6841cac26e959ab3806b581aeea027c2bd9cf8d7"
+				"status": "replaced",
+				"keccak256": "0x0a16f80beda8876e3b17af0e6841cac26e959ab3806b581aeea027c2bd9cf8d7",
+				"replaced_in": "v2.55.0-alpha"
 			}
 		}
 	},
@@ -951,5 +952,20 @@
 				"keccak256": "0xcbf35931a8a63393fb545169c8cb2be9b1bdee327053ee54e0482f84caa52479"
 			}
 		}
+	},
+	"v2.55.0-alpha": {
+		"tag": "v2.55.0-alpha",
+		"fulltag": "v2.55.0-alpha",
+		"release": "Atria",
+		"network": "kovan",
+		"date": "2021-12-02T22:52:06-05:00",
+		"commit": "c9c3471dff553de7d4baa700adc1bd71b73b58c0",
+		"contracts": {
+			"WrapperFactory": {
+				"address": "0xb7469A575b7931532F09AEe2882835A0249064a0",
+				"status": "current",
+				"keccak256": "0x582cac91f50cfefc154d67097081d0dd0d4877333df51c3cfe19485f80ef7e74"
+			}
+		}
 	}
 }

publish/deployed/kovan-ovm/deployment.json

@@ -6814,8 +6814,9 @@
 			},
 			"WrapperFactory": {
 				"address": "0xDE390c23De4cb2c9CC2e50c28f22A8b5f947b748",
-				"status": "current",
-				"keccak256": "0x0b16131f068641f79c66eb17f5504abe5e2df3a7c2acb097c8db05de3113c7af"
+				"status": "replaced",
+				"keccak256": "0x0b16131f068641f79c66eb17f5504abe5e2df3a7c2acb097c8db05de3113c7af",
+				"replaced_in": "v2.55.0-alpha"
 			}
 		}
 	},
@@ -6838,5 +6839,20 @@
 				"keccak256": "0xa1449f609b4427b695977ed157cfe46414a16d902590507338c7d5fb00c40206"
 			}
 		}
+	},
+	"v2.55.0-alpha": {
+		"tag": "v2.55.0-alpha",
+		"fulltag": "v2.55.0-alpha",
+		"release": "Atria",
+		"network": "kovan",
+		"date": "2021-12-02T22:52:06-05:00",
+		"commit": "c9c3471dff553de7d4baa700adc1bd71b73b58c0",
+		"contracts": {
+			"WrapperFactory": {
+				"address": "0x6B4D3e213e10d9238c1a1A87E493687cc2eb1DD0",
+				"status": "current",
+				"keccak256": "0x582cac91f50cfefc154d67097081d0dd0d4877333df51c3cfe19485f80ef7e74"
+			}
+		}
 	}
 }

publish/deployed/kovan-ovm/versions.json

@@ -407,6 +407,11 @@
 			"layer": "both",
 			"sources": ["DebtCache", "Issuer"],
 			"released": "both"
+		},
+		{
+			"sip": 192,
+			"layer": "both",
+			"sources": ["WrapperFactory"]
 		}
 	],
 	"releases": [
@@ -706,7 +711,7 @@
 				"major": 2,
 				"minor": 55
 			},
-			"sips": []
+			"sips": [192]
 		},
 		{
 			"name": "Atria (Optimism)",
@@ -716,7 +721,7 @@
 				"major": 2,
 				"minor": 55
 			},
-			"sips": []
+			"sips": [192]
 		},
 		{
 			"name": "Alhena",

publish/deployed/kovan/deployment.json

@@ -55,12 +55,10 @@ class SafeBatchSubmitter {
 
 			let matchedTxnIsPending = false;
 
-			for (const {
-				nonce,
-				dataDecoded: {
+			for (const { nonce, dataDecoded } of pendingTxns.results) {
+				const {
 					parameters: [{ valueDecoded }],
-				},
-			} of pendingTxns.results) {
+				} = dataDecoded || { parameters: [{ valueDecoded: [] }] };
 				// figure out what the next unused nonce position is (including everything else in the queue)
 				this.unusedNoncePosition = Math.max(this.unusedNoncePosition, nonce + 1);
 				matchedTxnIsPending =

publish/deployed/kovan/versions.json

@@ -161,6 +161,11 @@ const connectLayer = async ({
 
 			const owner = await AddressResolver.owner();
 			if (wallet.address.toLowerCase() !== owner.toLowerCase()) {
+				const calldata = await AddressResolver.interface.encodeFunctionData('importAddresses', [
+					names.map(toBytes32),
+					addresses,
+				]);
+				console.log('Calldata is', calldata);
 				await confirmAction(
 					yellow(
 						`    ⚠️  AddressResolver is owned by ${owner} and the current signer is $${wallet.address}. Please execute the above transaction and press "y" when done.`

publish/deployed/mainnet-ovm/deployment.json

@@ -325,6 +325,7 @@ const deploy = async ({
 		limitPromise,
 		newContractsBeingAdded,
 		runStep,
+		network,
 		useOvm,
 	});
 

publish/deployed/mainnet/deployment.json

@@ -13,11 +13,12 @@ module.exports = async ({
 	limitPromise,
 	newContractsBeingAdded,
 	runStep,
+	network,
 	useOvm,
 }) => {
 	console.log(gray(`\n------ REBUILD RESOLVER CACHES ------\n`));
 
-	const { AddressResolver } = deployer.deployedContracts;
+	const { AddressResolver, WrapperFactory } = deployer.deployedContracts;
 
 	const filterTargetsWith = ({ prop }) =>
 		Object.entries(deployer.deployedContracts).filter(([, target]) => {
@@ -26,6 +27,93 @@ module.exports = async ({
 
 	const contractsWithRebuildableCache = filterTargetsWith({ prop: 'rebuildCache' });
 
+	const wrappers = [];
+
+	// add deployed wrappers
+	try {
+		const wrapperCreatedLogs = await deployer.provider.getLogs({
+			fromBlock: 0,
+			topics: [ethers.utils.id('WrapperCreated(address,bytes32,address)')],
+		});
+
+		for (const rawLog of wrapperCreatedLogs) {
+			const log = WrapperFactory.interface.parseLog(rawLog);
+			wrappers.push([
+				`Wrapper for ${yellow(
+					ethers.utils.parseBytes32String(log.args.currencyKey)
+				)} via token ${yellow(
+					await new ethers.Contract(
+						log.args.token,
+						[
+							{
+								constant: true,
+								inputs: [],
+								name: 'name',
+								outputs: [
+									{
+										type: 'string',
+									},
+								],
+								payable: false,
+								stateMutability: 'view',
+								type: 'function',
+							},
+						],
+						deployer.provider
+					).name()
+				)}`,
+				new ethers.Contract(log.args.wrapperAddress, WrapperFactory.interface, deployer.provider),
+			]); // interface doesn't matter as long as it responds to MixinResolver
+		}
+	} catch (err) {
+		if (/eth_getLogs are limited to a 10,000 blocks range/.test(err.message)) {
+			console.log(
+				yellow.bold(
+					'Warning: Cannot fetch logs on this network. Known limitation on OVM mainnet - cannot search back greater than 10k blocks'
+				)
+			);
+		} else {
+			throw err;
+		}
+	}
+
+	// OVM pre-regenesis
+	if (network === 'mainnet' && useOvm) {
+		console.log(gray('Adding 3 known OVM wrapper pre-regenesis'));
+		wrappers.push(
+			[
+				'WETHWrapper',
+				new ethers.Contract(
+					'0x6202A3B0bE1D222971E93AaB084c6E584C29DB70',
+					WrapperFactory.interface,
+					deployer.provider
+				),
+			],
+			[
+				'DAIWrapper',
+				new ethers.Contract(
+					'0xad32aA4Bff8b61B4aE07E3BA437CF81100AF0cD7',
+					WrapperFactory.interface,
+					deployer.provider
+				),
+			],
+			[
+				'LUSDWrapper',
+				new ethers.Contract(
+					'0x8A91e92FDd86e734781c38DB52a390e1B99fba7c',
+					WrapperFactory.interface,
+					deployer.provider
+				),
+			]
+		);
+	}
+
+	console.log(gray(`found ${yellow(wrappers.length)} wrapper addresses`));
+
+	wrappers.forEach(([label, target]) => console.log(gray(label, 'at', yellow(target.address))));
+
+	contractsWithRebuildableCache.push(...wrappers);
+
 	// collect all resolver addresses required
 	const contractToDepMap = {};
 	const resolverAddressesRequired = (

publish/releases.json

@@ -72,6 +72,7 @@ const nominate = async ({
 	} = loadConnections({
 		network,
 		useFork,
+		useOvm,
 	});
 
 	if (!providerUrl) {