Revert Chainlink changes as they are yet only for base

This reverts commit c9cf454.
PeggyJV · Nov 14, 2024 · 46afe75 · 46afe75
1 parent c9cf454
commit 46afe75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/base/ERC4626SharePriceOracle.sol b/src/base/ERC4626SharePriceOracle.sol
@@ -297,17 +297,16 @@ contract ERC4626SharePriceOracle is AutomationCompatibleInterface {
         IRegistrar registrar = IRegistrar(automationRegistrar);
         IRegistry registry = IRegistry(automationRegistry);
         IRegistrar.RegistrationParams memory params = IRegistrar.RegistrationParams({
+            name: string.concat(target.name(), " Share Price Oracle"),
+            encryptedEmail: hex"",
             upkeepContract: address(this),
-            amount: initialUpkeepFunds,
-            adminAddress: automationAdmin,
             gasLimit: UPKEEP_GAS_LIMIT,
+            adminAddress: automationAdmin,
             triggerType: 0,
-            billingToken: address(link),
-            name: string.concat(target.name(), " Share Price Oracle"),
-            encryptedEmail: hex"",
             checkData: hex"",
             triggerConfig: hex"",
-            offchainConfig: hex""
+            offchainConfig: hex"",
+            amount: initialUpkeepFunds
         });
 
         link.safeApprove(automationRegistrar, initialUpkeepFunds);

diff --git a/src/interfaces/external/Chainlink/IRegistrar.sol b/src/interfaces/external/Chainlink/IRegistrar.sol
@@ -3,17 +3,16 @@ pragma solidity 0.8.21;
 
 interface IRegistrar {
     struct RegistrationParams {
+        string name;
+        bytes encryptedEmail;
         address upkeepContract;
-        uint96 amount;
-        address adminAddress;
         uint32 gasLimit;
+        address adminAddress;
         uint8 triggerType;
-        address billingToken;
-        string name;
-        bytes encryptedEmail;
         bytes checkData;
         bytes triggerConfig;
         bytes offchainConfig;
+        uint96 amount;
     }
 
     enum AutoApproveType {
@@ -22,7 +21,7 @@ interface IRegistrar {
         ENABLED_ALL
     }
 
-    function registerUpkeep(RegistrationParams calldata requestParams) external payable returns (uint256 id);
+    function registerUpkeep(RegistrationParams calldata requestParams) external returns (uint256 id);
 
     function setTriggerConfig(
         uint8 triggerType,