Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
FelixFan1992 committed Aug 12, 2024
1 parent 0df9d0d commit 04376d3
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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(
ZKSyncAutomationRegistryLogicC2_3 logicA
ZKSyncAutomationRegistryLogicA2_3 logicA
)
ZKSyncAutomationRegistryBase2_3(
logicA.getLinkAddress(),
logicA.getLinkUSDFeedAddress(),
logicA.getNativeUSDFeedAddress(),
logicA.getFastGasFeedAddress(),
logicA.getAutomationForwarderLogic(),
logicA.getAllowedReadOnlyAddress(),
logicA.getPayoutMode(),
logicA.getWrappedNativeTokenAddress()
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()
)
Chainable(address(logicA))
{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,28 +86,28 @@ abstract contract ZKSyncAutomationRegistryBase2_3 is ConfirmedOwner {
EnumerableSet.AddressSet internal s_registrars;
mapping(address => Transmitter) internal s_transmitters;
mapping(address => Signer) internal s_signers;
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
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
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 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;
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;
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
mapping(uint256 => bytes) internal s_upkeepPrivilegeConfig; // general config set by an administrative role for an upkeep
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) public s_billingConfigs; // billing configurations for different tokens
mapping(IERC20 billingToken => BillingConfig billingConfig) internal s_billingConfigs; // billing configurations for different tokens
mapping(uint256 upkeepID => BillingOverrides billingOverrides) internal s_billingOverrides; // billing overrides for specific upkeeps
IERC20[] public s_billingTokens; // list of billing tokens
PayoutMode public s_payoutMode;
IERC20[] internal s_billingTokens; // list of billing tokens
PayoutMode internal s_payoutMode;

error ArrayHasNoEntries();
error CannotCancel();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
ZKSyncAutomationRegistryLogicC2_3 logicB
ZKSyncAutomationRegistryLogicB2_3 logicB
)
ZKSyncAutomationRegistryBase2_3(
logicB.getLinkAddress(),
logicB.getLinkUSDFeedAddress(),
logicB.getNativeUSDFeedAddress(),
logicB.getFastGasFeedAddress(),
logicB.getAutomationForwarderLogic(),
logicB.getAllowedReadOnlyAddress(),
logicB.getPayoutMode(),
logicB.getWrappedNativeTokenAddress()
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()
)
Chainable(address(logicB))
{}
Expand Down

0 comments on commit 04376d3

Please sign in to comment.