Skip to content

Commit d694d87

Browse files
feat: add more event emissions (#840)
Co-authored-by: Urix <43704209+uri-99@users.noreply.github.com>
1 parent f470f12 commit d694d87

3 files changed

Lines changed: 28 additions & 9 deletions

File tree

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

contracts/src/core/AlignedLayerServiceManager.sol

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ contract AlignedLayerServiceManager is
3434
);
3535

3636
event BatchVerified(bytes32 indexed batchMerkleRoot, address senderAddress);
37+
event BatcherBalanceUpdated(address indexed batcher, uint256 newBalance);
3738

3839
constructor(
3940
IAVSDirectory __avsDirectory,
@@ -75,6 +76,10 @@ contract AlignedLayerServiceManager is
7576

7677
if (msg.value > 0) {
7778
batchersBalances[msg.sender] += msg.value;
79+
emit BatcherBalanceUpdated(
80+
msg.sender,
81+
batchersBalances[msg.sender]
82+
);
7883
}
7984

8085
require(batchersBalances[msg.sender] > 0, "Batcher balance is empty");
@@ -86,7 +91,12 @@ contract AlignedLayerServiceManager is
8691

8792
batchesState[batchIdentifierHash] = batchState;
8893

89-
emit NewBatch(batchMerkleRoot, msg.sender, uint32(block.number), batchDataPointer);
94+
emit NewBatch(
95+
batchMerkleRoot,
96+
msg.sender,
97+
uint32(block.number),
98+
batchDataPointer
99+
);
90100
}
91101

92102
function respondToTask(
@@ -98,7 +108,7 @@ contract AlignedLayerServiceManager is
98108
uint256 initialGasLeft = gasleft();
99109

100110
bytes32 batchIdentifierHash = keccak256(
101-
abi.encodePacked(batchMerkleRoot, senderAddress)
111+
abi.encodePacked(batchMerkleRoot, senderAddress)
102112
);
103113

104114
/* CHECKING SIGNATURES & WHETHER THRESHOLD IS MET OR NOT */
@@ -116,10 +126,7 @@ contract AlignedLayerServiceManager is
116126
"Batch already responded"
117127
);
118128

119-
require(
120-
batchersBalances[senderAddress] > 0,
121-
"Batcher has no balance"
122-
);
129+
require(batchersBalances[senderAddress] > 0, "Batcher has no balance");
123130

124131
batchesState[batchIdentifierHash].responded = true;
125132

@@ -152,12 +159,15 @@ contract AlignedLayerServiceManager is
152159
uint256 txCost = (initialGasLeft - finalGasLeft + 70000) * tx.gasprice;
153160

154161
require(
155-
batchersBalances[senderAddress] >=
156-
txCost,
162+
batchersBalances[senderAddress] >= txCost,
157163
"Batcher has not sufficient funds for paying this transaction"
158164
);
159165

160166
batchersBalances[senderAddress] -= txCost;
167+
emit BatcherBalanceUpdated(
168+
senderAddress,
169+
batchersBalances[senderAddress]
170+
);
161171
payable(msg.sender).transfer(txCost);
162172
}
163173

@@ -207,6 +217,7 @@ contract AlignedLayerServiceManager is
207217

208218
receive() external payable {
209219
batchersBalances[msg.sender] += msg.value;
220+
emit BatcherBalanceUpdated(msg.sender, batchersBalances[msg.sender]);
210221
}
211222

212223
function checkPublicInput(

contracts/src/core/BatcherPaymentService.sol

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ contract BatcherPaymentService is
2121
// EVENTS
2222
event PaymentReceived(address indexed sender, uint256 amount);
2323
event FundsWithdrawn(address indexed recipient, uint256 amount);
24+
event TaskCreated(bytes32 indexed batchMerkleRoot, string batchDataPointer);
25+
event BalanceLocked(address indexed user);
26+
event BalanceUnlocked(address indexed user, uint256 unlockBlock);
2427

2528
struct SignatureData {
2629
bytes signature;
@@ -112,6 +115,8 @@ contract BatcherPaymentService is
112115
batchDataPointer
113116
);
114117

118+
emit TaskCreated(batchMerkleRoot, batchDataPointer);
119+
115120
payable(BatcherWallet).transfer(
116121
(feePerProof * signaturesQty) - feeForAggregator
117122
);
@@ -124,11 +129,13 @@ contract BatcherPaymentService is
124129
);
125130

126131
UserData[msg.sender].unlockBlock = block.number + UNLOCK_BLOCK_COUNT;
132+
emit BalanceUnlocked(msg.sender, UserData[msg.sender].unlockBlock);
127133
}
128134

129135
function lock() external whenNotPaused {
130136
require(UserData[msg.sender].balance > 0, "User has no funds to lock");
131137
UserData[msg.sender].unlockBlock = 0;
138+
emit BalanceLocked(msg.sender);
132139
}
133140

134141
function withdraw(uint256 amount) external whenNotPaused {
@@ -142,6 +149,7 @@ contract BatcherPaymentService is
142149

143150
user_data.balance -= amount;
144151
user_data.unlockBlock = 0;
152+
emit BalanceLocked(msg.sender);
145153
payable(msg.sender).transfer(amount);
146154
emit FundsWithdrawn(msg.sender, amount);
147155
}

0 commit comments

Comments
 (0)