update Synth.sol

Synthetixio · Mar 28, 2024 · da0ca3f · da0ca3f
1 parent 364e542
commit da0ca3f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/contracts/Synth.sol b/contracts/Synth.sol
@@ -93,21 +93,13 @@ contract Synth is Owned, IERC20, ExternStateToken, MixinResolver, ISynth {
         return super._internalTransfer(messageSender, to, value);
     }
 
-    function transferFrom(
-        address from,
-        address to,
-        uint value
-    ) public onlyProxyOrInternal returns (bool) {
+    function transferFrom(address from, address to, uint value) public onlyProxyOrInternal returns (bool) {
         _ensureCanTransfer(from, value);
 
         return _internalTransferFrom(from, to, value);
     }
 
-    function transferFromAndSettle(
-        address from,
-        address to,
-        uint value
-    ) public onlyProxyOrInternal returns (bool) {
+    function transferFromAndSettle(address from, address to, uint value) public onlyProxyOrInternal returns (bool) {
         // Exchanger.settle() ensures synth is active
         (, , uint numEntriesSettled) = exchanger().settle(from, currencyKey);
 
@@ -240,11 +232,7 @@ contract Synth is Owned, IERC20, ExternStateToken, MixinResolver, ISynth {
 
     /* ========== INTERNAL FUNCTIONS ========== */
 
-    function _internalTransferFrom(
-        address from,
-        address to,
-        uint value
-    ) internal returns (bool) {
+    function _internalTransferFrom(address from, address to, uint value) internal returns (bool) {
         // Skip allowance update in case of infinite allowance
         if (tokenState.allowance(from, messageSender) != uint(-1)) {
             // Reduce the allowance by the amount we're transferring.
@@ -270,7 +258,7 @@ contract Synth is Owned, IERC20, ExternStateToken, MixinResolver, ISynth {
         _;
     }
 
-    modifier onlyProxyOrInternal {
+    modifier onlyProxyOrInternal() {
         _onlyProxyOrInternal();
         _;
     }
@@ -291,11 +279,12 @@ contract Synth is Owned, IERC20, ExternStateToken, MixinResolver, ISynth {
     /// which isn't supported due to SIP-238 for other callers
     function _isInternalTransferCaller(address caller) internal view returns (bool) {
         // These entries are not required or cached in order to allow them to not exist (==address(0))
-        // e.g. due to not being available on L2 or at some future point in time.
+        // e.g. due to not being available on L2 or at some future point time.
         return
             // ordered to reduce gas for more frequent calls
             caller == resolver.getAddress("CollateralShort") ||
             // not used frequently
+            caller == resolver.getAddress("DynamicSynthRedeemer") ||
             caller == resolver.getAddress("SynthRedeemer") ||
             caller == resolver.getAddress("WrapperFactory") || // transfer not used by users
             // legacy

diff --git a/test/contracts/Synth.js b/test/contracts/Synth.js
@@ -205,12 +205,18 @@ contract('Synth', async accounts => {
 				);
 			});
 
-			it('transfer does not revert from a whitelisted contract', async () => {
+			it('transfer does not revert from whitelisted contracts', async () => {
 				// set owner as SynthRedeemer
 				await addressResolver.importAddresses(['SynthRedeemer'].map(toBytes32), [owner], {
 					from: owner,
 				});
 				await sUSDImpl.transfer(account1, amount, { from: owner });
+
+				// set owner as DynamicSynthRedeemer
+				await addressResolver.importAddresses(['DynamicSynthRedeemer'].map(toBytes32), [owner], {
+					from: owner,
+				});
+				await sUSDImpl.transfer(account1, amount, { from: owner });
 			});
 		});
 	});