From aa27c54a1b176b17a2334b40582645bb4860ed61 Mon Sep 17 00:00:00 2001 From: MoonBoi9001 Date: Mon, 30 Sep 2024 17:56:02 +0100 Subject: [PATCH] fix: emit amount authorized + rescuded token in AuthorizedCollector/TokensRescued respectively. --- .../contracts/data-service/extensions/DataServiceRescuable.sol | 2 +- .../data-service/interfaces/IDataServiceRescuable.sol | 2 +- packages/horizon/contracts/interfaces/IPaymentsEscrow.sol | 3 ++- packages/horizon/contracts/payments/PaymentsEscrow.sol | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/horizon/contracts/data-service/extensions/DataServiceRescuable.sol b/packages/horizon/contracts/data-service/extensions/DataServiceRescuable.sol index 081950b8d..0d2f0750d 100644 --- a/packages/horizon/contracts/data-service/extensions/DataServiceRescuable.sol +++ b/packages/horizon/contracts/data-service/extensions/DataServiceRescuable.sol @@ -70,6 +70,6 @@ abstract contract DataServiceRescuable is DataService, IDataServiceRescuable { if (Denominations.isNativeToken(_token)) Address.sendValue(payable(_to), _tokens); else SafeERC20.safeTransfer(IERC20(_token), _to, _tokens); - emit TokensRescued(msg.sender, _to, _tokens); + emit TokensRescued(msg.sender, _to, _token, _tokens); } } diff --git a/packages/horizon/contracts/data-service/interfaces/IDataServiceRescuable.sol b/packages/horizon/contracts/data-service/interfaces/IDataServiceRescuable.sol index 811d3b92e..07e97ee8c 100644 --- a/packages/horizon/contracts/data-service/interfaces/IDataServiceRescuable.sol +++ b/packages/horizon/contracts/data-service/interfaces/IDataServiceRescuable.sol @@ -12,7 +12,7 @@ interface IDataServiceRescuable is IDataService { /** * @notice Emitted when tokens are rescued from the contract. */ - event TokensRescued(address indexed from, address indexed to, uint256 tokens); + event TokensRescued(address indexed from, address indexed to, address token, uint256 tokens); /** * @notice Emitted when a rescuer is set. diff --git a/packages/horizon/contracts/interfaces/IPaymentsEscrow.sol b/packages/horizon/contracts/interfaces/IPaymentsEscrow.sol index 4b98cf0a5..40394900f 100644 --- a/packages/horizon/contracts/interfaces/IPaymentsEscrow.sol +++ b/packages/horizon/contracts/interfaces/IPaymentsEscrow.sol @@ -38,8 +38,9 @@ interface IPaymentsEscrow { * @notice Emitted when a payer authorizes a collector to collect funds * @param payer The address of the payer * @param collector The address of the collector + * @param allowance The number of tokens the collector is allowed to collect */ - event AuthorizedCollector(address indexed payer, address indexed collector); + event AuthorizedCollector(address indexed payer, address indexed collector, uint256 allowance); /** * @notice Emitted when a payer thaws a collector diff --git a/packages/horizon/contracts/payments/PaymentsEscrow.sol b/packages/horizon/contracts/payments/PaymentsEscrow.sol index 5d0694346..4b76e2bc6 100644 --- a/packages/horizon/contracts/payments/PaymentsEscrow.sol +++ b/packages/horizon/contracts/payments/PaymentsEscrow.sol @@ -82,7 +82,7 @@ contract PaymentsEscrow is Initializable, MulticallUpgradeable, GraphDirectory, require(allowance != 0, PaymentsEscrowInvalidZeroTokens()); Collector storage collector = authorizedCollectors[msg.sender][collector_]; collector.allowance += allowance; - emit AuthorizedCollector(msg.sender, collector_); + emit AuthorizedCollector(msg.sender, collector_, collector.allowance); } /**