Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V7 import paths #665

Merged
merged 11 commits into from
Mar 13, 2023
Merged

V7 import paths #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
901db6d
rm protos
asalzmann Mar 13, 2023
4574d5e
v6 -> v7
asalzmann Mar 13, 2023
d3a65d4
more replacements
asalzmann Mar 13, 2023
53b5664
more replacements
asalzmann Mar 13, 2023
3e9680f
regenerate pb.go files
asalzmann Mar 13, 2023
8da87d6
revert v6->v7 for v2 migrations code
asalzmann Mar 13, 2023
1ca7c6c
add back v2 types
asalzmann Mar 13, 2023
9c8cd18
revert v7->v6
asalzmann Mar 13, 2023
5b4c984
resolve conflicts
asalzmann Mar 13, 2023
5ed0c4a
v6->v7!!!
asalzmann Mar 13, 2023
a13e717
fix import
asalzmann Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
70 changes: 35 additions & 35 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types"

"github.com/Stride-Labs/stride/v6/utils"
"github.com/Stride-Labs/stride/v7/utils"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
Expand Down Expand Up @@ -54,12 +54,12 @@ import (
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"

claimvesting "github.com/Stride-Labs/stride/v6/x/claim/vesting"
claimvestingtypes "github.com/Stride-Labs/stride/v6/x/claim/vesting/types"
claimvesting "github.com/Stride-Labs/stride/v7/x/claim/vesting"
claimvestingtypes "github.com/Stride-Labs/stride/v7/x/claim/vesting/types"

"github.com/Stride-Labs/stride/v6/x/mint"
mintkeeper "github.com/Stride-Labs/stride/v6/x/mint/keeper"
minttypes "github.com/Stride-Labs/stride/v6/x/mint/types"
"github.com/Stride-Labs/stride/v7/x/mint"
mintkeeper "github.com/Stride-Labs/stride/v7/x/mint/keeper"
minttypes "github.com/Stride-Labs/stride/v7/x/mint/types"

"github.com/cosmos/cosmos-sdk/x/params"
paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
Expand Down Expand Up @@ -105,35 +105,35 @@ import (
// monitoringp "github.com/tendermint/spn/x/monitoringp"
// monitoringpkeeper "github.com/tendermint/spn/x/monitoringp/keeper"

epochsmodule "github.com/Stride-Labs/stride/v6/x/epochs"
epochsmodulekeeper "github.com/Stride-Labs/stride/v6/x/epochs/keeper"
epochsmoduletypes "github.com/Stride-Labs/stride/v6/x/epochs/types"

"github.com/Stride-Labs/stride/v6/x/interchainquery"
interchainquerykeeper "github.com/Stride-Labs/stride/v6/x/interchainquery/keeper"
interchainquerytypes "github.com/Stride-Labs/stride/v6/x/interchainquery/types"

"github.com/Stride-Labs/stride/v6/x/autopilot"
autopilotkeeper "github.com/Stride-Labs/stride/v6/x/autopilot/keeper"
autopilottypes "github.com/Stride-Labs/stride/v6/x/autopilot/types"

"github.com/Stride-Labs/stride/v6/x/claim"
claimkeeper "github.com/Stride-Labs/stride/v6/x/claim/keeper"
claimtypes "github.com/Stride-Labs/stride/v6/x/claim/types"
icacallbacksmodule "github.com/Stride-Labs/stride/v6/x/icacallbacks"
icacallbacksmodulekeeper "github.com/Stride-Labs/stride/v6/x/icacallbacks/keeper"
icacallbacksmoduletypes "github.com/Stride-Labs/stride/v6/x/icacallbacks/types"
ratelimitmodule "github.com/Stride-Labs/stride/v6/x/ratelimit"
ratelimitclient "github.com/Stride-Labs/stride/v6/x/ratelimit/client"
ratelimitmodulekeeper "github.com/Stride-Labs/stride/v6/x/ratelimit/keeper"
ratelimitmoduletypes "github.com/Stride-Labs/stride/v6/x/ratelimit/types"
recordsmodule "github.com/Stride-Labs/stride/v6/x/records"
recordsmodulekeeper "github.com/Stride-Labs/stride/v6/x/records/keeper"
recordsmoduletypes "github.com/Stride-Labs/stride/v6/x/records/types"
stakeibcmodule "github.com/Stride-Labs/stride/v6/x/stakeibc"
stakeibcclient "github.com/Stride-Labs/stride/v6/x/stakeibc/client"
stakeibcmodulekeeper "github.com/Stride-Labs/stride/v6/x/stakeibc/keeper"
stakeibcmoduletypes "github.com/Stride-Labs/stride/v6/x/stakeibc/types"
epochsmodule "github.com/Stride-Labs/stride/v7/x/epochs"
epochsmodulekeeper "github.com/Stride-Labs/stride/v7/x/epochs/keeper"
epochsmoduletypes "github.com/Stride-Labs/stride/v7/x/epochs/types"

"github.com/Stride-Labs/stride/v7/x/interchainquery"
interchainquerykeeper "github.com/Stride-Labs/stride/v7/x/interchainquery/keeper"
interchainquerytypes "github.com/Stride-Labs/stride/v7/x/interchainquery/types"

"github.com/Stride-Labs/stride/v7/x/autopilot"
autopilotkeeper "github.com/Stride-Labs/stride/v7/x/autopilot/keeper"
autopilottypes "github.com/Stride-Labs/stride/v7/x/autopilot/types"

"github.com/Stride-Labs/stride/v7/x/claim"
claimkeeper "github.com/Stride-Labs/stride/v7/x/claim/keeper"
claimtypes "github.com/Stride-Labs/stride/v7/x/claim/types"
icacallbacksmodule "github.com/Stride-Labs/stride/v7/x/icacallbacks"
icacallbacksmodulekeeper "github.com/Stride-Labs/stride/v7/x/icacallbacks/keeper"
icacallbacksmoduletypes "github.com/Stride-Labs/stride/v7/x/icacallbacks/types"
ratelimitmodule "github.com/Stride-Labs/stride/v7/x/ratelimit"
ratelimitclient "github.com/Stride-Labs/stride/v7/x/ratelimit/client"
ratelimitmodulekeeper "github.com/Stride-Labs/stride/v7/x/ratelimit/keeper"
ratelimitmoduletypes "github.com/Stride-Labs/stride/v7/x/ratelimit/types"
recordsmodule "github.com/Stride-Labs/stride/v7/x/records"
recordsmodulekeeper "github.com/Stride-Labs/stride/v7/x/records/keeper"
recordsmoduletypes "github.com/Stride-Labs/stride/v7/x/records/types"
stakeibcmodule "github.com/Stride-Labs/stride/v7/x/stakeibc"
stakeibcclient "github.com/Stride-Labs/stride/v7/x/stakeibc/client"
stakeibcmodulekeeper "github.com/Stride-Labs/stride/v7/x/stakeibc/keeper"
stakeibcmoduletypes "github.com/Stride-Labs/stride/v7/x/stakeibc/types"

// this line is used by starport scaffolding # stargate/app/moduleImport
storetypes "github.com/cosmos/cosmos-sdk/store/types"
Expand Down
4 changes: 2 additions & 2 deletions app/apptesting/test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/tendermint/tendermint/crypto/ed25519"
tmtypes "github.com/tendermint/tendermint/proto/tendermint/types"

"github.com/Stride-Labs/stride/v6/app"
"github.com/Stride-Labs/stride/v6/utils"
"github.com/Stride-Labs/stride/v7/app"
"github.com/Stride-Labs/stride/v7/utils"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion app/test_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
tmtypes "github.com/tendermint/tendermint/types"
dbm "github.com/tendermint/tm-db"

cmdcfg "github.com/Stride-Labs/stride/v6/cmd/strided/config"
cmdcfg "github.com/Stride-Labs/stride/v7/cmd/strided/config"
)

const Bech32Prefix = "stride"
Expand Down
24 changes: 12 additions & 12 deletions app/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ import (

authz "github.com/cosmos/cosmos-sdk/x/authz"

v2 "github.com/Stride-Labs/stride/v6/app/upgrades/v2"
v3 "github.com/Stride-Labs/stride/v6/app/upgrades/v3"
v4 "github.com/Stride-Labs/stride/v6/app/upgrades/v4"
v5 "github.com/Stride-Labs/stride/v6/app/upgrades/v5"
v6 "github.com/Stride-Labs/stride/v6/app/upgrades/v6"
v7 "github.com/Stride-Labs/stride/v6/app/upgrades/v7"
autopilottypes "github.com/Stride-Labs/stride/v6/x/autopilot/types"
claimtypes "github.com/Stride-Labs/stride/v6/x/claim/types"
icacallbacktypes "github.com/Stride-Labs/stride/v6/x/icacallbacks/types"
ratelimittypes "github.com/Stride-Labs/stride/v6/x/ratelimit/types"
recordtypes "github.com/Stride-Labs/stride/v6/x/records/types"
stakeibctypes "github.com/Stride-Labs/stride/v6/x/stakeibc/types"
v2 "github.com/Stride-Labs/stride/v7/app/upgrades/v2"
v3 "github.com/Stride-Labs/stride/v7/app/upgrades/v3"
v4 "github.com/Stride-Labs/stride/v7/app/upgrades/v4"
v5 "github.com/Stride-Labs/stride/v7/app/upgrades/v5"
v6 "github.com/Stride-Labs/stride/v7/app/upgrades/v6"
v7 "github.com/Stride-Labs/stride/v7/app/upgrades/v7"
autopilottypes "github.com/Stride-Labs/stride/v7/x/autopilot/types"
claimtypes "github.com/Stride-Labs/stride/v7/x/claim/types"
icacallbacktypes "github.com/Stride-Labs/stride/v7/x/icacallbacks/types"
ratelimittypes "github.com/Stride-Labs/stride/v7/x/ratelimit/types"
recordtypes "github.com/Stride-Labs/stride/v7/x/records/types"
stakeibctypes "github.com/Stride-Labs/stride/v7/x/stakeibc/types"
)

func (app *StrideApp) setupUpgradeHandlers() {
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ package {upgradeVersion}

import (
sdk "github.com/cosmos/cosmos-sdk/types"
{new-consensus-version} "github.com/Stride-Labs/stride/v6/x/records/migrations/{new-consensus-version}"
{new-consensus-version} "github.com/Stride-Labs/stride/v7/x/records/migrations/{new-consensus-version}"
)

// TODO: Add migration logic to deserialize with old protos and re-serialize with new ones
Expand All @@ -112,7 +112,7 @@ func MigrateStore(ctx sdk.Context) error {
// app/upgrades/{upgradeVersion}/upgrades.go

import (
{module}migration "github.com/Stride-Labs/stride/v6/x/{module}/migrations/{new-consensus-version}"
{module}migration "github.com/Stride-Labs/stride/v7/x/{module}/migrations/{new-consensus-version}"
)

// CreateUpgradeHandler creates an SDK upgrade handler for {upgradeVersion}
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v3/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

claimkeeper "github.com/Stride-Labs/stride/v6/x/claim/keeper"
claimtypes "github.com/Stride-Labs/stride/v6/x/claim/types"
claimkeeper "github.com/Stride-Labs/stride/v7/x/claim/keeper"
claimtypes "github.com/Stride-Labs/stride/v7/x/claim/types"
)

// Note: ensure these values are properly set before running upgrade
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v3/upgrades_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/suite"

"github.com/Stride-Labs/stride/v6/app/apptesting"
"github.com/Stride-Labs/stride/v7/app/apptesting"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v4/upgrades_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/suite"

"github.com/Stride-Labs/stride/v6/app/apptesting"
"github.com/Stride-Labs/stride/v7/app/apptesting"
)

const dummyUpgradeHeight = 5
Expand Down
20 changes: 10 additions & 10 deletions app/upgrades/v5/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import (
authz "github.com/cosmos/cosmos-sdk/x/authz"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

claimmigration "github.com/Stride-Labs/stride/v6/x/claim/migrations/v2"
claimtypes "github.com/Stride-Labs/stride/v6/x/claim/types"
icacallbacksmigration "github.com/Stride-Labs/stride/v6/x/icacallbacks/migrations/v2"
icacallbacktypes "github.com/Stride-Labs/stride/v6/x/icacallbacks/types"
interchainquerykeeper "github.com/Stride-Labs/stride/v6/x/interchainquery/keeper"
recordsmigration "github.com/Stride-Labs/stride/v6/x/records/migrations/v2"
recordtypes "github.com/Stride-Labs/stride/v6/x/records/types"
stakeibckeeper "github.com/Stride-Labs/stride/v6/x/stakeibc/keeper"
stakeibcmigration "github.com/Stride-Labs/stride/v6/x/stakeibc/migrations/v2"
stakeibctypes "github.com/Stride-Labs/stride/v6/x/stakeibc/types"
claimmigration "github.com/Stride-Labs/stride/v7/x/claim/migrations/v2"
claimtypes "github.com/Stride-Labs/stride/v7/x/claim/types"
icacallbacksmigration "github.com/Stride-Labs/stride/v7/x/icacallbacks/migrations/v2"
icacallbacktypes "github.com/Stride-Labs/stride/v7/x/icacallbacks/types"
interchainquerykeeper "github.com/Stride-Labs/stride/v7/x/interchainquery/keeper"
recordsmigration "github.com/Stride-Labs/stride/v7/x/records/migrations/v2"
recordtypes "github.com/Stride-Labs/stride/v7/x/records/types"
stakeibckeeper "github.com/Stride-Labs/stride/v7/x/stakeibc/keeper"
stakeibcmigration "github.com/Stride-Labs/stride/v7/x/stakeibc/migrations/v2"
stakeibctypes "github.com/Stride-Labs/stride/v7/x/stakeibc/types"
)

// Note: ensure these values are properly set before running upgrade
Expand Down
28 changes: 14 additions & 14 deletions app/upgrades/v5/upgrades_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"

"github.com/Stride-Labs/stride/v6/app"

"github.com/Stride-Labs/stride/v6/app/apptesting"
upgradev5 "github.com/Stride-Labs/stride/v6/app/upgrades/v5"
oldclaimtypes "github.com/Stride-Labs/stride/v6/x/claim/migrations/v2/types"
claimtypes "github.com/Stride-Labs/stride/v6/x/claim/types"
icacallbacktypes "github.com/Stride-Labs/stride/v6/x/icacallbacks/types"
icqtypes "github.com/Stride-Labs/stride/v6/x/interchainquery/types"
recordkeeper "github.com/Stride-Labs/stride/v6/x/records/keeper"
oldrecordtypes "github.com/Stride-Labs/stride/v6/x/records/migrations/v2/types"
recordtypes "github.com/Stride-Labs/stride/v6/x/records/types"
stakeibckeeper "github.com/Stride-Labs/stride/v6/x/stakeibc/keeper"
oldstakeibctypes "github.com/Stride-Labs/stride/v6/x/stakeibc/migrations/v2/types"
stakeibctypes "github.com/Stride-Labs/stride/v6/x/stakeibc/types"
"github.com/Stride-Labs/stride/v7/app"

"github.com/Stride-Labs/stride/v7/app/apptesting"
upgradev5 "github.com/Stride-Labs/stride/v7/app/upgrades/v5"
oldclaimtypes "github.com/Stride-Labs/stride/v7/x/claim/migrations/v2/types"
claimtypes "github.com/Stride-Labs/stride/v7/x/claim/types"
icacallbacktypes "github.com/Stride-Labs/stride/v7/x/icacallbacks/types"
icqtypes "github.com/Stride-Labs/stride/v7/x/interchainquery/types"
recordkeeper "github.com/Stride-Labs/stride/v7/x/records/keeper"
oldrecordtypes "github.com/Stride-Labs/stride/v7/x/records/migrations/v2/types"
recordtypes "github.com/Stride-Labs/stride/v7/x/records/types"
stakeibckeeper "github.com/Stride-Labs/stride/v7/x/stakeibc/keeper"
oldstakeibctypes "github.com/Stride-Labs/stride/v7/x/stakeibc/migrations/v2/types"
stakeibctypes "github.com/Stride-Labs/stride/v7/x/stakeibc/types"
)

const dummyUpgradeHeight = 5
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v6/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

claimkeeper "github.com/Stride-Labs/stride/v6/x/claim/keeper"
claimkeeper "github.com/Stride-Labs/stride/v7/x/claim/keeper"
)

// Note: ensure these values are properly set before running upgrade
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/v6/upgrades_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"

"github.com/Stride-Labs/stride/v6/app"
"github.com/Stride-Labs/stride/v7/app"

"github.com/Stride-Labs/stride/v6/app/apptesting"
"github.com/Stride-Labs/stride/v6/x/claim/types"
claimtypes "github.com/Stride-Labs/stride/v6/x/claim/types"
"github.com/Stride-Labs/stride/v7/app/apptesting"
"github.com/Stride-Labs/stride/v7/x/claim/types"
claimtypes "github.com/Stride-Labs/stride/v7/x/claim/types"
)

const dummyUpgradeHeight = 5
Expand Down
14 changes: 7 additions & 7 deletions app/upgrades/v7/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
icahosttypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"

"github.com/Stride-Labs/stride/v6/utils"
epochskeeper "github.com/Stride-Labs/stride/v6/x/epochs/keeper"
epochstypes "github.com/Stride-Labs/stride/v6/x/epochs/types"
mintkeeper "github.com/Stride-Labs/stride/v6/x/mint/keeper"
minttypes "github.com/Stride-Labs/stride/v6/x/mint/types"
stakeibckeeper "github.com/Stride-Labs/stride/v6/x/stakeibc/keeper"
stakeibctypes "github.com/Stride-Labs/stride/v6/x/stakeibc/types"
"github.com/Stride-Labs/stride/v7/utils"
epochskeeper "github.com/Stride-Labs/stride/v7/x/epochs/keeper"
epochstypes "github.com/Stride-Labs/stride/v7/x/epochs/types"
mintkeeper "github.com/Stride-Labs/stride/v7/x/mint/keeper"
minttypes "github.com/Stride-Labs/stride/v7/x/mint/types"
stakeibckeeper "github.com/Stride-Labs/stride/v7/x/stakeibc/keeper"
stakeibctypes "github.com/Stride-Labs/stride/v7/x/stakeibc/types"
)

// Note: ensure these values are properly set before running upgrade
Expand Down
12 changes: 6 additions & 6 deletions app/upgrades/v7/upgrades_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import (
"github.com/cosmos/cosmos-sdk/store/prefix"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/Stride-Labs/stride/v6/app"
"github.com/Stride-Labs/stride/v6/app/apptesting"
v7 "github.com/Stride-Labs/stride/v6/app/upgrades/v7"
epochstypes "github.com/Stride-Labs/stride/v6/x/epochs/types"
stakeibctypes "github.com/Stride-Labs/stride/v6/x/stakeibc/types"
"github.com/Stride-Labs/stride/v7/app"
"github.com/Stride-Labs/stride/v7/app/apptesting"
v7 "github.com/Stride-Labs/stride/v7/app/upgrades/v7"
epochstypes "github.com/Stride-Labs/stride/v7/x/epochs/types"
stakeibctypes "github.com/Stride-Labs/stride/v7/x/stakeibc/types"

// This isn't the exact type host zone schema as the one that's will be in the store
// before the upgrade, but the only thing that matters, for the sake of the test,
// is that it doesn't have min/max redemption rate as attributes
oldstakeibctypes "github.com/Stride-Labs/stride/v6/x/stakeibc/migrations/v2/types"
oldstakeibctypes "github.com/Stride-Labs/stride/v7/x/stakeibc/migrations/v2/types"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/strided/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

"github.com/Stride-Labs/stride/v6/app"
"github.com/Stride-Labs/stride/v7/app"

cmdcfg "github.com/Stride-Labs/stride/v6/cmd/strided/config"
cmdcfg "github.com/Stride-Labs/stride/v7/cmd/strided/config"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/strided/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/cosmos/cosmos-sdk/snapshots"

"github.com/Stride-Labs/stride/v6/utils"
"github.com/Stride-Labs/stride/v7/utils"

tmDb "github.com/tendermint/tm-db"

Expand Down Expand Up @@ -40,8 +40,8 @@ import (
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
tmcfg "github.com/tendermint/tendermint/config"

"github.com/Stride-Labs/stride/v6/app"
// "github.com/Stride-Labs/stride/v6/app/params"
"github.com/Stride-Labs/stride/v7/app"
// "github.com/Stride-Labs/stride/v7/app/params"
// this line is used by starport scaffolding # stargate/root/import
)

Expand Down
6 changes: 5 additions & 1 deletion dockernet/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ source ${SCRIPT_DIR}/config.sh
BUILDDIR="$2"
mkdir -p $BUILDDIR


build_local_and_docker() {
module="$1"
folder="$2"
Expand All @@ -15,9 +16,10 @@ build_local_and_docker() {
printf '%s' "Building $title Locally... "
cwd=$PWD
cd $folder
GOBIN=$BUILDDIR go install -mod=readonly -trimpath ./... 2>&1 | grep -v -E "deprecated|keychain" | true
GOBIN=$BUILDDIR go install -mod=readonly -trimpath ./... | grep -v -E "deprecated|keychain" | true
local_build_succeeded=${PIPESTATUS[0]}
cd $cwd


if [[ "$local_build_succeeded" == "0" ]]; then
echo "Done"
Expand All @@ -44,6 +46,7 @@ build_local_and_docker() {
return $docker_build_succeeded
}


ADMINS_FILE=${DOCKERNET_HOME}/../utils/admins.go
ADMINS_FILE_BACKUP=${DOCKERNET_HOME}/../utils/admins.go.main

Expand All @@ -57,6 +60,7 @@ revert_admin_address() {
rm -f ${ADMINS_FILE}-E
}


# build docker images and local binaries
while getopts sgojthrn flag; do
case "${flag}" in
Expand Down
Loading