Merge pull request #144 from PeggyJV/bolten/4.0.0-rc4

Updates for v4 release
PeggyJV · May 6, 2022 · 4f87d4d · 4f87d4d
2 parents e9efe6c + 932c40d
commit 4f87d4d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/app/app.go b/app/app.go
@@ -169,10 +169,7 @@ var (
 	}
 
 	// module accounts that are allowed to receive tokens
-	allowedReceivingModAcc = map[string]bool{
-		distrtypes.ModuleName:      true,
-		cellarfeestypes.ModuleName: true,
-	}
+	allowedReceivingModAcc = map[string]bool{}
 
 	_ simapp.App              = (*SommelierApp)(nil)
 	_ servertypes.Application = (*SommelierApp)(nil)

diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go
@@ -1,8 +1,6 @@
 package v4
 
 import (
-	"fmt"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
@@ -19,8 +17,9 @@ func CreateUpgradeHandler(
 	accountKeeper authkeeper.AccountKeeper,
 	bankKeeper bankkeeper.Keeper,
 ) upgradetypes.UpgradeHandler {
-	fmt.Println("v4 upgrade: entering handler")
 	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx.Logger().Info("v4 upgrade: entering handler")
+
 		// Since this is the first in-place upgrade and InitChainer was not set up for this at genesis
 		// time, we must initialize the VM map ourselves.
 		fromVM := make(map[string]uint64)

diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/cosmos/cosmos-sdk v0.44.5
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/ibc-go/v2 v2.0.0
-	github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea
 	github.com/ethereum/go-ethereum v1.10.11
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.5.2
@@ -18,7 +17,7 @@ require (
 	github.com/miguelmota/go-ethereum-hdwallet v0.1.1
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/ory/dockertest/v3 v3.8.1
-	github.com/peggyjv/gravity-bridge/module/v2 v2.0.0-20220420162017-838c0d25e974 // indirect
+	github.com/peggyjv/gravity-bridge/module/v2 v2.0.0
 	github.com/rakyll/statik v0.1.7
 	github.com/regen-network/cosmos-proto v0.3.1
 	github.com/spf13/cast v1.4.1

diff --git a/go.sum b/go.sum
@@ -801,10 +801,8 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T
 github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE=
 github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/peggyjv/gravity-bridge/module/v2 v2.0.0-20220414233948-fb045a1867b7 h1:VtMZq6qdukLwdx5K+OG36WaMu19RJBBFzLgPlfCqyi8=
-github.com/peggyjv/gravity-bridge/module/v2 v2.0.0-20220414233948-fb045a1867b7/go.mod h1:XUHyaIYlqo2TgCSY0R4N/geZot6Vks/EZmhJ7Jz4wvQ=
-github.com/peggyjv/gravity-bridge/module/v2 v2.0.0-20220420162017-838c0d25e974 h1:6rGtwj8oqkuGLQOuzbYgaNPumr5Trl3032jtJHhaUS8=
-github.com/peggyjv/gravity-bridge/module/v2 v2.0.0-20220420162017-838c0d25e974/go.mod h1:XUHyaIYlqo2TgCSY0R4N/geZot6Vks/EZmhJ7Jz4wvQ=
+github.com/peggyjv/gravity-bridge/module/v2 v2.0.0 h1:q7Qm0Fbgn71QS9gdlpIqASX2JpLQNpGhCJOzOHlKF/4=
+github.com/peggyjv/gravity-bridge/module/v2 v2.0.0/go.mod h1:XUHyaIYlqo2TgCSY0R4N/geZot6Vks/EZmhJ7Jz4wvQ=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=