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
f86b7237
Commit
f86b7237
authored
Oct 15, 2020
by
Karl Floersch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add custom encoding for chain elements
parent
99d84f27
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
36 deletions
+44
-36
OVM_CanonicalTransactionChain.sol
...stic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol
+41
-34
OVM_CanonicalTransactionChain.spec.ts
...contracts/OVM/chain/OVM_CanonicalTransactionChain.spec.ts
+3
-2
No files found.
packages/contracts/contracts/optimistic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol
View file @
f86b7237
...
...
@@ -278,30 +278,13 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
_validateBatchContext(context, nextQueueIndex);
for (uint32 j = 0; j < context.numSequencedTransactions; j++) {
bytes memory txData = _getTransactionData(nextSequencerTransactionPosition);
bytes memory encodedChainElement = new bytes(12 + txData.length);
// assembly {
// let chainElementStart := add(encodedChainElement, 0x20)
// mstore(chainElementStart, 1)
// mstore(add(chainElementStart, 0x20), 0)
// mstore(add(chainElementStart, 0x40), context.timestamp)
// mstore(add(chainElementStart, 0x40), context.blockNumber)
// mstore(add(chainElementStart, 0x40), context.blockNumber)
// }
leaves[transactionIndex] = keccak256(
txData
(bytes32 leafHash, uint txDataLength) = _getSequencerChainElementLeafHash(
nextSequencerTransactionPosition,
context.timestamp,
context.blockNumber
);
// leaves[transactionIndex] = keccak256('hello world');
// leaves[transactionIndex] = _hashTransactionChainElement(
// TransactionChainElement({
// isSequenced: true,
// queueIndex: 0,
// timestamp: context.timestamp,
// blockNumber: context.blockNumber,
// txData: txData
// })
// );
nextSequencerTransactionPosition += uint32(TX_DATA_HEADER_SIZE + txData.length);
leaves[transactionIndex] = leafHash;
nextSequencerTransactionPosition += uint32(TX_DATA_HEADER_SIZE + txDataLength);
numSequencerTransactionsProcessed++;
transactionIndex++;
}
...
...
@@ -375,18 +358,22 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
});
}
/**
* Returns the transaction data located at a particular start position in calldata.
* @param _startPosition Start position in calldata (represented in bytes).
* @return _transactionData The transaction data for this particular element.
*/
function _getTransactionData(
uint256 _startPosition
// /**
// * Returns the transaction data located at a particular start position in calldata.
// * @param _startPosition Start position in calldata (represented in bytes).
// * @return _transactionData The transaction data for this particular element.
// */
uint constant BYTES_TILL_TX_DATA = 66;
function _getSequencerChainElementLeafHash(
uint256 _startPosition,
uint256 _timestamp,
uint256 _blockNumber
)
internal
view
returns (
bytes memory
bytes32 _leafHash,
uint _txDataLength
)
{
uint256 transactionSize;
...
...
@@ -394,12 +381,32 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
// 3 byte transactionSize
transactionSize := shr(232, calldataload(_startPosition))
}
bytes memory _
transactionData = new bytes(
transactionSize);
bytes memory _
chainElement = new bytes(BYTES_TILL_TX_DATA +
transactionSize);
assembly {
let chainElementStart := add(_chainElement, 0x20)
mstore8(chainElementStart, 1)
mstore8(add(chainElementStart, 1), 0)
mstore(add(chainElementStart, 2), _timestamp)
mstore(add(chainElementStart, 34), _blockNumber)
// Store the rest of the transaction
calldatacopy(add(_transactionData, 0x20), add(_startPosition, 3), transactionSize)
calldatacopy(add(chainElementStart, BYTES_TILL_TX_DATA), add(_startPosition, 3), transactionSize)
// Calculate the hash
_leafHash := keccak256(chainElementStart, add(BYTES_TILL_TX_DATA, transactionSize))
}
return _transactionData;
// console.log("Verifying that this worked!");
// console.logBytes(_chainElement);
// console.log("Hash:");
// console.logBytes32(_leafHash);
// console.log("TxSize:");
// console.log("transactionSize");
// console.log("~~~~~~~~");
return (
_leafHash,
transactionSize
);
}
/**
...
...
packages/contracts/test/contracts/OVM/chain/OVM_CanonicalTransactionChain.spec.ts
View file @
f86b7237
...
...
@@ -523,9 +523,10 @@ describe.only('OVM_CanonicalTransactionChain', () => {
console
.
log
(
'
\n
~~~~ BEGINNGING TRASACTION IN QUESTION ~~~~
'
)
const
transactions
=
[]
const
numTxs
=
200
// const numTxs = 20
for
(
let
i
=
0
;
i
<
numTxs
;
i
++
)
{
//
transactions.push('0x' + '1080111111111111111111111111111111111111111111111111111111111111')
transactions
.
push
(
'
0x
'
+
'
10801111
'
)
transactions
.
push
(
'
0x
'
+
'
1080111111111111111111111111111111111111111111111111111111111111
'
)
//
transactions.push('0x' + '10801111')
}
const
res
=
await
appendSequencerBatch
(
OVM_CanonicalTransactionChain
,
{
shouldStartAtBatch
:
2
,
...
...
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