Commit a9cb652b authored by Karl Floersch's avatar Karl Floersch

Small event fixes

parent 9c4eb7f8
......@@ -172,7 +172,9 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
queue.push2(transactionHash, timestampAndBlockNumber, bytes28(0));
emit QueueTransactionAppended(transaction, timestampAndBlockNumber);
(, uint32 nextQueueIndex) = _getLatestBatchContext();
// TODO: Evaluate if we need timestamp
emit TransactionEnqueued(transaction, nextQueueIndex - 1, block.timestamp);
}
/**
......@@ -203,7 +205,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
_numQueuedTransactions
);
emit ChainBatchAppended(
emit QueueBatchAppended(
nextQueueIndex - _numQueuedTransactions,
_numQueuedTransactions
);
......@@ -271,6 +273,10 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
}
}
require(
numSequencerTransactionsProcessed == _transactions.length,
"Not all sequencer transactions were processed."
);
require(
transactionIndex == _totalElementsToAppend,
"Actual transaction index does not match expected total elements to append."
......@@ -283,7 +289,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
numQueuedTransactions
);
emit ChainBatchAppended(
emit SequencerBatchAppended(
nextQueueIndex - numQueuedTransactions,
numQueuedTransactions
);
......
......@@ -17,12 +17,18 @@ interface iOVM_CanonicalTransactionChain is iOVM_BaseChain {
* Events *
**********/
event QueueTransactionAppended(
event TransactionEnqueued(
bytes _transaction,
bytes32 _timestampAndBlockNumber
uint _queueIndex,
uint _timestamp
);
event ChainBatchAppended(
event QueueBatchAppended(
uint256 _startingQueueIndex,
uint256 _numQueueElements
);
event SequencerBatchAppended(
uint256 _startingQueueIndex,
uint256 _numQueueElements
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment