Merge branch 'develop', Ixo v3 Upgrade go package versions

app/ante.go

@@ -8,10 +8,10 @@ import (
 	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
 	ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
 	ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
-	entityante "github.com/ixofoundation/ixo-blockchain/v2/x/entity/ante"
-	entitykeeper "github.com/ixofoundation/ixo-blockchain/v2/x/entity/keeper"
-	iidante "github.com/ixofoundation/ixo-blockchain/v2/x/iid/ante"
-	iidkeeper "github.com/ixofoundation/ixo-blockchain/v2/x/iid/keeper"
+	entityante "github.com/ixofoundation/ixo-blockchain/v3/x/entity/ante"
+	entitykeeper "github.com/ixofoundation/ixo-blockchain/v3/x/entity/keeper"
+	iidante "github.com/ixofoundation/ixo-blockchain/v3/x/iid/ante"
+	iidkeeper "github.com/ixofoundation/ixo-blockchain/v3/x/iid/keeper"
 )
 
 // HandlerOptions are the options required for constructing a default SDK AnteHandler.

app/app.go

@@ -29,11 +29,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/gorilla/mux"
-	"github.com/ixofoundation/ixo-blockchain/v2/app/keepers"
-	"github.com/ixofoundation/ixo-blockchain/v2/app/upgrades"
-	v2 "github.com/ixofoundation/ixo-blockchain/v2/app/upgrades/v2"
-	v3 "github.com/ixofoundation/ixo-blockchain/v2/app/upgrades/v3"
-	"github.com/ixofoundation/ixo-blockchain/v2/lib/ixo"
+	"github.com/ixofoundation/ixo-blockchain/v3/app/keepers"
+	"github.com/ixofoundation/ixo-blockchain/v3/app/upgrades"
+	v2 "github.com/ixofoundation/ixo-blockchain/v3/app/upgrades/v2"
+	v3 "github.com/ixofoundation/ixo-blockchain/v3/app/upgrades/v3"
+	"github.com/ixofoundation/ixo-blockchain/v3/lib/ixo"
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cast"
 	abci "github.com/tendermint/tendermint/abci/types"

app/encoding.go

@@ -2,7 +2,7 @@ package app
 
 import (
 	"github.com/cosmos/cosmos-sdk/std"
-	"github.com/ixofoundation/ixo-blockchain/v2/app/params"
+	"github.com/ixofoundation/ixo-blockchain/v3/app/params"
 )
 
 var encodingConfig params.EncodingConfig = MakeEncodingConfig()

app/keepers/keepers.go

@@ -74,19 +74,19 @@ import (
 	packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
 
 	// Local
-	wasmbinding "github.com/ixofoundation/ixo-blockchain/v2/wasmbinding"
-	bondskeeper "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/keeper"
-	bondstypes "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/types"
-	claimsmodulekeeper "github.com/ixofoundation/ixo-blockchain/v2/x/claims/keeper"
-	claimsmoduletypes "github.com/ixofoundation/ixo-blockchain/v2/x/claims/types"
-	entitymodule "github.com/ixofoundation/ixo-blockchain/v2/x/entity"
-	entitykeeper "github.com/ixofoundation/ixo-blockchain/v2/x/entity/keeper"
-	entitytypes "github.com/ixofoundation/ixo-blockchain/v2/x/entity/types"
-	iidmodulekeeper "github.com/ixofoundation/ixo-blockchain/v2/x/iid/keeper"
-	iidtypes "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types"
-	tokenmodule "github.com/ixofoundation/ixo-blockchain/v2/x/token"
-	tokenkeeper "github.com/ixofoundation/ixo-blockchain/v2/x/token/keeper"
-	tokentypes "github.com/ixofoundation/ixo-blockchain/v2/x/token/types"
+	wasmbinding "github.com/ixofoundation/ixo-blockchain/v3/wasmbinding"
+	bondskeeper "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/keeper"
+	bondstypes "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types"
+	claimsmodulekeeper "github.com/ixofoundation/ixo-blockchain/v3/x/claims/keeper"
+	claimsmoduletypes "github.com/ixofoundation/ixo-blockchain/v3/x/claims/types"
+	entitymodule "github.com/ixofoundation/ixo-blockchain/v3/x/entity"
+	entitykeeper "github.com/ixofoundation/ixo-blockchain/v3/x/entity/keeper"
+	entitytypes "github.com/ixofoundation/ixo-blockchain/v3/x/entity/types"
+	iidmodulekeeper "github.com/ixofoundation/ixo-blockchain/v3/x/iid/keeper"
+	iidtypes "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types"
+	tokenmodule "github.com/ixofoundation/ixo-blockchain/v3/x/token"
+	tokenkeeper "github.com/ixofoundation/ixo-blockchain/v3/x/token/keeper"
+	tokentypes "github.com/ixofoundation/ixo-blockchain/v3/x/token/types"
 )
 
 type AppKeepers struct {

app/keepers/keys.go

@@ -33,11 +33,11 @@ import (
 	packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
 
 	// Local
-	bondstypes "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/types"
-	claimsmoduletypes "github.com/ixofoundation/ixo-blockchain/v2/x/claims/types"
-	entitytypes "github.com/ixofoundation/ixo-blockchain/v2/x/entity/types"
-	iidtypes "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types"
-	tokentypes "github.com/ixofoundation/ixo-blockchain/v2/x/token/types"
+	bondstypes "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types"
+	claimsmoduletypes "github.com/ixofoundation/ixo-blockchain/v3/x/claims/types"
+	entitytypes "github.com/ixofoundation/ixo-blockchain/v3/x/entity/types"
+	iidtypes "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types"
+	tokentypes "github.com/ixofoundation/ixo-blockchain/v3/x/token/types"
 )
 
 func (appKeepers *AppKeepers) GenerateKeys() {

app/modules.go

@@ -53,19 +53,19 @@ import (
 	ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
 	intertx "github.com/cosmos/interchain-accounts/x/inter-tx"
 	intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
-	appparams "github.com/ixofoundation/ixo-blockchain/v2/app/params"
-	"github.com/ixofoundation/ixo-blockchain/v2/x/bonds"
-	bondstypes "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/types"
-	claimsmodule "github.com/ixofoundation/ixo-blockchain/v2/x/claims"
-	claimsmoduletypes "github.com/ixofoundation/ixo-blockchain/v2/x/claims/types"
-	entitymodule "github.com/ixofoundation/ixo-blockchain/v2/x/entity"
-	entityclient "github.com/ixofoundation/ixo-blockchain/v2/x/entity/client"
-	entitytypes "github.com/ixofoundation/ixo-blockchain/v2/x/entity/types"
-	iidmodule "github.com/ixofoundation/ixo-blockchain/v2/x/iid"
-	iidtypes "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types"
-	tokenmodule "github.com/ixofoundation/ixo-blockchain/v2/x/token"
-	tokenclient "github.com/ixofoundation/ixo-blockchain/v2/x/token/client"
-	tokentypes "github.com/ixofoundation/ixo-blockchain/v2/x/token/types"
+	appparams "github.com/ixofoundation/ixo-blockchain/v3/app/params"
+	"github.com/ixofoundation/ixo-blockchain/v3/x/bonds"
+	bondstypes "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types"
+	claimsmodule "github.com/ixofoundation/ixo-blockchain/v3/x/claims"
+	claimsmoduletypes "github.com/ixofoundation/ixo-blockchain/v3/x/claims/types"
+	entitymodule "github.com/ixofoundation/ixo-blockchain/v3/x/entity"
+	entityclient "github.com/ixofoundation/ixo-blockchain/v3/x/entity/client"
+	entitytypes "github.com/ixofoundation/ixo-blockchain/v3/x/entity/types"
+	iidmodule "github.com/ixofoundation/ixo-blockchain/v3/x/iid"
+	iidtypes "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types"
+	tokenmodule "github.com/ixofoundation/ixo-blockchain/v3/x/token"
+	tokenclient "github.com/ixofoundation/ixo-blockchain/v3/x/token/client"
+	tokentypes "github.com/ixofoundation/ixo-blockchain/v3/x/token/types"
 	packetforward "github.com/strangelove-ventures/packet-forward-middleware/v4/router"
 	packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
 )

app/upgrades/v2/constants.go

@@ -1,7 +1,7 @@
 package v2
 
 import (
-	"github.com/ixofoundation/ixo-blockchain/v2/app/upgrades"
+	"github.com/ixofoundation/ixo-blockchain/v3/app/upgrades"
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"

app/upgrades/v3/constants.go

@@ -3,7 +3,7 @@ package v3
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/ixofoundation/ixo-blockchain/v2/app/upgrades"
+	"github.com/ixofoundation/ixo-blockchain/v3/app/upgrades"
 )
 
 // UpgradeName defines the on-chain upgrade name for the Ixo v3 upgrade.

cmd/ixod/cmd/root.go

@@ -26,8 +26,8 @@ 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"
-	"github.com/ixofoundation/ixo-blockchain/v2/app"
-	"github.com/ixofoundation/ixo-blockchain/v2/app/params"
+	"github.com/ixofoundation/ixo-blockchain/v3/app"
+	"github.com/ixofoundation/ixo-blockchain/v3/app/params"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"

cmd/ixod/main.go

@@ -3,12 +3,12 @@ package main
 import (
 	"os"
 
-	"github.com/ixofoundation/ixo-blockchain/v2/app/params"
-	"github.com/ixofoundation/ixo-blockchain/v2/cmd/ixod/cmd"
+	"github.com/ixofoundation/ixo-blockchain/v3/app/params"
+	"github.com/ixofoundation/ixo-blockchain/v3/cmd/ixod/cmd"
 
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
-	"github.com/ixofoundation/ixo-blockchain/v2/app"
+	"github.com/ixofoundation/ixo-blockchain/v3/app"
 )
 
 func main() {

cmd/test_helpers.go.ignore

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/CosmWasm/wasmd/x/wasm/types"
-	"github.com/ixofoundation/ixo-blockchain/v2/app"
+	"github.com/ixofoundation/ixo-blockchain/v3/app"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"

go.mod

@@ -1,4 +1,4 @@
-module github.com/ixofoundation/ixo-blockchain/v2
+module github.com/ixofoundation/ixo-blockchain/v3
 
 go 1.19
 

proto/ixo/bonds/v1beta1/bonds.proto

@@ -4,7 +4,7 @@ package ixo.bonds.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
 
 // FunctionParam is a key-value pair used for specifying a specific bond
 // parameter.
@@ -37,11 +37,11 @@ message Bond {
   string description = 3;
   string creator_did = 4 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string controller_did = 5 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string function_type = 6;
   repeated FunctionParam function_parameters = 7 [
@@ -100,7 +100,7 @@ message Bond {
   string bond_did = 27;
   string oracle_did = 28 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
 }
 
@@ -109,7 +109,7 @@ message Bond {
 message BaseOrder {
   string account_did = 1 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.nullable) = false ];
   bool cancelled = 3;

proto/ixo/bonds/v1beta1/event.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ixo.bonds.v1beta1;
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
 
 import "gogoproto/gogo.proto";
 import "ixo/bonds/v1beta1/bonds.proto";

proto/ixo/bonds/v1beta1/genesis.proto

@@ -4,7 +4,7 @@ package ixo.bonds.v1beta1;
 import "gogoproto/gogo.proto";
 import "ixo/bonds/v1beta1/bonds.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
 
 // GenesisState defines the bonds module's genesis state.
 message GenesisState {

proto/ixo/bonds/v1beta1/query.proto

@@ -6,7 +6,7 @@ import "google/api/annotations.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "ixo/bonds/v1beta1/bonds.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/ixo/bonds/v1beta1/tx.proto

@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "ixo/bonds/v1beta1/bonds.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
 
 // Msg defines the bonds Msg service.
 service Msg {
@@ -56,15 +56,15 @@ message MsgCreateBond {
   ];
   string creator_did = 7 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string controller_did = 8 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string oracle_did = 9 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   repeated string reserve_tokens = 10;
   string tx_fee_percentage = 11 [
@@ -117,7 +117,7 @@ message MsgEditBond {
   string sanity_margin_percentage = 6;
   string editor_did = 7 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string editor_address = 8;
 }
@@ -138,7 +138,7 @@ message MsgSetNextAlpha {
   ];
   string oracle_did = 4 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string oracle_address = 5;
 }
@@ -151,7 +151,7 @@ message MsgUpdateBondState {
   string state = 2;
   string editor_did = 3 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string editor_address = 4;
 }
@@ -163,7 +163,7 @@ message MsgUpdateBondStateResponse {}
 message MsgBuy {
   string buyer_did = 1 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.nullable) = false ];
   repeated cosmos.base.v1beta1.Coin max_prices = 3 [
@@ -181,7 +181,7 @@ message MsgBuyResponse {}
 message MsgSell {
   string seller_did = 1 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.nullable) = false ];
   string bond_did = 3;
@@ -196,7 +196,7 @@ message MsgSellResponse {}
 message MsgSwap {
   string swapper_did = 1 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string bond_did = 2;
   cosmos.base.v1beta1.Coin from = 3 [ (gogoproto.nullable) = false ];
@@ -212,7 +212,7 @@ message MsgSwapResponse {}
 message MsgMakeOutcomePayment {
   string sender_did = 1 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string amount = 2 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
@@ -231,7 +231,7 @@ message MsgMakeOutcomePaymentResponse {}
 message MsgWithdrawShare {
   string recipient_did = 1 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   string bond_did = 2;
   string recipient_address = 3;
@@ -244,7 +244,7 @@ message MsgWithdrawShareResponse {}
 message MsgWithdrawReserve {
   string withdrawer_did = 1 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v2/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
   ];
   repeated cosmos.base.v1beta1.Coin amount = 2 [
     (gogoproto.nullable) = false,

proto/ixo/claims/v1beta1/authz.proto

@@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "ixo/claims/v1beta1/claims.proto";
 import "ixo/claims/v1beta1/cosmos.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/claims/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/claims/types";
 
 message SubmitClaimAuthorization {
   option (cosmos_proto.implements_interface) = "Authorization";

proto/ixo/claims/v1beta1/claims.proto

@@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/claims/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/claims/types";
 
 message Params {
   uint64 collection_sequence = 1;

proto/ixo/claims/v1beta1/cosmos.proto

@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/claims/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/claims/types";
 
 // Cosmos bank module types, creating here for ease of use
 

proto/ixo/claims/v1beta1/event.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ixo.claims.v1beta1;
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v2/x/claims/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/claims/types";
 
 import "gogoproto/gogo.proto";
 import "ixo/claims/v1beta1/claims.proto";