Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(rollup_relayer): add chain_monitor client #885

Merged
merged 44 commits into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
60cca24
Add batch status check logic
mask-pp Aug 28, 2023
34fc3ba
chore: auto version bump [bot]
mask-pp Aug 28, 2023
fc06952
fix comments
mask-pp Aug 28, 2023
a3abfd7
Merge branch 'develop' into feat/add_chain_monitor
mask-pp Aug 28, 2023
471af43
chore: auto version bump [bot]
mask-pp Aug 28, 2023
cde6981
Merge branch 'develop' into feat/add_chain_monitor
mask-pp Aug 28, 2023
8165c3d
chore: auto version bump [bot]
mask-pp Aug 28, 2023
020317e
fix comments
mask-pp Aug 29, 2023
d7b6331
chore: auto version bump [bot]
mask-pp Aug 29, 2023
057e498
Merge branch 'develop' into feat/add_chain_monitor
mask-pp Aug 29, 2023
69e1a5c
fix comments
mask-pp Aug 29, 2023
d85b422
fix comments
mask-pp Aug 29, 2023
1d59c6f
fix comments and add test case
mask-pp Aug 29, 2023
11a3810
fix ci
mask-pp Aug 29, 2023
9e8e944
fix ci
mask-pp Aug 29, 2023
4090cf0
fix ci
mask-pp Aug 29, 2023
ca2991e
fix ci
mask-pp Aug 29, 2023
f7bc5c4
fix bug in integration test
mask-pp Aug 30, 2023
c8b6b37
Feat/upgrade cmd (#889)
mask-pp Aug 30, 2023
c7a6949
Merge branch 'develop' into feat/add_chain_monitor
mask-pp Aug 30, 2023
af39650
chore: auto version bump [bot]
mask-pp Aug 30, 2023
aaaa741
fix bug
mask-pp Aug 30, 2023
fb255aa
fix bug
mask-pp Aug 30, 2023
1ff0e21
fix bug
mask-pp Aug 30, 2023
cc68797
fix bug
mask-pp Aug 30, 2023
90f8a28
fix bug
mask-pp Aug 30, 2023
26ba4d9
fix bug
mask-pp Aug 30, 2023
cdb658b
fix bug
mask-pp Aug 30, 2023
f02242a
fix bug
mask-pp Aug 30, 2023
5650704
fix bug
mask-pp Aug 30, 2023
4c14fae
fix bug
mask-pp Aug 30, 2023
08cb2d8
fix bug
mask-pp Aug 30, 2023
1869abc
fix ci
mask-pp Aug 30, 2023
70c700b
fix ci
mask-pp Aug 30, 2023
80bc054
fix bug
mask-pp Aug 30, 2023
bb10509
Merge branch 'develop' into feat/add_chain_monitor
mask-pp Aug 30, 2023
8756858
chore: auto version bump [bot]
mask-pp Aug 30, 2023
c822f58
revert change
mask-pp Aug 30, 2023
af2e477
temporary close the test case
mask-pp Aug 30, 2023
d236f7a
fix bug
mask-pp Aug 30, 2023
253b9a9
Update common/utils/utils.go
mask-pp Aug 30, 2023
0e24477
Update bridge/internal/config/relayer.go
mask-pp Aug 31, 2023
ec542d0
Merge branch 'develop' into feat/add_chain_monitor
mask-pp Aug 31, 2023
1274adc
chore: auto version bump [bot]
mask-pp Aug 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bridge-history-api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ require (
golang.org/x/arch v0.4.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions bridge-history-api/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down
5 changes: 5 additions & 0 deletions bridge/conf/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
"min_gas_price": 0,
"gas_price_diff": 50000
},
"chain_monitor": {
"timeout": 3,
"try_times": 5,
"base_url": "http://localhost:8750"
},
"finalize_batch_interval_sec": 0,
"message_sender_private_key": "1212121212121212121212121212121212121212121212121212121212121212",
"gas_oracle_sender_private_key": "1313131313131313131313131313131313131313131313131313131313131313",
Expand Down
21 changes: 21 additions & 0 deletions bridge/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ go 1.19

require (
github.com/agiledragon/gomonkey/v2 v2.9.0
github.com/gin-gonic/gin v1.9.1
github.com/go-resty/resty/v2 v2.7.0
github.com/orcaman/concurrent-map/v2 v2.0.1
github.com/prometheus/client_golang v1.14.0
github.com/scroll-tech/go-ethereum v1.10.14-0.20230812030736-25fe3ba69a28
Expand All @@ -16,12 +18,20 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd v0.20.1-beta // indirect
github.com/bytedance/sonic v1.9.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.1 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/uuid v1.3.0 // indirect
Expand All @@ -33,13 +43,19 @@ require (
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
Expand All @@ -54,12 +70,17 @@ require (
github.com/status-im/keycard-go v0.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/arch v0.4.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
Expand Down
Loading
Loading