Skip to content

Commit 0e5b2fa

Browse files
lispclispc
authored
chore(l2geth): upgrade to upstream/active branch (#1437)
* init * upgrade l2geth to upstream/active branch
1 parent e19504c commit 0e5b2fa

File tree

4 files changed

+48
-22
lines changed

4 files changed

+48
-22
lines changed

Diff for: ‎geth-utils/l2geth/go.mod

+10-7
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@ toolchain go1.23.2
66

77
require (
88
github.com/imdario/mergo v0.3.16
9-
github.com/scroll-tech/go-ethereum v1.10.14-0.20241001202020-2ed7456a4bc0
9+
github.com/scroll-tech/go-ethereum v1.10.24-0.20241022013349-0942cb789911
1010
)
1111

1212
require (
13-
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
13+
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
1414
github.com/bits-and-blooms/bitset v1.14.3 // indirect
1515
github.com/btcsuite/btcd v0.20.1-beta // indirect
16+
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
1617
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1718
github.com/consensys/bavard v0.1.22 // indirect
1819
github.com/consensys/gnark-crypto v0.14.0 // indirect
1920
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
2021
github.com/davecgh/go-spew v1.1.1 // indirect
2122
github.com/deckarep/golang-set v1.8.0 // indirect
23+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
2224
github.com/edsrzf/mmap-go v1.0.0 // indirect
2325
github.com/ethereum/c-kzg-4844/bindings/go v0.0.0-20230126171313-363c7d7593b4 // indirect
2426
github.com/fsnotify/fsnotify v1.6.0 // indirect
@@ -28,14 +30,14 @@ require (
2830
github.com/go-ole/go-ole v1.3.0 // indirect
2931
github.com/go-stack/stack v1.8.1 // indirect
3032
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
31-
github.com/google/uuid v1.1.5 // indirect
33+
github.com/google/uuid v1.3.0 // indirect
3234
github.com/gorilla/websocket v1.5.0 // indirect
3335
github.com/hashicorp/golang-lru v1.0.2 // indirect
3436
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
3537
github.com/holiman/uint256 v1.3.1 // indirect
36-
github.com/huin/goupnp v1.0.2 // indirect
38+
github.com/huin/goupnp v1.3.0 // indirect
3739
github.com/iden3/go-iden3-crypto v0.0.17 // indirect
38-
github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 // indirect
40+
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
3941
github.com/mattn/go-runewidth v0.0.15 // indirect
4042
github.com/mmcloughlin/addchain v0.4.0 // indirect
4143
github.com/olekukonko/tablewriter v0.0.5 // indirect
@@ -47,14 +49,15 @@ require (
4749
github.com/rjeczalik/notify v0.9.1 // indirect
4850
github.com/scroll-tech/zktrie v0.8.4 // indirect
4951
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
50-
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 // indirect
52+
github.com/status-im/keycard-go v0.2.0 // indirect
5153
github.com/supranational/blst v0.3.13 // indirect
5254
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
5355
github.com/tklauser/go-sysconf v0.3.14 // indirect
5456
github.com/tklauser/numcpus v0.9.0 // indirect
55-
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
57+
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
5658
github.com/yusufpapurcu/wmi v1.2.4 // indirect
5759
golang.org/x/crypto v0.28.0 // indirect
60+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
5861
golang.org/x/sync v0.8.0 // indirect
5962
golang.org/x/sys v0.26.0 // indirect
6063
golang.org/x/text v0.19.0 // indirect

Diff for: ‎geth-utils/l2geth/go.sum

+18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
22
github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40=
33
github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o=
4+
github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
5+
github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI=
46
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
57
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
68
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -14,6 +16,8 @@ github.com/bits-and-blooms/bitset v1.14.3 h1:Gd2c8lSNf9pKXom5JtD7AaKO8o7fGQ2LtFj
1416
github.com/bits-and-blooms/bitset v1.14.3/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
1517
github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
1618
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
19+
github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k=
20+
github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU=
1721
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
1822
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
1923
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
@@ -47,6 +51,9 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
4751
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4852
github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
4953
github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
54+
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
55+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc=
56+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
5057
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
5158
github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
5259
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
@@ -94,6 +101,7 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe
94101
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
95102
github.com/google/uuid v1.1.5 h1:kxhtnfFVi+rYdOALN0B3k9UT86zVJKfBimRaciULW4I=
96103
github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
104+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
97105
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
98106
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
99107
github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
@@ -107,6 +115,7 @@ github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXei
107115
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
108116
github.com/huin/goupnp v1.0.2 h1:RfGLP+h3mvisuWEyybxNq5Eft3NWhHLPeUN72kpKZoI=
109117
github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
118+
github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
110119
github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
111120
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
112121
github.com/iden3/go-iden3-crypto v0.0.16 h1:zN867xiz6HgErXVIV/6WyteGcOukE9gybYTorBMEdsk=
@@ -117,6 +126,7 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
117126
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
118127
github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJyexcZ3pYbTI9jWx5tHo1Dee/tWbLMfPe2TA=
119128
github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
129+
github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
120130
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
121131
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
122132
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -194,6 +204,8 @@ github.com/scroll-tech/go-ethereum v1.10.14-0.20240621133406-517e5b4b0764 h1:lzO
194204
github.com/scroll-tech/go-ethereum v1.10.14-0.20240621133406-517e5b4b0764/go.mod h1:byf/mZ8jLYUCnUePTicjJWn+RvKdxDn7buS6glTnMwQ=
195205
github.com/scroll-tech/go-ethereum v1.10.14-0.20241001202020-2ed7456a4bc0 h1:+l2Xru9yBH+TGoltTdShtzhFU18oNWdXb4J4BI4aZVI=
196206
github.com/scroll-tech/go-ethereum v1.10.14-0.20241001202020-2ed7456a4bc0/go.mod h1:xRDJvaNUe7lCU2fB+AqyS7gahar+dfJPrUJplfXF4dw=
207+
github.com/scroll-tech/go-ethereum v1.10.24-0.20241022013349-0942cb789911 h1:TYuFtkPvCl0hrEBS9u/2jZ2yk4S4HPCAzlLn+eDMINM=
208+
github.com/scroll-tech/go-ethereum v1.10.24-0.20241022013349-0942cb789911/go.mod h1:PWEOTg6LeWlJAlFJauO0msSLXWnpHmE+mVh5txtfeRM=
197209
github.com/scroll-tech/zktrie v0.7.1 h1:NrmZNjuBzsbrKePqdHDG+t2cXnimbtezPAFS0+L9ElE=
198210
github.com/scroll-tech/zktrie v0.7.1/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
199211
github.com/scroll-tech/zktrie v0.8.2 h1:UMuIfA+jdgWMLmTgTL64Emo+zzMOdcnH0+eYdDcshxQ=
@@ -206,6 +218,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
206218
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
207219
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg=
208220
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
221+
github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
209222
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
210223
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
211224
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -233,6 +246,7 @@ github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPD
233246
github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI=
234247
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
235248
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
249+
github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
236250
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
237251
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
238252
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -251,6 +265,8 @@ golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
251265
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
252266
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
253267
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
268+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
269+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
254270
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
255271
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
256272
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -268,6 +284,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
268284
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
269285
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
270286
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
287+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
271288
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
272289
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
273290
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
@@ -297,6 +314,7 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
297314
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
298315
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
299316
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
317+
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
300318
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
301319
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
302320
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=

Diff for: ‎geth-utils/l2geth/trace.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/scroll-tech/go-ethereum/core/state"
1313
"github.com/scroll-tech/go-ethereum/core/types"
1414
"github.com/scroll-tech/go-ethereum/core/vm"
15+
"github.com/scroll-tech/go-ethereum/eth/tracers/logger"
1516
"github.com/scroll-tech/go-ethereum/params"
1617
"github.com/scroll-tech/go-ethereum/rollup/tracing"
1718
"github.com/scroll-tech/go-ethereum/trie"
@@ -59,7 +60,7 @@ type TraceConfig struct {
5960
Block Block `json:"block_constants"`
6061
Accounts map[common.Address]Account `json:"accounts"`
6162
Transactions []Transaction `json:"transactions"`
62-
LoggerConfig *vm.LogConfig `json:"logger_config"`
63+
LoggerConfig *logger.Config `json:"logger_config"`
6364
ChainConfig *params.ChainConfig `json:"chain_config"`
6465
}
6566

@@ -72,7 +73,7 @@ func toBigInt(value *hexutil.Big) *big.Int {
7273
return big.NewInt(0)
7374
}
7475

75-
func transferTxs(txs []Transaction, chainID *big.Int) types.Transactions {
76+
func buildTxs(txs []Transaction, chainID *big.Int) types.Transactions {
7677

7778
t_txs := make([]*types.Transaction, 0, len(txs))
7879
for _, tx := range txs {
@@ -166,7 +167,6 @@ func Trace(config TraceConfig) (*types.BlockTrace, error) {
166167
DAOForkBlock: big.NewInt(0),
167168
DAOForkSupport: true,
168169
EIP150Block: big.NewInt(0),
169-
EIP150Hash: common.Hash{},
170170
EIP155Block: big.NewInt(0),
171171
EIP158Block: big.NewInt(0),
172172
ByzantiumBlock: big.NewInt(0),
@@ -176,7 +176,7 @@ func Trace(config TraceConfig) (*types.BlockTrace, error) {
176176
MuirGlacierBlock: big.NewInt(0),
177177
BerlinBlock: big.NewInt(0),
178178
LondonBlock: big.NewInt(0),
179-
ShanghaiBlock: big.NewInt(0),
179+
ShanghaiTime: newUint64(0),
180180

181181
TerminalTotalDifficulty: big.NewInt(0),
182182

@@ -197,7 +197,7 @@ func Trace(config TraceConfig) (*types.BlockTrace, error) {
197197
// fmt.Printf("geth-utils: ShanghaiBlock = %d\n", chainConfig.ShanghaiBlock)
198198
// fmt.Printf("geth-utils: ArchimedesBlock = %d\n", chainConfig.ArchimedesBlock)
199199

200-
txs := transferTxs(config.Transactions, chainConfig.ChainID)
200+
txs := buildTxs(config.Transactions, chainConfig.ChainID)
201201

202202
var txsGasLimit uint64
203203
blockGasLimit := toBigInt(config.Block.GasLimit).Uint64()
@@ -224,7 +224,7 @@ func Trace(config TraceConfig) (*types.BlockTrace, error) {
224224
},
225225
Coinbase: config.Block.Coinbase,
226226
BlockNumber: toBigInt(config.Block.Number),
227-
Time: toBigInt(config.Block.Timestamp),
227+
Time: toBigInt(config.Block.Timestamp).Uint64(),
228228
Difficulty: toBigInt(config.Block.Difficulty),
229229
// Random: &randao,
230230
BaseFee: toBigInt(config.Block.BaseFee),
@@ -248,7 +248,7 @@ func Trace(config TraceConfig) (*types.BlockTrace, error) {
248248
}
249249
block := types.NewBlockWithHeader(header).WithBody(txs, nil)
250250

251-
trieCfg := &trie.Config{Zktrie: true}
251+
trieCfg := &trie.Config{IsUsingZktrie: true}
252252
// Setup state db with accounts from argument
253253
stateDB, _ := state.New(
254254
common.Hash{},
@@ -265,7 +265,7 @@ func Trace(config TraceConfig) (*types.BlockTrace, error) {
265265
}
266266
}
267267

268-
rootBefore, err := stateDB.Commit(true)
268+
rootBefore, err := stateDB.Commit(block.NumberU64(), true)
269269
if err != nil {
270270
return nil, err
271271
}
@@ -287,7 +287,7 @@ func Trace(config TraceConfig) (*types.BlockTrace, error) {
287287
return nil, err
288288
}
289289

290-
rootAfter, err := stateDB.Commit(true)
290+
rootAfter, err := stateDB.Commit(block.NumberU64(), true)
291291
if err != nil {
292292
return nil, err
293293
}

0 commit comments

Comments
 (0)