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

Jump to bottom

Finishing v4 #454

Merged
merged 4 commits into from
Jun 27, 2024
Merged

Finishing v4 #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ed3ade
v4 refactoring
TheMarstonConnell Jun 26, 2024
88ef7f8
remove todo comment
TheMarstonConnell Jun 26, 2024
15480a5
bump to v4 module
TheMarstonConnell Jun 27, 2024
da61018
Merge branch 'master' into marston/finishing-v4
TheMarstonConnell Jun 27, 2024
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
  •  
  •  
  •  
40 changes: 20 additions & 20 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,31 +108,31 @@ import (
"github.com/CosmWasm/wasmd/x/wasm"
wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmappparams "github.com/jackalLabs/canine-chain/v3/app/params"
wasmappparams "github.com/jackalLabs/canine-chain/v4/app/params"

mint "github.com/jackalLabs/canine-chain/v3/x/jklmint"
mintkeeper "github.com/jackalLabs/canine-chain/v3/x/jklmint/keeper"
minttypes "github.com/jackalLabs/canine-chain/v3/x/jklmint/types"
mint "github.com/jackalLabs/canine-chain/v4/x/jklmint"
mintkeeper "github.com/jackalLabs/canine-chain/v4/x/jklmint/keeper"
minttypes "github.com/jackalLabs/canine-chain/v4/x/jklmint/types"

rnsmodule "github.com/jackalLabs/canine-chain/v3/x/rns"
rnsmodulekeeper "github.com/jackalLabs/canine-chain/v3/x/rns/keeper"
rnsmoduletypes "github.com/jackalLabs/canine-chain/v3/x/rns/types"
rnsmodule "github.com/jackalLabs/canine-chain/v4/x/rns"
rnsmodulekeeper "github.com/jackalLabs/canine-chain/v4/x/rns/keeper"
rnsmoduletypes "github.com/jackalLabs/canine-chain/v4/x/rns/types"

oraclemodule "github.com/jackalLabs/canine-chain/v3/x/oracle"
oraclemodulekeeper "github.com/jackalLabs/canine-chain/v3/x/oracle/keeper"
oraclemoduletypes "github.com/jackalLabs/canine-chain/v3/x/oracle/types"
oraclemodule "github.com/jackalLabs/canine-chain/v4/x/oracle"
oraclemodulekeeper "github.com/jackalLabs/canine-chain/v4/x/oracle/keeper"
oraclemoduletypes "github.com/jackalLabs/canine-chain/v4/x/oracle/types"

storagemodule "github.com/jackalLabs/canine-chain/v3/x/storage"
storagemodulekeeper "github.com/jackalLabs/canine-chain/v3/x/storage/keeper"
storagemoduletypes "github.com/jackalLabs/canine-chain/v3/x/storage/types"
storagemodule "github.com/jackalLabs/canine-chain/v4/x/storage"
storagemodulekeeper "github.com/jackalLabs/canine-chain/v4/x/storage/keeper"
storagemoduletypes "github.com/jackalLabs/canine-chain/v4/x/storage/types"

filetreemodule "github.com/jackalLabs/canine-chain/v3/x/filetree"
filetreemodulekeeper "github.com/jackalLabs/canine-chain/v3/x/filetree/keeper"
filetreemoduletypes "github.com/jackalLabs/canine-chain/v3/x/filetree/types"
filetreemodule "github.com/jackalLabs/canine-chain/v4/x/filetree"
filetreemodulekeeper "github.com/jackalLabs/canine-chain/v4/x/filetree/keeper"
filetreemoduletypes "github.com/jackalLabs/canine-chain/v4/x/filetree/types"

notificationsmodule "github.com/jackalLabs/canine-chain/v3/x/notifications"
notificationsmodulekeeper "github.com/jackalLabs/canine-chain/v3/x/notifications/keeper"
notificationsmoduletypes "github.com/jackalLabs/canine-chain/v3/x/notifications/types"
notificationsmodule "github.com/jackalLabs/canine-chain/v4/x/notifications"
notificationsmodulekeeper "github.com/jackalLabs/canine-chain/v4/x/notifications/keeper"
notificationsmoduletypes "github.com/jackalLabs/canine-chain/v4/x/notifications/types"

/*

Expand All @@ -145,7 +145,7 @@ import (
// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"

"github.com/jackalLabs/canine-chain/v3/docs"
"github.com/jackalLabs/canine-chain/v4/docs"
)

const appName = "JackalApp"
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"github.com/cosmos/cosmos-sdk/std"

"github.com/jackalLabs/canine-chain/v3/app/params"
"github.com/jackalLabs/canine-chain/v4/app/params"
)

// MakeEncodingConfig creates a new EncodingConfig with all modules registered
Expand Down
10 changes: 5 additions & 5 deletions app/sim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"testing"
"time"

filetreemoduletypes "github.com/jackalLabs/canine-chain/v3/x/filetree/types"
oraclemoduletypes "github.com/jackalLabs/canine-chain/v3/x/oracle/types"
rnsmoduletypes "github.com/jackalLabs/canine-chain/v3/x/rns/types"
storagemoduletypes "github.com/jackalLabs/canine-chain/v3/x/storage/types"
filetreemoduletypes "github.com/jackalLabs/canine-chain/v4/x/filetree/types"
oraclemoduletypes "github.com/jackalLabs/canine-chain/v4/x/oracle/types"
rnsmoduletypes "github.com/jackalLabs/canine-chain/v4/x/rns/types"
storagemoduletypes "github.com/jackalLabs/canine-chain/v4/x/storage/types"

"github.com/cosmos/cosmos-sdk/store"
"github.com/cosmos/cosmos-sdk/store/prefix"
Expand All @@ -38,7 +38,7 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
minttypes "github.com/jackalLabs/canine-chain/v3/x/jklmint/types"
minttypes "github.com/jackalLabs/canine-chain/v4/x/jklmint/types"
"github.com/stretchr/testify/require"
"github.com/tendermint/tendermint/libs/log"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
Expand Down
2 changes: 1 addition & 1 deletion app/test_access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"

"github.com/jackalLabs/canine-chain/v3/app/params"
"github.com/jackalLabs/canine-chain/v4/app/params"

"github.com/cosmos/cosmos-sdk/codec"
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
Expand Down
22 changes: 11 additions & 11 deletions app/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ package app

import (
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
"github.com/jackalLabs/canine-chain/v3/app/upgrades/bouncybulldog"
v121 "github.com/jackalLabs/canine-chain/v3/app/upgrades/testnet/121"
"github.com/jackalLabs/canine-chain/v3/app/upgrades/testnet/alpha11"
"github.com/jackalLabs/canine-chain/v3/app/upgrades/testnet/alpha13"
"github.com/jackalLabs/canine-chain/v3/app/upgrades/testnet/beta6"
"github.com/jackalLabs/canine-chain/v3/app/upgrades/testnet/beta7"
v3 "github.com/jackalLabs/canine-chain/v3/app/upgrades/v3"
v4 "github.com/jackalLabs/canine-chain/v3/app/upgrades/v4"
"github.com/jackalLabs/canine-chain/v3/app/upgrades/v4alpha1"
"github.com/jackalLabs/canine-chain/v3/app/upgrades/v4alpha3"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
"github.com/jackalLabs/canine-chain/v4/app/upgrades/bouncybulldog"
v121 "github.com/jackalLabs/canine-chain/v4/app/upgrades/testnet/121"
"github.com/jackalLabs/canine-chain/v4/app/upgrades/testnet/alpha11"
"github.com/jackalLabs/canine-chain/v4/app/upgrades/testnet/alpha13"
"github.com/jackalLabs/canine-chain/v4/app/upgrades/testnet/beta6"
"github.com/jackalLabs/canine-chain/v4/app/upgrades/testnet/beta7"
v3 "github.com/jackalLabs/canine-chain/v4/app/upgrades/v3"
v4 "github.com/jackalLabs/canine-chain/v4/app/upgrades/v4"
"github.com/jackalLabs/canine-chain/v4/app/upgrades/v4alpha1"
"github.com/jackalLabs/canine-chain/v4/app/upgrades/v4alpha3"
)

func (app *JackalApp) registerTestnetUpgradeHandlers() {
Expand Down
16 changes: 8 additions & 8 deletions app/upgrades/bouncybulldog/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package bouncybulldog

import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
"github.com/jackalLabs/canine-chain/v3/types"
filetreemoduletypes "github.com/jackalLabs/canine-chain/v3/x/filetree/types"
notificationsmoduletypes "github.com/jackalLabs/canine-chain/v3/x/notifications/types"
oraclekeeper "github.com/jackalLabs/canine-chain/v3/x/oracle/keeper"
oraclemoduletypes "github.com/jackalLabs/canine-chain/v3/x/oracle/types"
rnsmoduletypes "github.com/jackalLabs/canine-chain/v3/x/rns/types"
storagemoduletypes "github.com/jackalLabs/canine-chain/v3/x/storage/types"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
"github.com/jackalLabs/canine-chain/v4/types"
filetreemoduletypes "github.com/jackalLabs/canine-chain/v4/x/filetree/types"
notificationsmoduletypes "github.com/jackalLabs/canine-chain/v4/x/notifications/types"
oraclekeeper "github.com/jackalLabs/canine-chain/v4/x/oracle/keeper"
oraclemoduletypes "github.com/jackalLabs/canine-chain/v4/x/oracle/types"
rnsmoduletypes "github.com/jackalLabs/canine-chain/v4/x/rns/types"
storagemoduletypes "github.com/jackalLabs/canine-chain/v4/x/storage/types"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/testnet/121/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v121

import (
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
)

import (
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/testnet/alpha11/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
"github.com/jackalLabs/canine-chain/v3/types"
oraclekeeper "github.com/jackalLabs/canine-chain/v3/x/oracle/keeper"
oraclemoduletypes "github.com/jackalLabs/canine-chain/v3/x/oracle/types"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
"github.com/jackalLabs/canine-chain/v4/types"
oraclekeeper "github.com/jackalLabs/canine-chain/v4/x/oracle/keeper"
oraclemoduletypes "github.com/jackalLabs/canine-chain/v4/x/oracle/types"
)

var _ upgrades.Upgrade = &Upgrade{}
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/alpha13/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
"github.com/jackalLabs/canine-chain/v3/types"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
"github.com/jackalLabs/canine-chain/v4/types"
)

var _ upgrades.Upgrade = &Upgrade{}
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/testnet/alpha7/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/types"
"github.com/jackalLabs/canine-chain/v4/types"
)

func CreateUpgradeHandler(
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/beta6/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
storagemodulekeeper "github.com/jackalLabs/canine-chain/v3/x/storage/keeper"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
storagemodulekeeper "github.com/jackalLabs/canine-chain/v4/x/storage/keeper"
)

var _ upgrades.Upgrade = &Upgrade{}
Expand Down
10 changes: 5 additions & 5 deletions app/upgrades/testnet/beta7/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
"github.com/jackalLabs/canine-chain/v3/types"
notificationkeeper "github.com/jackalLabs/canine-chain/v3/x/notifications/keeper"
notificationtypes "github.com/jackalLabs/canine-chain/v3/x/notifications/types"
rnstypes "github.com/jackalLabs/canine-chain/v3/x/rns/types"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
"github.com/jackalLabs/canine-chain/v4/types"
notificationkeeper "github.com/jackalLabs/canine-chain/v4/x/notifications/keeper"
notificationtypes "github.com/jackalLabs/canine-chain/v4/x/notifications/types"
rnstypes "github.com/jackalLabs/canine-chain/v4/x/rns/types"
)

var _ upgrades.Upgrade = &Upgrade{}
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/testnet/v1.2.0-alpha.6/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/types"
"github.com/jackalLabs/canine-chain/v4/types"
)

func CreateUpgradeHandler(
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v3/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
ibcfeetypes "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/types"
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
storagekeeper "github.com/jackalLabs/canine-chain/v3/x/storage/keeper"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
storagekeeper "github.com/jackalLabs/canine-chain/v4/x/storage/keeper"

storagemoduletypes "github.com/jackalLabs/canine-chain/v3/x/storage/types"
storagemoduletypes "github.com/jackalLabs/canine-chain/v4/x/storage/types"
)

var _ upgrades.Upgrade = &Upgrade{}
Expand Down
20 changes: 10 additions & 10 deletions app/upgrades/v4/commont_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/golang/mock/gomock"
minttypes "github.com/jackalLabs/canine-chain/v3/x/jklmint/types"
oracletypes "github.com/jackalLabs/canine-chain/v3/x/oracle/types"
storagekeeper "github.com/jackalLabs/canine-chain/v3/x/storage/keeper"
storagetestutil "github.com/jackalLabs/canine-chain/v3/x/storage/testutil"
storagemoduletypes "github.com/jackalLabs/canine-chain/v3/x/storage/types"
minttypes "github.com/jackalLabs/canine-chain/v4/x/jklmint/types"
oracletypes "github.com/jackalLabs/canine-chain/v4/x/oracle/types"
storagekeeper "github.com/jackalLabs/canine-chain/v4/x/storage/keeper"
storagetestutil "github.com/jackalLabs/canine-chain/v4/x/storage/testutil"
storagemoduletypes "github.com/jackalLabs/canine-chain/v4/x/storage/types"

storetypes "github.com/cosmos/cosmos-sdk/store/types"
typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
canineglobaltestutil "github.com/jackalLabs/canine-chain/v3/testutil"
moduletestutil "github.com/jackalLabs/canine-chain/v3/types/module/testutil" // when importing from sdk,'go mod tidy' keeps trying to import from v0.46.
canineglobaltestutil "github.com/jackalLabs/canine-chain/v4/testutil"
moduletestutil "github.com/jackalLabs/canine-chain/v4/types/module/testutil" // when importing from sdk,'go mod tidy' keeps trying to import from v0.46.
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
tmtime "github.com/tendermint/tendermint/types/time"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/jackalLabs/canine-chain/v3/x/filetree"
"github.com/jackalLabs/canine-chain/v3/x/filetree/keeper"
"github.com/jackalLabs/canine-chain/v4/x/filetree"
"github.com/jackalLabs/canine-chain/v4/x/filetree/keeper"

"github.com/jackalLabs/canine-chain/v3/x/filetree/types"
"github.com/jackalLabs/canine-chain/v4/x/filetree/types"
"github.com/stretchr/testify/suite"
)

Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v4/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

"github.com/cosmos/btcutil/bech32"

types2 "github.com/jackalLabs/canine-chain/v3/x/storage/types"
types2 "github.com/jackalLabs/canine-chain/v4/x/storage/types"

v4 "github.com/jackalLabs/canine-chain/v3/app/upgrades/v4"
"github.com/jackalLabs/canine-chain/v3/x/filetree/types"
v4 "github.com/jackalLabs/canine-chain/v4/app/upgrades/v4"
"github.com/jackalLabs/canine-chain/v4/x/filetree/types"
)

func (suite *UpgradeTestKeeper) TestUpgrade() {
Expand Down
10 changes: 5 additions & 5 deletions app/upgrades/v4/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import (
"fmt"
"strconv"

notificationsmoduletypes "github.com/jackalLabs/canine-chain/v3/x/notifications/types"
notificationsmoduletypes "github.com/jackalLabs/canine-chain/v4/x/notifications/types"

storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
filetreemodulekeeper "github.com/jackalLabs/canine-chain/v3/x/filetree/keeper"
storagekeeper "github.com/jackalLabs/canine-chain/v3/x/storage/keeper"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
filetreemodulekeeper "github.com/jackalLabs/canine-chain/v4/x/filetree/keeper"
storagekeeper "github.com/jackalLabs/canine-chain/v4/x/storage/keeper"

storagemoduletypes "github.com/jackalLabs/canine-chain/v3/x/storage/types"
storagemoduletypes "github.com/jackalLabs/canine-chain/v4/x/storage/types"
)

var _ upgrades.Upgrade = &Upgrade{}
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v4alpha1/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
"github.com/jackalLabs/canine-chain/v3/types"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
"github.com/jackalLabs/canine-chain/v4/types"
)

var _ upgrades.Upgrade = &Upgrade{}
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v4alpha3/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/jackalLabs/canine-chain/v3/app/upgrades"
"github.com/jackalLabs/canine-chain/v4/app/upgrades"
)

var _ upgrades.Upgrade = &Upgrade{}
Expand Down
2 changes: 1 addition & 1 deletion cmd/canined/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

"github.com/jackalLabs/canine-chain/v3/app"
"github.com/jackalLabs/canine-chain/v4/app"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/canined/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
storage "github.com/jackalLabs/canine-chain/v3/x/storage/client/cli"
storage "github.com/jackalLabs/canine-chain/v4/x/storage/client/cli"
"github.com/prometheus/client_golang/prometheus"
"github.com/spf13/cast"
"github.com/spf13/cobra"
Expand All @@ -35,8 +35,8 @@ import (
"github.com/CosmWasm/wasmd/x/wasm"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/jackalLabs/canine-chain/v3/app"
"github.com/jackalLabs/canine-chain/v3/app/params"
"github.com/jackalLabs/canine-chain/v4/app"
"github.com/jackalLabs/canine-chain/v4/app/params"
)

// NewRootCmd creates a new root command for wasmd. It is called once in the
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/jackalLabs/canine-chain/v3
module github.com/jackalLabs/canine-chain/v4

go 1.20

Expand Down
12 changes: 5 additions & 7 deletions proto/canine_chain/jklmint/params.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ message Params {
string mint_denom = 1 [ (gogoproto.moretags) = "yaml:\"mint_denom\"" ];

int64 dev_grants_ratio = 2 [ (gogoproto.moretags) = "yaml:\"dev_grants_ratio\"" ]; // default 8
int64 referral_commission = 3 [ (gogoproto.moretags) = "yaml:\"referral_commission\"" ]; // default 25
int64 storage_provider_ratio = 4 [ (gogoproto.moretags) = "yaml:\"storage_provider_ratio\"" ]; // default 12
int64 staker_ratio = 5 [ (gogoproto.moretags) = "yaml:\"staker_ratio\"" ]; // default 80 - this includes the community pool allocation
int64 tokens_per_block = 6 [ (gogoproto.moretags) = "yaml:\"tokens_per_block\"" ]; // default 4200000
int64 pol_ratio = 7 [ (gogoproto.moretags) = "yaml:\"pol_ratio\"" ]; // default 40
int64 staker_ratio = 3 [ (gogoproto.moretags) = "yaml:\"staker_ratio\"" ]; // default 80 - this includes the community pool allocation
int64 tokens_per_block = 4 [ (gogoproto.moretags) = "yaml:\"tokens_per_block\"" ]; // default 4200000

int64 mint_decrease = 8 [ (gogoproto.moretags) = "yaml:\"mint_decrease\"" ]; // default 6
string storage_stipend_address = 9 [ (gogoproto.moretags) = "yaml:\"storage_stipend_address\"" ]; // multi-sig
int64 mint_decrease = 5 [ (gogoproto.moretags) = "yaml:\"mint_decrease\"" ]; // default 6
string storage_stipend_address = 6 [ (gogoproto.moretags) = "yaml:\"storage_stipend_address\"" ]; // multi-sig
int64 storage_provider_ratio = 7 [ (gogoproto.moretags) = "yaml:\"storage_provider_ratio\"" ]; // default 12

}
Loading
Loading