Merge pull request #47 from cgdusek/dev

Add v1.2.1 upgrade and Market v1.2.1-dev

Author: cgdusek

app/app.go

@@ -122,6 +122,7 @@ import (
 	v1_1_6 "github.com/onomyprotocol/onex/app/upgrades/v1.1.6"
 	v1_1_7 "github.com/onomyprotocol/onex/app/upgrades/v1.1.7"
 	v1_2_0 "github.com/onomyprotocol/onex/app/upgrades/v1.2.0"
+	v1_2_1 "github.com/onomyprotocol/onex/app/upgrades/v1.2.1"
 )
 
 const (
@@ -130,7 +131,7 @@ const (
 )
 
 var (
-	Upgrades = []upgrades.Upgrade{v1_1_7.Upgrade, v1_2_0.Upgrade}
+	Upgrades = []upgrades.Upgrade{v1_1_7.Upgrade, v1_2_0.Upgrade, v1_2_1.Upgrade}
 	Forks    = []upgrades.Fork{v1_1_6.Fork}
 
 	// DefaultNodeHome default home directories for the application daemon

app/upgrades/v1.2.1/constants.go

@@ -0,0 +1,15 @@
+package v1_2_1
+
+import (
+	"github.com/onomyprotocol/onex/app/upgrades"
+)
+
+const (
+	// UpgradeName defines the on-chain upgrades name.
+	UpgradeName = "v1.2.1"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+}

app/upgrades/v1.2.1/upgrade.go

@@ -0,0 +1,63 @@
+// Package v1_2_1 is contains chain upgrade of the corresponding version.
+package v1_2_1 //nolint:revive,stylecheck // app version
+
+import (
+	"strings"
+
+	"github.com/onomyprotocol/onex/app/upgrades"
+
+	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,
+	keepers *upgrades.UpgradeKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx.Logger().Info("Starting module migrations...")
+
+		// Deactivate all drops and remove owners
+		drops := keepers.MarketKeeper.GetAllDrop(ctx)
+		for _, drop := range drops {
+			if drop.Active {
+				pair := strings.Split(drop.Pair, ",")
+
+				denom1 := pair[0]
+				denom2 := pair[1]
+
+				pool, found := keepers.MarketKeeper.GetPool(ctx, drop.Pair)
+				if !found {
+					continue
+				}
+
+				member1, found := keepers.MarketKeeper.GetMember(ctx, denom2, denom1)
+				if !found {
+					continue
+				}
+
+				member2, found := keepers.MarketKeeper.GetMember(ctx, denom1, denom2)
+				if !found {
+					continue
+				}
+
+				// `total1 = (drop.Drops * member1.Balance) / pool.Drops`
+				total1 := (drop.Drops.Mul(member1.Balance)).Quo(pool.Drops)
+				total2 := (drop.Drops.Mul(member2.Balance)).Quo(pool.Drops)
+
+				drop.Product = total1.Mul(total2)
+				keepers.MarketKeeper.SetDrop(ctx, drop)
+			}
+		}
+
+		vm, err := mm.RunMigrations(ctx, configurator, vm)
+		if err != nil {
+			return vm, err
+		}
+
+		ctx.Logger().Info("Upgrade complete")
+		return vm, err
+	}
+}

go.mod

@@ -155,7 +155,7 @@ replace (
 	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.16-ics
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4
-	github.com/pendulum-labs/market => github.com/onomyprotocol/market v1.2.0
+	github.com/pendulum-labs/market => github.com/onomyprotocol/market v1.2.1-dev
 	github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.28
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )

go.sum

@@ -2204,8 +2204,8 @@ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:v
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/onomyprotocol/market v1.2.0 h1:XhmmXohKbKLLYucNaVtU9MIFn/94D8ugrk4YJ/CZj6Q=
-github.com/onomyprotocol/market v1.2.0/go.mod h1:sBeDReQziVBheY0/RiDrnZUztwdiu1ogWZpRQb3LDWA=
+github.com/onomyprotocol/market v1.2.1-dev h1:cWgVgF8+uKur5vpYhXJj9VpmahDEA5TfeDbnRAryq0I=
+github.com/onomyprotocol/market v1.2.1-dev/go.mod h1:sBeDReQziVBheY0/RiDrnZUztwdiu1ogWZpRQb3LDWA=
 github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=