Skip to content

Commit 0bc3420

Browse files
tapakornltapakornl
committed
Merge branch 'fix/permit_gasSwap' of https://github.com/tapakornl/scroll into fix/permit_gasSwap
2 parents c882e8c + 2a96c8f commit 0bc3420

Some content is hidden

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

54 files changed

+2594
-2702
lines changed

‎bridge-history-api/go.mod

+15-1
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.14.0
11-
github.com/scroll-tech/go-ethereum v1.10.14-0.20240305121210-a807a41fd1e9
11+
github.com/scroll-tech/go-ethereum v1.10.14-0.20240311135752-ccec84ce63c8
1212
github.com/stretchr/testify v1.8.4
1313
github.com/urfave/cli/v2 v2.25.7
1414
golang.org/x/sync v0.5.0
@@ -31,11 +31,14 @@ require (
3131
github.com/davecgh/go-spew v1.1.1 // indirect
3232
github.com/deckarep/golang-set v1.8.0 // indirect
3333
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
34+
github.com/edsrzf/mmap-go v1.0.0 // indirect
3435
github.com/ethereum/c-kzg-4844/bindings/go v0.0.0-20230126171313-363c7d7593b4 // indirect
3536
github.com/fjl/memsize v0.0.2 // indirect
3637
github.com/fsnotify/fsnotify v1.6.0 // indirect
3738
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
39+
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
3840
github.com/gin-contrib/sse v0.1.0 // indirect
41+
github.com/go-kit/kit v0.9.0 // indirect
3942
github.com/go-ole/go-ole v1.3.0 // indirect
4043
github.com/go-playground/locales v0.14.1 // indirect
4144
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -47,6 +50,9 @@ require (
4750
github.com/google/go-cmp v0.6.0 // indirect
4851
github.com/google/uuid v1.4.0 // indirect
4952
github.com/gorilla/websocket v1.5.0 // indirect
53+
github.com/hashicorp/go-bexpr v0.1.10 // indirect
54+
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
55+
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
5056
github.com/holiman/uint256 v1.2.4 // indirect
5157
github.com/huin/goupnp v1.3.0 // indirect
5258
github.com/iden3/go-iden3-crypto v0.0.15 // indirect
@@ -61,24 +67,31 @@ require (
6167
github.com/mattn/go-isatty v0.0.20 // indirect
6268
github.com/mattn/go-runewidth v0.0.14 // indirect
6369
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
70+
github.com/mitchellh/mapstructure v1.5.0 // indirect
71+
github.com/mitchellh/pointerstructure v1.2.0 // indirect
6472
github.com/mmcloughlin/addchain v0.4.0 // indirect
6573
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6674
github.com/modern-go/reflect2 v1.0.2 // indirect
75+
github.com/olekukonko/tablewriter v0.0.5 // indirect
6776
github.com/onsi/gomega v1.27.1 // indirect
6877
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
78+
github.com/pkg/errors v0.9.1 // indirect
6979
github.com/pmezard/go-difflib v1.0.0 // indirect
7080
github.com/prometheus/client_model v0.3.0 // indirect
7181
github.com/prometheus/common v0.39.0 // indirect
7282
github.com/prometheus/procfs v0.12.0 // indirect
83+
github.com/prometheus/tsdb v0.7.1 // indirect
7384
github.com/rivo/uniseg v0.4.4 // indirect
7485
github.com/rjeczalik/notify v0.9.1 // indirect
7586
github.com/rogpeppe/go-internal v1.10.0 // indirect
87+
github.com/rs/cors v1.7.0 // indirect
7688
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7789
github.com/scroll-tech/zktrie v0.7.1 // indirect
7890
github.com/sethvargo/go-retry v0.2.4 // indirect
7991
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
8092
github.com/status-im/keycard-go v0.2.0 // indirect
8193
github.com/supranational/blst v0.3.11-0.20230124161941-ca03e11a3ff2 // indirect
94+
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
8295
github.com/tklauser/go-sysconf v0.3.12 // indirect
8396
github.com/tklauser/numcpus v0.6.1 // indirect
8497
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -96,6 +109,7 @@ require (
96109
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
97110
google.golang.org/protobuf v1.31.0 // indirect
98111
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
112+
gopkg.in/urfave/cli.v1 v1.20.0 // indirect
99113
gopkg.in/yaml.v3 v3.0.1 // indirect
100114
rsc.io/tmplfunc v0.0.3 // indirect
101115
)

‎bridge-history-api/go.sum

+79-2
Large diffs are not rendered by default.

‎common/go.mod

+16-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/modern-go/reflect2 v1.0.2
1616
github.com/orcaman/concurrent-map v1.0.0
1717
github.com/prometheus/client_golang v1.14.0
18-
github.com/scroll-tech/go-ethereum v1.10.14-0.20240305121210-a807a41fd1e9
18+
github.com/scroll-tech/go-ethereum v1.10.14-0.20240311135752-ccec84ce63c8
1919
github.com/stretchr/testify v1.8.4
2020
github.com/urfave/cli/v2 v2.25.7
2121
gorm.io/driver/postgres v1.5.0
@@ -41,10 +41,14 @@ require (
4141
github.com/docker/distribution v2.8.2+incompatible // indirect
4242
github.com/docker/go-connections v0.4.0 // indirect
4343
github.com/docker/go-units v0.5.0 // indirect
44+
github.com/edsrzf/mmap-go v1.0.0 // indirect
4445
github.com/ethereum/c-kzg-4844/bindings/go v0.0.0-20230126171313-363c7d7593b4 // indirect
4546
github.com/fjl/memsize v0.0.2 // indirect
47+
github.com/fsnotify/fsnotify v1.6.0 // indirect
4648
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
49+
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
4750
github.com/gin-contrib/sse v0.1.0 // indirect
51+
github.com/go-kit/kit v0.9.0 // indirect
4852
github.com/go-ole/go-ole v1.3.0 // indirect
4953
github.com/go-playground/locales v0.14.1 // indirect
5054
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -58,6 +62,9 @@ require (
5862
github.com/google/go-cmp v0.6.0 // indirect
5963
github.com/google/uuid v1.4.0 // indirect
6064
github.com/gorilla/websocket v1.5.0 // indirect
65+
github.com/hashicorp/go-bexpr v0.1.10 // indirect
66+
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
67+
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
6168
github.com/holiman/uint256 v1.2.4 // indirect
6269
github.com/huin/goupnp v1.3.0 // indirect
6370
github.com/iden3/go-iden3-crypto v0.0.15 // indirect
@@ -75,10 +82,14 @@ require (
7582
github.com/mattn/go-sqlite3 v1.14.16 // indirect
7683
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
7784
github.com/mitchellh/mapstructure v1.5.0 // indirect
85+
github.com/mitchellh/pointerstructure v1.2.0 // indirect
7886
github.com/mmcloughlin/addchain v0.4.0 // indirect
7987
github.com/moby/term v0.5.0 // indirect
8088
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8189
github.com/morikuni/aec v1.0.0 // indirect
90+
github.com/olekukonko/tablewriter v0.0.5 // indirect
91+
github.com/onsi/ginkgo v1.16.5 // indirect
92+
github.com/onsi/gomega v1.27.1 // indirect
8293
github.com/opencontainers/go-digest v1.0.0 // indirect
8394
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
8495
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
@@ -87,14 +98,17 @@ require (
8798
github.com/prometheus/client_model v0.3.0 // indirect
8899
github.com/prometheus/common v0.39.0 // indirect
89100
github.com/prometheus/procfs v0.12.0 // indirect
101+
github.com/prometheus/tsdb v0.7.1 // indirect
90102
github.com/rivo/uniseg v0.4.4 // indirect
91103
github.com/rjeczalik/notify v0.9.1 // indirect
92104
github.com/rogpeppe/go-internal v1.10.0 // indirect
105+
github.com/rs/cors v1.7.0 // indirect
93106
github.com/russross/blackfriday/v2 v2.1.0 // indirect
94107
github.com/scroll-tech/zktrie v0.7.1 // indirect
95108
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
96109
github.com/status-im/keycard-go v0.2.0 // indirect
97110
github.com/supranational/blst v0.3.11-0.20230124161941-ca03e11a3ff2 // indirect
111+
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
98112
github.com/tklauser/go-sysconf v0.3.12 // indirect
99113
github.com/tklauser/numcpus v0.6.1 // indirect
100114
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -113,6 +127,7 @@ require (
113127
golang.org/x/tools v0.15.0 // indirect
114128
google.golang.org/protobuf v1.31.0 // indirect
115129
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
130+
gopkg.in/urfave/cli.v1 v1.20.0 // indirect
116131
gopkg.in/yaml.v3 v3.0.1 // indirect
117132
gotest.tools/v3 v3.4.0 // indirect
118133
rsc.io/tmplfunc v0.0.3 // indirect

0 commit comments

Comments
 (0)