Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dtl: remove legacy encoding #618

Merged
merged 3 commits into from
Apr 27, 2021
Merged

dtl: remove legacy encoding #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a71393e
dtl: remove legacy decoding
tynes Apr 24, 2021
68f8b2d
tests: remove dead test
tynes Apr 26, 2021
786b3af
chore: add changeset
tynes Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/grumpy-bananas-brush.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@eth-optimism/data-transport-layer": patch
---

Remove legacy transaction deserialization to support RLP batch encoding
32 changes: 3 additions & 29 deletions packages/data-transport-layer/src/services/l1-ingestion/handlers/sequencer-batch-appended.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,7 @@ const maybeDecodeSequencerBatchTransaction = (
decoded: DecodedSequencerBatchTransaction | null
type: 'EIP155' | 'ETH_SIGN' | null
} => {
let decoded = null
let type = null

try {
// Try to decode as RLP first. This function will throw if the transaction can't be properly
// decoded as RLP and we'll get bumped down to the next set of possible decodings.
const decodedTx = ethers.utils.parseTransaction(transaction)

return {
Expand All @@ -265,31 +260,10 @@ const maybeDecodeSequencerBatchTransaction = (
},
}
} catch (err) {
// Do nothing, fall back to legacy decode.
}

try {
const txType = transaction.slice(0, 1).readUInt8()
if (txType === TxType.EIP155) {
type = 'EIP155'
decoded = ctcCoder.eip155TxData.decode(transaction.toString('hex'))
} else if (txType === TxType.EthSign) {
type = 'ETH_SIGN'
decoded = ctcCoder.ethSignTxData.decode(transaction.toString('hex'))
} else {
throw new Error(`Unknown sequencer transaction type.`)
}
// Validate the transaction
if (!validateBatchTransaction(type, decoded)) {
decoded = null
return {
decoded: null,
type: null,
}
} catch (err) {
// Do nothing
}

return {
decoded,
type,
}
}

Expand Down
59 changes: 0 additions & 59 deletions ...ort-layer/test/unit-tests/services/l1-ingestion/handlers/sequencer-batch-appended.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,65 +136,6 @@ describe('Event Handlers: OVM_CanonicalTransactionChain.SequencerBatchAppended',
'10B99425FB53AD7D40A939205C0F7B35CBB89AB4D67E7AE64BDAC5F1073943B4',
batchExtraData: '',
}
it('should correctly parse a mainnet transaction', async () => {
const input1: [any, SequencerBatchAppendedExtraData] = [
{
args: {
_startingQueueIndex: ethers.constants.Zero,
_numQueueElements: ethers.constants.Zero,
_totalElements: ethers.constants.Zero,
},
},
{
l1TransactionData,
...exampleExtraData,
},
]

const output1 = await handleEventsSequencerBatchAppended.parseEvent(
...input1
)

const batchEntry = output1.transactionBatchEntry
expect(batchEntry.index).to.eq(exampleExtraData.batchIndex.toNumber())
expect(batchEntry.root).to.eq(exampleExtraData.batchRoot)
expect(batchEntry.size).to.eq(exampleExtraData.batchSize.toNumber())
expect(batchEntry.prevTotalElements).to.eq(
exampleExtraData.prevTotalElements.toNumber()
)
expect(batchEntry.extraData).to.eq(exampleExtraData.batchExtraData)
expect(batchEntry.blockNumber).to.eq(exampleExtraData.blockNumber)
expect(batchEntry.timestamp).to.eq(exampleExtraData.timestamp)
expect(batchEntry.submitter).to.eq(exampleExtraData.submitter)
expect(batchEntry.l1TransactionHash).to.eq(
exampleExtraData.l1TransactionHash
)

// Expected transaction entry results based on mainnet data
// Source: https://ethtx.info/mainnet/0x6effe006836b841205ace4d99d7ae1b74ee96aac499a3f358b97fccd32ee9af2
const txEntries = output1.transactionEntries
expect(txEntries).to.have.length(101)
expect(txEntries.every((t) => t.queueOrigin === 'sequencer' || 'l1')).to
.be.true

// Sequencer transactions are decoded, but l1 transactions are not
txEntries.forEach((tx, i) => {
if (tx.queueOrigin === 'l1') {
expect(tx.decoded).to.be.null
} else {
const l2Tx = blocksOnL2[i].transactions[0]
expect(tx.decoded.data).to.equal(l2Tx.data)
expect(tx.decoded.target).to.equal(l2Tx.to.toLowerCase())
expect(tx.decoded.nonce).to.equal(l2Tx.nonce)
expect(tx.decoded.gasLimit).to.equal(
BigNumber.from(l2Tx.gasLimit.hex).toNumber()
)
expect(tx.decoded.gasPrice).to.equal(
BigNumber.from(l2Tx.gasPrice.hex).toNumber()
)
}
})
})

it('should error on malformed transaction data', async () => {
const input1: [any, SequencerBatchAppendedExtraData] = [
Expand Down