From 257f10d17cc8ea733e1b528ca1d8673263a43835 Mon Sep 17 00:00:00 2001 From: Michael Tsitrin Date: Thu, 30 Jan 2025 10:24:35 +0200 Subject: [PATCH] update rdk and evmos --- app/app.go | 5 +++-- go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/app.go b/app/app.go index 6ca16c0..a311d2c 100644 --- a/app/app.go +++ b/app/app.go @@ -454,6 +454,7 @@ func NewRollapp( keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, + app.Erc20Keeper, app.GetSubspace(stakingtypes.ModuleName), ) @@ -474,7 +475,7 @@ func NewRollapp( app.DistrKeeper = distrkeeper.NewKeeper( appCodec, keys[distrtypes.StoreKey], app.GetSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper, - &stakingKeeper, &app.SequencersKeeper, authtypes.FeeCollectorName, + &stakingKeeper, &app.SequencersKeeper, app.Erc20Keeper, authtypes.FeeCollectorName, ) app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper) @@ -532,7 +533,7 @@ func NewRollapp( app.Erc20Keeper = erc20keeper.NewKeeper( keys[erc20types.StoreKey], appCodec, authtypes.NewModuleAddress(govtypes.ModuleName), - app.AccountKeeper, app.BankKeeper, app.EvmKeeper, app.StakingKeeper, + app.AccountKeeper, app.BankKeeper, app.EvmKeeper, ) // Create IBC Keeper diff --git a/go.mod b/go.mod index ae0998f..3d2bec9 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/bcdevtools/evm-block-explorer-rpc-cosmos v1.1.4 github.com/cosmos/cosmos-sdk v0.46.16 github.com/cosmos/ibc-go/v6 v6.2.1 - github.com/dymensionxyz/dymension-rdk v1.8.0-rc01.0.20250113104911-7fe0f886c502 - github.com/dymensionxyz/dymint v1.3.0-rc02.0.20250119074420-6e15db00be30 + github.com/dymensionxyz/dymension-rdk v1.8.0-rc01.0.20250129202218-961007a6507b + github.com/dymensionxyz/dymint v1.3.0-rc04 github.com/ethereum/go-ethereum v1.12.0 github.com/evmos/evmos/v12 v12.1.6 github.com/gogo/protobuf v1.3.3 @@ -361,7 +361,7 @@ replace ( // Dymension Forks replace ( github.com/cosmos/cosmos-sdk => github.com/dymensionxyz/cosmos-sdk v0.46.17-0.20241128210616-e9dfe47b8c73 - github.com/evmos/evmos/v12 => github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.5.0-rc02 + github.com/evmos/evmos/v12 => github.com/dymensionxyz/evmos/v12 v12.1.7-0.20250128194013-c3f3d1fd3f02 github.com/gorilla/rpc => github.com/dymensionxyz/rpc v1.3.1 github.com/osmosis-labs/osmosis/v15 => github.com/dymensionxyz/osmosis/v15 v15.2.0-dymension-v1.1.2 github.com/tendermint/tendermint => github.com/dymensionxyz/cometbft v0.34.29-0.20250109171128-0ea81b630cbc diff --git a/go.sum b/go.sum index 353d4ca..fab75da 100644 --- a/go.sum +++ b/go.sum @@ -577,12 +577,12 @@ github.com/dymensionxyz/cosmos-sdk v0.46.17-0.20241128210616-e9dfe47b8c73 h1:A0O github.com/dymensionxyz/cosmos-sdk v0.46.17-0.20241128210616-e9dfe47b8c73/go.mod h1:VPUuzF+l+ekSGPV7VVB8m0OMQfwp3QdKWNZjvkU3A1U= github.com/dymensionxyz/cosmosclient v0.4.2-beta.0.20241121093220-e0d7ad456fbd h1:V89QyOFM84o9w0iFdctMU6So8SS/Xt32JWAXGqJduT0= github.com/dymensionxyz/cosmosclient v0.4.2-beta.0.20241121093220-e0d7ad456fbd/go.mod h1:3weqpVj/TqTFpC0LjEB3H+HZSpm7BrQ1QkEg1Ahy6KY= -github.com/dymensionxyz/dymension-rdk v1.8.0-rc01.0.20250113104911-7fe0f886c502 h1:1go3SXCGVG6N51zdWEObDMKQO3Rmszfboo8M1e5IxFk= -github.com/dymensionxyz/dymension-rdk v1.8.0-rc01.0.20250113104911-7fe0f886c502/go.mod h1:6wbfP9JIoQQaL3Dlyj4GD+Z2axQAptp0wWac2HFIZSA= -github.com/dymensionxyz/dymint v1.3.0-rc02.0.20250119074420-6e15db00be30 h1:9N1A2cHQmqFDgwKPw+a0Rde3uUNk6dK/yc1ZzBP+xD4= -github.com/dymensionxyz/dymint v1.3.0-rc02.0.20250119074420-6e15db00be30/go.mod h1:IDTuEM0yDo7zNFL4MjUErcitVOIkVIIiq0j11anA5Og= -github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.5.0-rc02 h1:G6rtzFNnzeYOHN33rkw0kMQX+xRantRLTip1AMXYmBg= -github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.5.0-rc02/go.mod h1:CI6D89pkoiIm4BjoMFNnEaCLdKBEobLuwvhS0c1zh7Y= +github.com/dymensionxyz/dymension-rdk v1.8.0-rc01.0.20250129202218-961007a6507b h1:RBh/jywzfBlGJUiYkR2hfQ++dji5Xcf7kdsAchVLIKo= +github.com/dymensionxyz/dymension-rdk v1.8.0-rc01.0.20250129202218-961007a6507b/go.mod h1:0FM3wcS9rQdT+jEBKx/PKVc34zr482yp8gEWrrMWc14= +github.com/dymensionxyz/dymint v1.3.0-rc04 h1:h7mEfgyQB+a4H+FxhPSm/Ewefhk90rRNge0+NV5IcDk= +github.com/dymensionxyz/dymint v1.3.0-rc04/go.mod h1:sqE+4imdASE9lm63jv+K2zmOnclLJNZLPYbL9m6vR3o= +github.com/dymensionxyz/evmos/v12 v12.1.7-0.20250128194013-c3f3d1fd3f02 h1:lIAvQB85t5aGmmScaPTcUFddbjl4X4Oq7PnAE9tHtpM= +github.com/dymensionxyz/evmos/v12 v12.1.7-0.20250128194013-c3f3d1fd3f02/go.mod h1:CI6D89pkoiIm4BjoMFNnEaCLdKBEobLuwvhS0c1zh7Y= github.com/dymensionxyz/gerr-cosmos v1.0.0 h1:oi91rgOkpJWr41oX9JOyjvvBnhGY54tj513x8VlDAEc= github.com/dymensionxyz/gerr-cosmos v1.0.0/go.mod h1:n+0olxPogzWqFKba45mCpvrHLGmeS8W9UZjggHnWk6c= github.com/dymensionxyz/rpc v1.3.1 h1:7EXWIobaBes5zldRvTIg7TmNsEKjicrWA/OjCc0NaGs=