Skip to content

Commit

Permalink
Merge branch 'main' into sanaz/testground-sanity-test
Browse files Browse the repository at this point in the history
  • Loading branch information
@staheri14
staheri14 committed Apr 4, 2024
2 parents cd99696 + a92de72 commit f98393e
Show file tree
Hide file tree
Showing 189 changed files with 566 additions and 568 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-build-publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
permissions:
contents: write
packages: write
uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_pipeline.yml@v0.3.3
uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_pipeline.yml@v0.4.0
with:
dockerfile: Dockerfile
secrets: inherit
Expand All @@ -29,7 +29,7 @@ jobs:
permissions:
contents: write
packages: write
uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_pipeline.yml@v0.3.3
uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_pipeline.yml@v0.4.0
with:
dockerfile: docker/Dockerfile_txsim
packageName: txsim
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:

# hadolint lints the Dockerfile
hadolint:
uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_lint.yml@v0.3.3
uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_lint.yml@v0.4.0

yamllint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: celestiaorg/.github/.github/actions/yamllint@v0.3.3
- uses: celestiaorg/.github/.github/actions/yamllint@v0.4.0
2 changes: 1 addition & 1 deletion .github/workflows/pr-review-requester.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
auto-request-review:
name: Auto request reviews
uses: celestiaorg/.github/.github/workflows/reusable_housekeeping.yml@v0.3.3
uses: celestiaorg/.github/.github/workflows/reusable_housekeeping.yml@v0.4.0
secrets: inherit
# write access for issues and pull requests is needed because the called
# workflow requires write access to issues and pull requests and the
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ IMAGE := ghcr.io/tendermint/docker-build-proto:latest
DOCKER_PROTO_BUILDER := docker run -v $(shell pwd):/workspace --workdir /workspace $(IMAGE)
PROJECTNAME=$(shell basename "$(PWD)")
HTTPS_GIT := https://github.com/celestiaorg/celestia-app.git
PACKAGE_NAME := github.com/celestiaorg/celestia-app
PACKAGE_NAME := github.com/celestiaorg/celestia-app/v2
GOLANG_CROSS_VERSION ?= v1.22.1

# process linker flags
Expand Down
4 changes: 2 additions & 2 deletions app/ante/ante.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ante

import (
blobante "github.com/celestiaorg/celestia-app/x/blob/ante"
blob "github.com/celestiaorg/celestia-app/x/blob/keeper"
blobante "github.com/celestiaorg/celestia-app/v2/x/blob/ante"
blob "github.com/celestiaorg/celestia-app/v2/x/blob/keeper"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
Expand Down
6 changes: 3 additions & 3 deletions app/ante/fee_checker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package ante
import (
errors "cosmossdk.io/errors"
"cosmossdk.io/math"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
v1 "github.com/celestiaorg/celestia-app/pkg/appconsts/v1"
"github.com/celestiaorg/celestia-app/x/minfee"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
v1 "github.com/celestiaorg/celestia-app/v2/pkg/appconsts/v1"
"github.com/celestiaorg/celestia-app/v2/x/minfee"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerror "github.com/cosmos/cosmos-sdk/types/errors"
params "github.com/cosmos/cosmos-sdk/x/params/keeper"
Expand Down
2 changes: 1 addition & 1 deletion app/ante/get_tx_priority_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ante
import (
"testing"

"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/assert"
)
Expand Down
12 changes: 6 additions & 6 deletions app/ante/gov_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package ante_test
import (
"testing"

"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/ante"
"github.com/celestiaorg/celestia-app/app/encoding"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/test/util/testfactory"
"github.com/celestiaorg/celestia-app/test/util/testnode"
"github.com/celestiaorg/celestia-app/v2/app"
"github.com/celestiaorg/celestia-app/v2/app/ante"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/test/util/testfactory"
"github.com/celestiaorg/celestia-app/v2/test/util/testnode"
"github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
Expand Down
14 changes: 7 additions & 7 deletions app/ante/min_fee_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"math"
"testing"

"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/ante"
"github.com/celestiaorg/celestia-app/app/encoding"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
v2 "github.com/celestiaorg/celestia-app/pkg/appconsts/v2"
"github.com/celestiaorg/celestia-app/test/util/testnode"
"github.com/celestiaorg/celestia-app/x/minfee"
"github.com/celestiaorg/celestia-app/v2/app"
"github.com/celestiaorg/celestia-app/v2/app/ante"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
v2 "github.com/celestiaorg/celestia-app/v2/pkg/appconsts/v2"
"github.com/celestiaorg/celestia-app/v2/test/util/testnode"
"github.com/celestiaorg/celestia-app/v2/x/minfee"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/store"
Expand Down
6 changes: 3 additions & 3 deletions app/ante/msg_gatekeeper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package ante_test
import (
"testing"

"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/ante"
"github.com/celestiaorg/celestia-app/app/encoding"
"github.com/celestiaorg/celestia-app/v2/app"
"github.com/celestiaorg/celestia-app/v2/app/ante"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/stretchr/testify/require"
Expand Down
8 changes: 4 additions & 4 deletions app/ante/panic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"testing"

"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/ante"
"github.com/celestiaorg/celestia-app/app/encoding"
"github.com/celestiaorg/celestia-app/test/util/testnode"
"github.com/celestiaorg/celestia-app/v2/app"
"github.com/celestiaorg/celestia-app/v2/app/ante"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
"github.com/celestiaorg/celestia-app/v2/test/util/testnode"
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/stretchr/testify/require"
Expand Down
44 changes: 22 additions & 22 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package app
import (
"io"

"github.com/celestiaorg/celestia-app/app/module"
"github.com/celestiaorg/celestia-app/app/posthandler"
"github.com/celestiaorg/celestia-app/x/minfee"
"github.com/celestiaorg/celestia-app/x/mint"
mintkeeper "github.com/celestiaorg/celestia-app/x/mint/keeper"
minttypes "github.com/celestiaorg/celestia-app/x/mint/types"
"github.com/celestiaorg/celestia-app/x/upgrade"
upgradetypes "github.com/celestiaorg/celestia-app/x/upgrade/types"
"github.com/celestiaorg/celestia-app/v2/app/module"
"github.com/celestiaorg/celestia-app/v2/app/posthandler"
"github.com/celestiaorg/celestia-app/v2/x/minfee"
"github.com/celestiaorg/celestia-app/v2/x/mint"
mintkeeper "github.com/celestiaorg/celestia-app/v2/x/mint/keeper"
minttypes "github.com/celestiaorg/celestia-app/v2/x/mint/types"
"github.com/celestiaorg/celestia-app/v2/x/upgrade"
upgradetypes "github.com/celestiaorg/celestia-app/v2/x/upgrade/types"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
Expand Down Expand Up @@ -83,20 +83,20 @@ import (
tmos "github.com/tendermint/tendermint/libs/os"
dbm "github.com/tendermint/tm-db"

"github.com/celestiaorg/celestia-app/app/ante"
"github.com/celestiaorg/celestia-app/app/encoding"
appv1 "github.com/celestiaorg/celestia-app/pkg/appconsts/v1"
appv2 "github.com/celestiaorg/celestia-app/pkg/appconsts/v2"
"github.com/celestiaorg/celestia-app/pkg/proof"
"github.com/celestiaorg/celestia-app/x/blob"
blobkeeper "github.com/celestiaorg/celestia-app/x/blob/keeper"
blobtypes "github.com/celestiaorg/celestia-app/x/blob/types"
"github.com/celestiaorg/celestia-app/x/paramfilter"
"github.com/celestiaorg/celestia-app/x/tokenfilter"

"github.com/celestiaorg/celestia-app/x/blobstream"
blobstreamkeeper "github.com/celestiaorg/celestia-app/x/blobstream/keeper"
blobstreamtypes "github.com/celestiaorg/celestia-app/x/blobstream/types"
"github.com/celestiaorg/celestia-app/v2/app/ante"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
appv1 "github.com/celestiaorg/celestia-app/v2/pkg/appconsts/v1"
appv2 "github.com/celestiaorg/celestia-app/v2/pkg/appconsts/v2"
"github.com/celestiaorg/celestia-app/v2/pkg/proof"
"github.com/celestiaorg/celestia-app/v2/x/blob"
blobkeeper "github.com/celestiaorg/celestia-app/v2/x/blob/keeper"
blobtypes "github.com/celestiaorg/celestia-app/v2/x/blob/types"
"github.com/celestiaorg/celestia-app/v2/x/paramfilter"
"github.com/celestiaorg/celestia-app/v2/x/tokenfilter"

"github.com/celestiaorg/celestia-app/v2/x/blobstream"
blobstreamkeeper "github.com/celestiaorg/celestia-app/v2/x/blobstream/keeper"
blobstreamtypes "github.com/celestiaorg/celestia-app/v2/x/blobstream/types"
ibctestingtypes "github.com/cosmos/ibc-go/v6/testing/types"

packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/router"
Expand Down
4 changes: 2 additions & 2 deletions app/check_tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package app
import (
"fmt"

"github.com/celestiaorg/celestia-app/pkg/appconsts"
blobtypes "github.com/celestiaorg/celestia-app/x/blob/types"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
blobtypes "github.com/celestiaorg/celestia-app/v2/x/blob/types"
"github.com/celestiaorg/go-square/blob"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
abci "github.com/tendermint/tendermint/abci/types"
Expand Down
6 changes: 3 additions & 3 deletions app/default_overrides.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"time"

"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/x/mint"
minttypes "github.com/celestiaorg/celestia-app/x/mint/types"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/x/mint"
minttypes "github.com/celestiaorg/celestia-app/v2/x/mint/types"
"github.com/cosmos/cosmos-sdk/codec"
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion app/default_overrides_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/celestiaorg/celestia-app/app/encoding"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
"github.com/cosmos/cosmos-sdk/types"
distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
Expand Down
2 changes: 1 addition & 1 deletion app/denom.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package app

import "github.com/celestiaorg/celestia-app/pkg/appconsts"
import "github.com/celestiaorg/celestia-app/v2/pkg/appconsts"

const (
// BondDenom defines the native staking token denomination.
Expand Down
16 changes: 8 additions & 8 deletions app/errors/insufficient_gas_price_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"testing"

"cosmossdk.io/errors"
"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/encoding"
apperr "github.com/celestiaorg/celestia-app/app/errors"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/pkg/user"
testutil "github.com/celestiaorg/celestia-app/test/util"
"github.com/celestiaorg/celestia-app/test/util/testfactory"
blob "github.com/celestiaorg/celestia-app/x/blob/types"
"github.com/celestiaorg/celestia-app/v2/app"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
apperr "github.com/celestiaorg/celestia-app/v2/app/errors"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/pkg/user"
testutil "github.com/celestiaorg/celestia-app/v2/test/util"
"github.com/celestiaorg/celestia-app/v2/test/util/testfactory"
blob "github.com/celestiaorg/celestia-app/v2/x/blob/types"
"github.com/celestiaorg/go-square/namespace"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
Expand Down
16 changes: 8 additions & 8 deletions app/errors/nonce_mismatch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"fmt"
"testing"

"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/encoding"
apperr "github.com/celestiaorg/celestia-app/app/errors"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/pkg/user"
testutil "github.com/celestiaorg/celestia-app/test/util"
"github.com/celestiaorg/celestia-app/test/util/testfactory"
blob "github.com/celestiaorg/celestia-app/x/blob/types"
"github.com/celestiaorg/celestia-app/v2/app"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
apperr "github.com/celestiaorg/celestia-app/v2/app/errors"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/pkg/user"
testutil "github.com/celestiaorg/celestia-app/v2/test/util"
"github.com/celestiaorg/celestia-app/v2/test/util/testfactory"
blob "github.com/celestiaorg/celestia-app/v2/x/blob/types"
"github.com/celestiaorg/go-square/namespace"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
Expand Down
4 changes: 2 additions & 2 deletions app/extend_block.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package app

import (
"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/pkg/da"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/pkg/da"
"github.com/celestiaorg/go-square/shares"
"github.com/celestiaorg/go-square/square"
"github.com/celestiaorg/rsmt2d"
Expand Down
10 changes: 5 additions & 5 deletions app/module/migrations_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package module_test
import (
"testing"

"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/encoding"
"github.com/celestiaorg/celestia-app/app/module"
"github.com/celestiaorg/celestia-app/x/upgrade"
upgradetypes "github.com/celestiaorg/celestia-app/x/upgrade/types"
"github.com/celestiaorg/celestia-app/v2/app"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
"github.com/celestiaorg/celestia-app/v2/app/module"
"github.com/celestiaorg/celestia-app/v2/x/upgrade"
upgradetypes "github.com/celestiaorg/celestia-app/v2/x/upgrade/types"
"github.com/cosmos/cosmos-sdk/store"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
"github.com/cosmos/cosmos-sdk/tests/mocks"
Expand Down
2 changes: 1 addition & 1 deletion app/module/module_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
tmversion "github.com/tendermint/tendermint/proto/tendermint/version"

"github.com/celestiaorg/celestia-app/app/module"
"github.com/celestiaorg/celestia-app/v2/app/module"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/tests/mocks"
Expand Down
6 changes: 3 additions & 3 deletions app/prepare_proposal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package app
import (
"time"

"github.com/celestiaorg/celestia-app/app/ante"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/pkg/da"
"github.com/celestiaorg/celestia-app/v2/app/ante"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/pkg/da"
"github.com/celestiaorg/go-square/shares"
"github.com/celestiaorg/go-square/square"
"github.com/cosmos/cosmos-sdk/telemetry"
Expand Down
8 changes: 4 additions & 4 deletions app/process_proposal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"time"

"github.com/celestiaorg/celestia-app/app/ante"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/pkg/da"
blobtypes "github.com/celestiaorg/celestia-app/x/blob/types"
"github.com/celestiaorg/celestia-app/v2/app/ante"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/pkg/da"
blobtypes "github.com/celestiaorg/celestia-app/v2/x/blob/types"
"github.com/celestiaorg/go-square/blob"
"github.com/celestiaorg/go-square/shares"
"github.com/celestiaorg/go-square/square"
Expand Down
2 changes: 1 addition & 1 deletion app/square_size.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app

import (
"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
sdk "github.com/cosmos/cosmos-sdk/types"
)

Expand Down
14 changes: 7 additions & 7 deletions app/test/big_blob_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"testing"
"time"

"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/encoding"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/pkg/user"
"github.com/celestiaorg/celestia-app/test/util/testfactory"
"github.com/celestiaorg/celestia-app/test/util/testnode"
blobtypes "github.com/celestiaorg/celestia-app/x/blob/types"
"github.com/celestiaorg/celestia-app/v2/app"
"github.com/celestiaorg/celestia-app/v2/app/encoding"
"github.com/celestiaorg/celestia-app/v2/pkg/appconsts"
"github.com/celestiaorg/celestia-app/v2/pkg/user"
"github.com/celestiaorg/celestia-app/v2/test/util/testfactory"
"github.com/celestiaorg/celestia-app/v2/test/util/testnode"
blobtypes "github.com/celestiaorg/celestia-app/v2/x/blob/types"
"github.com/celestiaorg/go-square/blob"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
Loading

0 comments on commit f98393e

Please sign in to comment.