From 0df9d0d91a805725112e412c48e5e8026f98c2f7 Mon Sep 17 00:00:00 2001 From: FelixFan1992 Date: Mon, 12 Aug 2024 16:00:29 -0400 Subject: [PATCH] update --- .../ZKSyncAutomationRegistry2_3.sol | 18 ++++++++--------- .../ZKSyncAutomationRegistryBase2_3.sol | 20 +++++++++---------- .../ZKSyncAutomationRegistryLogicA2_3.sol | 18 ++++++++--------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistry2_3.sol b/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistry2_3.sol index fd9369d79b4..25d98253bad 100644 --- a/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistry2_3.sol +++ b/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistry2_3.sol @@ -50,17 +50,17 @@ contract ZKSyncAutomationRegistry2_3 is ZKSyncAutomationRegistryBase2_3, OCR2Abs * @dev we cast the contract to logicC in order to call logicC functions (via fallback) */ constructor( - ZKSyncAutomationRegistryLogicA2_3 logicA + ZKSyncAutomationRegistryLogicC2_3 logicA ) ZKSyncAutomationRegistryBase2_3( - ZKSyncAutomationRegistryLogicC2_3(address(logicA)).getLinkAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicA)).getLinkUSDFeedAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicA)).getNativeUSDFeedAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicA)).getFastGasFeedAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicA)).getAutomationForwarderLogic(), - ZKSyncAutomationRegistryLogicC2_3(address(logicA)).getAllowedReadOnlyAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicA)).getPayoutMode(), - ZKSyncAutomationRegistryLogicC2_3(address(logicA)).getWrappedNativeTokenAddress() + logicA.getLinkAddress(), + logicA.getLinkUSDFeedAddress(), + logicA.getNativeUSDFeedAddress(), + logicA.getFastGasFeedAddress(), + logicA.getAutomationForwarderLogic(), + logicA.getAllowedReadOnlyAddress(), + logicA.getPayoutMode(), + logicA.getWrappedNativeTokenAddress() ) Chainable(address(logicA)) {} diff --git a/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistryBase2_3.sol b/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistryBase2_3.sol index 497685b5ae8..db989e2c25c 100644 --- a/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistryBase2_3.sol +++ b/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistryBase2_3.sol @@ -86,17 +86,17 @@ abstract contract ZKSyncAutomationRegistryBase2_3 is ConfirmedOwner { EnumerableSet.AddressSet internal s_registrars; mapping(address => Transmitter) internal s_transmitters; mapping(address => Signer) internal s_signers; - address[] internal s_signersList; // s_signersList contains the signing address of each oracle - address[] internal s_transmittersList; // s_transmittersList contains the transmission address of each oracle + address[] public s_signersList; // s_signersList contains the signing address of each oracle + address[] public s_transmittersList; // s_transmittersList contains the transmission address of each oracle EnumerableSet.AddressSet internal s_deactivatedTransmitters; mapping(address => address) internal s_transmitterPayees; // s_payees contains the mapping from transmitter to payee. mapping(address => address) internal s_proposedPayee; // proposed payee for a transmitter bytes32 internal s_latestConfigDigest; // Read on transmit path in case of signature verification - HotVars internal s_hotVars; // Mixture of config and state, used in transmit - Storage internal s_storage; // Mixture of config and state, not used in transmit - uint256 internal s_fallbackGasPrice; - uint256 internal s_fallbackLinkPrice; - uint256 internal s_fallbackNativePrice; + HotVars public s_hotVars; // Mixture of config and state, used in transmit + Storage public s_storage; // Mixture of config and state, not used in transmit + uint256 public s_fallbackGasPrice; + uint256 public s_fallbackLinkPrice; + uint256 public s_fallbackNativePrice; mapping(address => MigrationPermission) internal s_peerRegistryMigrationPermission; // Permissions for migration to and fro mapping(uint256 => bytes) internal s_upkeepTriggerConfig; // upkeep triggers mapping(uint256 => bytes) internal s_upkeepOffchainConfig; // general config set by users for each upkeep @@ -104,10 +104,10 @@ abstract contract ZKSyncAutomationRegistryBase2_3 is ConfirmedOwner { mapping(address => bytes) internal s_adminPrivilegeConfig; // general config set by an administrative role for an admin // billing mapping(IERC20 billingToken => uint256 reserveAmount) internal s_reserveAmounts; // unspent user deposits + unwithdrawn NOP payments - mapping(IERC20 billingToken => BillingConfig billingConfig) internal s_billingConfigs; // billing configurations for different tokens + mapping(IERC20 billingToken => BillingConfig billingConfig) public s_billingConfigs; // billing configurations for different tokens mapping(uint256 upkeepID => BillingOverrides billingOverrides) internal s_billingOverrides; // billing overrides for specific upkeeps - IERC20[] internal s_billingTokens; // list of billing tokens - PayoutMode internal s_payoutMode; + IERC20[] public s_billingTokens; // list of billing tokens + PayoutMode public s_payoutMode; error ArrayHasNoEntries(); error CannotCancel(); diff --git a/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistryLogicA2_3.sol b/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistryLogicA2_3.sol index 64d697c70f9..0ca2000d35e 100644 --- a/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistryLogicA2_3.sol +++ b/contracts/src/v0.8/automation/v2_3_zksync/ZKSyncAutomationRegistryLogicA2_3.sol @@ -29,17 +29,17 @@ contract ZKSyncAutomationRegistryLogicA2_3 is ZKSyncAutomationRegistryBase2_3, C * @dev we cast the contract to logicC in order to call logicC functions (via fallback) */ constructor( - ZKSyncAutomationRegistryLogicB2_3 logicB + ZKSyncAutomationRegistryLogicC2_3 logicB ) ZKSyncAutomationRegistryBase2_3( - ZKSyncAutomationRegistryLogicC2_3(address(logicB)).getLinkAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicB)).getLinkUSDFeedAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicB)).getNativeUSDFeedAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicB)).getFastGasFeedAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicB)).getAutomationForwarderLogic(), - ZKSyncAutomationRegistryLogicC2_3(address(logicB)).getAllowedReadOnlyAddress(), - ZKSyncAutomationRegistryLogicC2_3(address(logicB)).getPayoutMode(), - ZKSyncAutomationRegistryLogicC2_3(address(logicB)).getWrappedNativeTokenAddress() + logicB.getLinkAddress(), + logicB.getLinkUSDFeedAddress(), + logicB.getNativeUSDFeedAddress(), + logicB.getFastGasFeedAddress(), + logicB.getAutomationForwarderLogic(), + logicB.getAllowedReadOnlyAddress(), + logicB.getPayoutMode(), + logicB.getWrappedNativeTokenAddress() ) Chainable(address(logicB)) {}