Skip to content

Commit fa25261

Browse files
georgehaogeorgehao
authored
Merge branch 'develop' into feat/prover_integrate_sentry
2 parents 2352802 + c4ba0f9 commit fa25261

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1866
-1429
lines changed

‎.github/workflows/docker.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
platforms: linux/amd64,linux/arm64
5050
push: true
5151
tags: |
52-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
53-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:latest
52+
scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
53+
scrolltech/${{ env.REPOSITORY }}:latest
5454
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
5555
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest
5656
@@ -94,8 +94,8 @@ jobs:
9494
platforms: linux/amd64,linux/arm64
9595
push: true
9696
tags: |
97-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
98-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:latest
97+
scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
98+
scrolltech/${{ env.REPOSITORY }}:latest
9999
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
100100
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest
101101
@@ -139,8 +139,8 @@ jobs:
139139
platforms: linux/amd64,linux/arm64
140140
push: true
141141
tags: |
142-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
143-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:latest
142+
scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
143+
scrolltech/${{ env.REPOSITORY }}:latest
144144
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
145145
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest
146146
@@ -184,8 +184,8 @@ jobs:
184184
platforms: linux/amd64,linux/arm64
185185
push: true
186186
tags: |
187-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
188-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:latest
187+
scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
188+
scrolltech/${{ env.REPOSITORY }}:latest
189189
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
190190
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest
191191
@@ -229,8 +229,8 @@ jobs:
229229
platforms: linux/amd64,linux/arm64
230230
push: true
231231
tags: |
232-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
233-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:latest
232+
scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
233+
scrolltech/${{ env.REPOSITORY }}:latest
234234
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
235235
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest
236236
@@ -274,8 +274,8 @@ jobs:
274274
platforms: linux/amd64,linux/arm64
275275
push: true
276276
tags: |
277-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
278-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:latest
277+
scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
278+
scrolltech/${{ env.REPOSITORY }}:latest
279279
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
280280
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest
281281
@@ -318,8 +318,8 @@ jobs:
318318
file: ./build/dockerfiles/coordinator-api.Dockerfile
319319
push: true
320320
tags: |
321-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
322-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:latest
321+
scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
322+
scrolltech/${{ env.REPOSITORY }}:latest
323323
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
324324
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest
325325
@@ -363,7 +363,7 @@ jobs:
363363
platforms: linux/amd64,linux/arm64
364364
push: true
365365
tags: |
366-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
367-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY }}:latest
366+
scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
367+
scrolltech/${{ env.REPOSITORY }}:latest
368368
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
369369
${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest

‎bridge-history-api/go.mod

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/go-redis/redis/v8 v8.11.5
99
github.com/pressly/goose/v3 v3.16.0
1010
github.com/prometheus/client_golang v1.19.0
11-
github.com/scroll-tech/go-ethereum v1.10.14-0.20240626125436-418bc6f728b6
11+
github.com/scroll-tech/go-ethereum v1.10.14-0.20241011150208-4742882675d8
1212
github.com/stretchr/testify v1.9.0
1313
github.com/urfave/cli/v2 v2.25.7
1414
golang.org/x/sync v0.7.0
@@ -17,43 +17,54 @@ require (
1717

1818
require (
1919
dario.cat/mergo v1.0.0 // indirect
20+
github.com/DataDog/zstd v1.4.5 // indirect
21+
github.com/Microsoft/go-winio v0.6.1 // indirect
2022
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
2123
github.com/beorn7/perks v1.0.1 // indirect
2224
github.com/bits-and-blooms/bitset v1.13.0 // indirect
2325
github.com/btcsuite/btcd v0.20.1-beta // indirect
26+
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
2427
github.com/bytedance/sonic v1.10.1 // indirect
2528
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2629
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
2730
github.com/chenzhuoyu/iasm v0.9.0 // indirect
31+
github.com/cockroachdb/errors v1.11.1 // indirect
32+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
33+
github.com/cockroachdb/pebble v1.1.0 // indirect
34+
github.com/cockroachdb/redact v1.1.5 // indirect
35+
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
2836
github.com/consensys/bavard v0.1.13 // indirect
2937
github.com/consensys/gnark-crypto v0.12.1 // indirect
3038
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
3139
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
3240
github.com/davecgh/go-spew v1.1.1 // indirect
33-
github.com/deckarep/golang-set v1.8.0 // indirect
41+
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
42+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
3443
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
3544
github.com/docker/cli v25.0.4-0.20240305161310-2bf4225ad269+incompatible // indirect
3645
github.com/docker/docker v26.1.0+incompatible // indirect
3746
github.com/docker/go-connections v0.5.0 // indirect
38-
github.com/edsrzf/mmap-go v1.0.0 // indirect
39-
github.com/ethereum/c-kzg-4844 v1.0.2 // indirect
47+
github.com/ethereum/c-kzg-4844 v1.0.3 // indirect
4048
github.com/fjl/memsize v0.0.2 // indirect
4149
github.com/fsnotify/fsnotify v1.6.0 // indirect
4250
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
4351
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
52+
github.com/getsentry/sentry-go v0.18.0 // indirect
4453
github.com/gin-contrib/sse v0.1.0 // indirect
45-
github.com/go-kit/kit v0.9.0 // indirect
4654
github.com/go-ole/go-ole v1.3.0 // indirect
4755
github.com/go-playground/locales v0.14.1 // indirect
4856
github.com/go-playground/universal-translator v0.18.1 // indirect
4957
github.com/go-playground/validator/v10 v10.15.5 // indirect
5058
github.com/go-stack/stack v1.8.1 // indirect
5159
github.com/goccy/go-json v0.10.2 // indirect
60+
github.com/gofrs/flock v0.8.1 // indirect
61+
github.com/gogo/protobuf v1.3.2 // indirect
62+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
5263
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
5364
github.com/google/uuid v1.6.0 // indirect
5465
github.com/gorilla/websocket v1.5.0 // indirect
5566
github.com/hashicorp/go-bexpr v0.1.10 // indirect
56-
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
67+
github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect
5768
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
5869
github.com/holiman/uint256 v1.2.4 // indirect
5970
github.com/huin/goupnp v1.3.0 // indirect
@@ -63,8 +74,10 @@ require (
6374
github.com/jinzhu/inflection v1.0.0 // indirect
6475
github.com/jinzhu/now v1.1.5 // indirect
6576
github.com/json-iterator/go v1.1.12 // indirect
66-
github.com/klauspost/compress v1.17.4 // indirect
77+
github.com/klauspost/compress v1.17.9 // indirect
6778
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
79+
github.com/kr/pretty v0.3.1 // indirect
80+
github.com/kr/text v0.2.0 // indirect
6881
github.com/leodido/go-urn v1.2.4 // indirect
6982
github.com/mattn/go-colorable v0.1.13 // indirect
7083
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -84,15 +97,15 @@ require (
8497
github.com/prometheus/client_model v0.5.0 // indirect
8598
github.com/prometheus/common v0.48.0 // indirect
8699
github.com/prometheus/procfs v0.12.0 // indirect
87-
github.com/prometheus/tsdb v0.7.1 // indirect
88100
github.com/rivo/uniseg v0.4.4 // indirect
89-
github.com/rjeczalik/notify v0.9.1 // indirect
101+
github.com/rogpeppe/go-internal v1.10.0 // indirect
90102
github.com/rs/cors v1.7.0 // indirect
91103
github.com/russross/blackfriday/v2 v2.1.0 // indirect
92-
github.com/scroll-tech/da-codec v0.0.0-20240730031611-1b736159d5cb // indirect
104+
github.com/scroll-tech/da-codec v0.1.2 // indirect
93105
github.com/scroll-tech/zktrie v0.8.4 // indirect
94106
github.com/sethvargo/go-retry v0.2.4 // indirect
95107
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
108+
github.com/sourcegraph/conc v0.3.0 // indirect
96109
github.com/status-im/keycard-go v0.2.0 // indirect
97110
github.com/supranational/blst v0.3.12 // indirect
98111
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
@@ -107,14 +120,16 @@ require (
107120
go.uber.org/multierr v1.11.0 // indirect
108121
golang.org/x/arch v0.5.0 // indirect
109122
golang.org/x/crypto v0.24.0 // indirect
123+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
124+
golang.org/x/mod v0.17.0 // indirect
110125
golang.org/x/net v0.25.0 // indirect
111126
golang.org/x/sys v0.21.0 // indirect
112127
golang.org/x/text v0.16.0 // indirect
113128
golang.org/x/time v0.3.0 // indirect
129+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
114130
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
115131
google.golang.org/protobuf v1.33.0 // indirect
116-
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
117-
gopkg.in/urfave/cli.v1 v1.20.0 // indirect
132+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
118133
gopkg.in/yaml.v3 v3.0.1 // indirect
119134
rsc.io/tmplfunc v0.0.3 // indirect
120135
)

0 commit comments

Comments
 (0)