feat: correct trusted type for harvesters

0xtekgrinder · 0xtekgrinder · commit 73ec13d32827 · 2024-11-19T11:26:21.000+01:00
diff --git a/scripts/foundry/transmuter/TransmuterWhitelistHarvesters.s.sol b/scripts/foundry/transmuter/TransmuterWhitelistHarvesters.s.sol
@@ -21,7 +21,7 @@ contract TransmuterWhitelistHarvesters is Utils {
             address to = address(transmuter);
             uint8 isDelegateCall = 0;
             {
-                bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x0A10f87F55d89eb2a89c264ebE46C90785a10B77, TrustedType.Updater);
+                bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x0A10f87F55d89eb2a89c264ebE46C90785a10B77, TrustedType.Seller);
                 uint256 dataLength = data.length;
                 bytes memory internalTx = abi.encodePacked(isDelegateCall, to, uint256(0), dataLength, data);
                 transactions = abi.encodePacked(transactions, internalTx);
@@ -32,13 +32,13 @@ contract TransmuterWhitelistHarvesters is Utils {
             address to = address(transmuter);
             uint8 isDelegateCall = 0;
             {
-                bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x54b96Fee8208Ea7aCe3d415e5c14798112909794, TrustedType.Updater);
+                bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x54b96Fee8208Ea7aCe3d415e5c14798112909794, TrustedType.Seller);
                 uint256 dataLength = data.length;
                 bytes memory internalTx = abi.encodePacked(isDelegateCall, to, uint256(0), dataLength, data);
                 transactions = abi.encodePacked(transactions, internalTx);
             }
             {
-                bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x5BEdD878CBfaF4dc53EC272A291A6a4C2259369D, TrustedType.Updater);
+                bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x5BEdD878CBfaF4dc53EC272A291A6a4C2259369D, TrustedType.Seller);
                 uint256 dataLength = data.length;
                 bytes memory internalTx = abi.encodePacked(isDelegateCall, to, uint256(0), dataLength, data);
                 transactions = abi.encodePacked(transactions, internalTx);
diff --git a/test/transmuter/TransmuterWhitelistHarvesters.t.sol b/test/transmuter/TransmuterWhitelistHarvesters.t.sol
@@ -36,12 +36,12 @@ contract TransmuterWhitelistHarvestersTest is BaseTest {
 
         {
             transmuter = ITransmuter(_chainToContract(chainId, ContractType.TransmuterAgEUR));
-            assertEq(IGetters(address(transmuter)).isTrusted(address(0x0A10f87F55d89eb2a89c264ebE46C90785a10B77)), true);
+            assertEq(IGetters(address(transmuter)).isTrustedSeller(address(0x0A10f87F55d89eb2a89c264ebE46C90785a10B77)), true);
         }
         {
             transmuter = ITransmuter(_chainToContract(chainId, ContractType.TransmuterAgUSD));
-            assertEq(IGetters(address(transmuter)).isTrusted(address(0x54b96Fee8208Ea7aCe3d415e5c14798112909794)), true);
-            assertEq(IGetters(address(transmuter)).isTrusted(address(0x5BEdD878CBfaF4dc53EC272A291A6a4C2259369D)), true);
+            assertEq(IGetters(address(transmuter)).isTrustedSeller(address(0x54b96Fee8208Ea7aCe3d415e5c14798112909794)), true);
+            assertEq(IGetters(address(transmuter)).isTrustedSeller(address(0x5BEdD878CBfaF4dc53EC272A291A6a4C2259369D)), true);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ contract TransmuterWhitelistHarvesters is Utils {`
`21`	`21`	`address to = address(transmuter);`
`22`	`22`	`uint8 isDelegateCall = 0;`
`23`	`23`	`{`
`24`		`- bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x0A10f87F55d89eb2a89c264ebE46C90785a10B77, TrustedType.Updater);`
	`24`	`+ bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x0A10f87F55d89eb2a89c264ebE46C90785a10B77, TrustedType.Seller);`
`25`	`25`	`uint256 dataLength = data.length;`
`26`	`26`	`bytes memory internalTx = abi.encodePacked(isDelegateCall, to, uint256(0), dataLength, data);`
`27`	`27`	`transactions = abi.encodePacked(transactions, internalTx);`
`@@ -32,13 +32,13 @@ contract TransmuterWhitelistHarvesters is Utils {`
`32`	`32`	`address to = address(transmuter);`
`33`	`33`	`uint8 isDelegateCall = 0;`
`34`	`34`	`{`
`35`		`- bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x54b96Fee8208Ea7aCe3d415e5c14798112909794, TrustedType.Updater);`
	`35`	`+ bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x54b96Fee8208Ea7aCe3d415e5c14798112909794, TrustedType.Seller);`
`36`	`36`	`uint256 dataLength = data.length;`
`37`	`37`	`bytes memory internalTx = abi.encodePacked(isDelegateCall, to, uint256(0), dataLength, data);`
`38`	`38`	`transactions = abi.encodePacked(transactions, internalTx);`
`39`	`39`	`}`
`40`	`40`	`{`
`41`		`- bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x5BEdD878CBfaF4dc53EC272A291A6a4C2259369D, TrustedType.Updater);`
	`41`	`+ bytes memory data = abi.encodeWithSelector(ISettersGovernor.toggleTrusted.selector, 0x5BEdD878CBfaF4dc53EC272A291A6a4C2259369D, TrustedType.Seller);`
`42`	`42`	`uint256 dataLength = data.length;`
`43`	`43`	`bytes memory internalTx = abi.encodePacked(isDelegateCall, to, uint256(0), dataLength, data);`
`44`	`44`	`transactions = abi.encodePacked(transactions, internalTx);`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ contract TransmuterWhitelistHarvestersTest is BaseTest {`
`36`	`36`
`37`	`37`	`{`
`38`	`38`	`transmuter = ITransmuter(_chainToContract(chainId, ContractType.TransmuterAgEUR));`
`39`		`- assertEq(IGetters(address(transmuter)).isTrusted(address(0x0A10f87F55d89eb2a89c264ebE46C90785a10B77)), true);`
	`39`	`+ assertEq(IGetters(address(transmuter)).isTrustedSeller(address(0x0A10f87F55d89eb2a89c264ebE46C90785a10B77)), true);`
`40`	`40`	`}`
`41`	`41`	`{`
`42`	`42`	`transmuter = ITransmuter(_chainToContract(chainId, ContractType.TransmuterAgUSD));`
`43`		`- assertEq(IGetters(address(transmuter)).isTrusted(address(0x54b96Fee8208Ea7aCe3d415e5c14798112909794)), true);`
`44`		`- assertEq(IGetters(address(transmuter)).isTrusted(address(0x5BEdD878CBfaF4dc53EC272A291A6a4C2259369D)), true);`
	`43`	`+ assertEq(IGetters(address(transmuter)).isTrustedSeller(address(0x54b96Fee8208Ea7aCe3d415e5c14798112909794)), true);`
	`44`	`+ assertEq(IGetters(address(transmuter)).isTrustedSeller(address(0x5BEdD878CBfaF4dc53EC272A291A6a4C2259369D)), true);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`