Skip to content

Commit df5ee72

Browse files
holgerd77holgerd77
committed
tx, vm: renamed EIP2930Transaction -> AccessListEIP2930Transaction
1 parent 11a29cf commit df5ee72

File tree

10 files changed

+54
-52
lines changed

10 files changed

+54
-52
lines changed

‎packages/tx/src/eip2930Transaction.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type EIP2930ValuesArray = [
3838
Buffer?
3939
]
4040

41-
export default class EIP2930Transaction extends BaseTransaction<EIP2930Transaction> {
41+
export default class AccessListEIP2930Transaction extends BaseTransaction<AccessListEIP2930Transaction> {
4242
public readonly chainId: BN
4343
public readonly accessList: AccessListBuffer
4444
public readonly v?: BN
@@ -68,7 +68,7 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
6868
}
6969

7070
public static fromTxData(txData: TxData, opts: TxOptions = {}) {
71-
return new EIP2930Transaction(txData, opts)
71+
return new AccessListEIP2930Transaction(txData, opts)
7272
}
7373

7474
// Instantiate a transaction from the serialized tx. This means that the Buffer should start with 0x01.
@@ -84,13 +84,13 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
8484
throw new Error('Invalid serialized tx input: must be array')
8585
}
8686

87-
return EIP2930Transaction.fromValuesArray(values, opts)
87+
return AccessListEIP2930Transaction.fromValuesArray(values, opts)
8888
}
8989

9090
// Instantiate a transaction from the serialized tx. This means that the Buffer should start with 0x01.
9191
// Alias of fromSerializedTx
9292
public static fromRlpSerializedTx(serialized: Buffer, opts: TxOptions = {}) {
93-
return EIP2930Transaction.fromSerializedTx(serialized, opts)
93+
return AccessListEIP2930Transaction.fromSerializedTx(serialized, opts)
9494
}
9595

9696
// Create a transaction from a values array.
@@ -102,7 +102,7 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
102102
>values
103103
const emptyBuffer = Buffer.from([])
104104

105-
return new EIP2930Transaction(
105+
return new AccessListEIP2930Transaction(
106106
{
107107
chainId: new BN(chainId),
108108
nonce: new BN(nonce),
@@ -365,7 +365,7 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
365365
common: this.common,
366366
}
367367

368-
return EIP2930Transaction.fromTxData(
368+
return AccessListEIP2930Transaction.fromTxData(
369369
{
370370
chainId: this.chainId,
371371
nonce: this.nonce,

‎packages/tx/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export { default as LegacyTransaction } from './legacyTransaction'
2-
export { default as EIP2930Transaction } from './eip2930Transaction'
2+
export { default as AccessListEIP2930Transaction } from './eip2930Transaction'
33
export { default as TransactionFactory } from './transactionFactory'
44
export * from './types'

‎packages/tx/src/transactionFactory.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Common from '@ethereumjs/common'
22
import { default as LegacyTransaction } from './legacyTransaction'
3-
import { default as EIP2930Transaction } from './eip2930Transaction'
3+
import { default as AccessListEIP2930Transaction } from './eip2930Transaction'
44
import { TxOptions, Transaction, TxData } from './types'
55
import { BN } from 'ethereumjs-util'
66

@@ -55,7 +55,7 @@ export default class TransactionFactory {
5555
)
5656
}
5757

58-
return EIP2930Transaction.fromRlpSerializedTx(rawData, txOptions)
58+
return AccessListEIP2930Transaction.fromRlpSerializedTx(rawData, txOptions)
5959
} else {
6060
return LegacyTransaction.fromRlpSerializedTx(rawData, txOptions)
6161
}
@@ -102,7 +102,7 @@ export default class TransactionFactory {
102102

103103
switch (transactionID) {
104104
case 1:
105-
return EIP2930Transaction
105+
return AccessListEIP2930Transaction
106106
default:
107107
throw new Error(`TypedTransaction with ID ${transactionID} unknown`)
108108
}

‎packages/tx/src/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { AddressLike, BNLike, BufferLike } from 'ethereumjs-util'
22
import Common from '@ethereumjs/common'
33
import { default as LegacyTransaction } from './legacyTransaction'
4-
import { default as EIP2930Transaction } from './eip2930Transaction'
4+
import { default as AccessListEIP2930Transaction } from './eip2930Transaction'
55

66
/**
77
* The options for initializing a Transaction.
@@ -131,7 +131,7 @@ export interface TxData {
131131
type?: BNLike
132132
}
133133

134-
export type Transaction = LegacyTransaction | EIP2930Transaction
134+
export type Transaction = LegacyTransaction | AccessListEIP2930Transaction
135135

136136
export type BaseTransactionData = {
137137
/**

‎packages/tx/test/base.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import tape from 'tape'
22
import Common from '@ethereumjs/common'
3-
import { LegacyTransaction, EIP2930Transaction } from '../src'
3+
import { LegacyTransaction, AccessListEIP2930Transaction } from '../src'
44
import { TxsJsonEntry } from './types'
55
import { BaseTransaction } from '../src/baseTransaction'
66
import { privateToPublic } from 'ethereumjs-util'
@@ -13,9 +13,9 @@ tape('[BaseTransaction]', function (t) {
1313
})
1414

1515
const eip2930Fixtures = require('./json/eip2930txs.json')
16-
const eip2930Txs: BaseTransaction<EIP2930Transaction>[] = []
16+
const eip2930Txs: BaseTransaction<AccessListEIP2930Transaction>[] = []
1717
eip2930Fixtures.forEach(function (tx: any) {
18-
eip2930Txs.push(EIP2930Transaction.fromTxData(tx.data))
18+
eip2930Txs.push(AccessListEIP2930Transaction.fromTxData(tx.data))
1919
})
2020

2121
const zero = Buffer.alloc(0)
@@ -28,8 +28,8 @@ tape('[BaseTransaction]', function (t) {
2828
fixtures: legacyFixtures,
2929
},
3030
{
31-
class: EIP2930Transaction,
32-
name: 'EIP2930Transaction',
31+
class: AccessListEIP2930Transaction,
32+
name: 'AccessListEIP2930Transaction',
3333
values: [Buffer.from([1])].concat(Array(7).fill(zero)),
3434
txs: eip2930Txs,
3535
fixtures: eip2930Fixtures,

‎packages/tx/test/eip2930.spec.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Common from '@ethereumjs/common'
22
import { Address, BN, bufferToHex, privateToAddress } from 'ethereumjs-util'
33
import tape from 'tape'
4-
import { AccessList, EIP2930Transaction } from '../src'
4+
import { AccessList, AccessListEIP2930Transaction } from '../src'
55

66
const pKey = Buffer.from('4646464646464646464646464646464646464646464646464646464646464646', 'hex')
77
const address = privateToAddress(pKey)
@@ -17,10 +17,10 @@ const validSlot = Buffer.from('01'.repeat(32), 'hex')
1717

1818
const chainId = new BN(1)
1919

20-
tape('[EIP2930Transaction]', function (t) {
20+
tape('[AccessListEIP2930Transaction]', function (t) {
2121
t.test('Initialization / Getter', function (t) {
2222
t.throws(() => {
23-
EIP2930Transaction.fromTxData(
23+
AccessListEIP2930Transaction.fromTxData(
2424
{
2525
chainId: chainId.addn(1),
2626
},
@@ -29,7 +29,7 @@ tape('[EIP2930Transaction]', function (t) {
2929
}, 'should reject transactions with wrong chain ID')
3030

3131
t.throws(() => {
32-
EIP2930Transaction.fromTxData(
32+
AccessListEIP2930Transaction.fromTxData(
3333
{
3434
v: 2,
3535
},
@@ -46,7 +46,7 @@ tape('[EIP2930Transaction]', function (t) {
4646
storageKeys: [bufferToHex(validSlot)],
4747
},
4848
]
49-
const txn = EIP2930Transaction.fromTxData(
49+
const txn = AccessListEIP2930Transaction.fromTxData(
5050
{
5151
accessList: access,
5252
chainId: 1,
@@ -66,7 +66,7 @@ tape('[EIP2930Transaction]', function (t) {
6666

6767
// also verify that we can always get the json access list, even if we don't provide one.
6868

69-
const txnRaw = EIP2930Transaction.fromTxData(
69+
const txnRaw = AccessListEIP2930Transaction.fromTxData(
7070
{
7171
accessList: BufferArray,
7272
chainId: 1,
@@ -90,7 +90,7 @@ tape('[EIP2930Transaction]', function (t) {
9090
]
9191

9292
st.throws(() => {
93-
EIP2930Transaction.fromTxData({ chainId, accessList }, { common })
93+
AccessListEIP2930Transaction.fromTxData({ chainId, accessList }, { common })
9494
})
9595

9696
accessList = [
@@ -103,38 +103,38 @@ tape('[EIP2930Transaction]', function (t) {
103103
]
104104

105105
st.throws(() => {
106-
EIP2930Transaction.fromTxData({ chainId, accessList }, { common })
106+
AccessListEIP2930Transaction.fromTxData({ chainId, accessList }, { common })
107107
})
108108

109109
accessList = [[]] // Address does not exist
110110

111111
st.throws(() => {
112-
EIP2930Transaction.fromTxData({ chainId, accessList }, { common })
112+
AccessListEIP2930Transaction.fromTxData({ chainId, accessList }, { common })
113113
})
114114

115115
accessList = [[validAddress]] // Slots does not exist
116116

117117
st.throws(() => {
118-
EIP2930Transaction.fromTxData({ chainId, accessList }, { common })
118+
AccessListEIP2930Transaction.fromTxData({ chainId, accessList }, { common })
119119
})
120120

121121
accessList = [[validAddress, validSlot]] // Slots is not an array
122122

123123
st.throws(() => {
124-
EIP2930Transaction.fromTxData({ chainId, accessList }, { common })
124+
AccessListEIP2930Transaction.fromTxData({ chainId, accessList }, { common })
125125
})
126126

127127
accessList = [[validAddress, [], []]] // 3 items where 2 are expected
128128

129129
st.throws(() => {
130-
EIP2930Transaction.fromTxData({ chainId, accessList }, { common })
130+
AccessListEIP2930Transaction.fromTxData({ chainId, accessList }, { common })
131131
})
132132

133133
st.end()
134134
})
135135

136136
t.test('should return right upfront cost', (st) => {
137-
let tx = EIP2930Transaction.fromTxData(
137+
let tx = AccessListEIP2930Transaction.fromTxData(
138138
{
139139
data: Buffer.from('010200', 'hex'),
140140
to: validAddress,
@@ -165,7 +165,7 @@ tape('[EIP2930Transaction]', function (t) {
165165
)
166166

167167
// In this Tx, `to` is `undefined`, so we should charge homestead creation gas.
168-
tx = EIP2930Transaction.fromTxData(
168+
tx = AccessListEIP2930Transaction.fromTxData(
169169
{
170170
data: Buffer.from('010200', 'hex'),
171171
accessList: [[validAddress, [validSlot]]],
@@ -188,7 +188,7 @@ tape('[EIP2930Transaction]', function (t) {
188188
)
189189

190190
// Explicilty check that even if we have duplicates in our list, we still charge for those
191-
tx = EIP2930Transaction.fromTxData(
191+
tx = AccessListEIP2930Transaction.fromTxData(
192192
{
193193
to: validAddress,
194194
accessList: [
@@ -206,7 +206,7 @@ tape('[EIP2930Transaction]', function (t) {
206206
})
207207

208208
t.test('should sign a transaction', function (t) {
209-
const tx = EIP2930Transaction.fromTxData(
209+
const tx = AccessListEIP2930Transaction.fromTxData(
210210
{
211211
data: Buffer.from('010200', 'hex'),
212212
to: validAddress,
@@ -277,7 +277,7 @@ tape('[EIP2930Transaction]', function (t) {
277277
Buffer.from('0be950468ba1c25a5cb50e9f6d8aa13c8cd21f24ba909402775b262ac76d374d', 'hex')
278278
)
279279

280-
const unsignedTx = EIP2930Transaction.fromTxData(txData, { common: usedCommon })
280+
const unsignedTx = AccessListEIP2930Transaction.fromTxData(txData, { common: usedCommon })
281281

282282
const serializedMessageRaw = unsignedTx.serialize()
283283

‎packages/tx/test/transactionFactory.spec.ts‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Common from '@ethereumjs/common'
22
import { BN } from 'ethereumjs-util'
33
import tape from 'tape'
4-
import { EIP2930Transaction, TransactionFactory, LegacyTransaction } from '../src'
4+
import { AccessListEIP2930Transaction, TransactionFactory, LegacyTransaction } from '../src'
55

66
const EIP2930Common = new Common({
77
eips: [2718, 2929, 2930],
@@ -11,21 +11,23 @@ const EIP2930Common = new Common({
1111

1212
const pKey = Buffer.from('4646464646464646464646464646464646464646464646464646464646464646', 'hex')
1313

14-
const simpleUnsignedEIP2930Transaction = EIP2930Transaction.fromTxData(
14+
const simpleUnsignedAccessListEIP2930Transaction = AccessListEIP2930Transaction.fromTxData(
1515
{ chainId: new BN(1) },
1616
{ common: EIP2930Common }
1717
)
1818

1919
const simpleUnsignedLegacyTransaction = LegacyTransaction.fromTxData({})
2020

21-
const simpleSignedEIP2930Transaction = simpleUnsignedEIP2930Transaction.sign(pKey)
21+
const simpleSignedAccessListEIP2930Transaction = simpleUnsignedAccessListEIP2930Transaction.sign(
22+
pKey
23+
)
2224
const simpleSignedLegacyTransaction = simpleUnsignedLegacyTransaction.sign(pKey)
2325

2426
tape('[TransactionFactory]: Basic functions', function (t) {
2527
t.test('should return the right type', function (st) {
26-
const serialized = simpleUnsignedEIP2930Transaction.serialize()
28+
const serialized = simpleUnsignedAccessListEIP2930Transaction.serialize()
2729
const factoryTx = TransactionFactory.fromRawData(serialized, { common: EIP2930Common })
28-
st.equals(factoryTx.constructor.name, EIP2930Transaction.name)
30+
st.equals(factoryTx.constructor.name, AccessListEIP2930Transaction.name)
2931

3032
const legacyTx = LegacyTransaction.fromTxData({})
3133
const serializedLegacyTx = legacyTx.serialize()
@@ -39,7 +41,7 @@ tape('[TransactionFactory]: Basic functions', function (t) {
3941
'should throw when trying to create EIP-2718 typed transactions when not allowed in Common',
4042
function (st) {
4143
st.throws(() => {
42-
TransactionFactory.fromRawData(simpleUnsignedEIP2930Transaction.serialize(), {})
44+
TransactionFactory.fromRawData(simpleUnsignedAccessListEIP2930Transaction.serialize(), {})
4345
})
4446
st.end()
4547
}
@@ -49,7 +51,7 @@ tape('[TransactionFactory]: Basic functions', function (t) {
4951
'should throw when trying to create EIP-2718 typed transactions when not allowed in Common',
5052
function (st) {
5153
st.throws(() => {
52-
const serialized = simpleUnsignedEIP2930Transaction.serialize()
54+
const serialized = simpleUnsignedAccessListEIP2930Transaction.serialize()
5355
serialized[0] = 2 // edit the transaction type
5456
TransactionFactory.fromRawData(serialized, { common: EIP2930Common })
5557
})
@@ -62,7 +64,7 @@ tape('[TransactionFactory]: Basic functions', function (t) {
6264
st.equals(legacyTx!.name, LegacyTransaction.name)
6365

6466
const eip2930Tx = TransactionFactory.getTransactionClass(1, EIP2930Common)
65-
st.equals(eip2930Tx!.name, EIP2930Transaction.name)
67+
st.equals(eip2930Tx!.name, AccessListEIP2930Transaction.name)
6668

6769
st.end()
6870
})
@@ -84,13 +86,13 @@ tape('[TransactionFactory]: Basic functions', function (t) {
8486

8587
t.test('should decode raw block body data', function (st) {
8688
const rawLegacy = simpleSignedLegacyTransaction.raw()
87-
const rawEIP2930 = simpleSignedEIP2930Transaction.raw()
89+
const rawEIP2930 = simpleSignedAccessListEIP2930Transaction.raw()
8890

8991
const legacyTx = TransactionFactory.fromBlockBodyData(rawLegacy)
9092
const eip2930Tx = TransactionFactory.fromBlockBodyData(rawEIP2930, { common: EIP2930Common })
9193

9294
st.equals(legacyTx.constructor.name, LegacyTransaction.name)
93-
st.equals(eip2930Tx.constructor.name, EIP2930Transaction.name)
95+
st.equals(eip2930Tx.constructor.name, AccessListEIP2930Transaction.name)
9496
st.end()
9597
})
9698

@@ -104,7 +106,7 @@ tape('[TransactionFactory]: Basic functions', function (t) {
104106

105107
st.equals(legacyTx.constructor.name, LegacyTransaction.name)
106108
st.equals(legacyTx2.constructor.name, LegacyTransaction.name)
107-
st.equals(eip2930Tx.constructor.name, EIP2930Transaction.name)
109+
st.equals(eip2930Tx.constructor.name, AccessListEIP2930Transaction.name)
108110
st.end()
109111
})
110112

‎packages/vm/lib/runTx.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { debug as createDebugLogger } from 'debug'
22
import { Address, BN } from 'ethereumjs-util'
33
import { Block } from '@ethereumjs/block'
4-
import { AccessListItem, EIP2930Transaction, Transaction } from '@ethereumjs/tx'
4+
import { AccessListItem, AccessListEIP2930Transaction, Transaction } from '@ethereumjs/tx'
55
import VM from './index'
66
import Bloom from './bloom'
77
import { default as EVM, EVMResult } from './evm/evm'
@@ -104,7 +104,7 @@ export default async function runTx(this: VM, opts: RunTxOpts): Promise<RunTxRes
104104
throw new Error('Cannot run transaction: EIP 2930 is not activated.')
105105
}
106106

107-
const castedTx = <EIP2930Transaction>opts.tx
107+
const castedTx = <AccessListEIP2930Transaction>opts.tx
108108

109109
castedTx.AccessListJSON.forEach((accessListItem: AccessListItem) => {
110110
const address = Buffer.from(accessListItem.address.slice(2), 'hex')

0 commit comments

Comments
 (0)