Skip to content

fix(blob-uploader): orm function InsertOrUpdateBlobUpload and s3 bucket region configuration #1679

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.

Sign up for GitHub

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

Merged
yiweichi merged 14 commits into from
Jul 16, 2025
Merged

fix(blob-uploader): orm function InsertOrUpdateBlobUpload and s3 bucket region configuration #1679

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
343a1bb
fix: aws s3 config
yiweichi Jun 11, 2025
2cd9217
chore: auto version bump [bot]
yiweichi Jun 11, 2025
465c36e
feat: temporarily disable codec_version check
yiweichi Jun 11, 2025
6cc6a45
feat: temporarily disable codec_version check
yiweichi Jun 11, 2025
c68a4a0
feat: temporarily disable codec_version check
yiweichi Jun 11, 2025
e50675f
fix: InsertOrUpdateBlobUpload
yiweichi Jun 12, 2025
7eb5212
fix: codec v2 special handle
yiweichi Jun 12, 2025
b63a137
fix: mainnet codec version special handle
yiweichi Jul 1, 2025
b5f6493
remove hotfix code
yiweichi Jul 7, 2025
88f9244
Merge branch 'develop' into fix-blob-uploader
yiweichi Jul 7, 2025
01f29db
indent
yiweichi Jul 7, 2025
fad502d
Merge branch 'fix-blob-uploader' of https://github.com/scroll-tech/sc…
yiweichi Jul 7, 2025
2be84ff
Merge branch 'develop' into fix-blob-uploader
yiweichi Jul 16, 2025
d73f57c
chore: auto version bump [bot]
yiweichi Jul 16, 2025
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 common/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"runtime/debug"
)

var tag = "v4.5.23"
var tag = "v4.5.24"

var commit = func() string {
if info, ok := debug.ReadBuildInfo(); ok {
Expand Down
6 changes: 4 additions & 2 deletions rollup/internal/controller/blob_uploader/s3_sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
Expand Down