Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
a9cb652b
Commit
a9cb652b
authored
Oct 13, 2020
by
Karl Floersch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small event fixes
parent
9c4eb7f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
6 deletions
+18
-6
OVM_CanonicalTransactionChain.sol
...stic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol
+9
-3
iOVM_CanonicalTransactionChain.sol
...ic-ethereum/iOVM/chain/iOVM_CanonicalTransactionChain.sol
+9
-3
No files found.
packages/contracts/contracts/optimistic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol
View file @
a9cb652b
...
@@ -172,7 +172,9 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
...
@@ -172,7 +172,9 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
queue.push2(transactionHash, timestampAndBlockNumber, bytes28(0));
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
...
@@ -203,7 +205,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
_numQueuedTransactions
_numQueuedTransactions
);
);
emit
Chain
BatchAppended(
emit
Queue
BatchAppended(
nextQueueIndex - _numQueuedTransactions,
nextQueueIndex - _numQueuedTransactions,
_numQueuedTransactions
_numQueuedTransactions
);
);
...
@@ -271,6 +273,10 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
...
@@ -271,6 +273,10 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
}
}
}
}
require(
numSequencerTransactionsProcessed == _transactions.length,
"Not all sequencer transactions were processed."
);
require(
require(
transactionIndex == _totalElementsToAppend,
transactionIndex == _totalElementsToAppend,
"Actual transaction index does not match expected total elements to append."
"Actual transaction index does not match expected total elements to append."
...
@@ -283,7 +289,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
...
@@ -283,7 +289,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
numQueuedTransactions
numQueuedTransactions
);
);
emit
Chain
BatchAppended(
emit
Sequencer
BatchAppended(
nextQueueIndex - numQueuedTransactions,
nextQueueIndex - numQueuedTransactions,
numQueuedTransactions
numQueuedTransactions
);
);
...
...
packages/contracts/contracts/optimistic-ethereum/iOVM/chain/iOVM_CanonicalTransactionChain.sol
View file @
a9cb652b
...
@@ -17,12 +17,18 @@ interface iOVM_CanonicalTransactionChain is iOVM_BaseChain {
...
@@ -17,12 +17,18 @@ interface iOVM_CanonicalTransactionChain is iOVM_BaseChain {
* Events *
* Events *
**********/
**********/
event
QueueTransactionAppend
ed(
event
TransactionEnqueu
ed(
bytes _transaction,
bytes _transaction,
bytes32 _timestampAndBlockNumber
uint _queueIndex,
uint _timestamp
);
);
event ChainBatchAppended(
event QueueBatchAppended(
uint256 _startingQueueIndex,
uint256 _numQueueElements
);
event SequencerBatchAppended(
uint256 _startingQueueIndex,
uint256 _startingQueueIndex,
uint256 _numQueueElements
uint256 _numQueueElements
);
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment