Upgrade L1geth (privacy-scaling-explorations#1216)

* Update l1geth * trigger ci? * bump go version * Update ci.yml * Update scroll-tech/go-ethereum * bump go version * remove toolchain * register structLogTracer at init * Upgrade to go 1.21 and go mod tidy * ignore test in default case for now * undo change * fix callTrace --------- Co-authored-by: Mason Liang <mason@scroll.io> Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com> Co-authored-by: lightsing <light.tsing@gmail.com>
cameron1024 · Apr 19, 2024 · e73b0bc · e73b0bc
1 parent a08da07
commit e73b0bc
Show file tree

Hide file tree

Showing 9 changed files with 462 additions and 1,045 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,6 @@ jobs:
 
   test-default:
     name: Test Default
-    if: false
     needs: [runner]
     runs-on: ${{ matrix.os }}
     concurrency: ${{ needs.runner.outputs.concurrency-group2 }}
@@ -58,7 +57,7 @@ jobs:
         uses: actions/setup-go@v3
         with:
           cache: false
-          go-version: ~1.20
+          go-version: ~1.21
       # Go cache for building geth-utils
       - name: Go cache
         uses: actions/cache@v3
@@ -101,7 +100,7 @@ jobs:
         uses: actions/setup-go@v3
         with:
           cache: false
-          go-version: ~1.19
+          go-version: ~1.21
       # Go cache for building geth-utils
       - name: Go cache
         uses: actions/cache@v3

diff --git a/eth-types/src/lib.rs b/eth-types/src/lib.rs
@@ -807,6 +807,11 @@ pub struct FlatGethCallTrace {
 impl GethCallTrace {
     /// generate the call_is_success vec
     pub fn gen_call_is_success(&self, mut call_is_success: Vec<bool>) -> Vec<bool> {
+        // ignore the call if it is a contract address collision
+        // https://github.com/ethereum/go-ethereum/issues/21438
+        if self.to.is_none() && self.error.as_deref() == Some("contract address collision") {
+            return call_is_success;
+        }
         call_is_success.push(self.error.is_none());
         for call in &self.calls {
             call_is_success = call.gen_call_is_success(call_is_success);
@@ -832,6 +837,11 @@ impl GethCallTrace {
         trace: &mut Vec<FlatGethCallTrace>,
         created: &mut HashSet<Address>,
     ) {
+        // ignore the call if it is a contract address collision
+        // https://github.com/ethereum/go-ethereum/issues/21438
+        if self.to.is_none() && self.error.as_deref() == Some("contract address collision") {
+            return;
+        }
         let call_type = OpcodeId::from_str(&self.call_type).unwrap();
         let is_callee_code_empty = self
             .to

diff --git a/geth-utils/l1geth/go.mod b/geth-utils/l1geth/go.mod
@@ -1,24 +1,78 @@
 module main
 
-go 1.18
+go 1.21
 
-require github.com/ethereum/go-ethereum v1.13.5
+require (
+	github.com/ethereum/go-ethereum v1.13.5-0.20240402092557-0bd03dbc5597
+	github.com/holiman/uint256 v1.2.4
+	github.com/imdario/mergo v0.3.16
+)
 
 require (
+	github.com/DataDog/zstd v1.4.5 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/StackExchange/wmi v1.2.1 // indirect
+	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.11.0 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cockroachdb/errors v1.11.1 // indirect
+	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
+	github.com/cockroachdb/pebble v1.1.0 // indirect
+	github.com/cockroachdb/redact v1.1.5 // indirect
+	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/consensys/bavard v0.1.13 // indirect
 	github.com/consensys/gnark-crypto v0.12.1 // indirect
-	github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
+	github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
+	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
-	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/holiman/uint256 v1.2.3 // indirect
+	github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
+	github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
+	github.com/getsentry/sentry-go v0.18.0 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/gofrs/flock v0.8.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
+	github.com/huin/goupnp v1.3.0 // indirect
+	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
+	github.com/klauspost/compress v1.15.15 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/mmcloughlin/addchain v0.4.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.12.0 // indirect
+	github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
+	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
+	github.com/status-im/keycard-go v0.2.0 // indirect
 	github.com/supranational/blst v0.3.11 // indirect
-	golang.org/x/crypto v0.15.0 // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.15.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )