From 37573e0318a5479c71129db4c0de04f3e044ee81 Mon Sep 17 00:00:00 2001 From: beer-1 <147697694+beer-1@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:08:19 +0900 Subject: [PATCH] fix: compute gov addr after `sdk.Config()` changed (#316) * compute gov addr after config changed * Fix type removal * chore(deps): bump github.com/cosmos/ibc-go/v8 in /tests/integration (#320) Bumps [github.com/cosmos/ibc-go/v8](https://github.com/cosmos/ibc-go) from 8.0.0 to 8.2.0. - [Release notes](https://github.com/cosmos/ibc-go/releases) - [Changelog](https://github.com/cosmos/ibc-go/blob/v8.2.0/CHANGELOG.md) - [Commits](https://github.com/cosmos/ibc-go/compare/v8.0.0...v8.2.0) --- updated-dependencies: - dependency-name: github.com/cosmos/ibc-go/v8 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Johnson Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * chore(deps): bump github.com/gagliardetto/solana-go from 1.9.3 to 1.10.0 (#327) Bumps [github.com/gagliardetto/solana-go](https://github.com/gagliardetto/solana-go) from 1.9.3 to 1.10.0. - [Release notes](https://github.com/gagliardetto/solana-go/releases) - [Changelog](https://github.com/gagliardetto/solana-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/gagliardetto/solana-go/compare/v1.9.3...v1.10.0) --- updated-dependencies: - dependency-name: github.com/gagliardetto/solana-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Johnson Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * chore(deps): bump supplypike/setup-bin from 3 to 4 (#336) Bumps [supplypike/setup-bin](https://github.com/supplypike/setup-bin) from 3 to 4. - [Release notes](https://github.com/supplypike/setup-bin/releases) - [Commits](https://github.com/supplypike/setup-bin/compare/v3...v4) --- updated-dependencies: - dependency-name: supplypike/setup-bin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * chore(deps): bump github.com/gagliardetto/binary from 0.7.7 to 0.8.0 (#326) Bumps [github.com/gagliardetto/binary](https://github.com/gagliardetto/binary) from 0.7.7 to 0.8.0. - [Release notes](https://github.com/gagliardetto/binary/releases) - [Changelog](https://github.com/gagliardetto/binary/blob/master/CHANGELOG.md) - [Commits](https://github.com/gagliardetto/binary/compare/v0.7.7...v0.8.0) --- updated-dependencies: - dependency-name: github.com/gagliardetto/binary dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Johnson * chore(deps): bump google.golang.org/grpc from 1.63.0 to 1.63.2 (#331) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.63.0 to 1.63.2. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.63.0...v1.63.2) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Johnson Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * chore(deps): bump github.com/klauspost/compress from 1.17.7 to 1.17.8 (#330) Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.17.7 to 1.17.8. - [Release notes](https://github.com/klauspost/compress/releases) - [Changelog](https://github.com/klauspost/compress/blob/master/.goreleaser.yml) - [Commits](https://github.com/klauspost/compress/compare/v1.17.7...v1.17.8) --- updated-dependencies: - dependency-name: github.com/klauspost/compress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Johnson Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * feat: `x/marketmap` v2 (#265) * new market * gen * fix * wip * dep * ok * tidy * update * cute * clean * params * fix * len * cp * init * ok * cute * add * errors * fix * keeper test * nice * cdc * msg : * msg * clean * update * fix tests * query * query setup * query * query * init hooks * add to keeper * test * add hooks * genesis hook * fix * this is my legacy * ok * lint * init * market query * types * events * proto * module defs * beautify * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * test * newline * remove * test * fix * fix * fix * fix * beautify * merchandise * fix * fix * fix * fix * fix * get params * test * comment * export func * test * invalid bech32 * check * bet * format * expand tests * feat(`x/marketmap`): init types and validation (#266) * clean * new market * gen * fix * wip * dep * update * cute * clean * len * cp * ok * nice * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * test * comment * expand tests * better errors --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * feat(`x/marketmap`): params type (#267) * clean * new market * gen * fix * wip * dep * update * cute * clean * params * fix * len * cp * ok * nice * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * test * newline * remove * comment * expand tests * fix --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * feat(`x/marketmap`): genesis and validation (#268) * bye * fix * 0 len * fix * fix vuln * fixington * fix * nolint * check * fix * feat(`x/marketmap`): keeper methods (#270) * clean * new market * gen * fix * wip * dep * update * cute * clean * params * fix * len * cp * init * ok * cute * add * errors * fix * keeper test * nice * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * test * newline * remove * test * fix * beautify * merchandise * comment * export func * test * expand tests * fix * bye * fix * fix vuln * check --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * feat(`x/marketmap`): tx and msg service (#273) * clean * new market * gen * fix * wip * dep * update * cute * clean * params * fix * len * cp * init * ok * cute * add * errors * fix * keeper test * nice * cdc * msg : * msg * clean * update * fix tests * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * test * newline * remove * test * fix * fix * beautify * merchandise * fix * comment * export func * test * invalid bech32 * check * bet * format * expand tests * fix * bye * fix * 0 len * fix * fix vuln * fixington * nolint * check --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * feat(`x/marketmap`): query server (#275) * clean * new market * gen * fix * wip * dep * update * cute * clean * params * fix * len * cp * init * ok * cute * add * errors * fix * keeper test * nice * cdc * msg : * msg * clean * update * fix tests * query * query setup * query * query * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * test * newline * remove * test * fix * fix * fix * beautify * merchandise * fix * fix * comment * export func * test * invalid bech32 * check * bet * format * expand tests * fix * bye * fix * 0 len * fix * fix vuln * fixington * fix * nolint * check --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * feat(`x/marktmap`): keeper genesis (#276) * clean * new market * gen * fix * wip * dep * update * cute * clean * params * fix * len * cp * init * ok * cute * add * errors * fix * keeper test * nice * cdc * msg : * msg * clean * update * fix tests * query * query setup * query * query * test * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * test * newline * remove * test * fix * fix * fix * fix * beautify * merchandise * fix * fix * fix * get params * test * comment * export func * test * invalid bech32 * check * bet * format * expand tests * fix * bye * fix * 0 len * fix * fix vuln * fixington * fix * nolint * check * fix --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * feat(`x/marketmap`): keeper hooks (#279) * clean * new market * gen * fix * wip * dep * update * cute * clean * params * fix * len * cp * init * ok * cute * add * errors * fix * keeper test * nice * cdc * msg : * msg * clean * update * fix tests * query * query setup * query * query * init hooks * add to keeper * test * add hooks * genesis hook * fix * this is my legacy * ok * lint * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * Update x/mm2/types/market.go Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix * test * newline * remove * test * fix * fix * fix * fix * beautify * merchandise * fix * fix * fix * fix * get params * test * comment * export func * test * invalid bech32 * check * bet * format * expand tests * fix * bye * fix * 0 len * fix * fix vuln * fixington * fix * nolint * check * fix * fix --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * feat(`x/marketmap`): query cli (#280) * init * market query * fix * feat(`x/marketmap`): events (#281) * types * events --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * feat(`x/marketmap`): add `Admin` param (#293) * add admin * fix * better check * revert * update proto * clean * fix * set * test * fix * test * fix * proto * best * capacity * ok * refactor: Provider Ticker Interface (PR1) (#322) * init * init * remove code that should not be here * remove code that should not be here v2 * testing nit * cr * removing decimals from if * refactor: API Price Providers with Provider Ticker Interface (PR2) (#325) * init * more changes * api providers * more nits * cr * cr 2 * remove dec * refactor: WebSocket Providers with ProviderTickers interface (PR3) (#328) * init * more changes * api providers * more nits * cr * cr 2 * init * nits * factory methods * oracle math done * done with build * done with build * done with dydx basic changes * updating * update * dydx provider done * done with oracle testing * done with providers * build * configs * config nit * nits * update aggregator * refactor: marketmap full conversion (#333) * wip * suite * renames * renames * all tests passing * lint pass * fix e2e * fix? * fix * fix * fix * fixed forever * ok * nits * tidy * remove GetProvider * refactor: `mm2` -> `marketmap` (#334) * wip * suite * renames * renames * all tests passing * lint pass * fix e2e * temp * bye * gen * fix * fmt * regen mocks * fix? * fix * fix * fix --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> --------- Co-authored-by: Alex Johnson * chore: Cleaning up deadcode (#337) * init * nit * tidy other readmes * more nits * chore: `marketmap` cleanup (#338) * proto * fix * comment * comment out test * fix * fix --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * ok * sure * tidy all * readme --------- Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> * fix test --------- Signed-off-by: dependabot[bot] Co-authored-by: Eric Co-authored-by: Alex Johnson Co-authored-by: Nikhil Vasan <97126437+nivasan1@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com> --- x/marketmap/keeper/msg_server_test.go | 5 ++++- x/marketmap/types/params.go | 11 ++--------- x/marketmap/types/params_test.go | 15 ++++++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/x/marketmap/keeper/msg_server_test.go b/x/marketmap/keeper/msg_server_test.go index a86d76587..7b77d44b7 100644 --- a/x/marketmap/keeper/msg_server_test.go +++ b/x/marketmap/keeper/msg_server_test.go @@ -2,6 +2,9 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/skip-mev/chaintestutil/sample" slinkytypes "github.com/skip-mev/slinky/pkg/types" @@ -236,7 +239,7 @@ func (s *KeeperTestSuite) TestMsgServerParams() { msg := &types.MsgParams{ Authority: s.authority.String(), Params: types.Params{ - MarketAuthorities: []string{types.DefaultMarketAuthority, sample.Address(r)}, + MarketAuthorities: []string{authtypes.NewModuleAddress(govtypes.ModuleName).String(), sample.Address(r)}, Admin: sample.Address(r), }, } diff --git a/x/marketmap/types/params.go b/x/marketmap/types/params.go index adcc93bcc..b466aa62a 100644 --- a/x/marketmap/types/params.go +++ b/x/marketmap/types/params.go @@ -8,18 +8,11 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) -var ( - // DefaultMarketAuthority is the default value for the market authority Param. - DefaultMarketAuthority = authtypes.NewModuleAddress(govtypes.ModuleName).String() - // DefaultAdmin is the default value for the market admin Param. - DefaultAdmin = authtypes.NewModuleAddress(govtypes.ModuleName).String() -) - // DefaultParams returns default marketmap parameters. func DefaultParams() Params { return Params{ - MarketAuthorities: []string{DefaultMarketAuthority}, - Admin: DefaultAdmin, + MarketAuthorities: []string{authtypes.NewModuleAddress(govtypes.ModuleName).String()}, + Admin: authtypes.NewModuleAddress(govtypes.ModuleName).String(), } } diff --git a/x/marketmap/types/params_test.go b/x/marketmap/types/params_test.go index 59558be36..9f4d8e11a 100644 --- a/x/marketmap/types/params_test.go +++ b/x/marketmap/types/params_test.go @@ -4,6 +4,7 @@ import ( "testing" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/stretchr/testify/require" "github.com/skip-mev/slinky/x/marketmap/types" @@ -25,15 +26,15 @@ func TestValidateBasic(t *testing.T) { { name: "valid multiple authorities", params: types.Params{ - MarketAuthorities: []string{authtypes.NewModuleAddress(authtypes.ModuleName).String(), types.DefaultMarketAuthority}, - Admin: types.DefaultAdmin, + MarketAuthorities: []string{authtypes.NewModuleAddress(authtypes.ModuleName).String(), authtypes.NewModuleAddress(govtypes.ModuleName).String()}, + Admin: authtypes.NewModuleAddress(govtypes.ModuleName).String(), }, expectErr: false, }, { name: "invalid admin", params: types.Params{ - MarketAuthorities: []string{authtypes.NewModuleAddress(authtypes.ModuleName).String(), types.DefaultMarketAuthority}, + MarketAuthorities: []string{authtypes.NewModuleAddress(authtypes.ModuleName).String(), authtypes.NewModuleAddress(govtypes.ModuleName).String()}, Admin: "invalid", }, expectErr: true, @@ -41,8 +42,8 @@ func TestValidateBasic(t *testing.T) { { name: "invalid duplicate authority", params: types.Params{ - MarketAuthorities: []string{types.DefaultMarketAuthority, types.DefaultMarketAuthority}, - Admin: types.DefaultAdmin, + MarketAuthorities: []string{authtypes.NewModuleAddress(govtypes.ModuleName).String(), authtypes.NewModuleAddress(govtypes.ModuleName).String()}, + Admin: authtypes.NewModuleAddress(govtypes.ModuleName).String(), }, expectErr: true, }, @@ -50,7 +51,7 @@ func TestValidateBasic(t *testing.T) { name: "invalid authority string", params: types.Params{ MarketAuthorities: []string{"incorrect"}, - Admin: types.DefaultAdmin, + Admin: authtypes.NewModuleAddress(govtypes.ModuleName).String(), }, expectErr: true, }, @@ -58,7 +59,7 @@ func TestValidateBasic(t *testing.T) { name: "invalid nil authority", params: types.Params{ MarketAuthorities: nil, - Admin: types.DefaultAdmin, + Admin: authtypes.NewModuleAddress(govtypes.ModuleName).String(), }, expectErr: true, },