Use correct version for os

decentrio · Oct 24, 2024 · b97fa99 · b97fa99
1 parent c68fee6
commit b97fa99
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/app/upgrades/v2/upgrades.go b/app/upgrades/v2/upgrades.go
@@ -25,6 +25,7 @@ import (
 	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	"github.com/ethereum/go-ethereum/common"
+	ostypes "github.com/evmos/os/types"
 	evmkeeper "github.com/evmos/os/x/evm/keeper"
 	evmtypes "github.com/evmos/os/x/evm/types"
 	assettypes "github.com/realiotech/realio-network/x/asset/types"
@@ -36,7 +37,7 @@ func CreateUpgradeHandler(
 	mm *module.Manager,
 	configurator module.Configurator,
 	accountkeeper authkeeper.AccountKeeper,
-	evmkeeper evmkeeper.Keeper,
+	evmkeeper *evmkeeper.Keeper,
 	paramskeeper paramskeeper.Keeper,
 	consensuskeeper consensusparamkeeper.Keeper,
 	IBCKeeper ibckeeper.Keeper,
@@ -89,7 +90,7 @@ func CreateUpgradeHandler(
 		params.AllowedClients = append(params.AllowedClients, exported.Localhost)
 		IBCKeeper.ClientKeeper.SetParams(sdkCtx, params)
 
-		MigrateEthAccountsToBaseAccounts(sdkCtx, accountkeeper, &evmkeeper)
+		MigrateEthAccountsToBaseAccounts(sdkCtx, accountkeeper, evmkeeper)
 		return mm.RunMigrations(ctx, configurator, vm)
 	}
 }
@@ -99,7 +100,7 @@ func CreateUpgradeHandler(
 // EthAccounts to standard Cosmos SDK accounts.
 func MigrateEthAccountsToBaseAccounts(ctx sdk.Context, ak authkeeper.AccountKeeper, ek *evmkeeper.Keeper) {
 	ak.IterateAccounts(ctx, func(account sdk.AccountI) (stop bool) {
-		ethAcc, ok := account.(*evmtypes.EthAccount)
+		ethAcc, ok := account.(*ostypes.EthAccount)
 		if !ok {
 			return false
 		}

diff --git a/go.mod b/go.mod
@@ -253,12 +253,12 @@ replace (
 	github.com/ethereum/go-ethereum => github.com/evmos/go-ethereum v1.10.26-evmos-rc4
 
 	// fork evmos-os to suite realio's ethermint migrations
-	github.com/evmos/os => github.com/decentrio/evmos-os v0.0.0-20241024044718-e6e96465be58
+	github.com/evmos/os => github.com/decentrio/evmos-os v0.0.0-20241024054802-0945bfe2d45b
 
 	// github.com/realio-tech/multi-staking-module => ../multi-staking
 	// github.com/evmos/os => ../evmos-os
 
-	github.com/evmos/os/example_chain => github.com/decentrio/evmos-os/example_chain v0.0.0-20241024044718-e6e96465be58
+	github.com/evmos/os/example_chain => github.com/decentrio/evmos-os/example_chain v0.0.0-20241024054802-0945bfe2d45b
 
 	// use cosmos flavored protobufs
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

diff --git a/go.sum b/go.sum
@@ -428,10 +428,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decentrio/evmos-os v0.0.0-20241024044718-e6e96465be58 h1:6pJVJoCTMs1mh1fbwVBeRe+sVTnS3lPZd8UeyjDHzxM=
-github.com/decentrio/evmos-os v0.0.0-20241024044718-e6e96465be58/go.mod h1:uQQyppk8z2C7Ypk/zj8/wnJSrf74rY8cXLzsD8F1tEE=
-github.com/decentrio/evmos-os/example_chain v0.0.0-20241024044718-e6e96465be58 h1:4RLCgtkr3PhHEwbA8H/dFDvdfZNaGM2kYVGgLi7n1ug=
-github.com/decentrio/evmos-os/example_chain v0.0.0-20241024044718-e6e96465be58/go.mod h1:+SPMqw9wtbWO3jG02uLbLtVVjMHBldmXTN51kxbWqJ8=
+github.com/decentrio/evmos-os v0.0.0-20241024054802-0945bfe2d45b h1:X+JTL+nm0Ylr/lPItKsj8vNv670fEgp8zldx5MVDouk=
+github.com/decentrio/evmos-os v0.0.0-20241024054802-0945bfe2d45b/go.mod h1:uQQyppk8z2C7Ypk/zj8/wnJSrf74rY8cXLzsD8F1tEE=
+github.com/decentrio/evmos-os/example_chain v0.0.0-20241024054802-0945bfe2d45b h1:knpuahWxslEV7z2H3nslmhlHBjBzWQiyUN1YueTcwig=
+github.com/decentrio/evmos-os/example_chain v0.0.0-20241024054802-0945bfe2d45b/go.mod h1:+SPMqw9wtbWO3jG02uLbLtVVjMHBldmXTN51kxbWqJ8=
 github.com/decentrio/multi-staking v0.0.0-20241009040005-7e6827edf511 h1:SanXgVfxhZXkJ+WkhmKqCozNLvdZMO/+MGF642bmneQ=
 github.com/decentrio/multi-staking v0.0.0-20241009040005-7e6827edf511/go.mod h1:Ap8n5OVafMew5tp7G10BfUXTGyvUVKBDqoeg5tEcTGo=
 github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=