Skip to content

Commit f4264fa

Browse files
zhouop0zhouop0
committed
format
1 parent 53cf9fd commit f4264fa

File tree

15 files changed

+37
-25
lines changed

15 files changed

+37
-25
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.23.4
55
require (
66
github.com/caarlos0/env/v6 v6.10.1
77
github.com/ethereum/go-ethereum v1.14.12
8+
github.com/gin-gonic/gin v1.10.0
89
github.com/go-gormigrate/gormigrate/v2 v2.1.3
910
github.com/pkg/errors v0.9.1
1011
github.com/spf13/cast v1.7.1
@@ -31,7 +32,6 @@ require (
3132
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
3233
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
3334
github.com/gin-contrib/sse v0.1.0 // indirect
34-
github.com/gin-gonic/gin v1.10.0 // indirect
3535
github.com/go-ole/go-ole v1.3.0 // indirect
3636
github.com/go-playground/locales v0.14.1 // indirect
3737
github.com/go-playground/universal-translator v0.18.1 // indirect

‎go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ github.com/go-gormigrate/gormigrate/v2 v2.1.3/go.mod h1:VJ9FIOBAur+NmQ8c4tDVwOui
7474
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
7575
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
7676
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
77+
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
78+
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
7779
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
7880
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
7981
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@@ -97,6 +99,8 @@ github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg
9799
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
98100
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
99101
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
102+
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
103+
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
100104
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
101105
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
102106
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -219,8 +223,6 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
219223
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
220224
golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
221225
golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
222-
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
223-
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
224226
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
225227
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
226228
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
@@ -237,15 +239,15 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
237239
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
238240
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
239241
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
240-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
241-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
242242
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
243243
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
244244
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
245245
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
246246
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
247247
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
248248
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
249+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
250+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
249251
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
250252
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
251253
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

‎handler/latestBlockNumber.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package handler
22

33
import (
44
"context"
5+
"time"
6+
57
"github.com/optimism-java/interopbackend/internal/schema"
68
"github.com/optimism-java/interopbackend/internal/svc"
79
"github.com/optimism-java/interopbackend/pkg/log"
8-
"time"
910

1011
"github.com/pkg/errors"
1112
"github.com/spf13/cast"

‎handler/logFilter.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ package handler
22

33
import (
44
"context"
5+
"math/big"
6+
"strings"
7+
58
"github.com/ethereum/go-ethereum"
69
"github.com/ethereum/go-ethereum/common"
710
"github.com/ethereum/go-ethereum/core/types"
@@ -11,8 +14,6 @@ import (
1114
"github.com/optimism-java/interopbackend/pkg/event"
1215
"github.com/optimism-java/interopbackend/pkg/log"
1316
"github.com/pkg/errors"
14-
"math/big"
15-
"strings"
1617
)
1718

1819
func LogBatchFilter(ctx *svc.ServiceContext, startBlock, endBlock int64, addresses []common.Address, topics [][]common.Hash) ([]*schema.SyncEvent, error) {

‎handler/syncBlock.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ package handler
22

33
import (
44
"fmt"
5+
"time"
6+
57
"github.com/ethereum/go-ethereum/common"
68
"github.com/optimism-java/interopbackend/internal/schema"
79
"github.com/optimism-java/interopbackend/internal/svc"
810
"github.com/optimism-java/interopbackend/pkg/log"
911
"github.com/optimism-java/interopbackend/pkg/rpc"
1012
"github.com/pkg/errors"
1113
"gorm.io/gorm"
12-
"time"
1314
)
1415

1516
func SyncBlock(ctx *svc.ServiceContext) {
@@ -37,7 +38,7 @@ func SyncBlock(ctx *svc.ServiceContext) {
3738
continue
3839
}
3940

40-
//block, err := ctx.L2RPC.BlockByNumber(context.Background(), big.NewInt(syncingBlockNumber))
41+
// block, err := ctx.L2RPC.BlockByNumber(context.Background(), big.NewInt(syncingBlockNumber))
4142
blockJSON, err := rpc.HTTPPostJSON("", ctx.Config.L2RPCUrl, "{\"jsonrpc\":\"2.0\",\"method\":\"eth_getBlockByNumber\",\"params\":[\""+fmt.Sprintf("0x%X", syncingBlockNumber)+"\", true],\"id\":1}")
4243
if err != nil {
4344
log.Errorf("[Handler.SyncBlock] Syncing block by number error: %s\n", errors.WithStack(err))

‎handler/syncEvent.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package handler
22

33
import (
4+
"sync"
5+
"time"
6+
47
"github.com/ethereum/go-ethereum/common"
58
"github.com/optimism-java/interopbackend/internal/blockchain"
69
"github.com/optimism-java/interopbackend/internal/schema"
710
"github.com/optimism-java/interopbackend/internal/svc"
811
"github.com/optimism-java/interopbackend/pkg/log"
912
"github.com/pkg/errors"
1013
"gorm.io/gorm"
11-
"sync"
12-
"time"
1314
)
1415

1516
func SyncEvent(ctx *svc.ServiceContext) {

‎internal/api/api.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package api
22

33
import (
4+
"net/http"
5+
"strconv"
6+
47
"github.com/gin-gonic/gin"
58
"github.com/optimism-java/interopbackend/internal/schema"
69
config "github.com/optimism-java/interopbackend/internal/types"
710
"gorm.io/gorm"
8-
"net/http"
9-
"strconv"
1011
)
1112

1213
type Api struct {

‎internal/blockchain/blockchain.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ func init() {
2828
cfg := config.GetConfig()
2929
AddContract(cfg.L2toL2CrossDomainMessenger)
3030
AddContract(cfg.CrossL2Inbox)
31-
3231
}
3332

3433
func Register(event Event) {

‎internal/blockchain/blockchain_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package blockchain
33
import (
44
"encoding/hex"
55
"fmt"
6+
"math/big"
7+
"testing"
8+
69
"github.com/ethereum/go-ethereum/accounts/abi"
710
"github.com/ethereum/go-ethereum/common"
811
"github.com/ethereum/go-ethereum/crypto"
912
"github.com/optimism-java/interopbackend/pkg/event"
10-
"math/big"
11-
"testing"
1213
)
1314

1415
func TestRemoveContract(t *testing.T) {
@@ -21,7 +22,6 @@ func TestRemoveContract(t *testing.T) {
2122
RemoveContract("BB")
2223
RemoveContract("CC")
2324
fmt.Println(GetContracts())
24-
2525
}
2626

2727
// 382409ac69001e11931a28435afef442cbfd20d9891907e8fa373ba7d351f320
@@ -37,7 +37,7 @@ func TestRemoveContract(t *testing.T) {
3737
func TestHashL2toL2CrossDomainMessage(t *testing.T) {
3838
logs := "382409ac69001e11931a28435afef442cbfd20d9891907e8fa373ba7d351f3200000000000000000000000000000000000000000000000000000000000000386000000000000000000000000420000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000847cfd6dbc000000000000000000000000420beef000000000000000000000000000000001000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb9226600000000000000000000000000000000000000000000000000000000000003e800000000000000000000000000000000000000000000000000000000"
3939
s := crypto.Keccak256(common.Hex2Bytes(logs))
40-
//与ExecutingMessage事件的msgHash匹配
40+
// 与ExecutingMessage事件的msgHash匹配
4141
fmt.Println(hex.EncodeToString(s))
4242

4343
sendMessageEvent := &event.SendMessage{}
@@ -101,7 +101,7 @@ func TestHashCody(t *testing.T) {
101101

102102
packed, _ := arguments.Pack(destination, source, nonce, sender, target, message)
103103
messageHash := crypto.Keccak256Hash(packed)
104-
//与RelayedMessage事件的messageHash匹配
104+
// 与RelayedMessage事件的messageHash匹配
105105
fmt.Println(messageHash)
106106
}
107107

‎internal/svc/svc.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package svc
22

33
import (
44
"context"
5-
"github.com/optimism-java/interopbackend/internal/types"
65
"log"
76
"time"
87

8+
"github.com/optimism-java/interopbackend/internal/types"
9+
910
"gorm.io/driver/mysql"
1011

1112
"github.com/ethereum/go-ethereum/common"

0 commit comments

Comments
 (0)