CanonicalTransactionChain and L1ToL2TransactionQueue by K-Ho · Pull Request #139 · ethereum-optimism/optimism

K-Ho · 2020-05-20T03:35:24Z

Description

Adds

RollupQueue contract which handles enqueueing and dequeuing of timestamped transactions (for both L1ToL2TransactionQueue and later the SlowTransactionQueue)
L1ToL2TransactionQueue contract which limits enqueueing to the l1ToL2TransactionPasser contract and limits dequeuing to the CanonicalTransactionChain contract.
CanonicalTransactionChain contract that allows batches of transactions to be added either directly from the sequencer or by moving transactions over from one of the transaction queues. It also allows for the verification of the position of a single transaction in the chain.

Questions

Let me know your thoughts on naming! Definitely room for improvement on that front

Fixes

Fixes #YAS-373, YAS-371, YAS-374, YAS-375

Contributing Agreement

I have read and understood the Optimism Contributing Guide and Code of Conduct and am following those guidelines in this pull request.

ben-chain

Woohoo!! Left a few small comments, but this LGTM!

ben-chain · 2020-05-22T21:22:29Z

packages/rollup-contracts/contracts/CanonicalTransactionChain.sol

+
+contract CanonicalTransactionChain {
+  address public sequencer;
+  uint public sequencerLivenessAssumption;


I know we've used this term in passing before, but a name more related to queueing might be good here as "liveness" is overloaded in crypto generally. forceInclusionPeriod? Idk hahaha

ben-chain · 2020-05-22T21:25:43Z

packages/rollup-contracts/contracts/CanonicalTransactionChain.sol

+    bytes32 batchHeaderHash = keccak256(abi.encodePacked(
+      timestamp,
+      true, // isL1ToL2Tx
+      elementsMerkleRoot,
+      numElementsInBatch,
+      cumulativeNumElements // cumulativePrevElements
+    ));
+    batches.push(batchHeaderHash);
+    cumulativeNumElements += numElementsInBatch;


Noting that this seems like a reasonable place for an appendBatch(time, isL1, numElements) function, seems like this functionality would be shared in a few places

ben-chain · 2020-05-22T21:30:42Z

packages/rollup-contracts/test/rollup-list/L1ToL2TransactionQueue.spec.ts

-      const block = ['0x1234']
      await l1ToL2TxQueue
-        .enqueueBlock(block)
+        .enqueueTx(defaultTx)


BTW there is a TestUtils.assertRevertsAsync which does this and auto-apends VM Exception while processing transaction: revert :)

ben-chain · 2020-05-22T21:40:34Z

packages/rollup-contracts/test/rollup-list/CanonicalTransactionChain.spec.ts

+      )
+    })
+
+    it('should rever if submitting a 10 minute old batch', async () => {


Suggested change

it('should rever if submitting a 10 minute old batch', async () => {

it('should revert if submitting a batch older than the liveness assumption', async () => {

ben-chain · 2020-05-22T21:45:17Z

packages/rollup-contracts/test/rollup-list/CanonicalTransactionChain.spec.ts

+    it('should update cumulativeNumElements correctly', async () => {
+      await appendBatch(DEFAULT_BATCH)
+      const cumulativeNumElements = await canonicalTxChain.cumulativeNumElements.call()
+      cumulativeNumElements.toNumber().should.equal(2)


Suggested change

cumulativeNumElements.toNumber().should.equal(2)

cumulativeNumElements.toNumber().should.equal(DEFAULT_BATCH.length)

c9dbc5f58 Test fix & fmt fcf735497 ExternalHeaderMode rebase f09d4e5ff Add for wind/unwind support to tbc (ethereum-optimism#159) 5c764a0cd popm: exclude tx outputs that would be dust (ethereum-optimism#186) 1f168f225 popm/wasm: fix dispatch params for {add,remove}EventListener (ethereum-optimism#181) 383611feb popm/wasm: add 'minerStatus' method (ethereum-optimism#178) 6a94b4c0b popm/wasm: rename KeyResult fields and add bitcoinScriptHash (ethereum-optimism#177) 9c4cea583 popm/wasm: add events and clean up globals (ethereum-optimism#175) a2372394d popm: improve UTXO selection when creating Bitcoin transaction (ethereum-optimism#173) 939813cac popm/wasm: fix ethereum address when generating and parsing keys (ethereum-optimism#174) 9245995ef Updated localnet to use more recent commits of optimism and op-geth (ethereum-optimism#139) 159fbc5f5 ci: improve runtime of high usage CI workflows (ethereum-optimism#163) 60a3489db popm/wasm: add 'bitcoinAddressToScriptHash' method (ethereum-optimism#169) fe9752a5a popm/wasm: add 'parseKey' method (ethereum-optimism#168) 65aa0caef ci: add registry-url to setup-node in release (ethereum-optimism#167) 8922ce805 popm/wasm: add new @hemilabs/pop-miner NPM package (ethereum-optimism#162) 67166046b scripts: add release script (ethereum-optimism#164) eea96059b ci: add labeler action (ethereum-optimism#165) git-subtree-dir: heminetwork git-subtree-split: c9dbc5f58a7f997fa4b3af0d765a2967ed3462d1

* feat: integrate portal to lockbox * fix: pr fixes * test: refactor assert

* feat: add shared lockbox (#126) * feat: create shared lockbox contract with its interface and unit tests * chore: polish tests and interfaces * chore: run pre-pr * chore: improve natspec * chore: run pre-pr * chore: update compiler version * feat: integrate portal to lockbox (#139) * feat: integrate portal to lockbox * fix: pr fixes * test: refactor assert * feat: add liquidity migrator contract with its unit test and interface (#128) * feat: create shared lockbox contract with its interface and unit tests * chore: polish tests and interfaces * chore: run pre-pr * chore: improve natspec * chore: run pre-pr * feat: add liqudity migrator contract with its unit test and interface * chore: remove underscore on stack var * chore: add todo * chore: run pre-pr * chore: add contract title natspec and proxied * refactor: integrate testing suite with common test * chore: pre-pr * chore: add spec test * feat: integrate system config with superchain config (#140) * feat: integrate portal to lockbox * fix: pr fixes * test: refactor assert * feat: integrate system config with superchain config * fix: remove OPCM interop * test: add dependency counter test * feat: manage dependency set on superchain config (#138) * chore: add zero dependencies check (#142) * fix: pre pr * feat: Add pause check (#145) * feat: Add pause check Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com> Co-authored-by: Joxess <joxes@defi.sucks> * test: add tests natspecs --------- Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com> Co-authored-by: Joxess <joxes@defi.sucks> * fix: pre pr and interfaces imports * feat: add upgrader role to superchain config (#163) * feat: use superchain config lockbox in portal (#164) * feat: use superchain config lockbox in portal * test: add new sharedlockbox test * fix: pre pr * feat: liquidity migrator deployment (#166) * feat: liquidity migrator deployment * test: fix comment * test: fix internal variables names * feat: dependency set refactor (#170) * feat: dependency set refactor * fix: deploy script variable name * fix: pr * fix: pr * fix: pre pr * fix: semgrep * fix: merge conflict * [WIP] feat: new lockbox (#192) * chore: partial implementation comments * feat: new lockbox * feat: introduce dependency manager predeploy * feat: remove timestamp check from CrossL2Inbox * feat: introduce cluster manager role and remove immutables * fix: remove unnecessary code, fix tests and setup * feat: use unstructured storage and OZ v5 * fix: L2ToL2CDM dependency set check * fix: dependency manager gas limit * feat: refactor interop feature contracts (#200) * feat: refactor interop feature contracts * fix: add noops comment * feat: adds OptimismPortal migrated flag * test: add missing tests * fix: portal interop storage naming --------- Co-authored-by: Skeletor Spaceman <skeletorspaceman@gmail.com> * fix: pre pr, setup and tests * fix: remove system config interop and add interop portal target check (#205) * fix: remove system config interop and add interop portal check * fix: interop portal target check order * fix: remove wrong comment * fix: refactor portal noops function (#206) * test: add dependency manager and portal interop tests (#209) * feat: initialize shared lockbox in interop portal (#211) * feat: initialize shared lockbox in interop portal * fix: refactor shared lockbox storage getter * fix: lockbox pr fixes (#214) * fix: pre pr * fix: semver lock * fix: semver lock * feat: descope dependency manager (#242) * feat: descope dependency manager * test: fix tests * test: fix tests * chore: improve eth liquidity test (#248) * fix: internal review fixes (#243) * fix: I-0 * fix: I-1 * fix: I-2 * fix: I-3 * fix: I-6 * fix: I-7 * fix: I-9 * fix: pre pr * fix: pre pr * fix: portal withdrawal checks (#255) * fix: portal withdrawal checks * fix: include current withdrawal check * fix: remove unused interop contracts (#256) * test: fix flake tests (#257) * fix: adjust op-deployer interop scripts (#262) * fix: pre pr * fix op-deployer tests * remove dependency code * fix lint * use Bob account --------- Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com> Co-authored-by: AgusDuha <81362284+agusduha@users.noreply.github.com> Co-authored-by: agusduha <agusnduha@gmail.com> Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com> Co-authored-by: Joxess <joxes@defi.sucks> Co-authored-by: Skeletor Spaceman <skeletorspaceman@gmail.com>

c9dbc5f58 Test fix & fmt fcf735497 ExternalHeaderMode rebase f09d4e5ff Add for wind/unwind support to tbc (ethereum-optimism#159) 5c764a0cd popm: exclude tx outputs that would be dust (ethereum-optimism#186) 1f168f225 popm/wasm: fix dispatch params for {add,remove}EventListener (ethereum-optimism#181) 383611feb popm/wasm: add 'minerStatus' method (ethereum-optimism#178) 6a94b4c0b popm/wasm: rename KeyResult fields and add bitcoinScriptHash (ethereum-optimism#177) 9c4cea583 popm/wasm: add events and clean up globals (ethereum-optimism#175) a2372394d popm: improve UTXO selection when creating Bitcoin transaction (ethereum-optimism#173) 939813cac popm/wasm: fix ethereum address when generating and parsing keys (ethereum-optimism#174) 9245995ef Updated localnet to use more recent commits of optimism and op-geth (ethereum-optimism#139) 159fbc5f5 ci: improve runtime of high usage CI workflows (ethereum-optimism#163) 60a3489db popm/wasm: add 'bitcoinAddressToScriptHash' method (ethereum-optimism#169) fe9752a5a popm/wasm: add 'parseKey' method (ethereum-optimism#168) 65aa0caef ci: add registry-url to setup-node in release (ethereum-optimism#167) 8922ce805 popm/wasm: add new @hemilabs/pop-miner NPM package (ethereum-optimism#162) 67166046b scripts: add release script (ethereum-optimism#164) eea96059b ci: add labeler action (ethereum-optimism#165) git-subtree-dir: heminetwork git-subtree-split: c9dbc5f58a7f997fa4b3af0d765a2967ed3462d1

* fix(derive): small fixes across the codebase * fix(batch): span batch validation * Update batch.rs Co-authored-by: clabby <ben@clab.by> --------- Co-authored-by: clabby <ben@clab.by>

## Overview Adds the new EIP-1559 parameters to the `SystemConfig` in preparation for the Holocene hardfork. New config update type is specified [here](https://specs.optimism.io/protocol/holocene/configurability.html#configupdate). --------- Co-authored-by: refcell <abigger87@gmail.com>

K-Ho added 21 commits May 14, 2020 18:33

add RollupTxQueue

baea8c4

remove unused imports

dfcff54

replace blockNumber with timestamp for canonicalTxChain

206b1ae

add isL1ToL2Tx, fix hashBlockHeader

57443a7

rollupList -> RollupQueue, fix canonicalTransactionChain

7c7bd14

RollupQueue tests

01d29e2

rename block -> batch

2e1b9ff

check messages for erroring tests

a402776

add timestamp to RollupQueue batches

004d700

alter dequeue to only support single batch dequeue

81d1099

integrate l1ToL2Queue into canonical chain

5d7f0c9

remove extraneous comments, working batch header verification

a8bdd90

constrain rollupQueue to single tx batches

e61c794

add main appendL1ToL2TxBatch functionality

8b87ebb

added appendTxBatch timestamp functionality

a09eae3

clean up comments

43cd771

getFrontBatch -> peek

55e7583

add tests for appendTxBatch timestamp protection

72f8422

add timestamp unit tests

d92c53c

clean up tests

bee8426

clean up canonicaltxChain tests

81f5557

K-Ho changed the title ~~[WIP] CanonicalTransactionChain and L1ToL2TransactionQueue~~ CanonicalTransactionChain and L1ToL2TransactionQueue May 22, 2020

K-Ho added 2 commits May 22, 2020 00:53

clean up neaming, add verifyElement test

b2c3014

add verifyElement test for L1toL2Batch

823bf62

ben-chain approved these changes May 22, 2020

View reviewed changes

K-Ho added 2 commits May 22, 2020 20:44

renaming, clean up test naming

13c3f7a

use TestUtils for revert message assertion

90f993c

K-Ho merged commit 6ab9d83 into master May 23, 2020

gakonst deleted the YAS-374/RollupChain/BatchHeader branch March 18, 2021 15:01

bap2pecs pushed a commit to babylonlabs-io/optimism that referenced this pull request Jul 31, 2024

feat: Add support for file backend for keyrings (ethereum-optimism#139)

d1f1a6f

OptimismBot pushed a commit that referenced this pull request Jan 16, 2025

feat: integrate portal to lockbox (#139)

27a4515

* feat: integrate portal to lockbox * fix: pr fixes * test: refactor assert

blockchaindevsh pushed a commit to blockchaindevsh/optimism that referenced this pull request Jan 25, 2025

fix semver-diff-check-no-build (ethereum-optimism#139)

ca17417

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CanonicalTransactionChain and L1ToL2TransactionQueue#139

CanonicalTransactionChain and L1ToL2TransactionQueue#139
K-Ho merged 25 commits intomasterfrom
YAS-374/RollupChain/BatchHeader

K-Ho commented May 20, 2020 •

edited

Loading

Uh oh!

ben-chain left a comment

Uh oh!

ben-chain May 22, 2020

Uh oh!

ben-chain May 22, 2020

Uh oh!

ben-chain May 22, 2020

Uh oh!

ben-chain May 22, 2020

Uh oh!

ben-chain May 22, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	it('should rever if submitting a 10 minute old batch', async () => {
	it('should revert if submitting a batch older than the liveness assumption', async () => {

	cumulativeNumElements.toNumber().should.equal(2)
	cumulativeNumElements.toNumber().should.equal(DEFAULT_BATCH.length)

Conversation

K-Ho commented May 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Questions

Fixes

Contributing Agreement

Uh oh!

ben-chain left a comment

Choose a reason for hiding this comment

Uh oh!

ben-chain May 22, 2020

Choose a reason for hiding this comment

Uh oh!

ben-chain May 22, 2020

Choose a reason for hiding this comment

Uh oh!

ben-chain May 22, 2020

Choose a reason for hiding this comment

Uh oh!

ben-chain May 22, 2020

Choose a reason for hiding this comment

Uh oh!

ben-chain May 22, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

K-Ho commented May 20, 2020 •

edited

Loading