@@ -23,17 +23,21 @@ import { GraphDirectory } from "../utilities/GraphDirectory.sol";
2323contract PaymentsEscrow is Initializable , MulticallUpgradeable , GraphDirectory , IPaymentsEscrow {
2424 using TokenUtils for IGraphToken;
2525
26- /// @notice Escrow account details for payer-collector-receiver tuples
27- mapping (address payer = > mapping (address collector = > mapping (address receiver = > IPaymentsEscrow.EscrowAccount escrowAccount )))
28- public escrowAccounts;
29-
3026 /// @notice The maximum thawing period (in seconds) for both escrow withdrawal and collector revocation
3127 /// @dev This is a precautionary measure to avoid inadvertedly locking funds for too long
3228 uint256 public constant MAX_WAIT_PERIOD = 90 days ;
3329
3430 /// @notice Thawing period in seconds for escrow funds withdrawal
3531 uint256 public immutable WITHDRAW_ESCROW_THAWING_PERIOD;
3632
33+ /// @notice Escrow account details for payer-collector-receiver tuples
34+ mapping (address payer = > mapping (address collector = > mapping (address receiver = > IPaymentsEscrow.EscrowAccount escrowAccount )))
35+ public escrowAccounts;
36+
37+ /**
38+ * @notice Modifier to prevent function execution when contract is paused
39+ * @dev Reverts if the controller indicates the contract is paused
40+ */
3741 modifier notPaused () {
3842 require (! _graphController ().paused (), PaymentsEscrowIsPaused ());
3943 _;
@@ -78,19 +82,9 @@ contract PaymentsEscrow is Initializable, MulticallUpgradeable, GraphDirectory,
7882 * @notice See {IPaymentsEscrow-thaw}
7983 */
8084 function thaw (address collector , address receiver , uint256 tokens ) external override notPaused {
81- EscrowAccount storage account = escrowAccounts[msg .sender ][collector][receiver];
82-
83- // if amount thawing is zero and requested amount is zero this is an invalid request.
84- // otherwise if amount thawing is greater than zero and requested amount is zero this
85- // is a cancel thaw request.
86- if (tokens == 0 ) {
87- require (account.tokensThawing != 0 , PaymentsEscrowNotThawing ());
88- account.tokensThawing = 0 ;
89- account.thawEndTimestamp = 0 ;
90- emit CancelThaw (msg .sender , receiver);
91- return ;
92- }
85+ require (tokens > 0 , PaymentsEscrowInvalidZeroTokens ());
9386
87+ EscrowAccount storage account = escrowAccounts[msg .sender ][collector][receiver];
9488 require (account.balance >= tokens, PaymentsEscrowInsufficientBalance (account.balance, tokens));
9589
9690 account.tokensThawing = tokens;
@@ -99,6 +93,21 @@ contract PaymentsEscrow is Initializable, MulticallUpgradeable, GraphDirectory,
9993 emit Thaw (msg .sender , collector, receiver, tokens, account.thawEndTimestamp);
10094 }
10195
96+ /**
97+ * @notice See {IPaymentsEscrow-cancelThaw}
98+ */
99+ function cancelThaw (address collector , address receiver ) external override notPaused {
100+ EscrowAccount storage account = escrowAccounts[msg .sender ][collector][receiver];
101+ require (account.tokensThawing != 0 , PaymentsEscrowNotThawing ());
102+
103+ uint256 tokensThawing = account.tokensThawing;
104+ uint256 thawEndTimestamp = account.thawEndTimestamp;
105+ account.tokensThawing = 0 ;
106+ account.thawEndTimestamp = 0 ;
107+
108+ emit CancelThaw (msg .sender , collector, receiver, tokensThawing, thawEndTimestamp);
109+ }
110+
102111 /**
103112 * @notice See {IPaymentsEscrow-withdraw}
104113 */
@@ -138,29 +147,27 @@ contract PaymentsEscrow is Initializable, MulticallUpgradeable, GraphDirectory,
138147 // Reduce amount from account balance
139148 account.balance -= tokens;
140149
141- uint256 balanceBefore = _graphToken ().balanceOf (address (this ));
150+ uint256 escrowBalanceBefore = _graphToken ().balanceOf (address (this ));
142151
143152 _graphToken ().approve (address (_graphPayments ()), tokens);
144153 _graphPayments ().collect (paymentType, receiver, tokens, dataService, dataServiceCut);
145154
146- uint256 balanceAfter = _graphToken ().balanceOf (address (this ));
155+ // Verify that the escrow balance is consistent with the collected tokens
156+ uint256 escrowBalanceAfter = _graphToken ().balanceOf (address (this ));
147157 require (
148- balanceBefore == tokens + balanceAfter ,
149- PaymentsEscrowInconsistentCollection (balanceBefore, balanceAfter , tokens)
158+ escrowBalanceBefore == tokens + escrowBalanceAfter ,
159+ PaymentsEscrowInconsistentCollection (escrowBalanceBefore, escrowBalanceAfter , tokens)
150160 );
151161
152- emit EscrowCollected (payer, msg .sender , receiver, tokens);
162+ emit EscrowCollected (paymentType, payer, msg .sender , receiver, tokens);
153163 }
154164
155165 /**
156166 * @notice See {IPaymentsEscrow-getBalance}
157167 */
158168 function getBalance (address payer , address collector , address receiver ) external view override returns (uint256 ) {
159169 EscrowAccount storage account = escrowAccounts[payer][collector][receiver];
160- if (account.balance <= account.tokensThawing) {
161- return 0 ;
162- }
163- return account.balance - account.tokensThawing;
170+ return account.balance > account.tokensThawing ? account.balance - account.tokensThawing : 0 ;
164171 }
165172
166173 /**
0 commit comments