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.

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

Ixo v3 Upgrade go package versions #381

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e554574
Redo from develop branch as base (#295)
alwyn-ixo Mar 20, 2023
b26cbfc
Redo from develop branch as base (#295) (#296)
alwyn-ixo Mar 21, 2023
d45fe9f
Update README.md
alwyn-ixo Mar 21, 2023
0015182
Update README.md
alwyn-ixo Mar 22, 2023
1126d4f
Update README.md
alwyn-ixo Mar 21, 2023
c9653e3
Update README.md
alwyn-ixo Mar 22, 2023
5ecdd6b
chore: update readme
Michael-Ixo Mar 22, 2023
de29018
Merge branch 'integration' into develop
Michael-Ixo Mar 22, 2023
7e047b4
Merge branch 'main' into develop
Michael-Ixo Jul 3, 2023
16e88a5
fix(wasm): enable wasm statesync
Michael-Ixo Jul 3, 2023
0597a7b
Develop wasmd (#305)
Michael-Ixo Aug 22, 2023
67abb29
ops(gha): update non-working flows to workflow_dispatch only
Michael-Ixo Aug 22, 2023
c1a127b
ops(gha): fix releaser linux
Michael-Ixo Aug 22, 2023
ca9e64c
Merge branch 'main' into develop
Michael-Ixo Aug 22, 2023
b9017bb
ops(ga): add release binary creation script, fix docker image
Michael-Ixo Aug 24, 2023
de7d15f
Merge branch 'main' into develop
Michael-Ixo Aug 24, 2023
845a7f5
fix(upgrades): upgrade wasmvm and fix upgrade handler
Michael-Ixo Aug 27, 2023
c7e1291
chore(modules): update chain module to coinside with github version
Michael-Ixo Sep 21, 2023
643d6e9
fix(cmd): fix halt-height param
Michael-Ixo Oct 11, 2023
f4193c3
Docs (#354)
Michael-Ixo Oct 25, 2023
2246089
Chain Upgrade v3 (#375)
Michael-Ixo Mar 22, 2024
a92fb31
Merge branch 'main' into develop
Michael-Ixo Mar 22, 2024
bf7cf8a
chore(modules): update chain module to coinside with github version v3
Michael-Ixo Mar 22, 2024
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
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,22 @@
</p>
<br />

The ixo Blockchain is a Layer 1 blockchain that runs on both Testnet and Mainnet. It is built using the [Cosmos SDK](https://docs.cosmos.network/main), [Tendermint](https://docs.tendermint.com/), and [IBC](https://ibc.cosmos.network/), and was one of the earliest networks to incorporate these technologies. The recent addition of [CosmWASM](https://github.com/CosmWasm/wasmd) in v0.19.3 demonstrates ixo's commitment to ongoing innovation and evolution.
The ixo Blockchain is a Layer 1 blockchain that runs on both Testnet and Mainnet. It is built using the [Cosmos SDK](https://docs.cosmos.network/main), [Tendermint](https://docs.tendermint.com/), and [IBC](https://ibc.cosmos.network/), and was one of the earliest networks to incorporate these technologies.

Have a look at [go.mod](https://github.com/ixofoundation/ixo-blockchain/blob/main/go.mod) for specific dependencies and their most recent versions.

The ixo Blockchain powers client applications for coordinating, financing and verifying impacts. The [Impacts Wallet](https://github.com/ixofoundation/ixo-Mobile-dev), [JAMBO](https://github.com/ixofoundation/jambo), and [Launchpad](https://github.com/ixofoundation/ixo-webclient) are examples of client applications that use the ixo Blockchain. The [Impacts SDK](https://www.npmjs.com/package/@ixo/impactxclient-sdk) makes it simple to interact with the ixo Blockchain.

Ixo has 5 custom cosmos modules which help to reach the Ixo goals and missions:

- [Bonds](/x/bonds/spec/README.md)
- [Iid](/x/iid/spec/README.md)
- [Entity](/x/entity/spec/README.md)
- [Claims](/x/claims/spec/README.md)
- [Token](/x/token/spec/README.md)

## 🤝 How to contribute

If you are interested in contributing to the ixo Blockchain, you can start by reviewing the documentation on our [website](https://docs.ixo.foundation/ixo/developers). There are many opportunities to get involved, such as contributing code or participating in community discussions.

Our community is passionate about using blockchain technology to create positive impacts in the world. We believe in the power of collaboration and innovation to drive change, and we welcome anyone who shares our vision to join us on Discord or Telegram.
Our community is passionate about using blockchain technology to create positive impacts in the world. We believe in the power of collaboration and innovation to drive change, and we welcome anyone who shares our vision to join us on Discord or Telegram
8 changes: 4 additions & 4 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 6 additions & 5 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +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"
"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"
Expand All @@ -52,7 +53,7 @@ var (
DefaultNodeHome = os.ExpandEnv("$HOME/.ixod")

// scheduled upgrades and forks
Upgrades = []upgrades.Upgrade{v2.Upgrade}
Upgrades = []upgrades.Upgrade{v2.Upgrade, v3.Upgrade}
Forks = []upgrades.Fork{}

// If EnableSpecificWasmProposals is "", and this is "true", then enable all x/wasm proposals.
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
26 changes: 13 additions & 13 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions app/keepers/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
26 changes: 13 additions & 13 deletions app/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v2/constants.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 3 additions & 0 deletions app/upgrades/v3/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# v3

v3 release changes is availabale [here](https://github.com/ixofoundation/ixo-blockchain/releases/tag/v3.0.0).
16 changes: 16 additions & 0 deletions app/upgrades/v3/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package v3

import (
store "github.com/cosmos/cosmos-sdk/store/types"

"github.com/ixofoundation/ixo-blockchain/v3/app/upgrades"
)

// UpgradeName defines the on-chain upgrade name for the Ixo v3 upgrade.
const UpgradeName = "v3"

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}
25 changes: 25 additions & 0 deletions app/upgrades/v3/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package v3

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

func CreateUpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("🚀 executing Ixo v3 upgrade 🚀")

// Run migrations before applying any other state changes.
// NOTE: DO NOT PUT ANY STATE CHANGES BEFORE RunMigrations().
migrations, err := mm.RunMigrations(ctx, configurator, fromVM)
if err != nil {
return nil, err
}

return migrations, nil
}
}
4 changes: 2 additions & 2 deletions cmd/ixod/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/ixod/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/test_helpers.go.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading