diff --git a/CHANGELOG.md b/CHANGELOG.md index 01d2f1a2..7a5e3be0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (build) [\#357](https://github.com/Finschia/finschia/pull/357) Upgrade to v4 * (fswap, fbridge) [\#359](https://github.com/Finschia/finschia/pull/359) Bump finschia-sdk v0.49.0-rc2 to v0.49.0-rc3 * (fswap, fbridge) [\#365](https://github.com/Finschia/finschia/pull/365) Load fbridge & fswap stores +* (fswap) [\#366](https://github.com/Finschia/finschia/pull/366) Bump github.com/Finschia/finschia-sdk from v0.49.0-rc3 to v0.49.0-rc4 ### Improvements diff --git a/app/app.go b/app/app.go index cd062f9a..aaf1514c 100644 --- a/app/app.go +++ b/app/app.go @@ -89,7 +89,6 @@ import ( foundationkeeper "github.com/Finschia/finschia-sdk/x/foundation/keeper" foundationmodule "github.com/Finschia/finschia-sdk/x/foundation/module" "github.com/Finschia/finschia-sdk/x/fswap" - fswapclient "github.com/Finschia/finschia-sdk/x/fswap/client" fswapkeeper "github.com/Finschia/finschia-sdk/x/fswap/keeper" fswaptypes "github.com/Finschia/finschia-sdk/x/fswap/types" "github.com/Finschia/finschia-sdk/x/genutil" @@ -165,7 +164,6 @@ var ( foundationclient.ProposalHandler, ibcclientclient.UpdateClientProposalHandler, ibcclientclient.UpgradeProposalHandler, - fswapclient.ProposalHandler, )..., ), params.AppModuleBasic{}, @@ -480,7 +478,7 @@ func NewLinkApp( ) fswapConfig := fswaptypes.DefaultConfig() - app.FswapKeeper = fswapkeeper.NewKeeper(appCodec, keys[fswaptypes.StoreKey], fswapConfig, app.BankKeeper) + app.FswapKeeper = fswapkeeper.NewKeeper(appCodec, keys[fswaptypes.StoreKey], fswapConfig, fswaptypes.DefaultAuthority().String(), app.BankKeeper) app.FbridgeKeeper = fbridgekeeper.NewKeeper(appCodec, keys[fbridgetypes.StoreKey], memKeys[fbridgetypes.MemStoreKey], app.AccountKeeper, app.BankKeeper, foundation.DefaultAuthority().String()) // register the proposal types @@ -491,8 +489,7 @@ func NewLinkApp( AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). AddRoute(foundation.RouterKey, foundationkeeper.NewFoundationProposalsHandler(app.FoundationKeeper)). AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)). - AddRoute(wasmplustypes.RouterKey, wasmpluskeeper.NewWasmProposalHandler(&app.WasmKeeper, wasmplustypes.EnableAllProposals)). - AddRoute(fswaptypes.RouterKey, fswap.NewSwapHandler(app.FswapKeeper)) + AddRoute(wasmplustypes.RouterKey, wasmpluskeeper.NewWasmProposalHandler(&app.WasmKeeper, wasmplustypes.EnableAllProposals)) govKeeper := govkeeper.NewKeeper( appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper, diff --git a/go.mod b/go.mod index 8ba06fc6..4367231e 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,13 @@ module github.com/Finschia/finschia/v4 go 1.20 require ( - github.com/Finschia/finschia-sdk v0.49.0-rc3 + github.com/Finschia/finschia-sdk v0.49.0-rc4 github.com/Finschia/ostracon v1.1.3 github.com/Finschia/wasmd v0.3.0 + github.com/Finschia/wasmvm v1.1.1-0.12.0 github.com/cosmos/ibc-go/v4 v4.3.1 github.com/golang/mock v1.6.0 + github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.1 github.com/prometheus/client_golang v1.17.0 github.com/rakyll/statik v0.1.7 @@ -25,7 +27,6 @@ require ( github.com/99designs/keyring v1.2.1 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/Finschia/r2ishiguro_vrf v0.1.2 // indirect - github.com/Finschia/wasmvm v1.1.1-0.12.0 // indirect github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/Workiva/go-datastructures v1.1.1 // indirect github.com/armon/go-metrics v0.4.1 // indirect @@ -61,7 +62,6 @@ require ( github.com/gogo/gateway v1.1.0 // indirect github.com/gogo/protobuf v1.3.3 // indirect github.com/golang/glog v1.0.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/gofuzz v1.2.0 // indirect diff --git a/go.sum b/go.sum index fafbc6f6..d9c6752b 100644 --- a/go.sum +++ b/go.sum @@ -47,14 +47,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/Finschia/finschia-sdk v0.48.1 h1:lqO5DOXNVmvYq3/CCSO5g5nn6dLMzGFUHgY8RutoQGA= -github.com/Finschia/finschia-sdk v0.48.1/go.mod h1:bmPv3zWUAWmm+ZxLpUAK3NhURQ4l+3tg3Bw+WcinbmY= -github.com/Finschia/finschia-sdk v0.49.0-rc1 h1:IiNz6KVGjMRDByV7HqUkUYncY/CFdJAFbAfMecalYHA= -github.com/Finschia/finschia-sdk v0.49.0-rc1/go.mod h1:bmPv3zWUAWmm+ZxLpUAK3NhURQ4l+3tg3Bw+WcinbmY= -github.com/Finschia/finschia-sdk v0.49.0-rc2 h1:NLEaf1DKcSYMyS4UIuHT9I/STY8k32EWVXlxq0sxnS8= -github.com/Finschia/finschia-sdk v0.49.0-rc2/go.mod h1:bmPv3zWUAWmm+ZxLpUAK3NhURQ4l+3tg3Bw+WcinbmY= -github.com/Finschia/finschia-sdk v0.49.0-rc3 h1:yptJLurSmAAsTkpQPyNz8DDiAlQRc1dF1/Za0CHYu8I= -github.com/Finschia/finschia-sdk v0.49.0-rc3/go.mod h1:bmPv3zWUAWmm+ZxLpUAK3NhURQ4l+3tg3Bw+WcinbmY= +github.com/Finschia/finschia-sdk v0.49.0-rc4 h1:9RTPkxLPVfkxo/2Slih/mPzwoclW/JS7CELKlgFhGHQ= +github.com/Finschia/finschia-sdk v0.49.0-rc4/go.mod h1:bmPv3zWUAWmm+ZxLpUAK3NhURQ4l+3tg3Bw+WcinbmY= github.com/Finschia/ibc-go/v4 v4.3.1 h1:pUKry0j+1/ypCC3X1TkEzoLrS1A/low/1PE2HZL+13k= github.com/Finschia/ibc-go/v4 v4.3.1/go.mod h1:kFZgmXXT2pt9QL7Ngx/eA7lI9JlOMGRG/oU4RTDXKcg= github.com/Finschia/ostracon v1.1.3 h1:GYPTc8et+sXEq9W2SUlYwvnImpZ4aG8hI2cIhyBWRSU=