Skip to content

Commit c0bf216

Browse files
authored
Merge pull request #666 from bnb-chain/feat-develop-deps-1017
feat: dep update dev to master
2 parents 6623f4e + 7bd5bbf commit c0bf216

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+337
-1270
lines changed

.github/workflows/buf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
protobuf-check:
1717
strategy:
1818
matrix:
19-
go-version: [1.20.x]
19+
go-version: [1.21.x]
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v3

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
build-test:
1313
strategy:
1414
matrix:
15-
go-version: [1.20.x]
15+
go-version: [1.21.x]
1616
os: [ubuntu-latest]
1717
runs-on: ${{ matrix.os }}
1818
env:

.github/workflows/gosec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: gosec
1313
strategy:
1414
matrix:
15-
go-version: [1.20.x]
15+
go-version: [1.21.x]
1616
os: [ubuntu-latest]
1717
runs-on: ${{ matrix.os }}
1818
env:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: golangci-lint
1515
strategy:
1616
matrix:
17-
go-version: [1.20.x]
17+
go-version: [1.21.x]
1818
os: [ubuntu-latest]
1919
runs-on: ${{ matrix.os }}
2020
env:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Build Release
1212
strategy:
1313
matrix:
14-
go-version: [1.20.x]
14+
go-version: [1.21.x]
1515
os: [ubuntu-latest, macos-latest]
1616
runs-on: ${{ matrix.os }}
1717
steps:

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
tests:
1313
strategy:
1414
matrix:
15-
go-version: [1.20.x]
15+
go-version: [1.21.x]
1616
os: [ubuntu-latest]
1717
runs-on: ${{ matrix.os }}
1818
env:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20-alpine as builder
1+
FROM golang:1.21-alpine as builder
22

33
RUN apk add --no-cache make git bash build-base linux-headers libc-dev
44

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ tools:
2222
go install github.com/cosmos/gogoproto/protoc-gen-gocosmos
2323
go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
2424
go install github.com/golang/mock/[email protected]
25+
echo "Tools installed"
2526

2627
proto-gen:
2728
cd proto && buf generate && cp -r github.com/bnb-chain/greenfield/x/* ../x && cp -r github.com/bnb-chain/greenfield/types/* ../types && rm -rf github.com && go mod tidy
29+
echo "proto-gen done"
2830

2931
proto-swagger-gen:
3032
bash ./scripts/protoc-swagger-gen.sh

e2e/core/basesuite.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
2626
gov "github.com/cosmos/cosmos-sdk/x/gov/types"
2727
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
28-
"github.com/prysmaticlabs/prysm/crypto/bls"
28+
"github.com/prysmaticlabs/prysm/v5/crypto/bls"
2929
"github.com/spf13/cobra"
3030
"github.com/stretchr/testify/suite"
3131
"golang.org/x/exp/slices"
@@ -260,7 +260,8 @@ func (s *BaseSuite) SendTxBlockWithoutCheck(msg sdk.Msg, from keys.KeyManager) (
260260
Memo: "",
261261
}
262262
s.Client.SetKeyManager(from)
263-
return s.Client.BroadcastTx(context.Background(), []sdk.Msg{msg}, txOpt)
263+
resp, err := s.Client.BroadcastTx(context.Background(), []sdk.Msg{msg}, txOpt)
264+
return resp, err
264265
}
265266

266267
func (s *BaseSuite) SendTxBlockWithoutCheckWithTxOpt(msg sdk.Msg, from keys.KeyManager, txOpt *types.TxOption) (*tx.BroadcastTxResponse, error) {
@@ -338,6 +339,7 @@ func (s *BaseSuite) CheckTxCode(txHash string, expectedCode uint32) error {
338339
}
339340

340341
if res.TxResponse.Code != expectedCode {
342+
s.T().Log("Debug", "code", res.TxResponse.Code, "string", res.TxResponse.String())
341343
return fmt.Errorf("expected code %d, got %d", expectedCode, res.TxResponse.Code)
342344
}
343345

e2e/core/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/cometbft/cometbft/crypto"
99
sdk "github.com/cosmos/cosmos-sdk/types"
10-
"github.com/prysmaticlabs/prysm/crypto/bls"
10+
"github.com/prysmaticlabs/prysm/v5/crypto/bls"
1111
"sigs.k8s.io/yaml"
1212

1313
"github.com/bnb-chain/greenfield/sdk/keys"

0 commit comments

Comments
 (0)