diff --git a/common/version/version.go b/common/version/version.go index dedecf6097..7a9994c069 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.29" +var tag = "v4.5.30" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/rollup/cmd/blob_uploader/app/app.go b/rollup/cmd/blob_uploader/app/app.go index 6ee84e11aa..71b9184e55 100644 --- a/rollup/cmd/blob_uploader/app/app.go +++ b/rollup/cmd/blob_uploader/app/app.go @@ -70,7 +70,7 @@ func action(ctx *cli.Context) error { log.Crit("failed to create l2 relayer", "config file", cfgFile, "error", err) } - go utils.Loop(subCtx, 2*time.Second, blobUploader.UploadBlobToS3) + go utils.Loop(subCtx, 1*time.Second, blobUploader.UploadBlobToS3) // Finish start all blob-uploader functions. log.Info("Start blob-uploader successfully", "version", version.Version) diff --git a/rollup/internal/controller/blob_uploader/s3_sender.go b/rollup/internal/controller/blob_uploader/s3_sender.go index bfbe32cfd0..a31857c856 100644 --- a/rollup/internal/controller/blob_uploader/s3_sender.go +++ b/rollup/internal/controller/blob_uploader/s3_sender.go @@ -25,8 +25,6 @@ type S3Uploader struct { func NewS3Uploader(cfg *config.AWSS3Config) (*S3Uploader, error) { // load AWS config var opts []func(*awsconfig.LoadOptions) error - opts = append(opts, awsconfig.WithRegion(cfg.Region)) - // if AccessKey && SecretKey provided, use it if cfg.AccessKey != "" && cfg.SecretKey != "" { opts = append(opts, awsconfig.WithCredentialsProvider( @@ -38,6 +36,10 @@ func NewS3Uploader(cfg *config.AWSS3Config) (*S3Uploader, error) { ) } + if cfg.Region != "" { + opts = append(opts, awsconfig.WithRegion(cfg.Region)) + } + awsCfg, err := awsconfig.LoadDefaultConfig(context.Background(), opts...) if err != nil { return nil, fmt.Errorf("failed to load default config: %w", err) diff --git a/rollup/internal/orm/blob_upload.go b/rollup/internal/orm/blob_upload.go index 391be5f31e..a528160a39 100644 --- a/rollup/internal/orm/blob_upload.go +++ b/rollup/internal/orm/blob_upload.go @@ -115,7 +115,8 @@ func (o *BlobUpload) InsertOrUpdateBlobUpload(ctx context.Context, batchIndex ui return fmt.Errorf("BlobUpload.InsertOrUpdateBlobUpload query error: %w, batch index: %v, batch_hash: %v, platform: %v", err, batchIndex, batchHash, platform) } - if err := db.Model(&existing).Update("status", int16(status)).Error; err != nil { + if err := db.Model(&existing).Where("batch_index = ? AND batch_hash = ? AND platform = ? AND deleted_at IS NULL", + batchIndex, batchHash, int16(platform)).Update("status", int16(status)).Error; err != nil { return fmt.Errorf("BlobUpload.InsertOrUpdateBlobUpload update error: %w, batch index: %v, batch_hash: %v, platform: %v", err, batchIndex, batchHash, platform) }