Skip to content

Commit fcfb708

Browse files
0xmountaintop0xmountaintop
authored
Merge branch 'develop' into replace-scroll-zkevm-with-scroll-prver-in-libzkp
2 parents 148d070 + a83e035 commit fcfb708

39 files changed

+320
-646
lines changed

‎bridge/cmd/event_watcher/app/app.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111
"github.com/scroll-tech/go-ethereum/log"
1212
"github.com/urfave/cli/v2"
1313

14+
"scroll-tech/common/database"
1415
"scroll-tech/common/metrics"
15-
cutils "scroll-tech/common/utils"
16+
"scroll-tech/common/utils"
1617
"scroll-tech/common/version"
1718

1819
"scroll-tech/bridge/internal/config"
1920
"scroll-tech/bridge/internal/controller/watcher"
20-
"scroll-tech/bridge/internal/utils"
2121
)
2222

2323
var app *cli.App
@@ -29,32 +29,32 @@ func init() {
2929
app.Name = "event-watcher"
3030
app.Usage = "The Scroll Event Watcher"
3131
app.Version = version.Version
32-
app.Flags = append(app.Flags, cutils.CommonFlags...)
32+
app.Flags = append(app.Flags, utils.CommonFlags...)
3333
app.Commands = []*cli.Command{}
3434
app.Before = func(ctx *cli.Context) error {
35-
return cutils.LogSetup(ctx)
35+
return utils.LogSetup(ctx)
3636
}
3737
// Register `event-watcher-test` app for integration-test.
38-
cutils.RegisterSimulation(app, cutils.EventWatcherApp)
38+
utils.RegisterSimulation(app, utils.EventWatcherApp)
3939
}
4040

4141
func action(ctx *cli.Context) error {
4242
// Load config file.
43-
cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
43+
cfgFile := ctx.String(utils.ConfigFileFlag.Name)
4444
cfg, err := config.NewConfig(cfgFile)
4545
if err != nil {
4646
log.Crit("failed to load config file", "config file", cfgFile, "error", err)
4747
}
4848

4949
subCtx, cancel := context.WithCancel(ctx.Context)
5050
// Init db connection
51-
db, err := utils.InitDB(cfg.DBConfig)
51+
db, err := database.InitDB(cfg.DBConfig)
5252
if err != nil {
5353
log.Crit("failed to init db connection", "err", err)
5454
}
5555
defer func() {
5656
cancel()
57-
if err = utils.CloseDB(db); err != nil {
57+
if err = database.CloseDB(db); err != nil {
5858
log.Error("can not close ormFactory", "error", err)
5959
}
6060
}()
@@ -75,14 +75,14 @@ func action(ctx *cli.Context) error {
7575
l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations, cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db)
7676
l2watcher := watcher.NewL2WatcherClient(ctx.Context, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, db)
7777

78-
go cutils.Loop(subCtx, 10*time.Second, func() {
78+
go utils.Loop(subCtx, 10*time.Second, func() {
7979
if loopErr := l1watcher.FetchContractEvent(); loopErr != nil {
8080
log.Error("Failed to fetch bridge contract", "err", loopErr)
8181
}
8282
})
8383

8484
// Start l2 watcher process
85-
go cutils.Loop(subCtx, 2*time.Second, l2watcher.FetchContractEvent)
85+
go utils.Loop(subCtx, 2*time.Second, l2watcher.FetchContractEvent)
8686
// Finish start all l2 functions
8787
log.Info("Start event-watcher successfully")
8888

‎bridge/cmd/gas_oracle/app/app.go

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import (
1111
"github.com/scroll-tech/go-ethereum/log"
1212
"github.com/urfave/cli/v2"
1313

14+
"scroll-tech/common/database"
1415
"scroll-tech/common/metrics"
15-
cutils "scroll-tech/common/utils"
16+
"scroll-tech/common/utils"
1617
"scroll-tech/common/version"
1718

1819
"scroll-tech/bridge/internal/config"
1920
"scroll-tech/bridge/internal/controller/relayer"
2021
"scroll-tech/bridge/internal/controller/watcher"
21-
"scroll-tech/bridge/internal/utils"
22+
butils "scroll-tech/bridge/internal/utils"
2223
)
2324

2425
var app *cli.App
@@ -31,31 +32,31 @@ func init() {
3132
app.Usage = "The Scroll Gas Oracle"
3233
app.Description = "Scroll Gas Oracle."
3334
app.Version = version.Version
34-
app.Flags = append(app.Flags, cutils.CommonFlags...)
35+
app.Flags = append(app.Flags, utils.CommonFlags...)
3536
app.Commands = []*cli.Command{}
3637
app.Before = func(ctx *cli.Context) error {
37-
return cutils.LogSetup(ctx)
38+
return utils.LogSetup(ctx)
3839
}
3940
// Register `gas-oracle-test` app for integration-test.
40-
cutils.RegisterSimulation(app, cutils.GasOracleApp)
41+
utils.RegisterSimulation(app, utils.GasOracleApp)
4142
}
4243

4344
func action(ctx *cli.Context) error {
4445
// Load config file.
45-
cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
46+
cfgFile := ctx.String(utils.ConfigFileFlag.Name)
4647
cfg, err := config.NewConfig(cfgFile)
4748
if err != nil {
4849
log.Crit("failed to load config file", "config file", cfgFile, "error", err)
4950
}
5051
subCtx, cancel := context.WithCancel(ctx.Context)
5152
// Init db connection
52-
db, err := utils.InitDB(cfg.DBConfig)
53+
db, err := database.InitDB(cfg.DBConfig)
5354
if err != nil {
5455
log.Crit("failed to init db connection", "err", err)
5556
}
5657
defer func() {
5758
cancel()
58-
if err = utils.CloseDB(db); err != nil {
59+
if err = database.CloseDB(db); err != nil {
5960
log.Error("can not close ormFactory", "error", err)
6061
}
6162
}()
@@ -76,7 +77,8 @@ func action(ctx *cli.Context) error {
7677
return err
7778
}
7879

79-
l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations, cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db)
80+
l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations,
81+
cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db)
8082

8183
l1relayer, err := relayer.NewLayer1Relayer(ctx.Context, db, cfg.L1Config.RelayerConfig)
8284
if err != nil {
@@ -89,8 +91,8 @@ func action(ctx *cli.Context) error {
8991
return err
9092
}
9193
// Start l1 watcher process
92-
go cutils.LoopWithContext(subCtx, 10*time.Second, func(ctx context.Context) {
93-
number, loopErr := utils.GetLatestConfirmedBlockNumber(ctx, l1client, cfg.L1Config.Confirmations)
94+
go utils.LoopWithContext(subCtx, 10*time.Second, func(ctx context.Context) {
95+
number, loopErr := butils.GetLatestConfirmedBlockNumber(ctx, l1client, cfg.L1Config.Confirmations)
9496
if loopErr != nil {
9597
log.Error("failed to get block number", "err", loopErr)
9698
return
@@ -102,8 +104,8 @@ func action(ctx *cli.Context) error {
102104
})
103105

104106
// Start l1relayer process
105-
go cutils.Loop(subCtx, 10*time.Second, l1relayer.ProcessGasPriceOracle)
106-
go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessGasPriceOracle)
107+
go utils.Loop(subCtx, 10*time.Second, l1relayer.ProcessGasPriceOracle)
108+
go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessGasPriceOracle)
107109

108110
// Finish start all message relayer functions
109111
log.Info("Start gas-oracle successfully")

‎bridge/cmd/msg_relayer/app/app.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"github.com/scroll-tech/go-ethereum/log"
1111
"github.com/urfave/cli/v2"
1212

13+
"scroll-tech/common/database"
1314
"scroll-tech/common/metrics"
14-
cutils "scroll-tech/common/utils"
15+
"scroll-tech/common/utils"
1516
"scroll-tech/common/version"
1617

1718
"scroll-tech/bridge/internal/config"
1819
"scroll-tech/bridge/internal/controller/relayer"
19-
"scroll-tech/bridge/internal/utils"
2020
)
2121

2222
var app *cli.App
@@ -29,32 +29,32 @@ func init() {
2929
app.Usage = "The Scroll Message Relayer"
3030
app.Description = "Message Relayer contains two main service: 1) relay l1 message to l2. 2) relay l2 message to l1."
3131
app.Version = version.Version
32-
app.Flags = append(app.Flags, cutils.CommonFlags...)
32+
app.Flags = append(app.Flags, utils.CommonFlags...)
3333
app.Commands = []*cli.Command{}
3434
app.Before = func(ctx *cli.Context) error {
35-
return cutils.LogSetup(ctx)
35+
return utils.LogSetup(ctx)
3636
}
3737
// Register `message-relayer-test` app for integration-test.
38-
cutils.RegisterSimulation(app, cutils.MessageRelayerApp)
38+
utils.RegisterSimulation(app, utils.MessageRelayerApp)
3939
}
4040

4141
func action(ctx *cli.Context) error {
4242
// Load config file.
43-
cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
43+
cfgFile := ctx.String(utils.ConfigFileFlag.Name)
4444
cfg, err := config.NewConfig(cfgFile)
4545
if err != nil {
4646
log.Crit("failed to load config file", "config file", cfgFile, "error", err)
4747
}
4848

4949
subCtx, cancel := context.WithCancel(ctx.Context)
5050
// Init db connection
51-
db, err := utils.InitDB(cfg.DBConfig)
51+
db, err := database.InitDB(cfg.DBConfig)
5252
if err != nil {
5353
log.Crit("failed to init db connection", "err", err)
5454
}
5555
defer func() {
5656
cancel()
57-
if err = utils.CloseDB(db); err != nil {
57+
if err = database.CloseDB(db); err != nil {
5858
log.Error("can not close ormFactory", "error", err)
5959
}
6060
}()
@@ -69,7 +69,7 @@ func action(ctx *cli.Context) error {
6969
}
7070

7171
// Start l1relayer process
72-
go cutils.Loop(subCtx, 10*time.Second, l1relayer.ProcessSavedEvents)
72+
go utils.Loop(subCtx, 10*time.Second, l1relayer.ProcessSavedEvents)
7373

7474
// Finish start all message relayer functions
7575
log.Info("Start message-relayer successfully")

‎bridge/cmd/rollup_relayer/app/app.go

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import (
1111
"github.com/scroll-tech/go-ethereum/log"
1212
"github.com/urfave/cli/v2"
1313

14+
"scroll-tech/common/database"
1415
"scroll-tech/common/metrics"
15-
cutils "scroll-tech/common/utils"
16+
"scroll-tech/common/utils"
1617
"scroll-tech/common/version"
1718

1819
"scroll-tech/bridge/internal/config"
1920
"scroll-tech/bridge/internal/controller/relayer"
2021
"scroll-tech/bridge/internal/controller/watcher"
21-
"scroll-tech/bridge/internal/utils"
22+
butils "scroll-tech/bridge/internal/utils"
2223
)
2324

2425
var app *cli.App
@@ -30,33 +31,33 @@ func init() {
3031
app.Name = "rollup-relayer"
3132
app.Usage = "The Scroll Rollup Relayer"
3233
app.Version = version.Version
33-
app.Flags = append(app.Flags, cutils.CommonFlags...)
34-
app.Flags = append(app.Flags, cutils.RollupRelayerFlags...)
34+
app.Flags = append(app.Flags, utils.CommonFlags...)
35+
app.Flags = append(app.Flags, utils.RollupRelayerFlags...)
3536
app.Commands = []*cli.Command{}
3637
app.Before = func(ctx *cli.Context) error {
37-
return cutils.LogSetup(ctx)
38+
return utils.LogSetup(ctx)
3839
}
3940
// Register `rollup-relayer-test` app for integration-test.
40-
cutils.RegisterSimulation(app, cutils.RollupRelayerApp)
41+
utils.RegisterSimulation(app, utils.RollupRelayerApp)
4142
}
4243

4344
func action(ctx *cli.Context) error {
4445
// Load config file.
45-
cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
46+
cfgFile := ctx.String(utils.ConfigFileFlag.Name)
4647
cfg, err := config.NewConfig(cfgFile)
4748
if err != nil {
4849
log.Crit("failed to load config file", "config file", cfgFile, "error", err)
4950
}
5051

5152
subCtx, cancel := context.WithCancel(ctx.Context)
5253
// Init db connection
53-
db, err := utils.InitDB(cfg.DBConfig)
54+
db, err := database.InitDB(cfg.DBConfig)
5455
if err != nil {
5556
log.Crit("failed to init db connection", "err", err)
5657
}
5758
defer func() {
5859
cancel()
59-
if err = utils.CloseDB(db); err != nil {
60+
if err = database.CloseDB(db); err != nil {
6061
log.Error("can not close ormFactory", "error", err)
6162
}
6263
}()
@@ -71,7 +72,7 @@ func action(ctx *cli.Context) error {
7172
return err
7273
}
7374

74-
initGenesis := ctx.Bool(cutils.ImportGenesisFlag.Name)
75+
initGenesis := ctx.Bool(utils.ImportGenesisFlag.Name)
7576
l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, db, cfg.L2Config.RelayerConfig, initGenesis)
7677
if err != nil {
7778
log.Error("failed to create l2 relayer", "config file", cfgFile, "error", err)
@@ -90,25 +91,26 @@ func action(ctx *cli.Context) error {
9091
return err
9192
}
9293

93-
l2watcher := watcher.NewL2WatcherClient(subCtx, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, db)
94+
l2watcher := watcher.NewL2WatcherClient(subCtx, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress,
95+
cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, db)
9496

9597
// Watcher loop to fetch missing blocks
96-
go cutils.LoopWithContext(subCtx, 2*time.Second, func(ctx context.Context) {
97-
number, loopErr := utils.GetLatestConfirmedBlockNumber(ctx, l2client, cfg.L2Config.Confirmations)
98+
go utils.LoopWithContext(subCtx, 2*time.Second, func(ctx context.Context) {
99+
number, loopErr := butils.GetLatestConfirmedBlockNumber(ctx, l2client, cfg.L2Config.Confirmations)
98100
if loopErr != nil {
99101
log.Error("failed to get block number", "err", loopErr)
100102
return
101103
}
102104
l2watcher.TryFetchRunningMissingBlocks(number)
103105
})
104106

105-
go cutils.Loop(subCtx, 2*time.Second, chunkProposer.TryProposeChunk)
107+
go utils.Loop(subCtx, 2*time.Second, chunkProposer.TryProposeChunk)
106108

107-
go cutils.Loop(subCtx, 2*time.Second, batchProposer.TryProposeBatch)
109+
go utils.Loop(subCtx, 2*time.Second, batchProposer.TryProposeBatch)
108110

109-
go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessPendingBatches)
111+
go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessPendingBatches)
110112

111-
go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessCommittedBatches)
113+
go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessCommittedBatches)
112114

113115
// Finish start all rollup relayer functions.
114116
log.Info("Start rollup-relayer successfully")

‎bridge/go.mod

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
github.com/stretchr/testify v1.8.2
1212
github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
1313
golang.org/x/sync v0.1.0
14-
gorm.io/driver/postgres v1.5.0
1514
gorm.io/gorm v1.25.1
1615
)
1716

@@ -30,9 +29,6 @@ require (
3029
github.com/holiman/uint256 v1.2.2 // indirect
3130
github.com/huin/goupnp v1.0.3 // indirect
3231
github.com/iden3/go-iden3-crypto v0.0.15 // indirect
33-
github.com/jackc/pgpassfile v1.0.0 // indirect
34-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
35-
github.com/jackc/pgx/v5 v5.3.0 // indirect
3632
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
3733
github.com/jinzhu/inflection v1.0.0 // indirect
3834
github.com/jinzhu/now v1.1.5 // indirect
@@ -58,8 +54,8 @@ require (
5854
github.com/yusufpapurcu/wmi v1.2.2 // indirect
5955
golang.org/x/crypto v0.10.0 // indirect
6056
golang.org/x/sys v0.9.0 // indirect
61-
golang.org/x/text v0.10.0 // indirect
6257
golang.org/x/time v0.3.0 // indirect
58+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
6359
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
6460
gopkg.in/yaml.v3 v3.0.1 // indirect
6561
)

0 commit comments

Comments
 (0)