Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/buf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
protobuf-check:
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build-test:
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gosec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: gosec
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: golangci-lint
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Build Release
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
tests:
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine as builder
FROM golang:1.21-alpine as builder

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

Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ tools:
go install github.com/cosmos/gogoproto/protoc-gen-gocosmos
go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
go install github.com/golang/mock/mockgen@v1.6.0
echo "Tools installed"

proto-gen:
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
echo "proto-gen done"

proto-swagger-gen:
bash ./scripts/protoc-swagger-gen.sh
Expand Down
6 changes: 4 additions & 2 deletions e2e/core/basesuite.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
gov "github.com/cosmos/cosmos-sdk/x/gov/types"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/prysmaticlabs/prysm/crypto/bls"
"github.com/prysmaticlabs/prysm/v5/crypto/bls"
"github.com/spf13/cobra"
"github.com/stretchr/testify/suite"
"golang.org/x/exp/slices"
Expand Down Expand Up @@ -260,7 +260,8 @@ func (s *BaseSuite) SendTxBlockWithoutCheck(msg sdk.Msg, from keys.KeyManager) (
Memo: "",
}
s.Client.SetKeyManager(from)
return s.Client.BroadcastTx(context.Background(), []sdk.Msg{msg}, txOpt)
resp, err := s.Client.BroadcastTx(context.Background(), []sdk.Msg{msg}, txOpt)
return resp, err
}

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

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

Expand Down
2 changes: 1 addition & 1 deletion e2e/core/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/cometbft/cometbft/crypto"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/prysmaticlabs/prysm/crypto/bls"
"github.com/prysmaticlabs/prysm/v5/crypto/bls"
"sigs.k8s.io/yaml"

"github.com/bnb-chain/greenfield/sdk/keys"
Expand Down
7 changes: 5 additions & 2 deletions e2e/tests/challenge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/prysmaticlabs/prysm/crypto/bls"
"github.com/prysmaticlabs/prysm/v5/crypto/bls"
"github.com/stretchr/testify/suite"

"github.com/bnb-chain/greenfield/e2e/core"
Expand Down Expand Up @@ -559,15 +559,18 @@ func (s *ChallengeTestSuite) TestUpdateChallengerParams() {
s.Require().NoError(err)
txBroadCastResp, err := s.SendTxBlockWithoutCheck(proposal, s.Validator)
s.Require().NoError(err)
s.T().Log("create proposal tx hash: ", txBroadCastResp.TxResponse.TxHash)
s.T().Log("create proposal tx hash: ", txBroadCastResp.TxResponse.TxHash, "gasLimit", txBroadCastResp.TxResponse.GasWanted, "gasUsed", txBroadCastResp.TxResponse.GasUsed)

// get proposal id
proposalID := 0
txResp, err := s.WaitForTx(txBroadCastResp.TxResponse.TxHash)
s.Require().NoError(err)
s.T().Log("Debug", "txResp.Code", txResp.Code, "txResp.Height", txResp.Height)
if txResp.Code == 0 && txResp.Height > 0 {
for _, event := range txResp.Events {
s.T().Log("Debug", "eventType", event.Type)
if event.Type == "submit_proposal" {
s.T().Log("Debug", "value", event.GetAttributes()[0].Value)
proposalID, err = strconv.Atoi(event.GetAttributes()[0].Value)
s.Require().NoError(err)
}
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/payment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/prysmaticlabs/prysm/crypto/bls"
"github.com/prysmaticlabs/prysm/v5/crypto/bls"
"github.com/samber/lo"
"github.com/stretchr/testify/suite"

Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/storage_bill_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/prysmaticlabs/prysm/crypto/bls"
"github.com/prysmaticlabs/prysm/v5/crypto/bls"

"github.com/bnb-chain/greenfield/e2e/core"
"github.com/bnb-chain/greenfield/sdk/keys"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/storage_rate_limit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/prysmaticlabs/prysm/crypto/bls"
"github.com/prysmaticlabs/prysm/v5/crypto/bls"

"github.com/bnb-chain/greenfield/e2e/core"
"github.com/bnb-chain/greenfield/sdk/keys"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/prysmaticlabs/prysm/crypto/bls"
"github.com/prysmaticlabs/prysm/v5/crypto/bls"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/virtualgroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
types2 "github.com/cosmos/cosmos-sdk/x/bank/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/prysmaticlabs/prysm/crypto/bls"
"github.com/prysmaticlabs/prysm/v5/crypto/bls"
"github.com/stretchr/testify/suite"

"github.com/bnb-chain/greenfield/e2e/core"
Expand Down
Loading
Loading