Skip to content

Commit 4f9a98e

Browse files
committed
fix: address comments
1 parent a434b2c commit 4f9a98e

File tree

13 files changed

+187
-130
lines changed

13 files changed

+187
-130
lines changed

common/utils/ethereum_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ func TestCalculateVersionedBlobHash(t *testing.T) {
2828
t.Fatalf("Failed to parse blobdata.json: %v", err)
2929
}
3030

31-
fmt.Println(blobData.BlobData)
3231
blobBytes, err := hex.DecodeString(blobData.BlobData)
3332
if err != nil {
3433
t.Fatalf("Failed to decode blob data: %v", err)

database/migrate/migrate_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,20 @@ func testResetDB(t *testing.T) {
5959
cur, err := Current(pgDB)
6060
assert.NoError(t, err)
6161
// total number of tables.
62-
assert.Equal(t, int64(28), cur)
62+
assert.Equal(t, int64(27), cur)
6363
}
6464

6565
func testMigrate(t *testing.T) {
6666
assert.NoError(t, Migrate(pgDB))
6767
cur, err := Current(pgDB)
6868
assert.NoError(t, err)
69-
assert.Equal(t, int64(28), cur)
69+
assert.Equal(t, int64(27), cur)
7070
}
7171

7272
func testRollback(t *testing.T) {
7373
version, err := Current(pgDB)
7474
assert.NoError(t, err)
75-
assert.Equal(t, int64(28), version)
75+
assert.Equal(t, int64(27), version)
7676

7777
assert.NoError(t, Rollback(pgDB, nil))
7878

database/migrate/migrations/00028_ blob_upload.sql renamed to database/migrate/migrations/00027_ blob_upload.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ CREATE TABLE blob_upload (
88
status SMALLINT NOT NULL,
99

1010
-- metadata
11-
updated_at TIMESTAMP NOT NULL DEFAULT now(),
12-
deleted_at TIMESTAMP(0) DEFAULT NULL,
11+
created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
12+
updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
13+
deleted_at TIMESTAMP(0) DEFAULT NULL
1314

14-
PRIMARY KEY (batch_index, platform),
15-
FOREIGN KEY (batch_index) REFERENCES batch(index)
15+
PRIMARY KEY (batch_index, platform)
1616
);
1717

1818
COMMENT ON COLUMN blob_upload.status IS 'undefined, pending, uploaded, failed';

database/migrate/migrations/00027_alter_batch_add_primary_key_index.sql

Lines changed: 0 additions & 9 deletions
This file was deleted.

go.work

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
go 1.22
2-
3-
toolchain go1.22.2
1+
go 1.22.4
42

53
use (
64
./bridge-history-api

go.work.sum

Lines changed: 64 additions & 10 deletions
Large diffs are not rendered by default.

rollup/cmd/blob_uploader/app/app.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"time"
99

1010
"github.com/prometheus/client_golang/prometheus"
11-
"github.com/scroll-tech/da-codec/encoding"
1211
"github.com/scroll-tech/go-ethereum/log"
1312
"github.com/urfave/cli/v2"
1413

rollup/go.mod

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module scroll-tech/rollup
22

3-
go 1.22
3+
go 1.22.4
44

55
require (
66
github.com/agiledragon/gomonkey/v2 v2.12.0
@@ -42,17 +42,24 @@ require (
4242
github.com/aws/smithy-go v1.22.2 // indirect
4343
github.com/beorn7/perks v1.0.1 // indirect
4444
github.com/bits-and-blooms/bitset v1.20.0 // indirect
45-
github.com/btcsuite/btcd v0.20.1-beta // indirect
45+
github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd // indirect
46+
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
47+
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
4648
github.com/bytedance/sonic v1.10.1 // indirect
47-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
49+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4850
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
4951
github.com/chenzhuoyu/iasm v0.9.0 // indirect
5052
github.com/consensys/bavard v0.1.29 // indirect
5153
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
5254
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5355
github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea // indirect
56+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
5457
github.com/edsrzf/mmap-go v1.0.0 // indirect
5558
github.com/ethereum/c-kzg-4844 v1.0.3 // indirect
59+
github.com/ethereum/go-ethereum v1.14.7 // indirect
60+
github.com/everFinance/ethrpc v1.0.4 // indirect
61+
github.com/everFinance/goether v1.1.9 // indirect
62+
github.com/everFinance/gojwk v1.0.0 // indirect
5663
github.com/fjl/memsize v0.0.2 // indirect
5764
github.com/fsnotify/fsnotify v1.7.0 // indirect
5865
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
@@ -64,7 +71,7 @@ require (
6471
github.com/go-playground/validator/v10 v10.15.5 // indirect
6572
github.com/go-stack/stack v1.8.1 // indirect
6673
github.com/goccy/go-json v0.10.2 // indirect
67-
github.com/golang/protobuf v1.5.3 // indirect
74+
github.com/golang/protobuf v1.5.4 // indirect
6875
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
6976
github.com/google/go-cmp v0.6.0 // indirect
7077
github.com/google/uuid v1.6.0 // indirect
@@ -76,6 +83,7 @@ require (
7683
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
7784
github.com/huin/goupnp v1.3.0 // indirect
7885
github.com/iden3/go-iden3-crypto v0.0.17 // indirect
86+
github.com/inconshreveable/log15 v2.16.0+incompatible // indirect
7987
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
8088
github.com/jinzhu/inflection v1.0.0 // indirect
8189
github.com/jinzhu/now v1.1.5 // indirect
@@ -84,6 +92,7 @@ require (
8492
github.com/klauspost/compress v1.17.9 // indirect
8593
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
8694
github.com/leodido/go-urn v1.2.4 // indirect
95+
github.com/linkedin/goavro/v2 v2.13.0 // indirect
8796
github.com/magiconair/properties v1.8.7 // indirect
8897
github.com/mattn/go-colorable v0.1.13 // indirect
8998
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -96,7 +105,9 @@ require (
96105
github.com/olekukonko/tablewriter v0.0.5 // indirect
97106
github.com/onsi/ginkgo v1.16.5 // indirect
98107
github.com/onsi/gomega v1.27.1 // indirect
108+
github.com/panjf2000/ants/v2 v2.10.0 // indirect
99109
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
110+
github.com/permadao/goar v1.1.1 // indirect
100111
github.com/pkg/errors v0.9.1 // indirect
101112
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
102113
github.com/prometheus/client_model v0.4.0 // indirect
@@ -111,6 +122,7 @@ require (
111122
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
112123
github.com/scroll-tech/zktrie v0.8.4 // indirect
113124
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
125+
github.com/shopspring/decimal v1.4.0 // indirect
114126
github.com/smartystreets/assertions v1.13.1 // indirect
115127
github.com/sourcegraph/conc v0.3.0 // indirect
116128
github.com/spf13/afero v1.11.0 // indirect
@@ -120,6 +132,9 @@ require (
120132
github.com/subosito/gotenv v1.6.0 // indirect
121133
github.com/supranational/blst v0.3.13 // indirect
122134
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
135+
github.com/tidwall/gjson v1.17.3 // indirect
136+
github.com/tidwall/match v1.1.1 // indirect
137+
github.com/tidwall/pretty v1.2.0 // indirect
123138
github.com/tklauser/go-sysconf v0.3.14 // indirect
124139
github.com/tklauser/numcpus v0.9.0 // indirect
125140
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -131,13 +146,15 @@ require (
131146
go.uber.org/multierr v1.9.0 // indirect
132147
golang.org/x/arch v0.5.0 // indirect
133148
golang.org/x/crypto v0.32.0 // indirect
134-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
149+
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
135150
golang.org/x/net v0.25.0 // indirect
136151
golang.org/x/sync v0.11.0 // indirect
137152
golang.org/x/sys v0.30.0 // indirect
153+
golang.org/x/term v0.28.0 // indirect
138154
golang.org/x/text v0.21.0 // indirect
139155
golang.org/x/time v0.5.0 // indirect
140156
google.golang.org/protobuf v1.33.0 // indirect
157+
gopkg.in/h2non/gentleman.v2 v2.0.5 // indirect
141158
gopkg.in/ini.v1 v1.67.0 // indirect
142159
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
143160
gopkg.in/urfave/cli.v1 v1.20.0 // indirect

0 commit comments

Comments
 (0)